@umijs/bundler-webpack 4.0.0-canary.20220624.1 → 4.0.0-canary.20220628.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,20 @@ 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'),
         },
         ...(userConfig.copy
-            ? userConfig.copy.map((item) => {
-                if (typeof item === 'string') {
-                    return {
-                        from: (0, path_1.join)(cwd, item),
-                        to: item,
-                    };
+            ? (_a = userConfig.copy) === null || _a === void 0 ? void 0 : _a.map((pattern) => {
+                if (typeof pattern === 'string') {
+                    return (0, path_1.resolve)(cwd, pattern);
                 }
                 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),
                 };
             })
             : []),

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.js

@@ -75,7 +75,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,
     });

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);
                     },
                 }));
             }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220624.1",
+  "version": "4.0.0-canary.20220628.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.20220628.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220628.1",
+    "@umijs/mfsu": "4.0.0-canary.20220628.1",
+    "@umijs/utils": "4.0.0-canary.20220628.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",