fix: rootDir in bundle DTS

web-infra-dev · Aug 12, 2024 · de8d0f3 · de8d0f3
1 parent f533fbb
commit de8d0f3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/e2e/cases/dts/bundle-false/__fixtures__/tsconfig.json b/e2e/cases/dts/bundle-false/__fixtures__/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "@rslib/tsconfig/base",
   "compilerOptions": {
-    "baseUrl": "./",
-    "rootDir": "src"
+    "baseUrl": "./"
   },
   "include": ["src"]
 }
diff --git a/e2e/cases/dts/bundle-false/abort-on-error/tsconfig.json b/e2e/cases/dts/bundle-false/abort-on-error/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "@rslib/tsconfig/base",
   "compilerOptions": {
-    "baseUrl": "./",
-    "rootDir": "src"
+    "baseUrl": "./"
   },
   "include": ["src"]
 }
diff --git a/e2e/cases/dts/bundle/__fixtures__/tsconfig.json b/e2e/cases/dts/bundle/__fixtures__/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "@rslib/tsconfig/base",
   "compilerOptions": {
-    "baseUrl": "./",
-    "rootDir": "src"
+    "baseUrl": "./"
   },
   "include": ["src"]
 }
diff --git a/e2e/cases/dts/bundle/abort-on-error/tsconfig.json b/e2e/cases/dts/bundle/abort-on-error/tsconfig.json
@@ -1,8 +1,7 @@
 {
   "extends": "@rslib/tsconfig/base",
   "compilerOptions": {
-    "baseUrl": "./",
-    "rootDir": "src"
+    "baseUrl": "./"
   },
   "include": ["src"]
 }
diff --git a/packages/plugin-dts/src/dts.ts b/packages/plugin-dts/src/dts.ts
@@ -24,7 +24,8 @@ export async function generateDts(data: DtsGenOptions): Promise<void> {
     throw new Error();
   }
   const { options: rawCompilerOptions } = loadTsconfig(configPath);
-  const rootDir = rawCompilerOptions.rootDir ?? 'src';
+  const rootDir =
+    rawCompilerOptions.rootDir ?? join(dirname(configPath), 'src');
   const outDir = distPath
     ? distPath
     : rawCompilerOptions.declarationDir || './dist';
@@ -81,7 +82,6 @@ export async function generateDts(data: DtsGenOptions): Promise<void> {
       name,
       cwd,
       configPath,
-      rootDir,
       declarationDir,
       dtsExtension,
     },

diff --git a/packages/plugin-dts/src/tsc.ts b/packages/plugin-dts/src/tsc.ts
@@ -12,7 +12,6 @@ export type EmitDtsOptions = {
   name: string;
   cwd: string;
   configPath: string;
-  rootDir: string;
   declarationDir: string;
   dtsExtension: string;
 };