Skip to content

Commit 269b828

Browse files
authored
Fix lssl task (#9967)
1 parent 02a79e3 commit 269b828

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Gulpfile.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => {
449449
});
450450

451451
gulp.task("lssl", "Builds language service server library", [tsserverLibraryFile]);
452-
gulp.task("local", "Builds the full compiler and services", [builtLocalCompiler, servicesFile, serverFile, builtGeneratedDiagnosticMessagesJSON]);
452+
gulp.task("local", "Builds the full compiler and services", [builtLocalCompiler, servicesFile, serverFile, builtGeneratedDiagnosticMessagesJSON, tsserverLibraryFile]);
453453
gulp.task("tsc", "Builds only the compiler", [builtLocalCompiler]);
454454

455455

@@ -503,7 +503,7 @@ gulp.task("VerifyLKG", false, [], () => {
503503
return gulp.src(expectedFiles).pipe(gulp.dest(LKGDirectory));
504504
});
505505

506-
gulp.task("LKGInternal", false, ["lib", "local", "lssl"]);
506+
gulp.task("LKGInternal", false, ["lib", "local"]);
507507

508508
gulp.task("LKG", "Makes a new LKG out of the built js files", ["clean", "dontUseDebugMode"], () => {
509509
return runSequence("LKGInternal", "VerifyLKG");

Jakefile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ var tsserverLibraryDefinitionFile = path.join(builtLocalDirectory, "tsserverlibr
551551
compileFile(
552552
tsserverLibraryFile,
553553
languageServiceLibrarySources,
554-
[builtLocalDirectory, copyright].concat(languageServiceLibrarySources),
554+
[builtLocalDirectory, copyright, builtLocalCompiler].concat(languageServiceLibrarySources).concat(libraryTargets),
555555
/*prefixes*/ [copyright],
556556
/*useBuiltCompiler*/ true,
557557
{ noOutFile: false, generateDeclarations: true });
@@ -562,7 +562,7 @@ task("lssl", [tsserverLibraryFile, tsserverLibraryDefinitionFile]);
562562

563563
// Local target to build the compiler and services
564564
desc("Builds the full compiler and services");
565-
task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON]);
565+
task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON, "lssl"]);
566566

567567
// Local target to build only tsc.js
568568
desc("Builds only the compiler");
@@ -617,7 +617,7 @@ task("generate-spec", [specMd]);
617617

618618
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
619619
desc("Makes a new LKG out of the built js files");
620-
task("LKG", ["clean", "release", "local", "lssl"].concat(libraryTargets), function() {
620+
task("LKG", ["clean", "release", "local"].concat(libraryTargets), function() {
621621
var expectedFiles = [tscFile, servicesFile, serverFile, nodePackageFile, nodeDefinitionsFile, standaloneDefinitionsFile, tsserverLibraryFile, tsserverLibraryDefinitionFile].concat(libraryTargets);
622622
var missingFiles = expectedFiles.filter(function (f) {
623623
return !fs.existsSync(f);

src/server/tsconfig.library.json

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"types": []
1111
},
1212
"files": [
13+
"../services/shims.ts",
14+
"../services/utilities.ts",
1315
"editorServices.ts",
1416
"protocol.d.ts",
1517
"session.ts"

0 commit comments

Comments
 (0)