fix: load the tsconfig extends with the specific extension name

eggjs · Apr 19, 2024 · 66b802c · 66b802c
1 parent f396e5f
commit 66b802c
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -442,11 +442,14 @@ export function loadTsConfig(tsconfigPath: string): ts.CompilerOptions {
       path.resolve(tsconfigDirName, extendPattern),
       path.resolve(tsconfigDirName, `${extendPattern}.json`),
     ];
-
-    if (!path.extname(tsConfig.extends) && !extendPattern.startsWith('.') && !extendPattern.startsWith('/')) {
+
+    const isExtendFromNodeModules = !extendPattern.startsWith('.') && !extendPattern.startsWith('/');
+    if (isExtendFromNodeModules) {
+      const DEFAULT_TS_CONFIG_FILE_NAME = 'tsconfig.json';
+      const extendTsConfigPath = !path.extname(tsconfigPath) ? DEFAULT_TS_CONFIG_FILE_NAME : '';
       maybeRealExtendPath.push(
-        path.resolve(tsconfigDirName, 'node_modules', extendPattern, 'tsconfig.json'),
-        path.resolve(process.cwd(), 'node_modules', extendPattern, 'tsconfig.json'),
+        path.resolve(tsconfigDirName, 'node_modules', extendPattern, extendTsConfigPath),
+        path.resolve(process.cwd(), 'node_modules', extendPattern, extendTsConfigPath),
       );
     }