fix(linting): speed up linting, fix output

WolfspiritM · Aug 13, 2019 · bd913cd · bd913cd
1 parent 66f4381
commit bd913cd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 27 deletions.
diff --git a/src/CompilerHost.ts b/src/CompilerHost.ts
@@ -208,20 +208,6 @@ export class CompilerHost
     // do nothing
   }
 
-  public resolveModuleNames(
-    moduleNames: string[],
-    containingFile: string,
-    reusedNames?: string[],
-    redirectedReference?: ts.ResolvedProjectReference
-  ): (ts.ResolvedModule | undefined)[] {
-    return this.tsHost.resolveModuleNames!(
-      moduleNames,
-      containingFile,
-      reusedNames,
-      redirectedReference
-    );
-  }
-
   public watchDirectory(
     path: string,
     callback: ts.DirectoryWatcherCallback,

diff --git a/src/cluster.ts b/src/cluster.ts
@@ -15,7 +15,7 @@ for (let num = 0; num < division; num++) {
   workers.push(
     childProcess.fork(path.resolve(__dirname, './service.js'), [], {
       execArgv: ['--max-old-space-size=' + process.env.MEMORY_LIMIT],
-      env: { ...process.env, WORK_NUMBER: num },
+      env: { ...process.env, WORK_NUMBER: num.toString() },
       stdio: ['inherit', 'inherit', 'inherit', 'ipc']
     })
   );

diff --git a/src/index.ts b/src/index.ts
@@ -233,7 +233,7 @@ class ForkTsCheckerWebpackPlugin {
 
     this.useTypescriptIncrementalApi =
       options.useTypescriptIncrementalApi === undefined
-        ? semver.gte(this.typescriptVersion, '3.0.0') && !this.vue
+        ? semver.gte(this.typescriptVersion, '3.0.0')
         : options.useTypescriptIncrementalApi;
 
     this.measureTime = options.measureCompilationTime === true;
@@ -246,15 +246,11 @@ class ForkTsCheckerWebpackPlugin {
   private validateVersions() {
     if (semver.lt(this.typescriptVersion, '2.1.0')) {
       throw new Error(
-        `Cannot use current typescript version of ${
-          this.typescriptVersion
-        }, the minimum required version is 2.1.0`
+        `Cannot use current typescript version of ${this.typescriptVersion}, the minimum required version is 2.1.0`
       );
     } else if (this.tslintVersion && semver.lt(this.tslintVersion, '4.0.0')) {
       throw new Error(
-        `Cannot use current tslint version of ${
-          this.tslintVersion
-        }, the minimum required version is 4.0.0`
+        `Cannot use current tslint version of ${this.tslintVersion}, the minimum required version is 4.0.0`
       );
     }
   }
@@ -542,7 +538,7 @@ class ForkTsCheckerWebpackPlugin {
             this.doneCallback();
           } else {
             if (this.compiler) {
-              forkTsCheckerHooks.waiting.call(this.tslint !== false);
+              forkTsCheckerHooks.waiting.call(!!this.tslint);
             }
             if (!this.silent && this.logger) {
               this.logger.info(
@@ -567,10 +563,7 @@ class ForkTsCheckerWebpackPlugin {
           this.doneCallback();
         } else {
           if (this.compiler) {
-            this.compiler.applyPlugins(
-              legacyHookMap.waiting,
-              this.tslint !== false
-            );
+            this.compiler.applyPlugins(legacyHookMap.waiting, !!this.tslint);
           }
           if (!this.silent && this.logger) {
             this.logger.info(

diff --git a/src/service.ts b/src/service.ts
@@ -103,6 +103,19 @@ async function run(cancellationToken: CancellationToken) {
     diagnostics = await checker.getDiagnostics(cancellationToken);
     if (checker.hasLinter()) {
       lints = checker.getLints(cancellationToken);
+      lints = lints.map(lint => {
+        if (lint.file) {
+          const unwrappedFileName = unwrapFileName(lint.file);
+
+          if (unwrappedFileName !== lint.file) {
+            return new NormalizedMessage({
+              ...lint.toJSON(),
+              file: unwrappedFileName
+            });
+          }
+        }
+        return lint;
+      });
     }
 
     diagnostics = diagnostics.map(diagnostic => {