perf: upgrade get-tsconfig with caching

privatenumber · Aug 11, 2023 · 544f4bd · 544f4bd
1 parent f92b1f2
commit 544f4bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
 	},
 	"dependencies": {
 		"esbuild": "^0.19.0",
-		"get-tsconfig": "^4.6.2",
+		"get-tsconfig": "^4.7.0",
 		"loader-utils": "^2.0.4",
 		"webpack-sources": "^1.4.3"
 	},

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/loader.ts b/src/loader.ts
@@ -57,13 +57,14 @@ async function ESBuildLoader(
 		 */
 		if (tsconfigPath) {
 			const tsconfigFullPath = path.resolve(tsconfigPath);
-			let tsconfig = tsconfigCache.get(tsconfigFullPath);
+			const cacheKey = `esbuild-loader:${tsconfigFullPath}`;
+			let tsconfig = tsconfigCache.get(cacheKey);
 			if (!tsconfig) {
 				tsconfig = {
-					config: parseTsconfig(tsconfigFullPath),
+					config: parseTsconfig(tsconfigFullPath, tsconfigCache),
 					path: tsconfigFullPath,
 				};
-				tsconfigCache.set(tsconfigFullPath, tsconfig);
+				tsconfigCache.set(cacheKey, tsconfig);
 			}
 
 			const filesMatcher = createFilesMatcher(tsconfig);
@@ -80,7 +81,7 @@ async function ESBuildLoader(
 			/* Detect tsconfig file */
 
 			// Webpack shouldn't be loading the same path multiple times so doesn't need to be cached
-			const tsconfig = getTsconfig(resourcePath);
+			const tsconfig = getTsconfig(resourcePath, 'tsconfig.json', tsconfigCache);
 			if (tsconfig) {
 				const fileMatcher = createFilesMatcher(tsconfig);
 				transformOptions.tsconfigRaw = fileMatcher(resourcePath) as TransformOptions['tsconfigRaw'];