fix(module-tools): fix ts6369 error when using project reference (web-infra-dev#5050)

10Derozan · web-flow · commit fef529c67405 · 2023-12-08T07:49:56.000+08:00
diff --git a/.changeset/nasty-onions-think.md b/.changeset/nasty-onions-think.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/module-tools': patch
+---
+
+fix(module-tools): fix ts6369
+fix(module-tools): 修复 ts6369 错误
diff --git a/packages/solutions/module-tools/src/builder/dts/tsc.ts b/packages/solutions/module-tools/src/builder/dts/tsc.ts
@@ -1,5 +1,6 @@
 import type { ChildProcess } from 'child_process';
-import { execa, logger } from '@modern-js/utils';
+import path from 'path';
+import { execa, fs, logger } from '@modern-js/utils';
 import type { GeneratorDtsConfig, PluginAPI, ModuleTools } from '../../types';
 import {
   getTscBinPath,
@@ -54,39 +55,55 @@ const runTscBin = async (
   api: PluginAPI<ModuleTools>,
   config: GeneratorDtsConfig,
 ) => {
-  const { appDirectory, watch = false, abortOnError = true } = config;
+  const {
+    appDirectory,
+    watch = false,
+    abortOnError = true,
+    tsconfigPath,
+    userTsconfig,
+    distPath,
+  } = config;
 
   const tscBinFile = await getTscBinPath(appDirectory);
 
-  const { tsconfigPath, userTsconfig, distPath } = config;
-
   const params: string[] = [];
 
-  if (watch) {
-    params.push('-w');
-  }
-
   // avoid error TS6305
   if (userTsconfig.references) {
-    params.push('-b');
+    params.push('-b', tsconfigPath);
+
+    // update outDir
+    userTsconfig.compilerOptions ??= {};
+    const { baseUrl = '.', outDir = 'dist' } = userTsconfig.compilerOptions;
+    const abosultBaseUrl = path.isAbsolute(baseUrl)
+      ? baseUrl
+      : path.join(path.dirname(tsconfigPath), baseUrl);
+    if (path.resolve(abosultBaseUrl, outDir) !== distPath) {
+      userTsconfig.compilerOptions.outDir = path.relative(
+        abosultBaseUrl,
+        distPath,
+      );
+      fs.writeFileSync(tsconfigPath, JSON.stringify(userTsconfig, null, 2));
+    }
+  } else {
+    params.push('-p', tsconfigPath, '--outDir', distPath);
+  }
+
+  if (watch) {
+    params.push('-w');
   }
 
   const childProgress = execa(
     tscBinFile,
     [
-      '-p',
-      tsconfigPath,
+      ...params,
       /* Required parameter, use it stdout have color */
       '--pretty',
       // https://github.com/microsoft/TypeScript/issues/21824
       '--preserveWatchOutput',
       // Only emit d.ts files
       '--declaration',
       '--emitDeclarationOnly',
-      // write d.ts files to distPath that defined in buildConfig.dts
-      '--outDir',
-      distPath,
-      ...params,
     ],
     {
       stdio: 'pipe',
diff --git a/tests/integration/module/fixtures/build/dts-composite/package.json b/tests/integration/module/fixtures/build/dts-composite/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "dts-composite",
+  "version": "1.0.0"
+}
diff --git a/tests/integration/module/fixtures/build/dts-composite/src/index.ts b/tests/integration/module/fixtures/build/dts-composite/src/index.ts
@@ -0,0 +1 @@
+export const b = 'hello world';
diff --git a/tests/integration/module/fixtures/build/dts-composite/tsconfig.json b/tests/integration/module/fixtures/build/dts-composite/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "@modern-js/tsconfig/base",
+  "compilerOptions": {
+    "baseUrl": "./",
+    "paths": {
+      "@src/*": ["./src/*"]
+    },
+    "composite": true,
+    "declaration": true,
+    "outDir": "dist"
+  },
+  "include": ["src"]
+}
diff --git a/tests/integration/module/fixtures/build/dts/tsconfig.json b/tests/integration/module/fixtures/build/dts/tsconfig.json
@@ -3,10 +3,20 @@
   "compilerOptions": {
     "baseUrl": "./",
     "paths": {
-      "@src/*": ["./src/*"]
+      "@src/*": [
+        "./src/*"
+      ]
     },
     "declaration": true,
-    "declarationMap": true
+    "declarationMap": true,
+    "outDir": "dist/bundleless/types"
   },
-  "include": ["src"]
-}
+  "include": [
+    "src"
+  ],
+  "references": [
+    {
+      "path": "../dts-composite"
+    }
+  ]
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "name": "dts-composite",
 +  "version": "1.0.0"
 +}