chore: bump rsbuild to 0.2.4 (#5097)

web-infra-dev · Dec 15, 2023 · 3067256 · 3067256
1 parent df19d4d
commit 3067256
Show file tree

Hide file tree

Showing 14 changed files with 167 additions and 126 deletions.
diff --git a/.changeset/angry-ears-joke.md b/.changeset/angry-ears-joke.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/uni-builder': patch
+'@modern-js/devtools-client': patch
+---
+
+chore: bump rsbuild to 0.2.4
+
+chore: 升级 rsbuild 到 0.2.4
diff --git a/packages/builder/builder-webpack-provider/package.json b/packages/builder/builder-webpack-provider/package.json
@@ -96,7 +96,7 @@
     "@modern-js/types": "workspace:*",
     "@modern-js/utils": "workspace:*",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.2.3",
+    "@rsbuild/babel-preset": "0.2.4",
     "@swc/helpers": "0.5.3",
     "babel-plugin-import": "1.13.5",
     "babel-plugin-styled-components": "1.13.3",

diff --git a/packages/builder/builder/package.json b/packages/builder/builder/package.json
@@ -62,7 +62,7 @@
   "dependencies": {
     "@modern-js/builder-shared": "workspace:*",
     "@modern-js/utils": "workspace:*",
-    "@rsbuild/monorepo-utils": "0.2.3",
+    "@rsbuild/monorepo-utils": "0.2.4",
     "@svgr/webpack": "8.0.1",
     "@swc/helpers": "0.5.3",
     "deepmerge": "^4.3.1",

diff --git a/packages/builder/uni-builder/package.json b/packages/builder/uni-builder/package.json
@@ -31,21 +31,21 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.2.3",
-    "@rsbuild/core": "0.2.3",
-    "@rsbuild/plugin-assets-retry": "0.2.3",
-    "@rsbuild/plugin-babel": "0.2.3",
-    "@rsbuild/plugin-check-syntax": "0.2.3",
-    "@rsbuild/plugin-css-minimizer": "0.2.3",
-    "@rsbuild/plugin-pug": "0.2.3",
-    "@rsbuild/plugin-react": "0.2.3",
-    "@rsbuild/plugin-rem": "0.2.3",
-    "@rsbuild/plugin-source-build": "0.2.3",
-    "@rsbuild/plugin-styled-components": "0.2.3",
-    "@rsbuild/plugin-svgr": "0.2.3",
-    "@rsbuild/plugin-type-check": "0.2.3",
-    "@rsbuild/shared": "0.2.3",
-    "@rsbuild/webpack": "0.2.3",
+    "@rsbuild/babel-preset": "0.2.4",
+    "@rsbuild/core": "0.2.4",
+    "@rsbuild/plugin-assets-retry": "0.2.4",
+    "@rsbuild/plugin-babel": "0.2.4",
+    "@rsbuild/plugin-check-syntax": "0.2.4",
+    "@rsbuild/plugin-css-minimizer": "0.2.4",
+    "@rsbuild/plugin-pug": "0.2.4",
+    "@rsbuild/plugin-react": "0.2.4",
+    "@rsbuild/plugin-rem": "0.2.4",
+    "@rsbuild/plugin-source-build": "0.2.4",
+    "@rsbuild/plugin-styled-components": "0.2.4",
+    "@rsbuild/plugin-svgr": "0.2.4",
+    "@rsbuild/plugin-type-check": "0.2.4",
+    "@rsbuild/shared": "0.2.4",
+    "@rsbuild/webpack": "0.2.4",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -67,7 +67,7 @@
     "webpack-subresource-integrity": "5.1.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.2.3",
+    "@rsbuild/plugin-swc": "0.2.4",
     "@scripts/build": "workspace:*",
     "@scripts/vitest-config": "workspace:*",
     "@types/lodash": "^4.14.202",

diff --git a/packages/builder/uni-builder/src/rspack/defaults.ts b/packages/builder/uni-builder/src/rspack/defaults.ts
@@ -8,7 +8,7 @@ import {
   getDefaultPerformanceConfig,
   getDefaultExperimentsConfig,
 } from '../shared/defaults';
-import { mergeRsbuildConfig } from '@rsbuild/shared';
+import { mergeRsbuildConfig } from '@rsbuild/core';
 import type { UniBuilderRspackConfig } from '../types';
 
 export const createDefaultConfig = (): UniBuilderRspackConfig => ({

diff --git a/packages/builder/uni-builder/src/webpack/defaults.ts b/packages/builder/uni-builder/src/webpack/defaults.ts
@@ -8,7 +8,7 @@ import {
   getDefaultPerformanceConfig,
   getDefaultExperimentsConfig,
 } from '../shared/defaults';
-import { mergeRsbuildConfig } from '@rsbuild/shared';
+import { mergeRsbuildConfig } from '@rsbuild/core';
 import type { UniBuilderWebpackConfig } from '../types';
 
 export const createDefaultConfig = (): UniBuilderWebpackConfig => ({

diff --git a/packages/builder/uni-builder/src/webpack/index.ts b/packages/builder/uni-builder/src/webpack/index.ts
@@ -85,9 +85,10 @@ export async function createWebpackBuilder(
   );
 
   const { webpackProvider } = await import('@rsbuild/webpack');
+  rsbuildConfig.provider = webpackProvider;
+
   const rsbuild = await createRsbuild({
     rsbuildConfig,
-    provider: webpackProvider,
     cwd,
   });
 

diff --git a/packages/builder/uni-builder/tests/__snapshots__/default.test.ts.snap b/packages/builder/uni-builder/tests/__snapshots__/default.test.ts.snap
@@ -145,6 +145,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -189,6 +190,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -239,6 +241,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -293,6 +296,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -353,6 +357,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -411,6 +416,7 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -861,8 +867,10 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
           "log": [Function],
         },
         "typescript": {
+          "build": false,
           "configFile": "tsconfig.json",
           "memoryLimit": 8192,
+          "mode": "readonly",
           "typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
         },
       },
@@ -1040,6 +1048,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -1084,6 +1093,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -1134,6 +1144,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -1188,6 +1199,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -1248,6 +1260,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -1306,6 +1319,7 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
                 "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
                 "options": {
                   "postcssOptions": {
+                    "config": false,
                     "plugins": [
                       [Function],
                       {
@@ -1822,8 +1836,10 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
           "log": [Function],
         },
         "typescript": {
+          "build": false,
           "configFile": "tsconfig.json",
           "memoryLimit": 8192,
+          "mode": "readonly",
           "typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
         },
       },
@@ -2008,6 +2024,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
             "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
             "options": {
               "postcssOptions": {
+                "config": false,
                 "plugins": [
                   [Function],
                   {
@@ -2067,6 +2084,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
             "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
             "options": {
               "postcssOptions": {
+                "config": false,
                 "plugins": [
                   [Function],
                   {
@@ -2140,6 +2158,7 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
             "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
             "options": {
               "postcssOptions": {
+                "config": false,
                 "plugins": [
                   [Function],
                   {
@@ -2709,8 +2728,10 @@ exports[`uni-builder webpack > should generator webpack config correctly 1`] = `
           "log": [Function],
         },
         "typescript": {
+          "build": false,
           "configFile": "tsconfig.json",
           "memoryLimit": 8192,
+          "mode": "readonly",
           "typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
         },
       },
@@ -2924,6 +2945,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
             "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
             "options": {
               "postcssOptions": {
+                "config": false,
                 "plugins": [
                   [Function],
                   {
@@ -2983,6 +3005,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
             "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
             "options": {
               "postcssOptions": {
+                "config": false,
                 "plugins": [
                   [Function],
                   {
@@ -3056,6 +3079,7 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
             "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
             "options": {
               "postcssOptions": {
+                "config": false,
                 "plugins": [
                   [Function],
                   {
@@ -3700,8 +3724,10 @@ exports[`uni-builder webpack > should generator webpack config correctly when pr
           "log": [Function],
         },
         "typescript": {
+          "build": false,
           "configFile": "tsconfig.json",
           "memoryLimit": 8192,
+          "mode": "readonly",
           "typescriptPath": "<WORKSPACE>/node_modules/<PNPM_INNER>/typescript/lib/typescript.js",
         },
       },

diff --git a/packages/builder/uni-builder/tests/__snapshots__/postcssLegacy.test.ts.snap b/packages/builder/uni-builder/tests/__snapshots__/postcssLegacy.test.ts.snap
@@ -117,6 +117,7 @@ exports[`plugin-postcssLegacy > should register postcss plugin by browserslist 1
               "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
               "options": {
                 "postcssOptions": {
+                  "config": false,
                   "plugins": [
                     [Function],
                     {
@@ -153,6 +154,7 @@ exports[`plugin-postcssLegacy > should register postcss plugin by browserslist 1
               "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
               "options": {
                 "postcssOptions": {
+                  "config": false,
                   "plugins": [
                     [Function],
                     {
@@ -195,6 +197,7 @@ exports[`plugin-postcssLegacy > should register postcss plugin by browserslist 1
               "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
               "options": {
                 "postcssOptions": {
+                  "config": false,
                   "plugins": [
                     [Function],
                     {
@@ -241,6 +244,7 @@ exports[`plugin-postcssLegacy > should register postcss plugin by browserslist 1
               "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
               "options": {
                 "postcssOptions": {
+                  "config": false,
                   "plugins": [
                     [Function],
                     {
@@ -293,6 +297,7 @@ exports[`plugin-postcssLegacy > should register postcss plugin by browserslist 1
               "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
               "options": {
                 "postcssOptions": {
+                  "config": false,
                   "plugins": [
                     [Function],
                     {
@@ -343,6 +348,7 @@ exports[`plugin-postcssLegacy > should register postcss plugin by browserslist 1
               "loader": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/shared/compiled/postcss-loader",
               "options": {
                 "postcssOptions": {
+                  "config": false,
                   "plugins": [
                     [Function],
                     {

diff --git a/packages/devtools/client/package.json b/packages/devtools/client/package.json
@@ -43,7 +43,7 @@
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/themes": "^2.0.0",
-    "@rsbuild/core": "0.2.3",
+    "@rsbuild/core": "0.2.4",
     "@types/jest": "^29",
     "@types/lodash": "^4.14.202",
     "@types/node": "~16.11.7",

diff --git a/packages/review/eslint-config-app/package.json b/packages/review/eslint-config-app/package.json
@@ -25,7 +25,7 @@
     "@babel/core": "^7.23.2",
     "@babel/eslint-parser": "^7.22.15",
     "@babel/eslint-plugin": "^7.22.10",
-    "@rsbuild/babel-preset": "0.2.3",
+    "@rsbuild/babel-preset": "0.2.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",
     "@typescript-eslint/parser": "^5.59.0",
     "eslint": "^8.28.0",

diff --git a/packages/runtime/plugin-testing/package.json b/packages/runtime/plugin-testing/package.json
@@ -128,7 +128,7 @@
     "@modern-js/plugin": "workspace:*",
     "@modern-js/prod-server": "workspace:*",
     "@modern-js/types": "workspace:*",
-    "@rsbuild/babel-preset": "0.2.3",
+    "@rsbuild/babel-preset": "0.2.4",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^13.4.0",
     "@types/testing-library__jest-dom": "^5.14.3",

diff --git a/packages/server/utils/package.json b/packages/server/utils/package.json
@@ -46,7 +46,7 @@
     "@modern-js/babel-compiler": "workspace:*",
     "@modern-js/utils": "workspace:*",
     "@modern-js/babel-plugin-module-resolver": "workspace:*",
-    "@rsbuild/babel-preset": "0.2.3",
+    "@rsbuild/babel-preset": "0.2.4",
     "@swc/helpers": "0.5.3",
     "babel-plugin-transform-typescript-metadata": "^0.3.2"
   },