@umijs/bundler-webpack 4.0.0-canary.20220624.1 → 4.0.0-canary.20220707.1

package/dist/config/assetRules.js

@@ -14,9 +14,6 @@ async function addAssetRules(opts) {
         dataUrlCondition: {
             maxSize: inlineLimit,
         },
-    })
-        .generator({
-        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
     });
     rule
         .oneOf('image')
@@ -26,9 +23,6 @@ async function addAssetRules(opts) {
         dataUrlCondition: {
             maxSize: inlineLimit,
         },
-    })
-        .generator({
-        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
     });
     const fallback = rule
         .oneOf('fallback')
@@ -40,11 +34,6 @@ async function addAssetRules(opts) {
     if (userConfig.mdx) {
         fallback.add(/\.mdx?$/);
     }
-    fallback
-        .end()
-        .type('asset/resource')
-        .generator({
-        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
-    });
+    fallback.end().type('asset/resource');
 }
 exports.addAssetRules = addAssetRules;

package/dist/config/config.js

@@ -78,7 +78,8 @@ async function getConfig(opts) {
         .filename(useHash ? `[name].[contenthash:8].js` : `[name].js`)
         .chunkFilename(useHash ? `[name].[contenthash:8].async.js` : `[name].async.js`)
         .publicPath(userConfig.publicPath || 'auto')
-        .pathinfo(isDev || disableCompress);
+        .pathinfo(isDev || disableCompress)
+        .set('assetModuleFilename', `${applyOpts.staticPathPrefix}[name].[hash:8][ext]`);
     // resolve
     // prettier-ignore
     config.resolve

package/dist/config/copyPlugin.js

@@ -4,23 +4,27 @@ exports.addCopyPlugin = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 async function addCopyPlugin(opts) {
+    var _a;
     const { config, userConfig, cwd } = opts;
     const copyPatterns = [
         (0, fs_1.existsSync)((0, path_1.join)(cwd, 'public')) && {
             from: (0, path_1.join)(cwd, 'public'),
+            // ref: https://github.com/webpack-contrib/copy-webpack-plugin#info
+            // Set minimized so terser will not do minimize
+            info: { minimized: true },
         },
         ...(userConfig.copy
-            ? userConfig.copy.map((item) => {
-                if (typeof item === 'string') {
+            ? (_a = userConfig.copy) === null || _a === void 0 ? void 0 : _a.map((pattern) => {
+                if (typeof pattern === 'string') {
                     return {
-                        from: (0, path_1.join)(cwd, item),
-                        to: item,
+                        from: (0, path_1.resolve)(cwd, pattern),
+                        info: { minimized: true },
                     };
                 }
                 return {
-                    // 相对于 process.cwd，所以这里需要使用绝对路径
-                    from: (0, path_1.join)(cwd, item.from),
-                    to: item.to,
+                    from: (0, path_1.resolve)(cwd, pattern.from),
+                    to: (0, path_1.resolve)(cwd, pattern.to),
+                    info: { minimized: true },
                 };
             })
             : []),

package/dist/config/cssRules.js

@@ -65,7 +65,15 @@ async function addCSSRules(opts) {
                 .options({
                 importLoaders: 1,
                 esModule: true,
-                url: true,
+                url: {
+                    filter: (url) => {
+                        // Don't parse absolute URLs
+                        // ref: https://github.com/webpack-contrib/css-loader#url
+                        if (url.startsWith('/'))
+                            return false;
+                        return true;
+                    },
+                },
                 import: true,
                 ...(isCSSModules
                     ? {

package/dist/config/svgRules.js

@@ -35,20 +35,14 @@ async function addSVGRules(opts) {
             .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'))
             .end();
     }
-    if (svgo === false) {
+    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;
+            .use('svgo-loader')
+            .loader(require.resolve('@umijs/bundler-webpack/compiled/svgo-loader'))
+            .options({ configFile: false, ...svgo })
+            .end();
     }
-    const svgRule = config.module.rule('svg');
-    svgRule
-        .test(/\.svg$/)
-        .use('svgo-loader')
-        .loader(require.resolve('@umijs/bundler-webpack/compiled/svgo-loader'))
-        .options({ configFile: false, ...svgo })
-        .end();
 }
 exports.addSVGRules = addSVGRules;

package/dist/dev.d.ts

@@ -19,6 +19,9 @@ declare type IOpts = {
     rootDir?: string;
     config: IConfig;
     entry: Record<string, string>;
+    mfsuStrategy?: 'eager' | 'normal';
+    mfsuInclude?: string[];
+    srcCodeCache?: any;
 } & Pick<IConfigOpts, 'cache'>;
 export declare function stripUndefined(obj: any): any;
 export declare function dev(opts: IOpts): Promise<void>;

package/dist/dev.js

@@ -32,6 +32,9 @@ async function dev(opts) {
             utils_1.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
         }
         mfsu = new mfsu_1.MFSU({
+            strategy: opts.mfsuStrategy,
+            include: opts.mfsuInclude || [],
+            srcCodeCache: opts.srcCodeCache,
             implementor: webpack_1.default,
             buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
             depBuildConfig: {
@@ -75,7 +78,7 @@ async function dev(opts) {
         extraEsbuildLoaderHandler: (mfsu === null || mfsu === void 0 ? void 0 : mfsu.getEsbuildLoaderHandler()) || [],
         chainWebpack: opts.chainWebpack,
         modifyWebpackConfig: opts.modifyWebpackConfig,
-        hmr: true,
+        hmr: process.env.HMR !== 'none',
         analyze: process.env.ANALYZE,
         cache: opts.cache,
     });
@@ -109,7 +112,7 @@ async function dev(opts) {
         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 mfsuCacheExists = (0, fs_1.existsSync)(mfsu.getCacheFilePath());
         const webpackCacheExists = (0, fs_1.existsSync)(webpackCachePath);
         if (webpackCacheExists && !mfsuCacheExists) {
             utils_1.logger.warn(`Invalidate webpack cache since mfsu cache is missing`);

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import * as parcelCSS from '@parcel/css';
 import type webpack from '../compiled/webpack';
 import './requireHook';
 export type { RequestHandler } from '@umijs/bundler-utils/compiled/express';
@@ -7,5 +6,4 @@ export * from './build';
 export * from './config/config';
 export * from './dev';
 export * from './schema';
-export { parcelCSS };
 export { webpack };

package/dist/index.js

@@ -10,25 +10,10 @@ 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);

package/dist/parcelCSS.d.ts

@@ -0,0 +1,2 @@
+import * as parcelCSS from '@parcel/css';
+export { parcelCSS };

package/dist/parcelCSS.js

@@ -0,0 +1,28 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parcelCSS = void 0;
+const parcelCSS = __importStar(require("@parcel/css"));
+exports.parcelCSS = parcelCSS;

package/dist/schema.js

@@ -74,8 +74,10 @@ function getSchemas() {
             cacheDirectory: Joi.string(),
             chainWebpack: Joi.function(),
             esbuild: Joi.boolean(),
+            include: Joi.array().items(Joi.string()),
             mfName: Joi.string(),
             runtimePublicPath: Joi.boolean(),
+            strategy: Joi.string().valid('eager', 'normal').default('normal'),
         }), Joi.boolean()),
         outputPath: (Joi) => Joi.string(),
         postcssLoader: (Joi) => Joi.object(),

package/dist/server/server.js

@@ -138,10 +138,11 @@ async function createServer(opts) {
                 app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, {
                     ...proxy[key],
                     // Add x-real-url in response header
-                    onProxyRes(proxyRes, req) {
-                        var _a;
+                    onProxyRes(proxyRes, req, res) {
+                        var _a, _b;
                         proxyRes.headers['x-real-url'] =
                             ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
+                        (_b = proxyConfig.onProxyRes) === null || _b === void 0 ? void 0 : _b.call(proxyConfig, proxyRes, req, res);
                     },
                 }));
             }
@@ -187,7 +188,7 @@ async function createServer(opts) {
     const protocol = userConfig.https ? 'https:' : 'http:';
     const port = opts.port || 8000;
     server.listen(port, () => {
-        const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
+        const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : 'localhost';
         utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
     });
     return server;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220624.1",
+  "version": "4.0.0-canary.20220707.1",
   "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",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -35,10 +35,10 @@
     "@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-canary.20220624.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220624.1",
-    "@umijs/mfsu": "4.0.0-canary.20220624.1",
-    "@umijs/utils": "4.0.0-canary.20220624.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220707.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220707.1",
+    "@umijs/mfsu": "4.0.0-canary.20220707.1",
+    "@umijs/utils": "4.0.0-canary.20220707.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",