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

package/dist/config/cssRules.js

@@ -20,7 +20,7 @@ function addCSSRules(opts) {
                 test: /\.less(\?.*)?$/,
                 loader: require.resolve('@umijs/bundler-webpack/compiled/less-loader'),
                 loaderOptions: {
-                    implementation: require.resolve('@umijs/bundler-webpack/compiled/less'),
+                    implementation: require.resolve('@umijs/bundler-utils/compiled/less'),
                     lessOptions: Object.assign({ modifyVars: userConfig.theme, javascriptEnabled: true }, userConfig.lessLoader),
                 },
             },

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

@@ -1,6 +1,8 @@
-export type { RequestHandler } from '../compiled/express';
+import type webpack from '../compiled/webpack';
+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 { webpack };

package/dist/plugins/ParcelCSSMinifyPlugin.d.ts

@@ -1,4 +1,4 @@
-import { type TransformOptions } from '@parcel/css';
+import type { TransformOptions } from '@parcel/css';
 import type { Compiler } from '../../compiled/webpack/types';
 declare type MinifyPluginOpts = Omit<TransformOptions, 'filename' | 'code' | 'minify'>;
 export declare class ParcelCSSMinifyPlugin {

package/dist/plugins/ParcelCSSMinifyPlugin.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParcelCSSMinifyPlugin = void 0;
-const css_1 = require("@parcel/css");
+const utils_1 = require("@umijs/utils");
 const buffer_1 = require("buffer");
 const path_1 = require("path");
 const webpack_sources_1 = require("../../compiled/webpack-sources");
@@ -60,7 +60,8 @@ class ParcelCSSMinifyPlugin {
                 const { source, map } = asset.source.sourceAndMap();
                 const sourceAsString = source.toString();
                 const code = typeof source === 'string' ? buffer_1.Buffer.from(source) : source;
-                const result = yield (0, css_1.transform)(Object.assign({ filename: asset.name, code, minify: true, sourceMap: sourcemap }, this.options));
+                const { transform } = (0, utils_1.importLazy)('@parcel/css');
+                const result = yield transform(Object.assign({ filename: asset.name, code, minify: true, sourceMap: sourcemap }, this.options));
                 const codeString = result.code.toString();
                 compilation.updateAsset(asset.name, 
                 // @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

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServer = void 0;
-const express_1 = __importDefault(require("@umijs/bundler-webpack/compiled/express"));
+const express_1 = __importDefault(require("@umijs/bundler-utils/compiled/express"));
 const http_proxy_middleware_1 = require("@umijs/bundler-webpack/compiled/http-proxy-middleware");
 const webpack_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack"));
 const utils_1 = require("@umijs/utils");
@@ -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.6",
+  "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",
@@ -25,42 +25,40 @@
     "build:client": "pnpm tsc --project ./tsconfig.client.json",
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch",
-    "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs"
+    "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
+    "test": "jest -c ../../jest.turbo.config.ts"
   },
   "dependencies": {
-    "@parcel/css": "1.5.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.6",
-    "@umijs/mfsu": "4.0.0-rc.6",
-    "@umijs/utils": "4.0.0-rc.6",
+    "@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.8",
-    "postcss-preset-env": "7.4.2",
+    "postcss": "^8.4.12",
+    "postcss-preset-env": "7.4.3",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
-    "@swc/core": "1.2.151",
-    "@types/express": "4.17.13",
+    "@swc/core": "1.2.160",
     "@types/webpack-sources": "3.2.0",
-    "@types/ws": "8.5.2",
-    "autoprefixer": "10.4.2",
-    "babel-loader": "8.2.3",
+    "@types/ws": "8.5.3",
+    "autoprefixer": "10.4.4",
+    "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.1",
-    "express": "4.17.3",
+    "cssnano": "5.1.5",
     "fork-ts-checker-webpack-plugin": "7.2.1",
-    "http-proxy-middleware": "2.0.3",
-    "less": "4.1.2",
+    "http-proxy-middleware": "2.0.4",
     "less-loader": "10.2.0",
     "mini-css-extract-plugin": "2.6.0",
     "postcss-flexbugs-fixes": "5.0.2",
@@ -73,7 +71,7 @@
     "style-loader": "3.3.1",
     "svgo-loader": "3.0.0",
     "tapable": "2.2.1",
-    "terser": "5.12.0",
+    "terser": "5.12.1",
     "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
     "webpack": "5.70.0",
@@ -100,10 +98,8 @@
       "cssnano",
       "compression",
       "connect-history-api-fallback",
-      "express",
       "fork-ts-checker-webpack-plugin",
       "http-proxy-middleware",
-      "less",
       "less-loader",
       "mini-css-extract-plugin",
       "postcss-flexbugs-fixes",
@@ -132,9 +128,9 @@
       "@babel/core": "@umijs/bundler-utils/compiled/babel/core",
       "es-module-lexer": "@umijs/bundler-utils/compiled/es-module-lexer",
       "esbuild": "@umijs/bundler-utils/compiled/esbuild",
-      "express": "$$LOCAL",
+      "express": "@umijs/bundler-utils/compiled/express",
       "jest-worker": "jest-worker",
-      "less": "$$LOCAL",
+      "less": "@umijs/bundler-utils/compiled/less",
       "cssnano": "$$LOCAL",
       "postcss": "postcss",
       "tapable": "$$LOCAL",
@@ -173,7 +169,6 @@
       "compression",
       "connect-history-api-fallback",
       "fork-ts-checker-webpack-plugin",
-      "less",
       "less-loader",
       "mini-css-extract-plugin",
       "postcss-flexbugs-fixes",

package/compiled/css-loader/LICENSE

@@ -1,20 +0,0 @@
-Copyright JS Foundation and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/compiled/css-loader/api.js

@@ -1,102 +0,0 @@
-"use strict";
-
-/*
-  MIT License http://www.opensource.org/licenses/mit-license.php
-  Author Tobias Koppers @sokra
-*/
-module.exports = function (cssWithMappingToString) {
-  var list = []; // return the list of modules as css string
-
-  list.toString = function toString() {
-    return this.map(function (item) {
-      var content = "";
-      var needLayer = typeof item[5] !== "undefined";
-
-      if (item[4]) {
-        content += "@supports (".concat(item[4], ") {");
-      }
-
-      if (item[2]) {
-        content += "@media ".concat(item[2], " {");
-      }
-
-      if (needLayer) {
-        content += "@layer".concat(item[5].length > 0 ? " ".concat(item[5]) : "", " {");
-      }
-
-      content += cssWithMappingToString(item);
-
-      if (needLayer) {
-        content += "}";
-      }
-
-      if (item[2]) {
-        content += "}";
-      }
-
-      if (item[4]) {
-        content += "}";
-      }
-
-      return content;
-    }).join("");
-  }; // import a list of modules into the list
-
-
-  list.i = function i(modules, media, dedupe, supports, layer) {
-    if (typeof modules === "string") {
-      modules = [[null, modules, undefined]];
-    }
-
-    var alreadyImportedModules = {};
-
-    if (dedupe) {
-      for (var _i = 0; _i < this.length; _i++) {
-        var id = this[_i][0];
-
-        if (id != null) {
-          alreadyImportedModules[id] = true;
-        }
-      }
-    }
-
-    for (var _i2 = 0; _i2 < modules.length; _i2++) {
-      var item = [].concat(modules[_i2]);
-
-      if (dedupe && alreadyImportedModules[item[0]]) {
-        continue;
-      }
-
-      if (typeof layer !== "undefined") {
-        if (typeof item[5] === "undefined") {
-          item[5] = layer;
-        } else {
-          item[1] = "@layer".concat(item[5].length > 0 ? " ".concat(item[5]) : "", " {").concat(item[1], "}");
-          item[5] = layer;
-        }
-      }
-
-      if (media) {
-        if (!item[2]) {
-          item[2] = media;
-        } else {
-          item[1] = "@media ".concat(item[2], " {").concat(item[1], "}");
-          item[2] = media;
-        }
-      }
-
-      if (supports) {
-        if (!item[4]) {
-          item[4] = "".concat(supports);
-        } else {
-          item[1] = "@supports (".concat(item[4], ") {").concat(item[1], "}");
-          item[4] = supports;
-        }
-      }
-
-      list.push(item);
-    }
-  };
-
-  return list;
-};

package/compiled/css-loader/getUrl.js

@@ -1,29 +0,0 @@
-"use strict";
-
-module.exports = function (url, options) {
-  if (!options) {
-    options = {};
-  }
-
-  if (!url) {
-    return url;
-  }
-
-  url = String(url.__esModule ? url.default : url); // If url is already wrapped in quotes, remove them
-
-  if (/^['"].*['"]$/.test(url)) {
-    url = url.slice(1, -1);
-  }
-
-  if (options.hash) {
-    url += options.hash;
-  } // Should url be wrapped?
-  // See https://drafts.csswg.org/css-values-3/#urls
-
-
-  if (/["'() \t\n]|(%20)/.test(url) || options.needQuotes) {
-    return "\"".concat(url.replace(/"/g, '\\"').replace(/\n/g, "\\n"), "\"");
-  }
-
-  return url;
-};