@umijs/bundler-webpack 4.0.0-rc.10 → 4.0.0-rc.13

package/compiled/webpack-manifest-plugin/index.js

@@ -1 +1 @@
-(function(){"use strict";var e={156:function(e,t,s){Object.defineProperty(t,"__esModule",{value:true});t.transformFiles=t.reduceChunk=t.reduceAssets=t.generateManifest=void 0;const n=s(17);const generateManifest=(e,t,{generate:s,seed:n={}})=>{let o;if(s){const i=Array.from(e.entrypoints.entries());const a=i.reduce(((e,[t,s])=>Object.assign(e,{[t]:s.getFiles()})),{});o=s(n,t,a)}else{o=t.reduce(((e,t)=>Object.assign(e,{[t.name]:t.path})),n)}return o};t.generateManifest=generateManifest;const getFileType=(e,{transformExtensions:t})=>{const s=e.replace(/\?.*/,"");const n=s.split(".");const o=n.pop();return t.test(o)?`${n.pop()}.${o}`:o};const reduceAssets=(e,t,s)=>{let o;if(s[t.name]){o=s[t.name]}else if(t.info.sourceFilename){o=n.join(n.dirname(t.name),n.basename(t.info.sourceFilename))}if(o){return e.concat({isAsset:true,isChunk:false,isInitial:false,isModuleAsset:true,name:o,path:t.name})}const i=t.chunks&&t.chunks.length>0;if(i){return e}return e.concat({isAsset:true,isChunk:false,isInitial:false,isModuleAsset:false,name:t.name,path:t.name})};t.reduceAssets=reduceAssets;const reduceChunk=(e,t,s,o)=>{Array.from(t.auxiliaryFiles||[]).forEach((e=>{o[e]={isAsset:true,isChunk:false,isInitial:false,isModuleAsset:true,name:n.basename(e),path:e}}));return Array.from(t.files).reduce(((e,n)=>{let o=t.name?t.name:null;o=o?s.useEntryKeys&&!n.endsWith(".map")?o:`${o}.${getFileType(n,s)}`:n;return e.concat({chunk:t,isAsset:false,isChunk:true,isInitial:t.isOnlyInitial(),isModuleAsset:false,name:o,path:n})}),e)};t.reduceChunk=reduceChunk;const standardizeFilePaths=e=>{const t=Object.assign({},e);t.name=e.name.replace(/\\/g,"/");t.path=e.path.replace(/\\/g,"/");return t};const transformFiles=(e,t)=>["filter","map","sort"].filter((e=>!!t[e])).reduce(((e,s)=>e[s](t[s])),e).map(standardizeFilePaths);t.transformFiles=transformFiles},874:function(e,t,s){Object.defineProperty(t,"__esModule",{value:true});t.normalModuleLoaderHook=t.getCompilerHooks=t.emitHook=t.beforeRunHook=void 0;const n=s(147);const o=s(17);const i=s(535);const a=s(728);const r=s(156);const u=new WeakMap;const getCompilerHooks=e=>{let t=u.get(e);if(typeof t==="undefined"){t={afterEmit:new i.SyncWaterfallHook(["manifest"]),beforeEmit:new i.SyncWaterfallHook(["manifest"])};u.set(e,t)}return t};t.getCompilerHooks=getCompilerHooks;const beforeRunHook=({emitCountMap:e,manifestFileName:t},s,n)=>{const o=e.get(t)||0;e.set(t,o+1);if(n){n()}};t.beforeRunHook=beforeRunHook;const l=function emit({compiler:e,emitCountMap:t,manifestAssetId:s,manifestFileName:i,moduleAssets:u,options:l},c){const p=t.get(i)-1;const m=c.getStats().toJson({all:false,assets:true,cachedAssets:true,ids:true,publicPath:true});const f=l.publicPath!==null?l.publicPath:m.publicPath;const{basePath:d,removeKeyHash:h}=l;t.set(i,p);const k={};let b=Array.from(c.chunks).reduce(((e,t)=>r.reduceChunk(e,t,l,k)),[]);b=m.assets.reduce(((e,t)=>r.reduceAssets(e,t,u)),b);b=b.filter((({name:s,path:n})=>{var i;return!n.includes("hot-update")&&typeof t.get(o.join(((i=e.options.output)===null||i===void 0?void 0:i.path)||"<unknown>",s))==="undefined"}));b.forEach((e=>{delete k[e.path]}));Object.keys(k).forEach((e=>{b=b.concat(k[e])}));b=b.map((e=>{const normalizePath=e=>{if(!e.endsWith("/")){return`${e}/`}return e};const t={name:d?normalizePath(d)+e.name:e.name,path:f?normalizePath(f)+e.path:e.path};t.name=h?t.name.replace(h,""):t.name;return Object.assign(e,t)}));b=r.transformFiles(b,l);let g=r.generateManifest(c,b,l);const _=p===0;g=getCompilerHooks(e).beforeEmit.call(g);if(_){const e=l.serialize(g);c.emitAsset(s,new a.RawSource(e));if(l.writeToFileEmit){n.mkdirSync(o.dirname(i),{recursive:true});n.writeFileSync(i,e)}}getCompilerHooks(e).afterEmit.call(g)};t.emitHook=l;const normalModuleLoaderHook=({moduleAssets:e},t,s)=>{const{emitFile:n}=t;t.emitFile=(t,i,a)=>{if(s.userRequest&&!e[t]){Object.assign(e,{[t]:o.join(o.dirname(t),o.basename(s.userRequest))})}return n.call(s,t,i,a)}};t.normalModuleLoaderHook=normalModuleLoaderHook},131:function(e,t,s){var n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:true});t.WebpackManifestPlugin=t.getCompilerHooks=void 0;const o=s(17);const i=n(s(205));const a=s(874);Object.defineProperty(t,"getCompilerHooks",{enumerable:true,get:function(){return a.getCompilerHooks}});const r=new Map;const u={assetHookStage:Infinity,basePath:"",fileName:"manifest.json",filter:null,generate:void 0,map:null,publicPath:null,removeKeyHash:/([a-f0-9]{16,32}\.?)/gi,seed:void 0,serialize(e){return JSON.stringify(e,null,2)},sort:null,transformExtensions:/^(gz|map)$/i,useEntryKeys:false,useLegacyEmit:false,writeToFileEmit:false};class WebpackManifestPlugin{constructor(e){this.options=Object.assign({},u,e)}apply(e){var t,s;const n={};const u=o.resolve(((t=e.options.output)===null||t===void 0?void 0:t.path)||"./",this.options.fileName);const l=o.relative(((s=e.options.output)===null||s===void 0?void 0:s.path)||"./",u);const c=a.beforeRunHook.bind(this,{emitCountMap:r,manifestFileName:u});const p=a.emitHook.bind(this,{compiler:e,emitCountMap:r,manifestAssetId:l,manifestFileName:u,moduleAssets:n,options:this.options});const m=a.normalModuleLoaderHook.bind(this,{moduleAssets:n});const f={name:"WebpackManifestPlugin",stage:this.options.assetHookStage};e.hooks.compilation.tap(f,(e=>{const t=!i.default.getCompilationHooks?e.hooks.normalModuleLoader:i.default.getCompilationHooks(e).loader;t.tap(f,m)}));if(this.options.useLegacyEmit===true){e.hooks.emit.tap(f,p)}else{e.hooks.thisCompilation.tap(f,(e=>{e.hooks.processAssets.tap(f,(()=>p(e)))}))}e.hooks.run.tapAsync(f,c);e.hooks.watchRun.tapAsync(f,c)}}t.WebpackManifestPlugin=WebpackManifestPlugin},205:function(e){e.exports=require("../webpack/NormalModule")},535:function(e){e.exports=require("@umijs/bundler-webpack/compiled/tapable")},728:function(e){e.exports=require("@umijs/bundler-webpack/compiled/webpack-sources")},147:function(e){e.exports=require("fs")},17:function(e){e.exports=require("path")}};var t={};function __nccwpck_require__(s){var n=t[s];if(n!==undefined){return n.exports}var o=t[s]={exports:{}};var i=true;try{e[s].call(o.exports,o,o.exports,__nccwpck_require__);i=false}finally{if(i)delete t[s]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var s=__nccwpck_require__(131);module.exports=s})();
+(function(){"use strict";var e={156:function(e,t,s){Object.defineProperty(t,"__esModule",{value:true});t.transformFiles=t.reduceChunk=t.reduceAssets=t.generateManifest=void 0;const n=s(17);const generateManifest=(e,t,{generate:s,seed:n={}})=>{let o;if(s){const i=Array.from(e.entrypoints.entries());const a=i.reduce(((e,[t,s])=>Object.assign(e,{[t]:s.getFiles()})),{});o=s(n,t,a)}else{o=t.reduce(((e,t)=>Object.assign(e,{[t.name]:t.path})),n)}return o};t.generateManifest=generateManifest;const getFileType=(e,{transformExtensions:t})=>{const s=e.replace(/\?.*/,"");const n=s.split(".");const o=n.pop();return t.test(o)?`${n.pop()}.${o}`:o};const reduceAssets=(e,t,s)=>{let o;if(s[t.name]){o=s[t.name]}else if(t.info.sourceFilename){o=n.join(n.dirname(t.name),n.basename(t.info.sourceFilename))}if(o){return e.concat({isAsset:true,isChunk:false,isInitial:false,isModuleAsset:true,name:o,path:t.name})}const i=t.chunks&&t.chunks.length>0;if(i){return e}return e.concat({isAsset:true,isChunk:false,isInitial:false,isModuleAsset:false,name:t.name,path:t.name})};t.reduceAssets=reduceAssets;const reduceChunk=(e,t,s,o)=>{Array.from(t.auxiliaryFiles||[]).forEach((e=>{o[e]={isAsset:true,isChunk:false,isInitial:false,isModuleAsset:true,name:n.basename(e),path:e}}));return Array.from(t.files).reduce(((e,n)=>{let o=t.name?t.name:null;o=o?s.useEntryKeys&&!n.endsWith(".map")?o:`${o}.${getFileType(n,s)}`:n;return e.concat({chunk:t,isAsset:false,isChunk:true,isInitial:t.isOnlyInitial(),isModuleAsset:false,name:o,path:n})}),e)};t.reduceChunk=reduceChunk;const standardizeFilePaths=e=>{const t=Object.assign({},e);t.name=e.name.replace(/\\/g,"/");t.path=e.path.replace(/\\/g,"/");return t};const transformFiles=(e,t)=>["filter","map","sort"].filter((e=>!!t[e])).reduce(((e,s)=>e[s](t[s])),e).map(standardizeFilePaths);t.transformFiles=transformFiles},874:function(e,t,s){Object.defineProperty(t,"__esModule",{value:true});t.normalModuleLoaderHook=t.getCompilerHooks=t.emitHook=t.beforeRunHook=void 0;const n=s(147);const o=s(17);const i=s(535);const a=s(728);const r=s(156);const u=new WeakMap;const getCompilerHooks=e=>{let t=u.get(e);if(typeof t==="undefined"){t={afterEmit:new i.SyncWaterfallHook(["manifest"]),beforeEmit:new i.SyncWaterfallHook(["manifest"])};u.set(e,t)}return t};t.getCompilerHooks=getCompilerHooks;const beforeRunHook=({emitCountMap:e,manifestFileName:t},s,n)=>{const o=e.get(t)||0;e.set(t,o+1);if(n){n()}};t.beforeRunHook=beforeRunHook;const l=function emit({compiler:e,emitCountMap:t,manifestAssetId:s,manifestFileName:i,moduleAssets:u,options:l},c){const p=t.get(i)-1;const m=c.getStats().toJson({all:false,assets:true,cachedAssets:true,ids:true,publicPath:true});const f=l.publicPath!==null?l.publicPath:m.publicPath;const{basePath:d,removeKeyHash:h}=l;t.set(i,p);const k={};let b=Array.from(c.chunks).reduce(((e,t)=>r.reduceChunk(e,t,l,k)),[]);b=m.assets.reduce(((e,t)=>r.reduceAssets(e,t,u)),b);b=b.filter((({name:s,path:n})=>{var i;return!n.includes("hot-update")&&typeof t.get(o.join(((i=e.options.output)===null||i===void 0?void 0:i.path)||"<unknown>",s))==="undefined"}));b.forEach((e=>{delete k[e.path]}));Object.keys(k).forEach((e=>{b=b.concat(k[e])}));b=b.map((e=>{const normalizePath=e=>{if(!e.endsWith("/")){return`${e}/`}return e};const t={name:d?normalizePath(d)+e.name:e.name,path:f?normalizePath(f)+e.path:e.path};t.name=h?t.name.replace(h,""):t.name;return Object.assign(e,t)}));b=r.transformFiles(b,l);let g=r.generateManifest(c,b,l);const _=p===0;g=getCompilerHooks(e).beforeEmit.call(g);if(_){const e=l.serialize(g);c.emitAsset(s,new a.RawSource(e));if(l.writeToFileEmit){n.mkdirSync(o.dirname(i),{recursive:true});n.writeFileSync(i,e)}}getCompilerHooks(e).afterEmit.call(g)};t.emitHook=l;const normalModuleLoaderHook=({moduleAssets:e},t,s)=>{const{emitFile:n}=t;t.emitFile=(t,i,a)=>{if(s.userRequest&&!e[t]){Object.assign(e,{[t]:o.join(o.dirname(t),o.basename(s.userRequest))})}return n.call(s,t,i,a)}};t.normalModuleLoaderHook=normalModuleLoaderHook},131:function(e,t,s){var n=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(t,"__esModule",{value:true});t.WebpackManifestPlugin=t.getCompilerHooks=void 0;const o=s(17);const i=n(s(205));const a=s(874);Object.defineProperty(t,"getCompilerHooks",{enumerable:true,get:function(){return a.getCompilerHooks}});const r=new Map;const u={assetHookStage:Infinity,basePath:"",fileName:"manifest.json",filter:null,generate:void 0,map:null,publicPath:null,removeKeyHash:/([a-f0-9]{16,32}\.?)/gi,seed:void 0,serialize(e){return JSON.stringify(e,null,2)},sort:null,transformExtensions:/^(gz|map)$/i,useEntryKeys:false,useLegacyEmit:false,writeToFileEmit:false};class WebpackManifestPlugin{constructor(e){this.options=Object.assign({},u,e)}apply(e){var t,s;const n={};const u=o.resolve(((t=e.options.output)===null||t===void 0?void 0:t.path)||"./",this.options.fileName);const l=o.relative(((s=e.options.output)===null||s===void 0?void 0:s.path)||"./",u);const c=a.beforeRunHook.bind(this,{emitCountMap:r,manifestFileName:u});const p=a.emitHook.bind(this,{compiler:e,emitCountMap:r,manifestAssetId:l,manifestFileName:u,moduleAssets:n,options:this.options});const m=a.normalModuleLoaderHook.bind(this,{moduleAssets:n});const f={name:"WebpackManifestPlugin",stage:this.options.assetHookStage};e.hooks.compilation.tap(f,(e=>{const t=!i.default.getCompilationHooks?e.hooks.normalModuleLoader:i.default.getCompilationHooks(e).loader;t.tap(f,m)}));if(this.options.useLegacyEmit===true){e.hooks.emit.tap(f,p)}else{e.hooks.thisCompilation.tap(f,(e=>{e.hooks.processAssets.tap(f,(()=>p(e)))}))}e.hooks.run.tapAsync(f,c);e.hooks.watchRun.tapAsync(f,c)}}t.WebpackManifestPlugin=WebpackManifestPlugin},205:function(e){e.exports=require("../webpack/NormalModule")},535:function(e){e.exports=require("@umijs/bundler-utils/compiled/tapable")},728:function(e){e.exports=require("@umijs/bundler-webpack/compiled/webpack-sources")},147:function(e){e.exports=require("fs")},17:function(e){e.exports=require("path")}};var t={};function __nccwpck_require__(s){var n=t[s];if(n!==undefined){return n.exports}var o=t[s]={exports:{}};var i=true;try{e[s].call(o.exports,o,o.exports,__nccwpck_require__);i=false}finally{if(i)delete t[s]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var s=__nccwpck_require__(131);module.exports=s})();

package/dist/build.d.ts

@@ -3,6 +3,7 @@ import { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
 declare type IOpts = {
     cwd: string;
+    rootDir?: string;
     entry: Record<string, string>;
     config: IConfig;
     onBuildComplete?: Function;

package/dist/build.js

@@ -21,6 +21,7 @@ function build(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const webpackConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
+            rootDir: opts.rootDir,
             env: types_1.Env.production,
             entry: opts.entry,
             userConfig: opts.config,

package/dist/client/client.js

@@ -41,15 +41,21 @@ const ErrorOverlay = __importStar(require("react-error-overlay"));
 const constants_1 = require("../constants");
 const formatWebpackMessages_1 = require("../utils/formatWebpackMessages");
 console.log('[webpack] connecting...');
+function getSocketHost() {
+    let l = location;
+    if (process.env.SOCKET_SERVER) {
+        l = new URL(process.env.SOCKET_SERVER);
+    }
+    const host = l.host;
+    const isHttps = l.protocol === 'https:';
+    return `${isHttps ? 'wss' : 'ws'}://${host}`;
+}
 let pingTimer = null;
-const host = location.host;
-const isHttps = location.protocol === 'https:';
-const wsUrl = `${isHttps ? 'wss' : 'ws'}://${host}`;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(wsUrl, 'webpack-hmr');
+const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
 socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {

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/config/config.d.ts

@@ -2,6 +2,7 @@ import { Configuration } from '../../compiled/webpack';
 import { Env, IConfig } from '../types';
 export interface IOpts {
     cwd: string;
+    rootDir?: string;
     env: Env;
     entry: Record<string, string>;
     extraBabelPresets?: any[];

package/dist/config/config.js

@@ -35,6 +35,7 @@ const javaScriptRules_1 = require("./javaScriptRules");
 const manifestPlugin_1 = require("./manifestPlugin");
 const miniCSSExtractPlugin_1 = require("./miniCSSExtractPlugin");
 const nodePolyfill_1 = require("./nodePolyfill");
+const nodePrefixPlugin_1 = require("./nodePrefixPlugin");
 const progressPlugin_1 = require("./progressPlugin");
 const speedMeasureWebpackPlugin_1 = require("./speedMeasureWebpackPlugin");
 const svgRules_1 = require("./svgRules");
@@ -153,6 +154,8 @@ function getConfig(opts) {
         // await applyPurgeCSSWebpackPlugin(applyOpts);
         // handle HarmonyLinkingError
         yield (0, harmonyLinkingErrorPlugin_1.addHarmonyLinkingErrorPlugin)(applyOpts);
+        // remove node: prefix
+        yield (0, nodePrefixPlugin_1.addNodePrefixPlugin)(applyOpts);
         // runtimePublicPath
         if (userConfig.runtimePublicPath) {
             config.plugin('runtimePublicPath').use(RuntimePublicPathPlugin_1.RuntimePublicPathPlugin);
@@ -166,7 +169,8 @@ function getConfig(opts) {
                     config: opts.cache.buildDependencies || [],
                 },
                 cacheDirectory: opts.cache.cacheDirectory ||
-                    (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'bundler-webpack'),
+                    // 使用 rootDir 是在有 APP_ROOT 时，把 cache 目录放在根目录下
+                    (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules', '.cache', 'bundler-webpack'),
             });
             // tnpm 安装依赖的情况 webpack 默认的 managedPaths 不生效
             // 使用 immutablePaths 避免 node_modules 的内容被写入缓存
@@ -175,7 +179,8 @@ function getConfig(opts) {
             if ( /*isTnpm*/require('@umijs/utils/package').__npminstall_done) {
                 config.snapshot({
                     immutablePaths: [
-                        opts.cache.absNodeModulesPath || (0, path_1.join)(opts.cwd, 'node_modules'),
+                        opts.cache.absNodeModulesPath ||
+                            (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules'),
                     ],
                 });
             }

package/dist/config/nodePolyfill.js

@@ -14,12 +14,12 @@ const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
 function addNodePolyfill(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const { config } = opts;
-        const nodeLibs = require('node-libs-browser');
         config.plugin('node-polyfill-provider').use(webpack_1.ProvidePlugin, [
             {
                 Buffer: ['buffer', 'Buffer'],
             },
         ]);
+        const nodeLibs = require('node-libs-browser');
         config.resolve.fallback.merge(Object.assign(Object.assign({}, Object.keys(nodeLibs).reduce((memo, key) => {
             if (nodeLibs[key]) {
                 memo[key] = nodeLibs[key];

package/dist/config/nodePrefixPlugin.d.ts

@@ -0,0 +1,11 @@
+import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+import { Env, IConfig } from '../types';
+interface IOpts {
+    name?: string;
+    config: Config;
+    userConfig: IConfig;
+    cwd: string;
+    env: Env;
+}
+export declare function addNodePrefixPlugin(opts: IOpts): Promise<void>;
+export {};

package/dist/config/nodePrefixPlugin.js

@@ -0,0 +1,25 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addNodePrefixPlugin = void 0;
+const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
+function addNodePrefixPlugin(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { config } = opts;
+        config.plugin('node-prefix-plugin').use(webpack_1.NormalModuleReplacementPlugin, [
+            /^node:/,
+            (resource) => {
+                resource.request = resource.request.replace(/^node:/, '');
+            },
+        ]);
+    });
+}
+exports.addNodePrefixPlugin = addNodePrefixPlugin;

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;
@@ -14,8 +16,10 @@ declare type IOpts = {
     extraBabelPlugins?: any[];
     extraBabelPresets?: any[];
     cwd: string;
+    rootDir?: string;
     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;
@@ -40,23 +49,24 @@ function dev(opts) {
                 mfName: (_c = opts.config.mfsu) === null || _c === void 0 ? void 0 : _c.mfName,
                 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'),
+                    (0, path_1.join)(opts.rootDir || 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),
+                        mfsu: opts.config.mfsu,
                         alias: opts.config.alias,
                         externals: opts.config.externals,
                         theme: opts.config.theme,
                         runtimePublicPath: opts.config.runtimePublicPath,
                         publicPath: opts.config.publicPath,
-                    };
+                    });
                 },
             });
         }
         const webpackConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
+            rootDir: opts.rootDir,
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
@@ -79,6 +89,7 @@ function dev(opts) {
         });
         const depConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
+            rootDir: opts.rootDir,
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
@@ -88,7 +99,7 @@ function dev(opts) {
             chainWebpack: (_e = opts.config.mfsu) === null || _e === void 0 ? void 0 : _e.chainWebpack,
             cache: {
                 buildDependencies: (_f = opts.cache) === null || _f === void 0 ? void 0 : _f.buildDependencies,
-                cacheDirectory: (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
+                cacheDirectory: (0, path_1.join)(opts.rootDir || opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
             },
         });
         (_g = webpackConfig.resolve).alias || (_g.alias = {});
@@ -113,6 +124,7 @@ function dev(opts) {
             host: opts.host,
             afterMiddlewares: [...(opts.afterMiddlewares || [])],
             onDevCompileDone: opts.onDevCompileDone,
+            onProgress: opts.onProgress,
         });
     });
 }

package/dist/schema.js

@@ -62,6 +62,7 @@ function getSchemas() {
             chainWebpack: Joi.function(),
             esbuild: Joi.boolean(),
             mfName: Joi.string(),
+            runtimePublicPath: Joi.boolean(),
         }), Joi.boolean()),
         outputPath: (Joi) => Joi.string(),
         postcssLoader: (Joi) => Joi.object(),

package/dist/server/https.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import { RequestListener } from 'http';
+import https from 'https';
+import { HttpsParams } from '../types';
+export declare function createHttpsServer(app: RequestListener, httpsConfig: HttpsParams): Promise<https.Server>;

package/dist/server/https.js

@@ -0,0 +1,73 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHttpsServer = void 0;
+const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
+const https_1 = __importDefault(require("https"));
+const path_1 = require("path");
+const defaultHttpsHosts = ['localhost', '127.0.0.1'];
+function createHttpsServer(app, httpsConfig) {
+    return __awaiter(this, void 0, void 0, function* () {
+        utils_1.logger.wait('[HTTPS] Starting service in https mode...');
+        // Check if mkcert is installed
+        try {
+            yield utils_1.execa.execa('mkcert', ['--version']);
+        }
+        catch (e) {
+            utils_1.logger.error('[HTTPS] The mkcert has not been installed.');
+            utils_1.logger.info('[HTTPS] Please follow the guide to install manually.');
+            switch (process.platform) {
+                case 'darwin':
+                    console.log(utils_1.chalk.green('$ brew install mkcert'));
+                    console.log(utils_1.chalk.gray('# If you use firefox, please install nss.'));
+                    console.log(utils_1.chalk.green('$ brew install nss'));
+                    console.log(utils_1.chalk.green('$ mkcert -install'));
+                    break;
+                case 'win32':
+                    console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#windows'));
+                    break;
+                case 'linux':
+                    console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#linux'));
+                    break;
+                default:
+                    break;
+            }
+            throw new Error(`[HTTPS] mkcert not found.`);
+        }
+        let { key, cert, hosts } = httpsConfig;
+        hosts = hosts || defaultHttpsHosts;
+        if (!key || !cert) {
+            key = (0, path_1.join)(__dirname, 'umi.key.pem');
+            cert = (0, path_1.join)(__dirname, 'umi.pem');
+        }
+        // Generate cert and key files if they are not exist.
+        if (!(0, fs_1.existsSync)(key) || !(0, fs_1.existsSync)(cert)) {
+            utils_1.logger.wait('[HTTPS] Generating cert and key files...');
+            yield utils_1.execa.execa('mkcert', [
+                '-cert-file',
+                cert,
+                '-key-file',
+                key,
+                ...hosts,
+            ]);
+        }
+        // Create server
+        return https_1.default.createServer({
+            key: (0, fs_1.readFileSync)(key, 'utf-8'),
+            cert: (0, fs_1.readFileSync)(cert, 'utf-8'),
+        }, app);
+    });
+}
+exports.createHttpsServer = createHttpsServer;

package/dist/server/server.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { Configuration } from '@umijs/bundler-webpack/compiled/webpack';
+import http from 'http';
 import { IConfig } from '../types';
 interface IOpts {
     cwd: string;
@@ -10,6 +11,7 @@ interface IOpts {
     beforeMiddlewares?: any[];
     afterMiddlewares?: any[];
     onDevCompileDone?: Function;
+    onProgress?: Function;
 }
-export declare function createServer(opts: IOpts): Promise<import("http").Server | import("https").Server | null>;
+export declare function createServer(opts: IOpts): Promise<import("https").Server | http.Server | null>;
 export {};

package/dist/server/server.js

@@ -18,9 +18,10 @@ const http_proxy_middleware_1 = require("@umijs/bundler-webpack/compiled/http-pr
 const webpack_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack"));
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
+const http_1 = __importDefault(require("http"));
 const path_1 = require("path");
 const constants_1 = require("../constants");
-const server_1 = require("../utils/server");
+const https_1 = require("./https");
 const ws_1 = require("./ws");
 function createServer(opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -62,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 || '/',
@@ -171,7 +190,9 @@ function createServer(opts) {
                 next();
             }
         });
-        const server = yield (0, server_1.getServer)(app, userConfig.https);
+        const server = userConfig.https
+            ? yield (0, https_1.createHttpsServer)(app, userConfig.https)
+            : http_1.default.createServer(app);
         if (!server) {
             return null;
         }

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.10",
+  "version": "4.0.0-rc.13",
   "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.10",
-    "@umijs/bundler-utils": "4.0.0-rc.10",
-    "@umijs/mfsu": "4.0.0-rc.10",
-    "@umijs/utils": "4.0.0-rc.10",
+    "@umijs/babel-preset-umi": "4.0.0-rc.13",
+    "@umijs/bundler-utils": "4.0.0-rc.13",
+    "@umijs/mfsu": "4.0.0-rc.13",
+    "@umijs/utils": "4.0.0-rc.13",
     "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,25 +57,24 @@
     "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",
     "style-loader": "3.3.1",
     "svgo-loader": "3.0.0",
-    "tapable": "2.2.1",
     "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",
@@ -111,7 +110,6 @@
       "style-loader",
       "speed-measure-webpack-plugin",
       "svgo-loader",
-      "tapable",
       "terser",
       "terser-webpack-plugin",
       "url-loader",
@@ -134,7 +132,7 @@
       "less": "@umijs/bundler-utils/compiled/less",
       "cssnano": "$$LOCAL",
       "postcss": "postcss",
-      "tapable": "$$LOCAL",
+      "tapable": "@umijs/bundler-utils/compiled/tapable",
       "terser": "$$LOCAL",
       "terser-webpack-plugin": "$$LOCAL",
       "typescript": "typescript",
@@ -175,6 +173,7 @@
       "postcss-flexbugs-fixes",
       "postcss-loader",
       "purgecss-webpack-plugin",
+      "react-refresh",
       "sass-loader",
       "speed-measure-webpack-plugin",
       "style-loader",