Webpack 4 resolve type references

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## v8.3.0
+
+* [Fixed impossibility to have several instances of ts-loader with different compiler options](https://github.com/TypeStrong/ts-loader/issues/1316) - thanks @timocov
+* This is a backport from v9.2.0 for webpack 4 compatibility
+
+## v8.2.0
+
+* [Use caches for module resolution and type reference directives when using compiler default functions](https://github.com/TypeStrong/ts-loader/pull/1287) - thanks @sheetalkamat - uses: https://github.com/microsoft/TypeScript/pull/43700
+* This is a backport from v9.1.0 for webpack 4 compatibility
+
 ## v8.1.0
 * [feat: remove top-level typescript import statements](https://github.com/TypeStrong/ts-loader/pull/1259) - thanks @ulivz
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-loader",
-  "version": "8.1.0",
+  "version": "8.3.0",
   "description": "TypeScript loader for webpack",
   "main": "index.js",
   "types": "dist",
@@ -96,7 +96,7 @@
     "mocha": "^6.0.0",
     "prettier": "^2.0.5",
     "rimraf": "^2.6.2",
-    "typescript": "^4.0.0",
+    "typescript": "^4.6.3",
     "webpack": "^4.5.0",
     "webpack-cli": "^3.1.1"
   },

src/index.ts

@@ -161,8 +161,10 @@ function getOptionsHash(loaderOptions: LoaderOptions) {
   const hash = crypto.createHash('sha256');
   Object.keys(loaderOptions).forEach(key => {
     const value = loaderOptions[key];
-    if (value) {
-      hash.update(key + value.toString());
+    if (value !== undefined) {
+      const valueString =
+        typeof value === 'function' ? value.toString() : JSON.stringify(value);
+      hash.update(key + valueString);
     }
   });
   return hash.digest('hex').substring(0, 16);

src/instances.ts

@@ -378,6 +378,7 @@ export function initializeInstance(
   } else if (typeof customerTransformers === 'string') {
     try {
       customerTransformers = require(customerTransformers);
+      // eslint-disable-next-line prettier/prettier
     } catch (err) {
       throw new Error(
         `Failed to load customTransformers from "${instance.loaderOptions.getCustomTransformers}": ${err.message}`

src/interfaces.ts

@@ -102,8 +102,9 @@ export interface ServiceHostWhichMayBeCacheable
 
 export interface WatchHost
   extends typescript.WatchCompilerHostOfFilesAndCompilerOptions<
-    typescript.EmitAndSemanticDiagnosticsBuilderProgram
-  > {
+      typescript.EmitAndSemanticDiagnosticsBuilderProgram
+    >,
+    HostMayBeCacheable {
   invokeFileWatcher: WatchFactory['invokeFileWatcher'];
   updateRootFileNames(): void;
   outputFiles: Map<FilePathKey, typescript.OutputFile[]>;
@@ -178,13 +179,57 @@ export interface ConfigFileInfo {
   dtsFiles?: string[];
 }
 
+interface CacheWithRedirects<T> {
+  ownMap: Map<string, T>;
+  redirectsMap: Map<typescript.Path, Map<string, T>>;
+  getOrCreateMapOfCacheRedirects(
+    redirectedReference: typescript.ResolvedProjectReference | undefined
+  ): Map<string, T>;
+  clear(): void;
+  setOwnOptions(newOptions: typescript.CompilerOptions): void;
+  setOwnMap(newOwnMap: Map<string, T>): void;
+}
+interface PerModuleNameCache {
+  get(
+    directory: string
+  ): typescript.ResolvedModuleWithFailedLookupLocations | undefined;
+  set(
+    directory: string,
+    result: typescript.ResolvedModuleWithFailedLookupLocations
+  ): void;
+}
+
+export interface ModuleResolutionCache
+  extends typescript.ModuleResolutionCache {
+  directoryToModuleNameMap: CacheWithRedirects<
+    Map<string, typescript.ResolvedModuleWithFailedLookupLocations>
+  >;
+  moduleNameToDirectoryMap: CacheWithRedirects<PerModuleNameCache>;
+  clear(): void;
+  update(compilerOptions: typescript.CompilerOptions): void;
+}
+
+// Until the API has been released and ts-loader is built against a version of TypeScript that contains it - see https://github.com/microsoft/TypeScript/blob/74993a2a64bb2e423b40204bb54ff749cdd4ef54/src/compiler/moduleNameResolver.ts#L458
+export interface TypeReferenceDirectiveResolutionCache {
+  getOrCreateCacheForDirectory(
+    directoryName: string,
+    redirectedReference?: typescript.ResolvedProjectReference
+  ): Map<
+    string,
+    typescript.ResolvedTypeReferenceDirectiveWithFailedLookupLocations
+  >;
+  clear(): void;
+  update(compilerOptions: typescript.CompilerOptions): void;
+}
 export interface TSInstance {
   compiler: typeof typescript;
   compilerOptions: typescript.CompilerOptions;
   /** Used for Vue for the most part */
   appendTsTsxSuffixesIfRequired: (filePath: string) => string;
   loaderOptions: LoaderOptions;
   rootFileNames: Set<string>;
+  moduleResolutionCache?: ModuleResolutionCache;
+  typeReferenceResolutionCache?: TypeReferenceDirectiveResolutionCache;
   /**
    * a cache of all the files
    */