@umijs/bundler-webpack 4.0.0-rc.9 → 4.0.2

package/dist/config/ssrPlugin.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
+const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const constants_1 = require("../constants");
+const PLUGIN_NAME = 'SSR_PLUGIN';
+class SSRPlugin {
+    constructor(opts) {
+        this.opts = opts;
+        this.manifest = new Map();
+    }
+    apply(compiler) {
+        // ref: https://github.com/webdeveric/webpack-assets-manifest
+        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.processAssets.tap(PLUGIN_NAME, () => {
+                const publicPath = compiler.options.output.publicPath || '/';
+                const assets = compilation.getAssets().filter((asset) => {
+                    if (asset.info.hotModuleReplacement) {
+                        return false;
+                    }
+                    return true;
+                });
+                assets.forEach((asset) => {
+                    if (asset.info.sourceFilename) {
+                        this.manifest.set(asset.info.sourceFilename, publicPath + asset.name);
+                    }
+                });
+                const stats = compilation.getStats().toJson({
+                    all: false,
+                    assets: true,
+                    cachedAssets: true,
+                    cachedModules: true,
+                });
+                const { assetsByChunkName } = stats;
+                Object.keys(assetsByChunkName).forEach((chunkName) => {
+                    assetsByChunkName[chunkName].forEach((filename) => {
+                        const ext = (0, path_1.extname)(filename.split(/[?#]/)[0]);
+                        if (!filename.includes('.hot-update.')) {
+                            this.manifest.set(chunkName + ext, publicPath + filename);
+                        }
+                    });
+                });
+                const assetsSource = JSON.stringify({
+                    assets: Object.fromEntries(this.manifest),
+                }, null, 2);
+                if (process.env.NODE_ENV === 'production' ||
+                    this.opts.userConfig.writeToDisk) {
+                    compilation.emitAsset('build-manifest.json', new webpack_1.sources.RawSource(assetsSource, false));
+                }
+                else {
+                    const outputPath = compiler.options.output.path;
+                    utils_1.fsExtra.mkdirpSync(outputPath);
+                    (0, fs_1.writeFileSync)((0, path_1.join)(outputPath, 'build-manifest.json'), assetsSource, 'utf-8');
+                }
+            });
+        });
+    }
+}
+function addSSRPlugin(opts) {
+    if (opts.userConfig.ssr && opts.name !== constants_1.MFSU_NAME) {
+        opts.config.plugin('ssr-plugin').use(SSRPlugin, [opts]);
+    }
+}
+exports.default = addSSRPlugin;

package/dist/config/svgRules.js

@@ -1,57 +1,48 @@
 "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.addSVGRules = void 0;
-function addSVGRules(opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { config, userConfig } = opts;
-        const { svgr, svgo = {} } = userConfig;
-        if (svgr) {
-            const svgrRule = config.module.rule('svgr');
-            svgrRule
-                .test(/\.svg$/)
-                .issuer(/\.[jt]sx?$/)
-                .type('javascript/auto')
-                .use('svgr-loader')
-                .loader(require.resolve('../loader/svgr'))
-                .options(Object.assign(Object.assign({ svgoConfig: Object.assign({ plugins: [
-                        {
-                            name: 'preset-default',
-                            params: {
-                                overrides: {
-                                    removeTitle: false,
-                                },
+async function addSVGRules(opts) {
+    const { config, userConfig } = opts;
+    const { svgr, svgo = {} } = userConfig;
+    if (svgr) {
+        const svgrRule = config.module.rule('svgr');
+        svgrRule
+            .test(/\.svg$/)
+            .issuer(/\.[jt]sx?$/)
+            .type('javascript/auto')
+            .use('svgr-loader')
+            .loader(require.resolve('../loader/svgr'))
+            .options({
+            svgoConfig: {
+                plugins: [
+                    {
+                        name: 'preset-default',
+                        params: {
+                            overrides: {
+                                removeTitle: false,
                             },
                         },
-                    ] }, svgo) }, svgr), { svgo: !!svgo }))
-                .end()
-                .use('url-loader')
-                .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'))
-                .end();
-        }
-        if (svgo === false) {
-            const svgRule = config.module.rule('svg');
-            svgRule
-                .test(/\.svg$/)
-                .use('url-loader')
-                .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'));
-            return;
-        }
+                    },
+                    'prefixIds',
+                ],
+                ...svgo,
+            },
+            ...svgr,
+            svgo: !!svgo,
+        })
+            .end()
+            .use('url-loader')
+            .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'))
+            .end();
+    }
+    if (svgo !== false) {
         const svgRule = config.module.rule('svg');
         svgRule
             .test(/\.svg$/)
             .use('svgo-loader')
             .loader(require.resolve('@umijs/bundler-webpack/compiled/svgo-loader'))
-            .options(Object.assign({ configFile: false }, svgo))
+            .options({ configFile: false, ...svgo })
             .end();
-    });
+    }
 }
 exports.addSVGRules = addSVGRules;

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

@@ -1,114 +1,134 @@
 "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.dev = void 0;
+exports.dev = exports.stripUndefined = void 0;
 const mfsu_1 = require("@umijs/mfsu");
 const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
 const path_1 = require("path");
 const webpack_1 = __importDefault(require("../compiled/webpack"));
 const config_1 = require("./config/config");
 const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
-function dev(opts) {
+function stripUndefined(obj) {
+    Object.keys(obj).forEach((key) => {
+        if (obj[key] === undefined) {
+            delete obj[key];
+        }
+    });
+    return obj;
+}
+exports.stripUndefined = stripUndefined;
+async function dev(opts) {
     var _a, _b, _c, _d, _e, _f;
     var _g;
-    return __awaiter(this, void 0, void 0, function* () {
-        const enableMFSU = opts.config.mfsu !== false;
-        let mfsu = null;
-        if (enableMFSU) {
-            if (opts.config.srcTranspiler === types_1.Transpiler.swc) {
-                utils_1.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
-            }
-            mfsu = new mfsu_1.MFSU({
-                implementor: webpack_1.default,
-                buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
-                depBuildConfig: {
-                    extraPostCSSPlugins: ((_b = opts.config) === null || _b === void 0 ? void 0 : _b.extraPostCSSPlugins) || [],
-                },
-                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'),
-                getCacheDependency() {
-                    var _a;
-                    return {
-                        version: require('../package.json').version,
-                        esbuildMode: !!((_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild),
-                    };
-                },
-            });
+    const enableMFSU = opts.config.mfsu !== false;
+    let mfsu = null;
+    if (enableMFSU) {
+        if (opts.config.srcTranspiler === types_1.Transpiler.swc) {
+            utils_1.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
         }
-        const webpackConfig = yield (0, config_1.getConfig)({
-            cwd: opts.cwd,
-            env: types_1.Env.development,
-            entry: opts.entry,
-            userConfig: opts.config,
-            babelPreset: opts.babelPreset,
-            extraBabelPlugins: [
-                ...(opts.beforeBabelPlugins || []),
-                ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getBabelPlugins()) || []),
-                ...(opts.extraBabelPlugins || []),
-            ],
-            extraBabelPresets: [
-                ...(opts.beforeBabelPresets || []),
-                ...(opts.extraBabelPresets || []),
-            ],
-            extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
-            chainWebpack: opts.chainWebpack,
-            modifyWebpackConfig: opts.modifyWebpackConfig,
-            hmr: true,
-            analyze: process.env.ANALYZE,
-            cache: opts.cache,
-        });
-        const depConfig = yield (0, config_1.getConfig)({
-            cwd: opts.cwd,
-            env: types_1.Env.development,
-            entry: opts.entry,
-            userConfig: opts.config,
-            hash: true,
-            staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
-            name: constants_1.MFSU_NAME,
-            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'),
+        mfsu = new mfsu_1.MFSU({
+            implementor: webpack_1.default,
+            buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
+            depBuildConfig: {
+                extraPostCSSPlugins: ((_b = opts.config) === null || _b === void 0 ? void 0 : _b.extraPostCSSPlugins) || [],
+            },
+            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.rootDir || opts.cwd, 'node_modules/.cache/mfsu'),
+            onMFSUProgress: opts.onMFSUProgress,
+            getCacheDependency() {
+                return stripUndefined({
+                    version: require('../package.json').version,
+                    mfsu: opts.config.mfsu,
+                    alias: opts.config.alias,
+                    externals: opts.config.externals,
+                    theme: opts.config.theme,
+                    runtimePublicPath: opts.config.runtimePublicPath,
+                    publicPath: opts.config.publicPath,
+                });
             },
         });
-        (_g = webpackConfig.resolve).alias || (_g.alias = {});
-        // TODO: REMOVE ME
-        ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
-            // @ts-ignore
-            webpackConfig.resolve.alias[dep] = require.resolve(dep);
-        });
-        yield (mfsu === null || mfsu === void 0 ? void 0 : mfsu.setWebpackConfig({
-            config: webpackConfig,
-            depConfig: depConfig,
-        }));
-        yield (0, server_1.createServer)({
-            webpackConfig,
-            userConfig: opts.config,
-            cwd: opts.cwd,
-            beforeMiddlewares: [
-                ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getMiddlewares()) || []),
-                ...(opts.beforeMiddlewares || []),
-            ],
-            port: opts.port,
-            host: opts.host,
-            afterMiddlewares: [...(opts.afterMiddlewares || [])],
-            onDevCompileDone: opts.onDevCompileDone,
-        });
+    }
+    const webpackConfig = await (0, config_1.getConfig)({
+        cwd: opts.cwd,
+        rootDir: opts.rootDir,
+        env: types_1.Env.development,
+        entry: opts.entry,
+        userConfig: opts.config,
+        babelPreset: opts.babelPreset,
+        extraBabelPlugins: [
+            ...(opts.beforeBabelPlugins || []),
+            ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getBabelPlugins()) || []),
+            ...(opts.extraBabelPlugins || []),
+        ],
+        extraBabelPresets: [
+            ...(opts.beforeBabelPresets || []),
+            ...(opts.extraBabelPresets || []),
+        ],
+        extraBabelIncludes: opts.config.extraBabelIncludes,
+        extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
+        chainWebpack: opts.chainWebpack,
+        modifyWebpackConfig: opts.modifyWebpackConfig,
+        hmr: true,
+        analyze: process.env.ANALYZE,
+        cache: opts.cache,
+    });
+    const depConfig = await (0, config_1.getConfig)({
+        cwd: opts.cwd,
+        rootDir: opts.rootDir,
+        env: types_1.Env.development,
+        entry: opts.entry,
+        userConfig: opts.config,
+        hash: true,
+        staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
+        name: constants_1.MFSU_NAME,
+        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.rootDir || opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
+        },
+    });
+    (_g = webpackConfig.resolve).alias || (_g.alias = {});
+    // TODO: REMOVE ME
+    ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
+        // @ts-ignore
+        webpackConfig.resolve.alias[dep] = require.resolve(dep);
+    });
+    await (mfsu === null || mfsu === void 0 ? void 0 : mfsu.setWebpackConfig({
+        config: webpackConfig,
+        depConfig: depConfig,
+    }));
+    if (mfsu &&
+        webpackConfig.cache &&
+        typeof webpackConfig.cache === 'object' &&
+        webpackConfig.cache.type === 'filesystem') {
+        const webpackCachePath = (0, path_1.join)(webpackConfig.cache.cacheDirectory, `default-development`, 'index.pack');
+        const mfsuCacheExists = (0, fs_1.existsSync)(mfsu.depInfo.cacheFilePath);
+        const webpackCacheExists = (0, fs_1.existsSync)(webpackCachePath);
+        if (webpackCacheExists && !mfsuCacheExists) {
+            utils_1.logger.warn(`Invalidate webpack cache since mfsu cache is missing`);
+            utils_1.rimraf.sync(webpackConfig.cache.cacheDirectory);
+        }
+    }
+    await (0, server_1.createServer)({
+        webpackConfig,
+        userConfig: opts.config,
+        cwd: opts.cwd,
+        beforeMiddlewares: [
+            ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getMiddlewares()) || []),
+            ...(opts.beforeMiddlewares || []),
+        ],
+        port: opts.port,
+        host: opts.host,
+        afterMiddlewares: [...(opts.afterMiddlewares || [])],
+        onDevCompileDone: opts.onDevCompileDone,
+        onProgress: opts.onProgress,
     });
 }
 exports.dev = dev;

package/dist/index.d.ts

@@ -1,8 +1,11 @@
+import * as parcelCSS from '@parcel/css';
 import type webpack from '../compiled/webpack';
+import './requireHook';
 export type { RequestHandler } from '@umijs/bundler-utils/compiled/express';
 export type { Compiler, Stats } from '../compiled/webpack';
 export * from './build';
 export * from './config/config';
 export * from './dev';
 export * from './schema';
+export { parcelCSS };
 export { webpack };

package/dist/index.js

@@ -10,10 +10,26 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parcelCSS = void 0;
+const parcelCSS = __importStar(require("@parcel/css"));
+exports.parcelCSS = parcelCSS;
+require("./requireHook");
 __exportStar(require("./build"), exports);
 __exportStar(require("./config/config"), exports);
 __exportStar(require("./dev"), exports);

package/dist/loader/svgr.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -22,9 +13,9 @@ const plugin_svgo_1 = __importDefault(require("@svgr/plugin-svgo"));
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
 const path_1 = require("path");
 const util_1 = require("util");
-const tranformSvg = (0, util_1.callbackify)((contents, options, state) => __awaiter(void 0, void 0, void 0, function* () {
-    const jsCode = yield (0, core_1.transform)(contents, options, state);
-    const result = yield (0, esbuild_1.transform)(jsCode, {
+const tranformSvg = (0, util_1.callbackify)(async (contents, options, state) => {
+    const jsCode = await (0, core_1.transform)(contents, options, state);
+    const result = await (0, esbuild_1.transform)(jsCode, {
         loader: 'tsx',
         target: 'es2015',
     });
@@ -32,7 +23,7 @@ const tranformSvg = (0, util_1.callbackify)((contents, options, state) => __awai
         throw new Error(`Error while transforming using Esbuild`);
     }
     return result.code;
-}));
+});
 function svgrLoader(contents) {
     this.cacheable && this.cacheable();
     const callback = this.async();

package/dist/loader/swc.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@swc/core");
 const types_1 = require("../types");
@@ -54,11 +43,17 @@ function swcLoader(contents) {
     // 启用异步模式
     const callback = this.async();
     const loaderOpts = this.getOptions();
-    const { sync = false, parseMap = false } = loaderOpts, otherOpts = __rest(loaderOpts, ["sync", "parseMap"]);
+    const { sync = false, parseMap = false, ...otherOpts } = loaderOpts;
     const filename = this.resourcePath;
-    const swcOpts = Object.assign(Object.assign(Object.assign({}, getBaseOpts({
+    const swcOpts = {
+        ...getBaseOpts({
+            filename,
+        }),
         filename,
-    })), { filename, sourceMaps: this.sourceMap, sourceFileName: filename }), otherOpts);
+        sourceMaps: this.sourceMap,
+        sourceFileName: filename,
+        ...otherOpts,
+    };
     try {
         if (sync) {
             const output = (0, core_1.transformSync)(contents, swcOpts);

package/dist/plugins/ProgressPlugin.js

@@ -12,8 +12,9 @@ class UmiProgressPlugin extends webpack_1.ProgressPlugin {
         };
     }
     apply(compiler) {
+        const prefix = this.options.name ? `[${this.options.name}]` : '[Webpack]';
         compiler.hooks.invalid.tap(PLUGIN_NAME, () => {
-            utils_1.logger.wait('Compiling...');
+            utils_1.logger.wait(`${prefix} Compiling...`);
         });
         compiler.hooks.done.tap(PLUGIN_NAME, (stats) => {
             const { errors, warnings } = stats.toJson({
@@ -32,8 +33,7 @@ class UmiProgressPlugin extends webpack_1.ProgressPlugin {
                 });
             }
             else {
-                const prefix = this.options.name ? `${this.options.name} ` : '';
-                utils_1.logger.event(`${prefix}Compiled successfully in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
+                utils_1.logger.event(`${prefix} Compiled in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
             }
         });
     }

package/dist/plugins/RuntimePublicPathPlugin.js

@@ -10,8 +10,11 @@ class RuntimePublicPathPlugin {
                 // The hook to get the public path ('__webpack_require__.p')
                 // https://github.com/webpack/webpack/blob/master/lib/runtime/PublicPathRuntimeModule.js
                 if (module.constructor.name === 'PublicPathRuntimeModule') {
+                    // If current public path is handled by mini-css-extract-plugin, skip it
+                    if (module.getGeneratedCode().includes('webpack:///mini-css-extract-plugin'))
+                        return;
                     // @ts-ignore
-                    module._cachedGeneratedCode = `__webpack_require__.p = (globalThis || window).publicPath;`;
+                    module._cachedGeneratedCode = `__webpack_require__.p = (globalThis || window).publicPath || '/';`;
                 }
             });
         });

package/dist/schema.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="hapi__joi" />
-import type { Root } from '@hapi/joi';
+import type { Root } from '@umijs/utils/compiled/@hapi/joi';
 export declare function getSchemas(): Record<string, (Joi: Root) => any>;

package/dist/schema.js

@@ -4,18 +4,30 @@ exports.getSchemas = void 0;
 const types_1 = require("./types");
 const options = [
     'cheap-source-map',
-    'cheap-eval-source-map',
-    'cheap-hidden-source-map',
-    'cheap-inline-source-map',
     'cheap-module-source-map',
-    'cheap-module-eval-source-map',
-    'cheap-module-hidden-source-map',
-    'cheap-module-inline-source-map',
     'eval',
     'eval-source-map',
+    'eval-cheap-source-map',
+    'eval-cheap-module-source-map',
+    'eval-nosources-cheap-source-map',
+    'eval-nosources-cheap-module-source-map',
+    'eval-nosources-source-map',
     'source-map',
     'hidden-source-map',
+    'hidden-nosources-cheap-source-map',
+    'hidden-nosources-cheap-module-source-map',
+    'hidden-nosources-source-map',
+    'hidden-cheap-source-map',
+    'hidden-cheap-module-source-map',
     'inline-source-map',
+    'inline-cheap-source-map',
+    'inline-cheap-module-source-map',
+    'inline-nosources-cheap-source-map',
+    'inline-nosources-cheap-module-source-map',
+    'inline-nosources-source-map',
+    'nosources-source-map',
+    'nosources-cheap-source-map',
+    'nosources-cheap-module-source-map',
 ];
 const DEVTOOL_REGEX = new RegExp('^' + // start of string
     '(#@|@|#)?' + // maybe one of the pragmas
@@ -40,12 +52,14 @@ function getSchemas() {
         devtool: (Joi) => Joi.alternatives().try(Joi.string().regex(DEVTOOL_REGEX), Joi.boolean()),
         esm: (Joi) => Joi.object(),
         externals: (Joi) => Joi.alternatives().try(Joi.object(), Joi.string(), Joi.func()),
+        extraBabelIncludes: (Joi) => Joi.array().items(Joi.string()),
         extraBabelPlugins: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
         extraBabelPresets: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
         extraPostCSSPlugins: (Joi) => Joi.array(),
         fastRefresh: (Joi) => Joi.boolean(),
         forkTSChecker: (Joi) => Joi.object(),
         hash: (Joi) => Joi.boolean(),
+        https: (Joi) => Joi.object(),
         ignoreMomentLocale: (Joi) => Joi.boolean(),
         inlineLimit: (Joi) => Joi.number(),
         jsMinifier: (Joi) => Joi.string().valid(types_1.JSMinifier.esbuild, types_1.JSMinifier.swc, types_1.JSMinifier.terser, types_1.JSMinifier.uglifyJs, types_1.JSMinifier.none),
@@ -61,6 +75,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(),