Require typescript from provided path

Author: Timer

src/IncrementalChecker.ts

@@ -44,6 +44,7 @@ export class IncrementalChecker {
   vue: boolean;
 
   constructor(
+    typescriptPath: string,
     programConfigFile: string,
     linterConfigFile: string | false,
     watchPaths: string[],
@@ -52,7 +53,7 @@ export class IncrementalChecker {
     checkSyntacticErrors: boolean,
     vue: boolean
   ) {
-    // TODO: set `typescript`
+    this.typescript = require(typescriptPath);
     this.programConfigFile = programConfigFile;
     this.linterConfigFile = linterConfigFile;
     this.watchPaths = watchPaths;

src/TypeScriptInstance.ts

@@ -25,5 +25,6 @@ export interface TypeScriptInstance {
   flattenDiagnosticMessageText: typeof ts.flattenDiagnosticMessageText;
   resolveModuleName: typeof ts.resolveModuleName;
   createSourceFile: typeof ts.createSourceFile;
-  sys: ts.System;
+  version: typeof ts.version;
+  sys: typeof ts.sys;
 }

src/index.ts

@@ -69,6 +69,7 @@ class ForkTsCheckerWebpackPlugin {
   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;
   tslint: string | true;
@@ -109,7 +110,7 @@ class ForkTsCheckerWebpackPlugin {
 
   vue: boolean;
 
-  constructor(options?: Partial<Options>) {
+  constructor(typescriptPath?: string | null, options?: Partial<Options>) {
     options = options || ({} as Options);
     this.options = Object.assign({}, options);
 
@@ -159,9 +160,12 @@ class ForkTsCheckerWebpackPlugin {
     this.emitCallback = this.createNoopEmitCallback();
     this.doneCallback = this.createDoneCallback();
 
-    this.typescriptVersion = require('typescript').version;
+    // tslint:disable-next-line:no-implicit-dependencies
+    this.typescriptPath = typescriptPath || require.resolve('typescript');
+    this.typescriptVersion = require(typescriptPath).version;
     this.tslintVersion = this.tslint
-      ? require('tslint').Linter.VERSION
+      ? // tslint:disable-next-line:no-implicit-dependencies
+        require('tslint').Linter.VERSION
       : undefined;
 
     this.vue = options.vue === true; // default false
@@ -553,6 +557,7 @@ class ForkTsCheckerWebpackPlugin {
             ? []
             : ['--max-old-space-size=' + this.memoryLimit],
         env: Object.assign({}, process.env, {
+          TYPESCRIPT_PATH: this.typescriptPath,
           TSCONFIG: this.tsconfigPath,
           TSLINT: this.tslintPath || '',
           WATCH: this.isWatching ? this.watchPaths.join('|') : '',

src/service.ts

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