Fixes #325 ensures correct caching in parallel webpack builds

privatenumber · Jul 14, 2023 · 654dd6b · 654dd6b
1 parent 3ee8b57
commit 654dd6b
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/src/loader.ts b/src/loader.ts
@@ -14,8 +14,8 @@ import {
 } from 'get-tsconfig';
 import type { LoaderOptions } from './types.js';
 
-let foundTsconfig: TsConfigResult | null;
-let fileMatcher: FileMatcher;
+const foundTsconfigMap = new Map<string | undefined, TsConfigResult | null>();
+const fileMatcherMap = new Map<string | undefined, FileMatcher>();
 
 async function ESBuildLoader(
 	this: webpack.loader.LoaderContext,
@@ -49,18 +49,27 @@ async function ESBuildLoader(
 	};
 
 	if (!('tsconfigRaw' in transformOptions)) {
+		console.log(tsconfig);
+		let fileMatcher = fileMatcherMap.get(tsconfig);
 		if (!fileMatcher) {
 			const tsconfigPath = tsconfig && path.resolve(tsconfig);
-			foundTsconfig = (
-				tsconfigPath
-					? {
-						config: parseTsconfig(tsconfigPath),
-						path: tsconfigPath,
-					}
-					: getTsconfig()
-			);
+			let foundTsconfig = foundTsconfigMap.get(tsconfig);
+			if (!foundTsconfig) {
+				foundTsconfig = (
+					tsconfigPath
+						? {
+							config: parseTsconfig(tsconfigPath),
+							path: tsconfigPath,
+						}
+						: getTsconfig()
+				);
+			}
 			if (foundTsconfig) {
+				foundTsconfigMap.set(tsconfig, foundTsconfig);
 				fileMatcher = createFilesMatcher(foundTsconfig);
+				if (fileMatcher) {
+					fileMatcherMap.set(tsconfig, fileMatcher);
+				}
 			}
 		}