web-infra-dev · 9aoy · Jun 14, 2024 · Jun 14, 2024
diff --git a/.changeset/clever-guests-wait.md b/.changeset/clever-guests-wait.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/app-tools': patch
+'@modern-js/uni-builder': patch
+---
+
+chore(deps): bump rsbuild to 0.7.7
diff --git a/packages/cli/plugin-bff/package.json b/packages/cli/plugin-bff/package.json
@@ -70,7 +70,7 @@
     "@swc/helpers": "0.5.3"
   },
   "devDependencies": {
-    "@rsbuild/shared": "0.7.3",
+    "@rsbuild/shared": "0.7.7",
     "@modern-js/runtime": "workspace:*",
     "@modern-js/core": "workspace:*",
     "@modern-js/bff-runtime": "workspace:*",
@@ -86,7 +86,7 @@
     "memfs": "^3.5.1",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.91.0"
+    "webpack": "^5.92.0"
   },
   "sideEffects": false,
   "publishConfig": {

diff --git a/packages/cli/plugin-data-loader/package.json b/packages/cli/plugin-data-loader/package.json
@@ -75,7 +75,7 @@
     "supertest": "^6.1.6",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.91.0",
+    "webpack": "^5.92.0",
     "react": "^18",
     "react-dom": "^18"
   },

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

diff --git a/packages/cli/rsbuild-plugin-esbuild/package.json b/packages/cli/rsbuild-plugin-esbuild/package.json
@@ -27,14 +27,14 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.3",
-    "@rsbuild/shared": "0.7.3",
+    "@rsbuild/shared": "0.7.7",
     "esbuild": "0.17.19",
-    "webpack": "^5.91.0"
+    "webpack": "^5.92.0"
   },
   "devDependencies": {
     "@scripts/build": "workspace:*",
-    "@rsbuild/core": "0.7.3",
-    "@rsbuild/webpack": "0.7.3",
+    "@rsbuild/core": "0.7.7",
+    "@rsbuild/webpack": "0.7.7",
     "typescript": "^5.4.2"
   },
   "publishConfig": {

diff --git a/packages/cli/rsbuild-plugin-esbuild/src/index.ts b/packages/cli/rsbuild-plugin-esbuild/src/index.ts
@@ -91,6 +91,8 @@ export function pluginEsbuild(
             .use(ESBuildMinifyPlugin)
             .init(
               () =>
+                // @ts-expect-error
+                // Due to rspack compiler missing some properties, but ESBuildMinifyPlugin only works in webpack.
                 new ESBuildMinifyPlugin({
                   // other legalComments such as linked is not supported yet
                   // https://github.com/privatenumber/esbuild-loader/issues/263

diff --git a/packages/cli/uni-builder/package.json b/packages/cli/uni-builder/package.json
@@ -35,26 +35,26 @@
     "@modern-js/server": "workspace:*",
     "@modern-js/prod-server": "workspace:*",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.7.3",
-    "@rsbuild/core": "0.7.3",
-    "@rsbuild/plugin-sass": "0.7.3",
-    "@rsbuild/plugin-less": "0.7.3",
-    "@rsbuild/plugin-assets-retry": "0.7.3",
-    "@rsbuild/plugin-babel": "0.7.3",
-    "@rsbuild/plugin-check-syntax": "0.7.3",
-    "@rsbuild/plugin-css-minimizer": "0.7.3",
-    "@rsbuild/plugin-pug": "0.7.3",
-    "@rsbuild/plugin-react": "0.7.3",
-    "@rsbuild/plugin-rem": "0.7.3",
-    "@rsbuild/plugin-source-build": "0.7.3",
-    "@rsbuild/plugin-styled-components": "0.7.3",
-    "@rsbuild/plugin-svgr": "0.7.3",
-    "@rsbuild/plugin-type-check": "0.7.3",
-    "@rsbuild/plugin-typed-css-modules": "0.7.3",
-    "@rsbuild/plugin-toml": "0.7.3",
-    "@rsbuild/plugin-yaml": "0.7.3",
-    "@rsbuild/shared": "0.7.3",
-    "@rsbuild/webpack": "0.7.3",
+    "@rsbuild/babel-preset": "0.7.7",
+    "@rsbuild/core": "0.7.7",
+    "@rsbuild/plugin-sass": "0.7.7",
+    "@rsbuild/plugin-less": "0.7.7",
+    "@rsbuild/plugin-assets-retry": "0.7.7",
+    "@rsbuild/plugin-babel": "0.7.7",
+    "@rsbuild/plugin-check-syntax": "0.7.7",
+    "@rsbuild/plugin-css-minimizer": "0.7.7",
+    "@rsbuild/plugin-pug": "0.7.7",
+    "@rsbuild/plugin-react": "0.7.7",
+    "@rsbuild/plugin-rem": "0.7.7",
+    "@rsbuild/plugin-source-build": "0.7.7",
+    "@rsbuild/plugin-styled-components": "0.7.7",
+    "@rsbuild/plugin-svgr": "0.7.7",
+    "@rsbuild/plugin-type-check": "0.7.7",
+    "@rsbuild/plugin-typed-css-modules": "0.7.7",
+    "@rsbuild/plugin-toml": "0.7.7",
+    "@rsbuild/plugin-yaml": "0.7.7",
+    "@rsbuild/shared": "0.7.7",
+    "@rsbuild/webpack": "0.7.7",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -76,11 +76,11 @@
     "rspack-manifest-plugin": "5.0.0",
     "terser-webpack-plugin": "5.3.10",
     "ts-loader": "9.4.4",
-    "webpack": "^5.91.0",
+    "webpack": "^5.92.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.7.3",
+    "@rsbuild/plugin-swc": "0.7.7",
     "@scripts/build": "workspace:*",
     "@scripts/vitest-config": "workspace:*",
     "@types/lodash": "^4.14.202",

diff --git a/packages/cli/uni-builder/src/index.ts b/packages/cli/uni-builder/src/index.ts
@@ -14,7 +14,7 @@ export type {
   UniBuilderWebpackInstance,
 };
 export type {
-  BundlerChain,
+  RspackChain,
   RsbuildPlugin,
   ConfigChain,
   CopyPluginOptions,
@@ -38,5 +38,5 @@ export {
   type RsbuildContext,
   type RsbuildConfig,
 } from '@rsbuild/core';
-export type { webpack, WebpackChain, WebpackConfig } from '@rsbuild/webpack';
+export type { webpack, WebpackConfig } from '@rsbuild/webpack';
 export { RUNTIME_CHUNK_NAME } from './shared/constants';
diff --git a/packages/cli/uni-builder/src/shared/manifest.ts b/packages/cli/uni-builder/src/shared/manifest.ts
@@ -1,9 +1,9 @@
-import type { Chunk } from 'webpack';
+import type { Rspack } from '@rsbuild/shared';
 
 export const generateManifest = (
   seed: Record<string, any>,
   files: Array<{
-    chunk?: Chunk;
+    chunk?: Rspack.Chunk;
     name: string;
     path: string;
   }>,

diff --git a/packages/cli/uni-builder/src/shared/plugins/splitChunk.ts b/packages/cli/uni-builder/src/shared/plugins/splitChunk.ts
@@ -42,7 +42,6 @@ export const pluginSplitChunks = (): RsbuildPlugin => ({
       chain.optimization.splitChunks({
         ...currentConfig,
         // rspack chunks type mismatch with webpack
-        // @ts-expect-error
         cacheGroups: {
           ...createCacheGroups(groups),
           ...(currentConfig as Exclude<SplitChunks, false>).cacheGroups,

diff --git a/packages/cli/uni-builder/src/webpack/plugins/minimize.ts b/packages/cli/uni-builder/src/webpack/plugins/minimize.ts
@@ -1,6 +1,6 @@
 import {
   CHAIN_ID,
-  type BundlerChain,
+  type RspackChain,
   type RsbuildPlugin,
   type NormalizedConfig,
 } from '@rsbuild/shared';
@@ -34,7 +34,7 @@ function applyRemoveConsole(
 }
 
 async function applyJSMinimizer(
-  chain: BundlerChain,
+  chain: RspackChain,
   config: NormalizedConfig,
   userTerserConfig?: ToolsTerserConfig,
 ) {

diff --git a/packages/cli/uni-builder/tests/__snapshots__/babel.test.ts.snap b/packages/cli/uni-builder/tests/__snapshots__/babel.test.ts.snap
@@ -21,6 +21,11 @@ exports[`plugin-babel (rspack mode) > should not set babel-loader when babel con
       /\\\\\\.\\(\\?:ts\\|tsx\\|jsx\\|mts\\|cts\\)\\$/,
       /\\[\\\\\\\\/\\]@rsbuild\\[\\\\\\\\/\\]core\\[\\\\\\\\/\\]dist\\[\\\\\\\\/\\]/,
     ],
+    "resolve": {
+      "alias": {
+        "core-js": "<WORKSPACE>/node_modules/<PNPM_INNER>/core-js",
+      },
+    },
     "test": /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/,
     "type": "javascript/auto",
     "use": [
@@ -105,6 +110,11 @@ exports[`plugin-babel (rspack mode) > should set babel-loader when babel config
       /\\\\\\.\\(\\?:ts\\|tsx\\|jsx\\|mts\\|cts\\)\\$/,
       /\\[\\\\\\\\/\\]@rsbuild\\[\\\\\\\\/\\]core\\[\\\\\\\\/\\]dist\\[\\\\\\\\/\\]/,
     ],
+    "resolve": {
+      "alias": {
+        "core-js": "<WORKSPACE>/node_modules/<PNPM_INNER>/core-js",
+      },
+    },
     "test": /\\\\\\.\\(\\?:js\\|jsx\\|mjs\\|cjs\\|ts\\|tsx\\|mts\\|cts\\)\\$/,
     "type": "javascript/auto",
     "use": [
@@ -253,7 +263,7 @@ exports[`plugin-babel > should add core-js-entry when output.polyfill is entry 1
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -518,7 +528,7 @@ exports[`plugin-babel > should apply exclude condition when using source.exclude
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -660,7 +670,7 @@ exports[`plugin-babel > should not add core-js-entry when output.polyfill is usa
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -796,7 +806,7 @@ exports[`plugin-babel > should not have any pluginImport in Babel 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -904,7 +914,7 @@ exports[`plugin-babel > should not have any pluginImport in Babel 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1015,7 +1025,7 @@ exports[`plugin-babel > should not set default pluginImport for Babel 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1142,7 +1152,7 @@ exports[`plugin-babel > should not set default pluginImport for Babel 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1277,7 +1287,7 @@ exports[`plugin-babel > should override targets of babel-preset-env when using o
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1417,7 +1427,7 @@ exports[`plugin-babel > should set babel-loader 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1563,7 +1573,7 @@ exports[`plugin-babel > should set include/exclude 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1699,7 +1709,7 @@ exports[`plugin-babel > should set proper pluginImport option in Babel 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",
@@ -1834,7 +1844,7 @@ exports[`plugin-babel > should set proper pluginImport option in Babel 1`] = `
               "<WORKSPACE>/node_modules/<PNPM_INNER>/@babel/plugin-transform-runtime/lib/index.js",
               {
                 "useESModules": true,
-                "version": "7.24.6",
+                "version": "7.24.7",
               },
             ],
             "<WORKSPACE>/node_modules/<PNPM_INNER>/@rsbuild/babel-preset/dist/pluginLockCorejsVersion.cjs",