Skip to content

Commit a2fdc7e

Browse files
committed
Add Gulpfile lint to jake, fix lints
1 parent d008da5 commit a2fdc7e

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

Gulpfile.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ declare global {
2727
import del = require("del");
2828
import mkdirP = require("mkdirP");
2929
import minimist = require("minimist");
30-
import browserify = require("browserify")
30+
import browserify = require("browserify");
3131
import through2 = require("through2");
3232
import merge2 = require("merge2");
3333
import intoStream = require("into-stream");
@@ -106,8 +106,6 @@ const servicesSources = require("./src/services/tsconfig.json").files.map((file)
106106

107107
const serverCoreSources = require("./src/server/tsconfig.json").files.map((file) => path.join(serverDirectory, file));
108108

109-
const serverSources = serverCoreSources.concat(servicesSources);
110-
111109
const languageServiceLibrarySources = [
112110
"editorServices.ts",
113111
"protocol.d.ts",
@@ -493,15 +491,15 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => {
493491
declaration: true,
494492
outFile: tsserverLibraryFile
495493
}, /*useBuiltCompiler*/ true);
496-
let {js, dts}: {js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream} = gulp.src(languageServiceLibrarySources)
494+
const {js, dts}: {js: NodeJS.ReadableStream, dts: NodeJS.ReadableStream} = gulp.src(languageServiceLibrarySources)
497495
.pipe(sourcemaps.init())
498496
.pipe(newer(tsserverLibraryFile))
499497
.pipe(tsc(settings));
500498

501499
return merge2([
502500
js.pipe(prependCopyright())
503501
.pipe(sourcemaps.write("."))
504-
.pipe(gulp.dest(".")),
502+
.pipe(gulp.dest(".")),
505503
dts.pipe(prependCopyright())
506504
.pipe(gulp.dest("."))
507505
]);

Jakefile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,8 @@ var lintTargets = compilerSources
10431043
.concat(["instrumenter.ts"].map(function(f) { return path.join(harnessDirectory, f) }))
10441044
.concat(serverCoreSources)
10451045
.concat(tslintRulesFiles)
1046-
.concat(servicesSources);
1046+
.concat(servicesSources)
1047+
.concat(["Gulpfile.ts"]);
10471048

10481049

10491050
desc("Runs tslint on the compiler sources. Optional arguments are: f[iles]=regex");

0 commit comments

Comments
 (0)