feat(builder): bump webpack v5.88, support top level await (#4102)

* feat(builder): bump webpack v5.88, support top level await * docs: fix * chore: fix rule type * chore: fix type issue
web-infra-dev · Jun 30, 2023 · 272646c · 272646c
1 parent a44aac7
commit 272646c
Show file tree

Hide file tree

Showing 28 changed files with 482 additions and 228 deletions.
diff --git a/.changeset/short-trees-fly.md b/.changeset/short-trees-fly.md
@@ -0,0 +1,21 @@
+---
+'@modern-js/builder-webpack-provider': patch
+'@modern-js/builder-rspack-provider': patch
+'@modern-js/builder-plugin-image-compress': patch
+'@modern-js/builder-shared': patch
+'@modern-js/plugin-data-loader': patch
+'@modern-js/runtime': patch
+'@modern-js/builder-plugin-stylus': patch
+'@modern-js/plugin-storybook': patch
+'@modern-js/app-tools': patch
+'@modern-js/builder-plugin-swc': patch
+'@modern-js/builder-plugin-vue': patch
+'@modern-js/plugin-bff': patch
+'@modern-js/server': patch
+'@modern-js/utils': patch
+'@modern-js/doc-core': patch
+---
+
+feat(builder): bump webpack v5.88, support top level await
+
+feat(builder): 升级 webpack v5.88, 支持 top level await
diff --git a/packages/builder/builder-rspack-provider/package.json b/packages/builder/builder-rspack-provider/package.json
@@ -65,7 +65,7 @@
     "react-refresh": "0.14.0",
     "rspack-plugin-virtual-module": "0.1.0",
     "style-loader": "3.3.1",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "devDependencies": {
     "@arco-design/web-react": "^2.46.0",

diff --git a/packages/builder/builder-rspack-provider/tests/helper.ts b/packages/builder/builder-rspack-provider/tests/helper.ts
@@ -16,7 +16,7 @@ export const getBuilderPlugins = async () => {
 /** Match plugin by constructor name. */
 export const matchPlugin = (config: RspackConfig, pluginName: string) => {
   const result = config.plugins?.filter(
-    item => item.constructor.name === pluginName,
+    item => item?.constructor.name === pluginName,
   );
 
   if (Array.isArray(result)) {

diff --git a/packages/builder/builder-shared/package.json b/packages/builder/builder-shared/package.json
@@ -130,7 +130,7 @@
     "line-diff": "^2.0.1",
     "postcss": "8.4.21",
     "source-map": "^0.7.4",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "webpack-sources": "^3.2.3",
     "zod": "^3.20.2",
     "zod-validation-error": "1.2.0"

diff --git a/packages/builder/builder-shared/src/fallback.ts b/packages/builder/builder-shared/src/fallback.ts
@@ -1,13 +1,18 @@
 import { JS_REGEX, TS_REGEX } from './constants';
 import type { RuleSetRule } from 'webpack';
 
+type Rules = (undefined | null | false | '' | 0 | RuleSetRule | '...')[];
+
 export const resourceRuleFallback = (
-  rules: Array<RuleSetRule | '...'> = [],
+  rules: Rules = [],
 ): Array<RuleSetRule | '...'> => {
-  const innerRules: Array<RuleSetRule> = [];
+  const innerRules: RuleSetRule[] = [];
   const outerRules: Array<RuleSetRule | '...'> = [];
 
   for (const rule of rules) {
+    if (!rule) {
+      continue;
+    }
     if (
       // "..." refers to the webpack defaults
       rule === '...' ||
@@ -25,7 +30,11 @@ export const resourceRuleFallback = (
         rule.mimetype
       )
     ) {
-      rule.oneOf.forEach(r => innerRules.push(r));
+      rule.oneOf.forEach(item => {
+        if (item) {
+          innerRules.push(item);
+        }
+      });
     } else {
       innerRules.push(rule);
     }

diff --git a/packages/builder/builder-webpack-provider/package.json b/packages/builder/builder-webpack-provider/package.json
@@ -107,7 +107,7 @@
     "style-loader": "3.3.1",
     "terser-webpack-plugin": "5.3.6",
     "ts-loader": "9.4.1",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "devDependencies": {
     "@arco-design/web-react": "^2.46.0",

diff --git a/packages/builder/builder-webpack-provider/src/core/webpackConfig.ts b/packages/builder/builder-webpack-provider/src/core/webpackConfig.ts
@@ -140,7 +140,7 @@ async function getConfigUtils(
     removePlugin(pluginName: string) {
       if (config.plugins) {
         config.plugins = config.plugins.filter(
-          p => p.constructor.name !== pluginName,
+          item => item?.constructor.name !== pluginName,
         );
       }
     },

diff --git a/packages/builder/builder-webpack-provider/src/plugins/copy.ts b/packages/builder/builder-webpack-provider/src/plugins/copy.ts
@@ -25,7 +25,7 @@ export const builderPluginCopy = (): BuilderPlugin => ({
 
     api.modifyWebpackConfig(async config => {
       const copyPlugin = config.plugins?.find(
-        item => item.constructor.name === 'CopyPlugin',
+        item => item?.constructor.name === 'CopyPlugin',
       ) as unknown as CopyPluginOptions;
 
       if (copyPlugin) {
@@ -41,7 +41,7 @@ export const builderPluginCopy = (): BuilderPlugin => ({
         );
         if (isContextNotExists) {
           config.plugins = config.plugins?.filter(
-            item => item.constructor.name !== 'CopyPlugin',
+            item => item?.constructor.name !== 'CopyPlugin',
           );
         }
       }

diff --git a/packages/builder/builder-webpack-provider/src/stub/builder.ts b/packages/builder/builder-webpack-provider/src/stub/builder.ts
@@ -258,7 +258,7 @@ export async function createStubBuilder(options?: StubBuilderOptions) {
   const matchWebpackPlugin = async (pluginName: string) => {
     const config = await unwrapWebpackConfig();
     const result = config.plugins?.filter(
-      item => item.constructor.name === pluginName,
+      item => item?.constructor.name === pluginName,
     );
     if (Array.isArray(result)) {
       assert(result.length <= 1);

diff --git a/packages/builder/builder-webpack-provider/src/stub/utils.ts b/packages/builder/builder-webpack-provider/src/stub/utils.ts
@@ -22,6 +22,7 @@ export function matchLoader({
   }
   return config.module.rules.some(rule => {
     if (
+      rule &&
       typeof rule === 'object' &&
       rule.test &&
       rule.test instanceof RegExp &&

diff --git a/packages/builder/plugin-image-compress/package.json b/packages/builder/plugin-image-compress/package.json
@@ -59,7 +59,7 @@
     "@scripts/vitest-config": "workspace:*",
     "@types/node": "^14",
     "typescript": "^5",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "sideEffects": false,
   "publishConfig": {

diff --git a/packages/builder/plugin-stylus/package.json b/packages/builder/plugin-stylus/package.json
@@ -50,7 +50,7 @@
     "@modern-js/utils": "workspace:*",
     "@scripts/vitest-config": "workspace:*",
     "typescript": "^5",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "peerDependencies": {
     "@modern-js/builder-rspack-provider": "workspace:^2.25.0"

diff --git a/packages/builder/plugin-swc/package.json b/packages/builder/plugin-swc/package.json
@@ -63,7 +63,7 @@
     "magic-string": "0.29.0",
     "source-map": "^0.7.4",
     "typescript": "^5",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "react": "^18",
     "react-dom": "^18"
   },

diff --git a/packages/builder/plugin-vue/package.json b/packages/builder/plugin-vue/package.json
@@ -50,7 +50,7 @@
     "@modern-js/utils": "workspace:*",
     "@scripts/vitest-config": "workspace:*",
     "typescript": "^5",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "peerDependencies": {
     "@modern-js/builder-webpack-provider": "workspace:^2.25.0",

diff --git a/packages/cli/doc-core/package.json b/packages/cli/doc-core/package.json
@@ -140,7 +140,7 @@
     "typescript": "^5",
     "vite": "^4.0.4",
     "vitest": "0.21.1",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "gray-matter": "4.0.3"
   },
   "sideEffects": [

diff --git a/packages/cli/plugin-bff/package.json b/packages/cli/plugin-bff/package.json
@@ -85,7 +85,7 @@
     "memfs": "^3.3.0",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "webpack-chain": "^6.5.1"
   },
   "sideEffects": false,

diff --git a/packages/cli/plugin-data-loader/package.json b/packages/cli/plugin-data-loader/package.json
@@ -83,7 +83,7 @@
     "supertest": "^6.1.6",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "webpack-chain": "^6.5.1",
     "react": "^18",
     "react-dom": "^18"

diff --git a/packages/cli/plugin-storybook/package.json b/packages/cli/plugin-storybook/package.json
@@ -86,7 +86,7 @@
     "react-dom": "^17.0.2",
     "require-from-string": "^2.0.2",
     "typescript": "^5",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "webpack-chain": "^6.5.1"
   },
   "peerDependencies": {

diff --git a/packages/runtime/plugin-runtime/package.json b/packages/runtime/plugin-runtime/package.json
@@ -203,7 +203,7 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "sideEffects": false,
   "modernConfig": {},

diff --git a/packages/server/server/package.json b/packages/server/server/package.json
@@ -73,7 +73,7 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "4.1.1",
     "typescript": "^5",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "websocket": "^1"
   },
   "peerDependencies": {

diff --git a/packages/solutions/app-tools/package.json b/packages/solutions/app-tools/package.json
@@ -109,7 +109,7 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.82.1"
+    "webpack": "^5.88.1"
   },
   "peerDependencies": {
     "@modern-js/builder-rspack-provider": "workspace:^2.25.0"

diff --git a/packages/toolkit/utils/package.json b/packages/toolkit/utils/package.json
@@ -320,7 +320,7 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "webpack": "^5.82.1",
+    "webpack": "^5.88.1",
     "@types/serialize-javascript": "^5.0.1"
   },
   "sideEffects": false