Merge remote-tracking branch 'upstream/master' into good-neighbor

Author: Timer

CHANGELOG.md

@@ -1,3 +1,19 @@
+## v0.4.14
+
+* [Add support for `reportFiles` option](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/179) (#179)
+
+## v0.4.13
+
+* [Merge in `compilerOptions` prior to calling `parseJsonConfigFileContent`](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/176) (#176)
+
+## v0.4.12
+
+* [Add `compilerOptions` option](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/173) (#173)
+
+## v0.4.11
+
+* [Fix os.cpus is not a function](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/172) (#172)
+
 ## v0.4.10
 
 * [Allow fork-ts-checker-webpack-plugin to be imported in .ts files using ESM import syntax](https://github.com/Realytics/fork-ts-checker-webpack-plugin/pull/163) (#163)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fork-ts-checker-webpack-plugin-alt",
-  "version": "0.4.10",
+  "version": "0.4.14",
   "description": "Runs typescript type checker and linter on separate process.",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -9,8 +9,8 @@
   ],
   "scripts": {
     "build": "tsc --version && tsc --project \"./src\"",
-    "test:unit": "mocha -R spec ./test/unit",
-    "test:integration": "mocha -R spec ./test/integration && rimraf tmp",
+    "test:unit": "mocha -R spec ./test/unit --exit",
+    "test:integration": "mocha -R spec ./test/integration --exit && rimraf tmp",
     "test": "npm run build && npm run test:unit && npm run test:integration",
     "test:watch": "mocha -R spec --watch ./test/unit",
     "test:coverage": "rimraf coverage && istanbul cover -root lib --include-all-sources mocha -- -R spec ./test/unit ./test/integration",
@@ -51,10 +51,8 @@
   "devDependencies": {
     "@types/babel-code-frame": "^6.20.1",
     "@types/chokidar": "^1.7.5",
-    "@types/lodash.endswith": "^4.2.3",
-    "@types/lodash.isfunction": "^3.0.3",
-    "@types/lodash.isstring": "^4.0.3",
-    "@types/lodash.startswith": "^4.2.3",
+    "@types/lodash": "^4.14.117",
+    "@types/micromatch": "^3.1.0",
     "@types/minimatch": "^3.0.1",
     "@types/node": "^8.0.26",
     "@types/resolve": "0.0.4",
@@ -65,7 +63,7 @@
     "husky": "^1.1.2",
     "istanbul": "^0.4.5",
     "lint-staged": "^7.3.0",
-    "mocha": "^3.4.1",
+    "mocha": "^5.2.0",
     "mock-fs": "^4.3.0",
     "mock-require": "^2.0.2",
     "prettier": "^1.14.3",
@@ -88,10 +86,8 @@
     "babel-code-frame": "^6.22.0",
     "chalk": "^2.4.1",
     "chokidar": "^2.0.4",
-    "lodash.endswith": "^4.2.1",
-    "lodash.isfunction": "^3.0.8",
-    "lodash.isstring": "^4.0.1",
-    "lodash.startswith": "^4.2.1",
+    "lodash": "^4.17.11",
+    "micromatch": "^3.1.10",
     "minimatch": "^3.0.4",
     "resolve": "^1.5.0",
     "tapable": "^1.0.0"

src/FilesWatcher.ts

@@ -1,6 +1,6 @@
 import * as chokidar from 'chokidar';
 import * as path from 'path';
-import startsWith = require('lodash.startswith');
+import startsWith = require('lodash/startsWith');
 
 export class FilesWatcher {
   watchPaths: string[];

src/IncrementalChecker.ts

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import endsWith = require('lodash.endswith');
+import endsWith = require('lodash/endsWith');
 import * as path from 'path';
 // tslint:disable-next-line:no-implicit-dependencies
 import * as ts from 'typescript';
@@ -25,6 +25,7 @@ interface ConfigurationFile extends Configuration.IConfigurationFile {
 
 export class IncrementalChecker {
   programConfigFile: string;
+  compilerOptions: object;
   linterConfigFile: string | false;
   watchPaths: string[];
   workNumber: number;
@@ -46,6 +47,7 @@ export class IncrementalChecker {
   constructor(
     typescriptPath: string,
     programConfigFile: string,
+    compilerOptions: object,
     linterConfigFile: string | false,
     watchPaths: string[],
     workNumber: number,
@@ -55,6 +57,7 @@ export class IncrementalChecker {
   ) {
     this.typescript = require(typescriptPath);
     this.programConfigFile = programConfigFile;
+    this.compilerOptions = compilerOptions;
     this.linterConfigFile = linterConfigFile;
     this.watchPaths = watchPaths;
     this.workNumber = workNumber || 0;
@@ -74,18 +77,29 @@ export class IncrementalChecker {
     }));
   }
 
-  static loadProgramConfig(typescript: TypeScriptInstance, configFile: string) {
-    return typescript.parseJsonConfigFileContent(
-      // Regardless of the setting in the tsconfig.json we want isolatedModules to be false
-      Object.assign(
-        typescript.readConfigFile(configFile, typescript.sys.readFile).config,
-        {
-          isolatedModules: false
-        }
-      ),
+  static loadProgramConfig(
+    typescript: TypeScriptInstance,
+    configFile: string,
+    compilerOptions: object
+  ) {
+    const tsconfig = typescript.readConfigFile(
+      configFile,
+      typescript.sys.readFile
+    ).config;
+
+    tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+    tsconfig.compilerOptions = {
+      ...tsconfig.compilerOptions,
+      ...compilerOptions
+    };
+
+    const parsed = typescript.parseJsonConfigFileContent(
+      tsconfig,
       typescript.sys,
       path.dirname(configFile)
     );
+
+    return parsed;
   }
 
   static loadLinterConfig(configFile: string): ConfigurationFile {
@@ -201,7 +215,11 @@ export class IncrementalChecker {
   loadVueProgram() {
     this.programConfig =
       this.programConfig ||
-      VueProgram.loadProgramConfig(this.typescript, this.programConfigFile);
+      VueProgram.loadProgramConfig(
+        this.typescript,
+        this.programConfigFile,
+        this.compilerOptions
+      );
 
     return VueProgram.createProgram(
       this.typescript,
@@ -218,7 +236,8 @@ export class IncrementalChecker {
       this.programConfig ||
       IncrementalChecker.loadProgramConfig(
         this.typescript,
-        this.programConfigFile
+        this.programConfigFile,
+        this.compilerOptions
       );
 
     return IncrementalChecker.createProgram(

src/VueProgram.ts

@@ -14,7 +14,11 @@ interface ResolvedScript {
 }
 
 export class VueProgram {
-  static loadProgramConfig(typescript: TypeScriptInstance, configFile: string) {
+  static loadProgramConfig(
+    typescript: TypeScriptInstance,
+    configFile: string,
+    compilerOptions: object
+  ) {
     const extraExtensions = ['vue'];
 
     const parseConfigHost: ts.ParseConfigHost = {
@@ -32,14 +36,19 @@ export class VueProgram {
       }
     };
 
+    const tsconfig = typescript.readConfigFile(
+      configFile,
+      typescript.sys.readFile
+    ).config;
+
+    tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+    tsconfig.compilerOptions = {
+      ...tsconfig.compilerOptions,
+      ...compilerOptions
+    };
+
     const parsed = typescript.parseJsonConfigFileContent(
-      // Regardless of the setting in the tsconfig.json we want isolatedModules to be false
-      Object.assign(
-        typescript.readConfigFile(configFile, typescript.sys.readFile).config,
-        {
-          isolatedModules: false
-        }
-      ),
+      tsconfig,
       parseConfigHost,
       path.dirname(configFile)
     );

src/index.ts

@@ -3,10 +3,11 @@ import * as process from 'process';
 import * as childProcess from 'child_process';
 import chalk, { Chalk } from 'chalk';
 import * as fs from 'fs';
+import * as micromatch from 'micromatch';
 import * as os from 'os';
 import * as webpack from 'webpack';
-import isString = require('lodash.isstring');
-import isFunction = require('lodash.isfunction');
+import isString = require('lodash/isString');
+import isFunction = require('lodash/isFunction');
 import { CancellationToken } from './CancellationToken';
 import { NormalizedMessage } from './NormalizedMessage';
 import { createDefaultFormatter } from './formatter/defaultFormatter';
@@ -40,11 +41,13 @@ interface Logger {
 interface Options {
   typescript?: string;
   tsconfig: string;
+  compilerOptions: object;
   tslint: string | true;
   watch: string | string[];
   async: boolean;
   ignoreDiagnostics: number[];
   ignoreLints: string[];
+  reportFiles: string[];
   colors: boolean;
   logger: Logger;
   formatter: 'default' | 'codeframe' | Formatter;
@@ -66,17 +69,19 @@ interface Options {
 class ForkTsCheckerWebpackPlugin {
   static DEFAULT_MEMORY_LIMIT = 2048;
   static ONE_CPU = 1;
-  static ALL_CPUS = os.cpus() ? os.cpus().length : 1;
+  static ALL_CPUS = os.cpus && os.cpus() ? os.cpus().length : 1;
   static ONE_CPU_FREE = Math.max(1, ForkTsCheckerWebpackPlugin.ALL_CPUS - 1);
   static TWO_CPUS_FREE = Math.max(1, ForkTsCheckerWebpackPlugin.ALL_CPUS - 2);
 
   typescriptPath: string;
   options: Partial<Options>;
   tsconfig: string;
+  compilerOptions: object;
   tslint: string | true;
   watch: string[];
   ignoreDiagnostics: number[];
   ignoreLints: string[];
+  reportFiles: string[];
   logger: Logger;
   silent: boolean;
   async: boolean;
@@ -116,6 +121,10 @@ class ForkTsCheckerWebpackPlugin {
     this.options = Object.assign({}, options);
 
     this.tsconfig = options.tsconfig || './tsconfig.json';
+    this.compilerOptions =
+      typeof options.compilerOptions === 'object'
+        ? options.compilerOptions
+        : {};
     this.tslint = options.tslint
       ? options.tslint === true
         ? './tslint.json'
@@ -126,6 +135,7 @@ class ForkTsCheckerWebpackPlugin {
       : options.watch || [];
     this.ignoreDiagnostics = options.ignoreDiagnostics || [];
     this.ignoreLints = options.ignoreLints || [];
+    this.reportFiles = options.reportFiles || [];
     this.logger = options.logger || console;
     this.silent = options.silent === true; // default false
     this.async = options.async !== false; // default true
@@ -572,6 +582,7 @@ class ForkTsCheckerWebpackPlugin {
         env: Object.assign({}, process.env, {
           TYPESCRIPT_PATH: this.typescriptPath,
           TSCONFIG: this.tsconfigPath,
+          COMPILER_OPTIONS: JSON.stringify(this.compilerOptions),
           TSLINT: this.tslintPath || '',
           WATCH: this.isWatching ? this.watchPaths.join('|') : '',
           WORK_DIVISION: Math.max(1, this.workersNumber),
@@ -685,6 +696,26 @@ class ForkTsCheckerWebpackPlugin {
       );
     }
 
+    if (this.reportFiles.length) {
+      const reportFilesPredicate = (diagnostic: NormalizedMessage): boolean => {
+        if (diagnostic.file) {
+          const relativeFileName = path.relative(
+            this.compiler.options.context,
+            diagnostic.file
+          );
+          const matchResult = micromatch([relativeFileName], this.reportFiles);
+
+          if (matchResult.length === 0) {
+            return false;
+          }
+        }
+        return true;
+      };
+
+      this.diagnostics = this.diagnostics.filter(reportFilesPredicate);
+      this.lints = this.lints.filter(reportFilesPredicate);
+    }
+
     if ('hooks' in this.compiler) {
       // webpack 4
       this.compiler.hooks.forkTsCheckerReceive.call(

src/service.ts

@@ -7,6 +7,7 @@ import { OperationCanceledException } from './OperationCanceledException';
 const checker = new IncrementalChecker(
   process.env.TYPESCRIPT_PATH,
   process.env.TSCONFIG,
+  JSON.parse(process.env.COMPILER_OPTIONS),
   process.env.TSLINT === '' ? false : process.env.TSLINT,
   process.env.WATCH === '' ? [] : process.env.WATCH.split('|'),
   parseInt(process.env.WORK_NUMBER, 10),

src/tsconfig.json

@@ -8,7 +8,7 @@
     "noUnusedParameters": true,
     "suppressImplicitAnyIndexErrors": true,
     "strictNullChecks": false,
-    "lib": ["es5", "es2015.core", "dom"],
+    "lib": ["es5", "es2015", "dom"],
     "module": "commonjs",
     "moduleResolution": "node",
     "declaration": true,

src/tslint.json

@@ -22,6 +22,8 @@
       "allow-pascal-case"
     ],
     "no-namespace": false,
-    "array-type": [true, "array"]
+    "array-type": [true, "array"],
+    "no-submodule-imports": [true, "lodash"]
+
   }
 }