From 68e88025108f0fdef50b38380773c907ec6484d3 Mon Sep 17 00:00:00 2001 From: Timeless0911 <1604889533@qq.com> Date: Fri, 9 Aug 2024 17:58:32 +0800 Subject: [PATCH] fix: rootDir in bundle DTS --- e2e/cases/dts/bundle-false/__fixtures__/tsconfig.json | 3 +-- e2e/cases/dts/bundle-false/abort-on-error/tsconfig.json | 3 +-- e2e/cases/dts/bundle/__fixtures__/tsconfig.json | 3 +-- e2e/cases/dts/bundle/abort-on-error/tsconfig.json | 3 +-- packages/plugin-dts/src/dts.ts | 4 ++-- packages/plugin-dts/src/tsc.ts | 1 - 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/e2e/cases/dts/bundle-false/__fixtures__/tsconfig.json b/e2e/cases/dts/bundle-false/__fixtures__/tsconfig.json index 0fccc577..888d3e46 100644 --- 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 index 0fccc577..888d3e46 100644 --- 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 index 0fccc577..888d3e46 100644 --- 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 index 0fccc577..888d3e46 100644 --- 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 index 3f1e6b77..28f18e4c 100644 --- 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 { 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 { name, cwd, configPath, - rootDir, declarationDir, dtsExtension, }, diff --git a/packages/plugin-dts/src/tsc.ts b/packages/plugin-dts/src/tsc.ts index 957635f3..79dc3983 100644 --- 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; };