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

package/dist/config/javaScriptRules.js

@@ -42,7 +42,8 @@ function addJavaScriptRules(opts) {
                 .test(/\.(js|mjs)$/)
                 .include.add((path) => {
                 try {
-                    if (path.includes('client/client'))
+                    // do src transform for bundler-webpack/client/client/client.js
+                    if (path.includes('client/client/client'))
                         return true;
                     return (0, depMatch_1.isMatch)({ path, pkgs: depPkgs });
                 }

package/dist/dev.js

@@ -22,8 +22,8 @@ const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
 function dev(opts) {
-    var _a, _b, _c, _d, _e;
-    var _f;
+    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;
@@ -80,12 +80,13 @@ function dev(opts) {
             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: (_e = opts.cache) === null || _e === void 0 ? void 0 : _e.buildDependencies,
+                buildDependencies: (_f = opts.cache) === null || _f === void 0 ? void 0 : _f.buildDependencies,
                 cacheDirectory: (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
             },
         });
-        (_f = webpackConfig.resolve).alias || (_f.alias = {});
+        (_g = webpackConfig.resolve).alias || (_g.alias = {});
         // TODO: REMOVE ME
         ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
             // @ts-ignore

package/dist/schema.js

@@ -40,8 +40,8 @@ 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()),
-        extraBabelPlugins: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
-        extraBabelPresets: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
+        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(),
@@ -58,6 +58,7 @@ function getSchemas() {
         }),
         mfsu: (Joi) => Joi.alternatives(Joi.object({
             cacheDirectory: Joi.string(),
+            chainWebpack: Joi.function(),
             esbuild: Joi.boolean(),
             mfName: Joi.string(),
         }), Joi.boolean()),

package/dist/server/server.js

@@ -42,7 +42,7 @@ function createServer(opts) {
         // cros
         app.use((_req, res, next) => {
             res.header('Access-Control-Allow-Origin', '*');
-            res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With , yourHeaderFeild');
+            res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With');
             res.header('Access-Control-Allow-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
             next();
         });
@@ -55,7 +55,7 @@ function createServer(opts) {
         app.use((req, res, next) => {
             if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
                 res.setHeader('Content-Type', 'application/javascript');
-                res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
+                (0, fs_1.createReadStream)((0, path_1.join)(opts.cwd, 'umi.js')).on('error', next).pipe(res);
             }
             else {
                 next();
@@ -133,7 +133,17 @@ function createServer(opts) {
         // proxy
         if (proxy) {
             Object.keys(proxy).forEach((key) => {
-                app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(proxy[key]));
+                const proxyConfig = proxy[key];
+                const target = proxyConfig.target;
+                if (target) {
+                    app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, Object.assign(Object.assign({}, proxy[key]), { 
+                        // Add x-real-url in response header
+                        onProxyRes(proxyRes, req) {
+                            var _a;
+                            proxyRes.headers['x-real-url'] =
+                                ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
+                        } })));
+                }
             });
         }
         // after middlewares
@@ -155,8 +165,7 @@ function createServer(opts) {
             res.set('Content-Type', 'text/html');
             const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
             if ((0, fs_1.existsSync)(htmlPath)) {
-                const html = (0, fs_1.readFileSync)(htmlPath, 'utf-8');
-                res.send(html);
+                (0, fs_1.createReadStream)(htmlPath).on('error', next).pipe(res);
             }
             else {
                 next();

package/dist/swcPlugins/autoCSSModules.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
 const utils_1 = require("@umijs/utils");
+const changeImportFromString_1 = require("./changeImportFromString");
 class AutoCSSModule extends Visitor_1.default {
     visitTsType(expression) {
         return expression;
@@ -24,7 +25,8 @@ class AutoCSSModule extends Visitor_1.default {
         const { specifiers, source } = expression;
         const { value } = source;
         if (specifiers.length && (0, utils_1.isStyleFile)({ filename: value })) {
-            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value: `${value}?modules` }) });
+            const newImportFrom = `${value}?modules`;
+            (0, changeImportFromString_1.changeImportFromString)(expression, newImportFrom);
         }
         return expression;
     }

package/dist/swcPlugins/changeImportFromString.d.ts

@@ -0,0 +1,2 @@
+import type { ImportDeclaration } from '@swc/core';
+export declare const changeImportFromString: (e: ImportDeclaration, v: string) => void;

package/dist/swcPlugins/changeImportFromString.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changeImportFromString = void 0;
+const changeImportFromString = (e, v) => {
+    e.source.value = v;
+    // sync change to `raw`
+    // https://github.com/swc-project/swc/issues/4128
+    e.source.raw = `'${v}'`;
+};
+exports.changeImportFromString = changeImportFromString;

package/dist/swcPlugins/lockCoreJS.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
 const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
+const changeImportFromString_1 = require("./changeImportFromString");
 function addLastSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }
@@ -14,8 +15,8 @@ class LockCoreJS extends Visitor_1.default {
         const { source } = expression;
         let { value, type } = source;
         if (type === 'StringLiteral' && value.startsWith('core-js/')) {
-            value = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
-            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value }) });
+            const newValue = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
+            (0, changeImportFromString_1.changeImportFromString)(expression, newValue);
         }
         return expression;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.8",
+  "version": "4.0.0-rc.9",
   "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,34 +29,34 @@
     "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@parcel/css": "1.6.0",
+    "@parcel/css": "1.7.2",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
     "@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.8",
-    "@umijs/mfsu": "4.0.0-rc.8",
-    "@umijs/utils": "4.0.0-rc.8",
+    "@umijs/babel-preset-umi": "4.0.0-rc.9",
+    "@umijs/mfsu": "4.0.0-rc.9",
+    "@umijs/utils": "4.0.0-rc.9",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",
     "node-libs-browser": "2.2.1",
     "postcss": "^8.4.12",
-    "postcss-preset-env": "7.4.2",
+    "postcss-preset-env": "7.4.3",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@swc/core": "1.2.156",
+    "@swc/core": "1.2.160",
     "@types/webpack-sources": "3.2.0",
     "@types/ws": "8.5.3",
     "autoprefixer": "10.4.4",
-    "babel-loader": "8.2.3",
+    "babel-loader": "8.2.4",
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
     "copy-webpack-plugin": "10.2.4",
     "css-minimizer-webpack-plugin": "3.4.1",
-    "cssnano": "5.1.4",
+    "cssnano": "5.1.5",
     "fork-ts-checker-webpack-plugin": "7.2.1",
     "http-proxy-middleware": "2.0.4",
     "less-loader": "10.2.0",