From 09ff5325eec124232355aebf28336da304b85776 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Tue, 14 Jun 2016 17:31:25 -0700 Subject: [PATCH] Fix lssl task --- Gulpfile.ts | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Gulpfile.ts b/Gulpfile.ts index fbce0c87e15..8f72d5ffa47 100644 --- a/Gulpfile.ts +++ b/Gulpfile.ts @@ -571,19 +571,32 @@ gulp.task(serverFile, false, [servicesFile], () => { const tsserverLibraryFile = path.join(builtLocalDirectory, "tsserverlibrary.js"); const tsserverLibraryDefinitionFile = path.join(builtLocalDirectory, "tsserverlibrary.d.ts"); -gulp.task(tsserverLibraryFile, false, [servicesFile], () => { +gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => { const settings: tsc.Settings = getCompilerSettings({ declaration: true, outFile: tsserverLibraryFile }, /*useBuiltCompiler*/ true); - let result: NodeJS.ReadWriteStream = gulp.src(languageServiceLibrarySources) + let {js, dts}: {js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream} = gulp.src(languageServiceLibrarySources) .pipe(sourcemaps.init()) .pipe(tsc(settings)); if (!useDebugMode) { - result = result.pipe(insert.prepend(fs.readFileSync(copyright))); + const copyrightText = fs.readFileSync(copyright); + js = js.pipe(insert.prepend(copyrightText)); + dts = dts.pipe(insert.prepend(copyrightText)); + } + js.pipe(sourcemaps.write(".")) + .pipe(gulp.dest(".")) + .on("end", complete); + dts.pipe(gulp.dest(".")) + .on("end", complete); + + let completed = 0; + function complete() { + completed++; + if (completed >= 2) { + done(); + } } - return result.pipe(sourcemaps.write(".")) - .pipe(gulp.dest(".")); }); gulp.task("lssl", "Builds language service server library", [tsserverLibraryFile]);