From a2fdc7e7ca1f76132c7260278946a28f274ea582 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 23 Jun 2016 10:12:14 -0700 Subject: [PATCH] Add Gulpfile lint to jake, fix lints --- Gulpfile.ts | 8 +++----- Jakefile.js | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gulpfile.ts b/Gulpfile.ts index 67bad0b8821..ddc0dce8552 100644 --- a/Gulpfile.ts +++ b/Gulpfile.ts @@ -27,7 +27,7 @@ declare global { import del = require("del"); import mkdirP = require("mkdirP"); import minimist = require("minimist"); -import browserify = require("browserify") +import browserify = require("browserify"); import through2 = require("through2"); import merge2 = require("merge2"); import intoStream = require("into-stream"); @@ -106,8 +106,6 @@ const servicesSources = require("./src/services/tsconfig.json").files.map((file) const serverCoreSources = require("./src/server/tsconfig.json").files.map((file) => path.join(serverDirectory, file)); -const serverSources = serverCoreSources.concat(servicesSources); - const languageServiceLibrarySources = [ "editorServices.ts", "protocol.d.ts", @@ -493,7 +491,7 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => { declaration: true, outFile: tsserverLibraryFile }, /*useBuiltCompiler*/ true); - let {js, dts}: {js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream} = gulp.src(languageServiceLibrarySources) + const {js, dts}: {js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream} = gulp.src(languageServiceLibrarySources) .pipe(sourcemaps.init()) .pipe(newer(tsserverLibraryFile)) .pipe(tsc(settings)); @@ -501,7 +499,7 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => { return merge2([ js.pipe(prependCopyright()) .pipe(sourcemaps.write(".")) - .pipe(gulp.dest(".")), + .pipe(gulp.dest(".")), dts.pipe(prependCopyright()) .pipe(gulp.dest(".")) ]); diff --git a/Jakefile.js b/Jakefile.js index 6dd5939f791..e5c3648d5f1 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -1043,7 +1043,8 @@ var lintTargets = compilerSources .concat(["instrumenter.ts"].map(function(f) { return path.join(harnessDirectory, f) })) .concat(serverCoreSources) .concat(tslintRulesFiles) - .concat(servicesSources); + .concat(servicesSources) + .concat(["Gulpfile.ts"]); desc("Runs tslint on the compiler sources. Optional arguments are: f[iles]=regex");