chore: move base configs to single package (#2470)

web-infra-dev · May 30, 2024 · 64b5da4 · 64b5da4
1 parent 84f8f16
commit 64b5da4
Show file tree

Hide file tree

Showing 143 changed files with 217 additions and 369 deletions.
diff --git a/e2e/cases/babel/decorator/tsconfig.json b/e2e/cases/babel/decorator/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/cache/tsconfig.json b/e2e/cases/cache/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/cli/basic/tsconfig.json b/e2e/cases/cli/basic/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/cli/build-watch/tsconfig.json b/e2e/cases/cli/build-watch/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/cli/falsy-plugins/tsconfig.json b/e2e/cases/cli/falsy-plugins/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/cli/reload-config/tsconfig.json b/e2e/cases/cli/reload-config/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/cli/reload-env/tsconfig.json b/e2e/cases/cli/reload-env/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/css/css-modules-dom/tsconfig.json b/e2e/cases/css/css-modules-dom/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/css/resolve-ts-paths/tsconfig.json b/e2e/cases/css/resolve-ts-paths/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/css/style-loader/tsconfig.json b/e2e/cases/css/style-loader/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/html/combined/tsconfig.json b/e2e/cases/html/combined/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/html/minify/tsconfig.json b/e2e/cases/html/minify/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/ignore-css/tsconfig.json b/e2e/cases/ignore-css/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/performance/resource-hints/tsconfig.json b/e2e/cases/performance/resource-hints/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/rem/basic/tsconfig.json b/e2e/cases/rem/basic/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/server/hmr/tsconfig.json b/e2e/cases/server/hmr/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/solid/ts/tsconfig.json b/e2e/cases/solid/ts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "module": "ESNext",
     "jsx": "preserve",

diff --git a/e2e/cases/source-build/app/tsconfig.json b/e2e/cases/source-build/app/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "declaration": false,
     "jsx": "react-jsx",

diff --git a/e2e/cases/source-build/components/tsconfig.json b/e2e/cases/source-build/components/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "composite": true,
     "declaration": true,

diff --git a/e2e/cases/source-build/utils/tsconfig.json b/e2e/cases/source-build/utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "composite": true,
     "declaration": true,

diff --git a/e2e/cases/source/alias-by-target/tsconfig.json b/e2e/cases/source/alias-by-target/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/source/custom-tsconfig/tsconfig.custom.json b/e2e/cases/source/custom-tsconfig/tsconfig.custom.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/source/custom-tsconfig/tsconfig.json b/e2e/cases/source/custom-tsconfig/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/source/global-vars/tsconfig.json b/e2e/cases/source/global-vars/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/source/jsconfig-paths/jsconfig.json b/e2e/cases/source/jsconfig-paths/jsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/source/tsconfig-paths/tsconfig.json b/e2e/cases/source/tsconfig-paths/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/svelte/ts/tsconfig.json b/e2e/cases/svelte/ts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "module": "ESNext"
   },

diff --git a/e2e/cases/top-level-await/tsconfig.json b/e2e/cases/top-level-await/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/type-check/basic/tsconfig.json b/e2e/cases/type-check/basic/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/type-check/exclude-node-modules/tsconfig.json b/e2e/cases/type-check/exclude-node-modules/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/typescript/tsconfig.json b/e2e/cases/typescript/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/cases/wasm/tsconfig.json b/e2e/cases/wasm/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "jsx": "react-jsx",
     "baseUrl": "./",

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "@biomejs/biome": "1.7.3",
     "@changesets/cli": "^2.27.1",
     "@modern-js/module-tools": "^2.50.0",
-    "@rsbuild/tsconfig": "workspace:*",
+    "@rsbuild/config": "workspace:*",
     "@scripts/test-helper": "workspace:*",
     "check-dependency-version-consistency": "^4.1.0",
     "cross-env": "^7.0.3",

diff --git a/packages/compat/babel-preset/modern.config.ts b/packages/compat/babel-preset/modern.config.ts
@@ -1,5 +1,5 @@
 import { moduleTools } from '@modern-js/module-tools';
-import { dualBuildConfigs } from '../../../scripts/modern.base.config';
+import { dualBuildConfigs } from '@rsbuild/config/modern';
 
 export default {
   plugins: [moduleTools()],

diff --git a/packages/compat/babel-preset/tests/tsconfig.json b/packages/compat/babel-preset/tests/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "baseUrl": "./",
     "types": ["vitest/globals"]

diff --git a/packages/compat/babel-preset/tsconfig.json b/packages/compat/babel-preset/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/compat/plugin-swc/modern.config.ts b/packages/compat/plugin-swc/modern.config.ts
@@ -1,5 +1,5 @@
 import { moduleTools } from '@modern-js/module-tools';
-import { dualBuildConfigs } from '../../../scripts/modern.base.config';
+import { dualBuildConfigs } from '@rsbuild/config/modern';
 
 export default {
   plugins: [moduleTools()],

diff --git a/packages/compat/plugin-swc/tests/tsconfig.json b/packages/compat/plugin-swc/tests/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "baseUrl": "./",
     "types": ["vitest/globals"]

diff --git a/packages/compat/plugin-swc/tsconfig.json b/packages/compat/plugin-swc/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/compat/webpack/modern.config.ts b/packages/compat/webpack/modern.config.ts
@@ -1,3 +1,3 @@
-import { configForDualPackage } from '../../../scripts/modern.base.config';
+import { configForDualPackage } from '@rsbuild/config/modern';
 
 export default configForDualPackage;
diff --git a/packages/compat/webpack/tests/tsconfig.json b/packages/compat/webpack/tests/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "baseUrl": "./",
     "types": ["vitest/globals"]

diff --git a/packages/compat/webpack/tsconfig.json b/packages/compat/webpack/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/core/modern.config.ts b/packages/core/modern.config.ts
@@ -9,7 +9,7 @@ import {
   commonExternals,
   emitTypePkgJsonPlugin,
   esmBuildConfig,
-} from '../../scripts/modern.base.config';
+} from '@rsbuild/config/modern';
 
 const externals = [
   ...commonExternals,

diff --git a/packages/core/tests/tsconfig.json b/packages/core/tests/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "baseUrl": "./",
     "types": ["vitest/globals"]

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/create-rsbuild/modern.config.ts b/packages/create-rsbuild/modern.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig, moduleTools } from '@modern-js/module-tools';
-import { esmBuildConfig } from '../../scripts/modern.base.config';
+import { esmBuildConfig } from '@rsbuild/config/modern';
 
 export default defineConfig({
   plugins: [moduleTools()],

diff --git a/packages/create-rsbuild/tsconfig.json b/packages/create-rsbuild/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./"

diff --git a/packages/plugin-assets-retry/modern.config.ts b/packages/plugin-assets-retry/modern.config.ts
@@ -1,5 +1,5 @@
 import { moduleTools } from '@modern-js/module-tools';
-import { dualBuildConfigs } from '../../scripts/modern.base.config';
+import { dualBuildConfigs } from '@rsbuild/config/modern';
 
 export default {
   plugins: [moduleTools()],

diff --git a/packages/plugin-assets-retry/tests/tsconfig.json b/packages/plugin-assets-retry/tests/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "baseUrl": "./",
     "types": ["vitest/globals"]

diff --git a/packages/plugin-assets-retry/tsconfig.json b/packages/plugin-assets-retry/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/plugin-babel/modern.config.ts b/packages/plugin-babel/modern.config.ts
@@ -1,3 +1,3 @@
-import { configForDualPackage } from '../../scripts/modern.base.config';
+import { configForDualPackage } from '@rsbuild/config/modern';
 
 export default configForDualPackage;
diff --git a/packages/plugin-babel/tsconfig.json b/packages/plugin-babel/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/plugin-basic-ssl/modern.config.ts b/packages/plugin-basic-ssl/modern.config.ts
@@ -1,5 +1,5 @@
 import { moduleTools } from '@modern-js/module-tools';
-import { dualBuildConfigs } from '../../scripts/modern.base.config';
+import { dualBuildConfigs } from '@rsbuild/config/modern';
 
 export default {
   plugins: [moduleTools()],

diff --git a/packages/plugin-basic-ssl/tsconfig.json b/packages/plugin-basic-ssl/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "outDir": "./dist",
     "baseUrl": "./",

diff --git a/packages/plugin-check-syntax/modern.config.ts b/packages/plugin-check-syntax/modern.config.ts
@@ -1,3 +1,3 @@
-import { configForDualPackage } from '../../scripts/modern.base.config';
+import { configForDualPackage } from '@rsbuild/config/modern';
 
 export default configForDualPackage;
diff --git a/packages/plugin-check-syntax/tests/tsconfig.json b/packages/plugin-check-syntax/tests/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rsbuild/tsconfig/base",
+  "extends": "@rsbuild/config/ts",
   "compilerOptions": {
     "baseUrl": "./",
     "types": ["vitest/globals"]