From 9dfc23dfda06b1edaa8ab2e19ca6e3111a740bef Mon Sep 17 00:00:00 2001 From: Soon Date: Wed, 5 Feb 2025 16:03:51 +0800 Subject: [PATCH] refactor: remove prebundle package's `.d.ts` (#1809) --- packages/cli/tsconfig.json | 1 + packages/core/src/node/PluginDriver.ts | 1 - packages/core/tsconfig.json | 1 + packages/create-rspress/tsconfig.json | 1 + packages/document/tsconfig.json | 4 ++-- packages/modern-plugin-rspress/tsconfig.json | 2 ++ packages/plugin-api-docgen/tsconfig.json | 1 + packages/plugin-auto-nav-sidebar/tsconfig.json | 1 + packages/plugin-client-redirects/tsconfig.json | 1 + packages/plugin-container-syntax/tsconfig.json | 1 + packages/plugin-last-updated/tsconfig.json | 1 + packages/plugin-medium-zoom/tsconfig.json | 1 + packages/plugin-playground/tsconfig.json | 1 + packages/plugin-preview/tsconfig.json | 1 + packages/plugin-rss/tsconfig.json | 4 ++-- packages/plugin-shiki/tsconfig.json | 1 + packages/plugin-typedoc/tsconfig.json | 1 + packages/runtime/tsconfig.json | 2 ++ packages/shared/chalk.d.ts | 2 -- packages/shared/logger.d.ts | 1 - packages/shared/node-utils.d.ts | 1 - packages/theme-default/tsconfig.json | 1 + tsconfig.json | 1 + 23 files changed, 23 insertions(+), 9 deletions(-) delete mode 100644 packages/shared/chalk.d.ts delete mode 100644 packages/shared/logger.d.ts delete mode 100644 packages/shared/node-utils.d.ts diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 78f99ae81..06b40c18c 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -2,6 +2,7 @@ "extends": "@modern-js/tsconfig/base", "declaration": true, "compilerOptions": { + "moduleResolution": "bundler", "module": "ESNext", "target": "ESNext", "baseUrl": "./", diff --git a/packages/core/src/node/PluginDriver.ts b/packages/core/src/node/PluginDriver.ts index 82791a725..1fa1936a6 100644 --- a/packages/core/src/node/PluginDriver.ts +++ b/packages/core/src/node/PluginDriver.ts @@ -55,7 +55,6 @@ export class PluginDriver { if (isDevDebugMode()) { const SourceBuildPlugin = await import( - // @ts-expect-error need moduleResolution: Node16, NodeNext or Bundler to get type declarations work '@rspress/theme-default/node/source-build-plugin.js' ).then( r => r.SourceBuildPlugin, diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 563c5ae95..1875d762b 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "strict": false, "declaration": true, "noEmit": false, diff --git a/packages/create-rspress/tsconfig.json b/packages/create-rspress/tsconfig.json index 74540c515..8ad197149 100644 --- a/packages/create-rspress/tsconfig.json +++ b/packages/create-rspress/tsconfig.json @@ -2,6 +2,7 @@ "extends": "@modern-js/tsconfig/base", "declaration": true, "compilerOptions": { + "moduleResolution": "bundler", "module": "ESNext", "target": "ESNext", "baseUrl": "./", diff --git a/packages/document/tsconfig.json b/packages/document/tsconfig.json index 138ecb536..224b51a1f 100644 --- a/packages/document/tsconfig.json +++ b/packages/document/tsconfig.json @@ -2,6 +2,7 @@ "extends": "@modern-js/tsconfig/base", "compilerOptions": { "jsx": "preserve", + "moduleResolution": "bundler", "paths": { "i18n": ["./i18n.json"], "@theme": ["./theme"], @@ -10,8 +11,7 @@ "@zh/*": ["./docs/zh/*"], "@en/*": ["./docs/en/*"] }, - "module": "ESNext", - "moduleResolution": "Bundler" + "module": "ESNext" }, "include": [ "./rspress.config.ts", diff --git a/packages/modern-plugin-rspress/tsconfig.json b/packages/modern-plugin-rspress/tsconfig.json index 4becfde17..1bdc5f601 100644 --- a/packages/modern-plugin-rspress/tsconfig.json +++ b/packages/modern-plugin-rspress/tsconfig.json @@ -1,6 +1,8 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", + "module": "ESNext", "declaration": true, "noEmit": false, "outDir": "dist", diff --git a/packages/plugin-api-docgen/tsconfig.json b/packages/plugin-api-docgen/tsconfig.json index a664bfa78..27c0f9da0 100644 --- a/packages/plugin-api-docgen/tsconfig.json +++ b/packages/plugin-api-docgen/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "composite": true, "declaration": true, "noEmit": false, diff --git a/packages/plugin-auto-nav-sidebar/tsconfig.json b/packages/plugin-auto-nav-sidebar/tsconfig.json index e9dc37774..1c1049ad3 100644 --- a/packages/plugin-auto-nav-sidebar/tsconfig.json +++ b/packages/plugin-auto-nav-sidebar/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": true, "noEmit": false, "composite": true, diff --git a/packages/plugin-client-redirects/tsconfig.json b/packages/plugin-client-redirects/tsconfig.json index 123fea282..d63af44ef 100644 --- a/packages/plugin-client-redirects/tsconfig.json +++ b/packages/plugin-client-redirects/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "composite": true, "declaration": true, "module": "ESNext", diff --git a/packages/plugin-container-syntax/tsconfig.json b/packages/plugin-container-syntax/tsconfig.json index be8089b85..f33f17f73 100644 --- a/packages/plugin-container-syntax/tsconfig.json +++ b/packages/plugin-container-syntax/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "composite": true, "declaration": true, "module": "ESNext", diff --git a/packages/plugin-last-updated/tsconfig.json b/packages/plugin-last-updated/tsconfig.json index 6b6e4634c..6273446a7 100644 --- a/packages/plugin-last-updated/tsconfig.json +++ b/packages/plugin-last-updated/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": true, "composite": true, "module": "ESNext", diff --git a/packages/plugin-medium-zoom/tsconfig.json b/packages/plugin-medium-zoom/tsconfig.json index 5bb504fc3..97a02a037 100644 --- a/packages/plugin-medium-zoom/tsconfig.json +++ b/packages/plugin-medium-zoom/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": true, "noEmit": false, "outDir": "dist", diff --git a/packages/plugin-playground/tsconfig.json b/packages/plugin-playground/tsconfig.json index 2c8f9fa47..0a0047a49 100644 --- a/packages/plugin-playground/tsconfig.json +++ b/packages/plugin-playground/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": true, "composite": true, "noEmit": false, diff --git a/packages/plugin-preview/tsconfig.json b/packages/plugin-preview/tsconfig.json index dcad55f95..77255ad87 100644 --- a/packages/plugin-preview/tsconfig.json +++ b/packages/plugin-preview/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "composite": true, "noEmit": false, "declaration": true, diff --git a/packages/plugin-rss/tsconfig.json b/packages/plugin-rss/tsconfig.json index 2e6dfe5f2..c9df657db 100644 --- a/packages/plugin-rss/tsconfig.json +++ b/packages/plugin-rss/tsconfig.json @@ -1,12 +1,12 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": false, "module": "ESNext", "target": "ES2020", "esModuleInterop": true, - "skipLibCheck": true, - "moduleResolution": "bundler" + "skipLibCheck": true }, "include": ["src"], "references": [ diff --git a/packages/plugin-shiki/tsconfig.json b/packages/plugin-shiki/tsconfig.json index dcab8bc24..1ff09cb31 100644 --- a/packages/plugin-shiki/tsconfig.json +++ b/packages/plugin-shiki/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": false, "module": "ESNext", "target": "ESNext", diff --git a/packages/plugin-typedoc/tsconfig.json b/packages/plugin-typedoc/tsconfig.json index b55a9649b..931b71876 100644 --- a/packages/plugin-typedoc/tsconfig.json +++ b/packages/plugin-typedoc/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": false, "module": "ESNext", "target": "ESNext", diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json index e2d81fc99..e7f0f5f16 100644 --- a/packages/runtime/tsconfig.json +++ b/packages/runtime/tsconfig.json @@ -1,6 +1,8 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", + "module": "ESNext", "composite": true, "declaration": true, "noEmit": false, diff --git a/packages/shared/chalk.d.ts b/packages/shared/chalk.d.ts deleted file mode 100644 index da3a4f7f4..000000000 --- a/packages/shared/chalk.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './dist/chalk'; -export { default } from './dist/chalk'; diff --git a/packages/shared/logger.d.ts b/packages/shared/logger.d.ts deleted file mode 100644 index 066d2099a..000000000 --- a/packages/shared/logger.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/logger'; diff --git a/packages/shared/node-utils.d.ts b/packages/shared/node-utils.d.ts deleted file mode 100644 index 4193a07ca..000000000 --- a/packages/shared/node-utils.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/node-utils'; diff --git a/packages/theme-default/tsconfig.json b/packages/theme-default/tsconfig.json index 551d0188a..6e00cc65b 100644 --- a/packages/theme-default/tsconfig.json +++ b/packages/theme-default/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@modern-js/tsconfig/base", "compilerOptions": { + "moduleResolution": "bundler", "declaration": true, "noEmit": false, "declarationDir": "dist", diff --git a/tsconfig.json b/tsconfig.json index 2d03e2064..3939d960e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,7 @@ "extends": "@modern-js/tsconfig/base", "compilerOptions": { "target": "ES2019", + "module": "ESNext", "declaration": true, "outDir": "./dist", "jsx": "preserve",