chore(deps): bump rsbuild to 0.4.3 (#5390)

web-infra-dev · Feb 18, 2024 · fd2d496 · fd2d496
1 parent 2c71d6a
commit fd2d496
Show file tree

Hide file tree

Showing 19 changed files with 494 additions and 197 deletions.
diff --git a/.changeset/pink-rings-push.md b/.changeset/pink-rings-push.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/uni-builder': patch
+---
+
+chore(deps): bump rsbuild 0.4.3
+
+chore(deps): 升级 rsbuild 到 0.4.3
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.4.0",
+    "@rsbuild/babel-preset": "0.4.3",
     "@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.4.0",
+    "@rsbuild/monorepo-utils": "0.4.3",
     "@svgr/webpack": "8.1.0",
     "@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
@@ -35,23 +35,23 @@
     "@modern-js/server": "workspace:*",
     "@modern-js/prod-server": "workspace:*",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.4.0",
-    "@rsbuild/core": "0.4.0",
-    "@rsbuild/plugin-assets-retry": "0.4.0",
-    "@rsbuild/plugin-babel": "0.4.0",
-    "@rsbuild/plugin-check-syntax": "0.4.0",
-    "@rsbuild/plugin-css-minimizer": "0.4.0",
-    "@rsbuild/plugin-pug": "0.4.0",
-    "@rsbuild/plugin-react": "0.4.0",
-    "@rsbuild/plugin-rem": "0.4.0",
-    "@rsbuild/plugin-source-build": "0.4.0",
-    "@rsbuild/plugin-styled-components": "0.4.0",
-    "@rsbuild/plugin-svgr": "0.4.0",
-    "@rsbuild/plugin-type-check": "0.4.0",
-    "@rsbuild/plugin-toml": "0.4.0",
-    "@rsbuild/plugin-yaml": "0.4.0",
-    "@rsbuild/shared": "0.4.0",
-    "@rsbuild/webpack": "0.4.0",
+    "@rsbuild/babel-preset": "0.4.3",
+    "@rsbuild/core": "0.4.3",
+    "@rsbuild/plugin-assets-retry": "0.4.3",
+    "@rsbuild/plugin-babel": "0.4.3",
+    "@rsbuild/plugin-check-syntax": "0.4.3",
+    "@rsbuild/plugin-css-minimizer": "0.4.3",
+    "@rsbuild/plugin-pug": "0.4.3",
+    "@rsbuild/plugin-react": "0.4.3",
+    "@rsbuild/plugin-rem": "0.4.3",
+    "@rsbuild/plugin-source-build": "0.4.3",
+    "@rsbuild/plugin-styled-components": "0.4.3",
+    "@rsbuild/plugin-svgr": "0.4.3",
+    "@rsbuild/plugin-type-check": "0.4.3",
+    "@rsbuild/plugin-toml": "0.4.3",
+    "@rsbuild/plugin-yaml": "0.4.3",
+    "@rsbuild/shared": "0.4.3",
+    "@rsbuild/webpack": "0.4.3",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@modern-js/builder-plugin-node-polyfill": "workspace:*",
-    "@rsbuild/plugin-swc": "0.4.0",
+    "@rsbuild/plugin-swc": "0.4.3",
     "@scripts/build": "workspace:*",
     "@scripts/vitest-config": "workspace:*",
     "@types/lodash": "^4.14.202",

diff --git a/packages/builder/uni-builder/src/types.ts b/packages/builder/uni-builder/src/types.ts
@@ -250,6 +250,15 @@ export type UniBuilderExtraConfig = {
      */
     templateParametersByEntries?: Record<string, Record<string, unknown>>;
   };
+  performance?: {
+    /**
+     * Specifies whether to modularize the import of [lodash](https://npmjs.com/package/lodash)
+     * and remove unused lodash modules to reduce the code size of lodash.
+     *
+     * Tips: this configuration is not yet supported in rspack
+     */
+    transformLodash?: boolean;
+  };
   security?: {
     /**
      * Adding an integrity attribute (`integrity`) to sub-resources introduced by HTML allows the browser to

diff --git a/packages/builder/uni-builder/src/webpack/index.ts b/packages/builder/uni-builder/src/webpack/index.ts
@@ -31,9 +31,14 @@ export async function parseConfig(
   );
 
   rsbuildPlugins.push(
-    pluginBabel({
-      babelLoaderOptions: uniBuilderConfig.tools?.babel,
-    }),
+    pluginBabel(
+      {
+        babelLoaderOptions: uniBuilderConfig.tools?.babel,
+      },
+      {
+        transformLodash: uniBuilderConfig.performance?.transformLodash ?? true,
+      },
+    ),
   );
   rsbuildPlugins.push(pluginReact());
 

diff --git a/packages/builder/uni-builder/src/webpack/plugins/babel.ts b/packages/builder/uni-builder/src/webpack/plugins/babel.ts
@@ -37,7 +37,12 @@ export const getPresetReact = (rootPath: string, isProd: boolean) => {
   return [require.resolve('@babel/preset-react'), presetReactOptions];
 };
 
-export const pluginBabel = (options?: PluginBabelOptions): RsbuildPlugin => ({
+export const pluginBabel = (
+  options: PluginBabelOptions,
+  extraOptions: {
+    transformLodash: boolean;
+  },
+): RsbuildPlugin => ({
   name: 'uni-builder:babel',
 
   post: [
@@ -102,10 +107,7 @@ export const pluginBabel = (options?: PluginBabelOptions): RsbuildPlugin => ({
                 });
 
           applyPluginImport(baseBabelConfig, config.source.transformImport);
-          applyPluginLodash(
-            baseBabelConfig,
-            config.performance.transformLodash,
-          );
+          applyPluginLodash(baseBabelConfig, extraOptions.transformLodash);
 
           baseBabelConfig.presets?.push(
             getPresetReact(api.context.rootPath, isProd),

diff --git a/packages/builder/uni-builder/tests/__snapshots__/default.test.ts.snap b/packages/builder/uni-builder/tests/__snapshots__/default.test.ts.snap
@@ -862,6 +862,36 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
       "name": "HotModuleReplacementPlugin",
     },
     HtmlWebpackPlugin {
+      "options": {
+        "base": false,
+        "cache": true,
+        "chunks": [
+          "index",
+        ],
+        "chunksSortMode": "auto",
+        "compile": true,
+        "entryName": "index",
+        "excludeChunks": [],
+        "favicon": false,
+        "filename": "html/index/index.html",
+        "hash": false,
+        "inject": "head",
+        "meta": {
+          "charset": {
+            "charset": "UTF-8",
+          },
+          "viewport": "width=device-width, initial-scale=1.0",
+        },
+        "minify": false,
+        "publicPath": "auto",
+        "scriptLoading": "defer",
+        "showErrors": true,
+        "template": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/static/template.html",
+        "templateContent": false,
+        "templateParameters": [Function],
+        "title": "",
+        "xhtml": false,
+      },
       "userOptions": {
         "chunks": [
           "index",
@@ -936,7 +966,9 @@ exports[`uni-builder rspack > should generator rspack config correctly 1`] = `
       "options": {
         "exclude": /node_modules/i,
         "forceEnable": false,
-        "include": /\\\\\\.\\(\\[cm\\]js\\|\\[jt\\]sx\\?\\|flow\\)\\$/i,
+        "include": [
+          /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/,
+        ],
       },
     },
   ],
@@ -1911,6 +1943,55 @@ exports[`uni-builder rspack > should generator rspack config correctly when prod
   },
   "plugins": [
     HtmlWebpackPlugin {
+      "options": {
+        "base": false,
+        "cache": true,
+        "chunks": [
+          "index",
+        ],
+        "chunksSortMode": "auto",
+        "compile": true,
+        "entryName": "index",
+        "excludeChunks": [],
+        "favicon": false,
+        "filename": "html/index/index.html",
+        "hash": false,
+        "inject": "head",
+        "meta": {
+          "charset": {
+            "charset": "UTF-8",
+          },
+          "viewport": "width=device-width, initial-scale=1.0",
+        },
+        "minify": {
+          "collapseWhitespace": true,
+          "keepClosingSlash": true,
+          "minifyCSS": true,
+          "minifyJS": {
+            "format": {
+              "ascii_only": true,
+            },
+            "mangle": {
+              "safari10": true,
+            },
+          },
+          "minifyURLs": true,
+          "removeComments": false,
+          "removeEmptyAttributes": true,
+          "removeRedundantAttributes": true,
+          "removeScriptTypeAttributes": true,
+          "removeStyleLinkTypeAttributes": true,
+          "useShortDoctype": true,
+        },
+        "publicPath": "auto",
+        "scriptLoading": "defer",
+        "showErrors": true,
+        "template": "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/core/static/template.html",
+        "templateContent": false,
+        "templateParameters": [Function],
+        "title": "",
+        "xhtml": false,
+      },
       "userOptions": {
         "chunks": [
           "index",

diff --git a/packages/cli/plugin-swc/package.json b/packages/cli/plugin-swc/package.json
@@ -37,7 +37,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@rsbuild/plugin-swc": "0.4.0",
+    "@rsbuild/plugin-swc": "0.4.3",
     "@modern-js/utils": "workspace:*",
     "@swc/helpers": "0.5.3"
   },

diff --git a/packages/cli/plugin-swc/src/index.ts b/packages/cli/plugin-swc/src/index.ts
@@ -30,7 +30,12 @@ export function factory(
           isSSR(config),
         );
 
-        context.builder.addPlugins([pluginSwc(finalConfig)]);
+        context.builder.addPlugins([
+          pluginSwc({
+            ...finalConfig,
+            transformLodash: config.performance.transformLodash ?? true,
+          }),
+        ]);
       },
     }),
   });

diff --git a/packages/devtools/client/package.json b/packages/devtools/client/package.json
@@ -42,7 +42,7 @@
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/themes": "^2.0.0",
-    "@rsbuild/core": "0.4.0",
+    "@rsbuild/core": "0.4.3",
     "@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.4.0",
+    "@rsbuild/babel-preset": "0.4.3",
     "@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.4.0",
+    "@rsbuild/babel-preset": "0.4.3",
     "@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/server/package.json b/packages/server/server/package.json
@@ -62,7 +62,7 @@
     "axios": "^1.6.0"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.4.0",
+    "@rsbuild/shared": "0.4.3",
     "@modern-js/server-core": "workspace:*",
     "@scripts/build": "workspace:*",
     "@scripts/jest-config": "workspace:*",

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.4.0",
+    "@rsbuild/babel-preset": "0.4.3",
     "@swc/helpers": "0.5.3",
     "babel-plugin-transform-typescript-metadata": "^0.3.2"
   },

diff --git a/packages/solutions/app-tools/package.json b/packages/solutions/app-tools/package.json
@@ -90,16 +90,16 @@
     "@modern-js/types": "workspace:*",
     "@modern-js/upgrade": "workspace:*",
     "@modern-js/utils": "workspace:*",
-    "@rsbuild/plugin-esbuild": "0.4.0",
-    "@rsbuild/plugin-node-polyfill": "0.4.0",
-    "@rsbuild/shared": "0.4.0",
+    "@rsbuild/plugin-esbuild": "0.4.3",
+    "@rsbuild/plugin-node-polyfill": "0.4.3",
+    "@rsbuild/shared": "0.4.3",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
     "@modern-js/server-core": "workspace:*"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.0",
+    "@rsbuild/plugin-swc": "0.4.3",
     "@scripts/build": "workspace:*",
     "@scripts/jest-config": "workspace:*",
     "@types/babel__traverse": "7.18.5",