chore: upgrade webpack-chain

WeBankFinTech · Mar 31, 2023 · 2097234 · 2097234
1 parent e80ede7
commit 2097234
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 503 deletions.
diff --git a/packages/fes-builder-webpack/package.json b/packages/fes-builder-webpack/package.json
@@ -59,8 +59,8 @@
     "terser-webpack-plugin": "^5.3.6",
     "vue-loader": "^17.0.1",
     "webpack": "^5.76.2",
+    "webpack-5-chain": "^8.0.1",
     "webpack-bundle-analyzer": "^4.4.0",
-    "webpack-chain": "^6.5.1",
     "webpack-dev-server": "^4.8.1",
     "webpackbar": "^5.0.2"
   },

diff --git a/packages/fes-builder-webpack/src/plugins/commands/webpack/index.js b/packages/fes-builder-webpack/src/plugins/commands/webpack/index.js
@@ -27,7 +27,7 @@ export default function (api) {
         async fn({ options }) {
             const assert = require('assert');
             const { getBundleAndConfigs } = require('../buildDevUtils');
-            const { toString } = require('webpack-chain');
+            const { toString } = require('webpack-5-chain');
             const { highlight } = require('cli-highlight');
             const { bundleConfig } = await getBundleAndConfigs({ api });
 

diff --git a/packages/fes-builder-webpack/src/plugins/commands/webpackConfig/index.js b/packages/fes-builder-webpack/src/plugins/commands/webpackConfig/index.js
@@ -1,6 +1,6 @@
 import { join } from 'path';
 import { existsSync } from 'fs';
-import Config from 'webpack-chain';
+import Config from 'webpack-5-chain';
 import webpack from 'webpack';
 import createCssWebpackConfig from './css';
 import getBabelOpts from './getBabelOpts';

diff --git a/packages/fes-builder-webpack/types.d.ts b/packages/fes-builder-webpack/types.d.ts
@@ -1,4 +1,4 @@
-import Config from 'webpack-chain'
+import Config from 'webpack-5-chain'
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin'
 

diff --git a/packages/fes-plugin-swc/package.json b/packages/fes-plugin-swc/package.json
@@ -26,13 +26,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@swc/core": "^1.3.37",
+    "@fesjs/utils": "^3.0.0-rc.2",
+    "@swc/core": "^1.3.44",
     "@swc/css": "^0.0.20",
-    "swc-plugin-vue-jsx": "^0.2.1",
+    "css-minimizer-webpack-plugin": "^5.0.0",
     "swc-loader": "^0.2.3",
-    "@fesjs/utils": "^3.0.0-rc.2",
-    "terser-webpack-plugin": "^5.3.6",
-    "css-minimizer-webpack-plugin": "^4.0.0"
+    "swc-plugin-vue-jsx": "^0.2.1",
+    "terser-webpack-plugin": "^5.3.7"
   },
   "peerDependencies": {
     "@fesjs/fes": "^3.0.0-rc.0"

diff --git a/packages/fes-plugin-swc/src/swcOptions.js b/packages/fes-plugin-swc/src/swcOptions.js
@@ -28,10 +28,9 @@ export function buildSwcOptions(targets, config, isJsx, isTs, minify = false) {
                 },
                 experimental: isJsx
                     ? {
-                          plugins: [['swc-plugin-vue-jsx', {}]],
-                      }
+                        plugins: [['swc-plugin-vue-jsx', {}]],
+                    }
                     : undefined,
-                // preserveAllComments: true,
             },
             isModule: 'unknown',
             minify: minify ? {} : false,