@umijs/bundler-webpack 4.0.0-rc.11 → 4.0.0-rc.12

package/dist/config/compressPlugin.js

@@ -19,6 +19,7 @@ const terser_webpack_plugin_1 = __importDefault(require("../../compiled/terser-w
 const ESBuildCSSMinifyPlugin_1 = __importDefault(require("../plugins/ESBuildCSSMinifyPlugin"));
 const ParcelCSSMinifyPlugin_1 = require("../plugins/ParcelCSSMinifyPlugin");
 const types_1 = require("../types");
+const getEsBuildTarget_1 = require("../utils/getEsBuildTarget");
 function addCompressPlugin(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { config, userConfig, env } = opts;
@@ -32,8 +33,14 @@ function addCompressPlugin(opts) {
         }
         config.optimization.minimize(true);
         let minify;
+        let terserOptions;
         if (jsMinifier === types_1.JSMinifier.esbuild) {
             minify = terser_webpack_plugin_1.default.esbuildMinify;
+            terserOptions = {
+                target: (0, getEsBuildTarget_1.getEsBuildTarget)({
+                    targets: userConfig.targets || {},
+                }),
+            };
         }
         else if (jsMinifier === types_1.JSMinifier.terser) {
             minify = terser_webpack_plugin_1.default.terserMinify;
@@ -47,11 +54,12 @@ function addCompressPlugin(opts) {
         else if (jsMinifier !== types_1.JSMinifier.none) {
             throw new Error(`Unsupported jsMinifier ${userConfig.jsMinifier}.`);
         }
+        terserOptions = Object.assign(Object.assign({}, terserOptions), userConfig.jsMinifierOptions);
         if (jsMinifier !== types_1.JSMinifier.none) {
             config.optimization.minimizer(`js-${jsMinifier}`).use(terser_webpack_plugin_1.default, [
                 {
                     minify,
-                    terserOptions: userConfig.jsMinifierOptions,
+                    terserOptions,
                 },
             ]);
         }

package/dist/constants.d.ts

@@ -12,3 +12,4 @@ export declare enum MESSAGE_TYPE {
 export declare const DEFAULT_BROWSER_TARGETS: {
     chrome: number;
 };
+export declare const DEFAULT_ESBUILD_TARGET_KEYS: string[];

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_BROWSER_TARGETS = exports.MESSAGE_TYPE = exports.MFSU_NAME = exports.DEFAULT_OUTPUT_PATH = exports.DEFAULT_DEVTOOL = void 0;
+exports.DEFAULT_ESBUILD_TARGET_KEYS = exports.DEFAULT_BROWSER_TARGETS = exports.MESSAGE_TYPE = exports.MFSU_NAME = exports.DEFAULT_OUTPUT_PATH = exports.DEFAULT_DEVTOOL = void 0;
 exports.DEFAULT_DEVTOOL = 'cheap-module-source-map';
 exports.DEFAULT_OUTPUT_PATH = 'dist';
 exports.MFSU_NAME = 'MFSU';
@@ -16,3 +16,9 @@ var MESSAGE_TYPE;
 exports.DEFAULT_BROWSER_TARGETS = {
     chrome: 80,
 };
+exports.DEFAULT_ESBUILD_TARGET_KEYS = [
+    'chrome',
+    'firefox',
+    'edge',
+    'safari',
+];

package/dist/dev.d.ts

@@ -4,6 +4,8 @@ declare type IOpts = {
     afterMiddlewares?: any[];
     beforeMiddlewares?: any[];
     onDevCompileDone?: Function;
+    onProgress?: Function;
+    onMFSUProgress?: Function;
     port?: number;
     host?: string;
     babelPreset?: any;
@@ -17,5 +19,6 @@ declare type IOpts = {
     config: IConfig;
     entry: Record<string, string>;
 } & Pick<IConfigOpts, 'cache'>;
+export declare function stripUndefined(obj: any): any;
 export declare function dev(opts: IOpts): Promise<void>;
 export {};

package/dist/dev.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dev = void 0;
+exports.dev = exports.stripUndefined = void 0;
 const mfsu_1 = require("@umijs/mfsu");
 const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
@@ -21,6 +21,15 @@ const config_1 = require("./config/config");
 const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
+function stripUndefined(obj) {
+    Object.keys(obj).forEach((key) => {
+        if (obj[key] === undefined) {
+            delete obj[key];
+        }
+    });
+    return obj;
+}
+exports.stripUndefined = stripUndefined;
 function dev(opts) {
     var _a, _b, _c, _d, _e, _f;
     var _g;
@@ -41,9 +50,10 @@ function dev(opts) {
                 runtimePublicPath: opts.config.runtimePublicPath,
                 tmpBase: ((_d = opts.config.mfsu) === null || _d === void 0 ? void 0 : _d.cacheDirectory) ||
                     (0, path_1.join)(opts.cwd, 'node_modules/.cache/mfsu'),
+                onMFSUProgress: opts.onMFSUProgress,
                 getCacheDependency() {
                     var _a;
-                    return {
+                    return stripUndefined({
                         version: require('../package.json').version,
                         esbuildMode: !!((_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild),
                         alias: opts.config.alias,
@@ -51,7 +61,7 @@ function dev(opts) {
                         theme: opts.config.theme,
                         runtimePublicPath: opts.config.runtimePublicPath,
                         publicPath: opts.config.publicPath,
-                    };
+                    });
                 },
             });
         }
@@ -113,6 +123,7 @@ function dev(opts) {
             host: opts.host,
             afterMiddlewares: [...(opts.afterMiddlewares || [])],
             onDevCompileDone: opts.onDevCompileDone,
+            onProgress: opts.onProgress,
         });
     });
 }

package/dist/server/server.d.ts

@@ -11,6 +11,7 @@ interface IOpts {
     beforeMiddlewares?: any[];
     afterMiddlewares?: any[];
     onDevCompileDone?: Function;
+    onProgress?: Function;
 }
 export declare function createServer(opts: IOpts): Promise<import("https").Server | http.Server | null>;
 export {};

package/dist/server/server.js

@@ -63,7 +63,25 @@ function createServer(opts) {
             }
         });
         // webpack dev middleware
-        const compiler = (0, webpack_1.default)(Array.isArray(webpackConfig) ? webpackConfig : [webpackConfig]);
+        const configs = Array.isArray(webpackConfig)
+            ? webpackConfig
+            : [webpackConfig];
+        const progresses = [];
+        if (opts.onProgress) {
+            configs.forEach((config) => {
+                const progress = {
+                    percent: 0,
+                    status: 'waiting',
+                };
+                progresses.push(progress);
+                config.plugins.push(new webpack_1.default.ProgressPlugin((percent, msg) => {
+                    progress.percent = percent;
+                    progress.status = msg;
+                    opts.onProgress({ progresses });
+                }));
+            });
+        }
+        const compiler = (0, webpack_1.default)(configs);
         const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
         const compilerMiddleware = webpackDevMiddleware(compiler, {
             publicPath: userConfig.publicPath || '/',

package/dist/utils/getEsBuildTarget.d.ts

@@ -0,0 +1,5 @@
+interface IOpts {
+    targets: Record<string, any>;
+}
+export declare function getEsBuildTarget({ targets }: IOpts): string[];
+export {};

package/dist/utils/getEsBuildTarget.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEsBuildTarget = void 0;
+const constants_1 = require("../constants");
+function getEsBuildTarget({ targets }) {
+    return Object.keys(targets)
+        .filter((key) => constants_1.DEFAULT_ESBUILD_TARGET_KEYS.includes(key))
+        .map((key) => {
+        return `${key}${targets[key] === true ? '0' : targets[key]}`;
+    });
+}
+exports.getEsBuildTarget = getEsBuildTarget;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.11",
+  "version": "4.0.0-rc.12",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -29,16 +29,16 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@parcel/css": "1.7.2",
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
+    "@parcel/css": "1.8.1",
+    "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
     "@svgr/core": "6.2.1",
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.0-rc.11",
-    "@umijs/bundler-utils": "4.0.0-rc.11",
-    "@umijs/mfsu": "4.0.0-rc.11",
-    "@umijs/utils": "4.0.0-rc.11",
+    "@umijs/babel-preset-umi": "4.0.0-rc.12",
+    "@umijs/bundler-utils": "4.0.0-rc.12",
+    "@umijs/mfsu": "4.0.0-rc.12",
+    "@umijs/utils": "4.0.0-rc.12",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",
@@ -48,7 +48,7 @@
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@swc/core": "1.2.160",
+    "@swc/core": "1.2.165",
     "@types/webpack-sources": "3.2.0",
     "@types/ws": "8.5.3",
     "autoprefixer": "10.4.4",
@@ -57,15 +57,15 @@
     "connect-history-api-fallback": "1.6.0",
     "copy-webpack-plugin": "10.2.4",
     "css-minimizer-webpack-plugin": "3.4.1",
-    "cssnano": "5.1.5",
-    "fork-ts-checker-webpack-plugin": "7.2.1",
+    "cssnano": "5.1.7",
+    "fork-ts-checker-webpack-plugin": "7.2.4",
     "http-proxy-middleware": "2.0.4",
     "less-loader": "10.2.0",
     "mini-css-extract-plugin": "2.6.0",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-loader": "6.2.1",
     "purgecss-webpack-plugin": "4.1.3",
-    "react-refresh": "0.11.0",
+    "react-refresh": "0.12.0",
     "sass-loader": "12.6.0",
     "schema-utils": "4.0.0",
     "speed-measure-webpack-plugin": "1.5.0",
@@ -75,7 +75,7 @@
     "terser": "5.12.1",
     "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
-    "webpack": "5.70.0",
+    "webpack": "5.72.0",
     "webpack-5-chain": "8.0.0",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-dev-middleware": "5.3.1",
@@ -175,6 +175,7 @@
       "postcss-flexbugs-fixes",
       "postcss-loader",
       "purgecss-webpack-plugin",
+      "react-refresh",
       "sass-loader",
       "speed-measure-webpack-plugin",
       "style-loader",