@umijs/bundler-webpack 4.0.0-canary.20220729.2 → 4.0.0-canary.20220809.1

package/dist/config/compressPlugin.js

@@ -53,7 +53,8 @@ async function addCompressPlugin(opts) {
   }
   config.optimization.minimize(true);
   const esbuildTarget = (0, import_getEsBuildTarget.getEsBuildTarget)({
-    targets: userConfig.targets || {}
+    targets: userConfig.targets || {},
+    jsMinifier
   });
   let minify;
   let terserOptions;

package/dist/dev.js

@@ -65,6 +65,10 @@ async function dev(opts) {
   const cacheDirectoryPath = (0, import_path.resolve)(opts.rootDir || opts.cwd, opts.config.cacheDirectoryPath || "node_modules/.cache");
   const enableMFSU = opts.config.mfsu !== false;
   let mfsu = null;
+  let devHost = "localhost";
+  if (opts.host && opts.host !== "0.0.0.0") {
+    devHost = opts.host;
+  }
   if (enableMFSU) {
     if (opts.config.srcTranspiler === import_types.Transpiler.swc) {
       import_utils.logger.warn(`Swc currently not supported for use with mfsu, recommended you use srcTranspiler: 'esbuild' in dev.`);
@@ -97,7 +101,7 @@ async function dev(opts) {
           publicPath: opts.config.publicPath
         });
       },
-      serverBase: `${opts.config.https ? "https" : "http"}://${opts.host}:${opts.port || 8e3}`
+      serverBase: `${opts.config.https ? "https" : "http"}://${devHost}:${opts.port || 8e3}`
     });
   }
   const webpackConfig = await (0, import_config.getConfig)({
@@ -137,6 +141,7 @@ async function dev(opts) {
     staticPathPrefix: import_mfsu.MF_DEP_PREFIX,
     name: import_constants.MFSU_NAME,
     chainWebpack: (_i = opts.config.mfsu) == null ? void 0 : _i.chainWebpack,
+    extraBabelIncludes: opts.config.extraBabelIncludes,
     cache: {
       buildDependencies: (_j = opts.cache) == null ? void 0 : _j.buildDependencies,
       cacheDirectory: (0, import_path.join)(cacheDirectoryPath, "mfsu-deps")
@@ -169,7 +174,7 @@ async function dev(opts) {
       ...opts.beforeMiddlewares || []
     ],
     port: opts.port,
-    host: opts.host,
+    host: devHost,
     afterMiddlewares: [...opts.afterMiddlewares || []],
     onDevCompileDone: opts.onDevCompileDone,
     onProgress: opts.onProgress

package/dist/server/server.js

@@ -162,6 +162,13 @@ async function createServer(opts) {
         (0, import_assert.default)(typeof proxy2.target === "string", "proxy.target must be string");
         (0, import_assert.default)(proxy2.context, "proxy.context must be supplied");
         middleware = (0, import_http_proxy_middleware.createProxyMiddleware)(proxy2.context, __spreadProps(__spreadValues({}, proxy2), {
+          onProxyReq(proxyReq, req, res) {
+            var _a, _b;
+            if (proxyReq.getHeader("origin")) {
+              proxyReq.setHeader("origin", ((_a = new URL(proxy2.target)) == null ? void 0 : _a.href) || "");
+            }
+            (_b = proxy2.onProxyReq) == null ? void 0 : _b.call(proxy2, proxyReq, req, res);
+          },
           onProxyRes(proxyRes, req, res) {
             var _a, _b;
             proxyRes.headers["x-real-url"] = ((_a = new URL(req.url || "", proxy2.target)) == null ? void 0 : _a.href) || "";
@@ -215,8 +222,10 @@ async function createServer(opts) {
   const protocol = userConfig.https ? "https:" : "http:";
   const port = opts.port || 8e3;
   server.listen(port, () => {
-    const host = opts.host && opts.host !== "0.0.0.0" ? opts.host : "localhost";
-    import_utils.logger.ready(`App listening at ${import_utils.chalk.green(`${protocol}//${host}:${port}`)}`);
+    const banner = (0, import_utils.getDevBanner)(protocol, opts.host, port);
+    console.log(banner.before);
+    import_utils.logger.ready(banner.main);
+    console.log(banner.after);
   });
   return server;
 }

package/dist/utils/getEsBuildTarget.d.ts

@@ -1,5 +1,7 @@
+import { JSMinifier } from '../types';
 interface IOpts {
     targets: Record<string, any>;
+    jsMinifier: `${JSMinifier}`;
 }
-export declare function getEsBuildTarget({ targets }: IOpts): string[];
+export declare function getEsBuildTarget({ targets, jsMinifier }: IOpts): string[];
 export {};

package/dist/utils/getEsBuildTarget.js

@@ -22,8 +22,14 @@ __export(getEsBuildTarget_exports, {
   getEsBuildTarget: () => getEsBuildTarget
 });
 module.exports = __toCommonJS(getEsBuildTarget_exports);
+var import_utils = require("@umijs/utils");
 var import_constants = require("../constants");
-function getEsBuildTarget({ targets }) {
+var import_types = require("../types");
+function getEsBuildTarget({ targets, jsMinifier }) {
+  if (targets["ie"] && jsMinifier === import_types.JSMinifier.esbuild) {
+    import_utils.logger.error(`${import_utils.chalk.red(`jsMinifier: esbuild`)} is not supported when there is ie in the targets, you can use ${import_utils.chalk.green(`jsMinifier: 'terser'`)}`);
+    throw new Error("IE is not supported");
+  }
   return Object.keys(targets).filter((key) => import_constants.DEFAULT_ESBUILD_TARGET_KEYS.includes(key)).map((key) => {
     return `${key}${targets[key] === true ? "0" : targets[key]}`;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220729.2",
+  "version": "4.0.0-canary.20220809.1",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -34,11 +34,11 @@
     "@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.20220729.2",
-    "@umijs/bundler-utils": "4.0.0-canary.20220729.2",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220809.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220809.1",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.0-canary.20220729.2",
-    "@umijs/utils": "4.0.0-canary.20220729.2",
+    "@umijs/mfsu": "4.0.0-canary.20220809.1",
+    "@umijs/utils": "4.0.0-canary.20220809.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",