fix: load the tsconfig extends with the specific extension name (#111)

eggjs · Feb 4, 2025 · 2bbc458 · 2bbc458
1 parent f396e5f
commit 2bbc458
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
   },
   "devDependencies": {
     "@eggjs/tsconfig": "^1.0.0",
+    "@tsconfig/node14": "^14.1.2",
     "@types/commander": "^2.12.2",
     "@types/del": "^3.0.0",
     "@types/globby": "^6.1.0",

diff --git a/src/utils.ts b/src/utils.ts
@@ -442,11 +442,13 @@ 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(extendPattern) ? 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),
       );
     }
 

diff --git a/test/fixtures/test-tsconfig/tsconfig.node.json b/test/fixtures/test-tsconfig/tsconfig.node.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@tsconfig/node14/tsconfig.json"
+}
diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -220,5 +220,10 @@ describe('utils.test.ts', () => {
     const tsConfig2 = utils.loadTsConfig(path.resolve(__dirname, './fixtures/test-tsconfig/tsconfig.json'));
     assert(tsConfig2);
     assert(tsConfig2.skipLibCheck);
+
+    const tsConfig3 = utils.loadTsConfig(path.resolve(__dirname, './fixtures/test-tsconfig/tsconfig.node.json'));
+    assert(tsConfig3);
+    assert(tsConfig3.strict);
+    assert(tsConfig3.skipLibCheck);
   });
 });