@umijs/bundler-webpack 4.0.0-canary.20220729.2 → 4.0.0-canary.20220819.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/config/config.d.ts

@@ -7,7 +7,7 @@ export interface IOpts {
     entry: Record<string, string>;
     extraBabelPresets?: any[];
     extraBabelPlugins?: any[];
-    extraBabelIncludes?: string[];
+    extraBabelIncludes?: Array<string | RegExp>;
     extraEsbuildLoaderHandler?: any[];
     babelPreset?: any;
     chainWebpack?: Function;

package/dist/config/javaScriptRules.d.ts

@@ -7,7 +7,7 @@ interface IOpts {
     env: Env;
     extraBabelPlugins: any[];
     extraBabelPresets: any[];
-    extraBabelIncludes: string[];
+    extraBabelIncludes: Array<string | RegExp>;
     extraEsbuildLoaderHandler: any[];
     babelPreset: any;
     name?: string;

package/dist/config/javaScriptRules.js

@@ -46,6 +46,9 @@ async function addJavaScriptRules(opts) {
     config.module.rule("jsx-ts-tsx").test(/\.(jsx|ts|tsx)$/),
     config.module.rule("extra-src").test(/\.(js|mjs)$/).include.add([
       ...opts.extraBabelIncludes.map((p) => {
+        if (import_utils.lodash.isRegExp(p)) {
+          return p;
+        }
         if ((0, import_path.isAbsolute)(p)) {
           return p;
         }

package/dist/dev.d.ts

@@ -8,6 +8,7 @@ declare type IOpts = {
     onMFSUProgress?: Function;
     port?: number;
     host?: string;
+    ip?: string;
     babelPreset?: any;
     chainWebpack?: Function;
     modifyWebpackConfig?: Function;
@@ -21,6 +22,7 @@ declare type IOpts = {
     entry: Record<string, string>;
     mfsuStrategy?: 'eager' | 'normal';
     mfsuInclude?: string[];
+    mfsuServerBase?: string;
     srcCodeCache?: any;
 } & Pick<IConfigOpts, 'cache' | 'pkg'>;
 export declare function stripUndefined(obj: any): any;

package/dist/dev.js

@@ -97,7 +97,7 @@ async function dev(opts) {
           publicPath: opts.config.publicPath
         });
       },
-      serverBase: `${opts.config.https ? "https" : "http"}://${opts.host}:${opts.port || 8e3}`
+      serverBase: opts.mfsuServerBase
     });
   }
   const webpackConfig = await (0, import_config.getConfig)({
@@ -137,6 +137,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")
@@ -170,6 +171,7 @@ async function dev(opts) {
     ],
     port: opts.port,
     host: opts.host,
+    ip: opts.ip,
     afterMiddlewares: [...opts.afterMiddlewares || []],
     onDevCompileDone: opts.onDevCompileDone,
     onProgress: opts.onProgress

package/dist/plugins/RuntimePublicPathPlugin.js

@@ -30,7 +30,7 @@ var RuntimePublicPathPlugin = class {
         if (module2.constructor.name === "PublicPathRuntimeModule") {
           if (module2.getGeneratedCode().includes("webpack:///mini-css-extract-plugin"))
             return;
-          module2._cachedGeneratedCode = `__webpack_require__.p = (typeof globalThis !== undefined ? globalThis : window).publicPath || '/';`;
+          module2._cachedGeneratedCode = `__webpack_require__.p = (typeof globalThis !== 'undefined' ? globalThis : window).publicPath || '/';`;
         }
       });
     });

package/dist/schema.js

@@ -73,7 +73,7 @@ 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()),
-    extraBabelIncludes: (Joi) => Joi.array().items(Joi.string()),
+    extraBabelIncludes: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object().instance(RegExp))),
     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(),

package/dist/server/server.d.ts

@@ -6,6 +6,7 @@ interface IOpts {
     cwd: string;
     port?: number;
     host?: string;
+    ip?: string;
     webpackConfig: Configuration;
     userConfig: IConfig;
     beforeMiddlewares?: any[];

package/dist/server/server.js

@@ -58,6 +58,7 @@ async function createServer(opts) {
   const { webpackConfig, userConfig } = opts;
   const { proxy } = userConfig;
   const app = (0, import_express.default)();
+  let ws;
   app.use((0, import_cors.default)({
     origin: true,
     methods: ["GET", "HEAD", "PUT", "POST", "PATCH", "DELETE", "OPTIONS"],
@@ -148,7 +149,8 @@ async function createServer(opts) {
     });
   }
   function sendMessage(type, data, sender) {
-    (sender || ws).send(JSON.stringify({ type, data }));
+    var _a;
+    (_a = sender || ws) == null ? void 0 : _a.send(JSON.stringify({ type, data }));
   }
   if (proxy) {
     const proxyArr = Array.isArray(proxy) ? proxy : proxy.target ? [proxy] : Object.keys(proxy).map((key) => {
@@ -162,6 +164,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) || "";
@@ -202,11 +211,26 @@ async function createServer(opts) {
       next();
     }
   });
-  const server = userConfig.https ? await (0, import_bundler_utils.createHttpsServer)(app, userConfig.https) : import_http.default.createServer(app);
+  let server;
+  if (userConfig.https) {
+    const httpsOpts = userConfig.https;
+    if (!httpsOpts.hosts) {
+      httpsOpts.hosts = import_utils.lodash.uniq([
+        ...httpsOpts.hosts || [],
+        "127.0.0.1",
+        "localhost",
+        opts.ip,
+        opts.host !== "0.0.0.0" && opts.host
+      ].filter(Boolean));
+    }
+    server = await (0, import_bundler_utils.createHttpsServer)(app, httpsOpts);
+  } else {
+    server = import_http.default.createServer(app);
+  }
   if (!server) {
     return null;
   }
-  const ws = (0, import_ws.createWebSocketServer)(server);
+  ws = (0, import_ws.createWebSocketServer)(server);
   ws.wss.on("connection", (socket) => {
     if (stats) {
       sendStats(getStats(stats), false, socket);
@@ -215,8 +239,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/types.d.ts

@@ -54,14 +54,14 @@ export interface IConfig {
     cssLoaderModules?: {
         [key: string]: any;
     };
-    cssMinifier?: CSSMinifier;
+    cssMinifier?: `${CSSMinifier}`;
     cssMinifierOptions?: {
         [key: string]: any;
     };
     define?: {
         [key: string]: any;
     };
-    depTranspiler?: Transpiler;
+    depTranspiler?: `${Transpiler}`;
     devtool?: Config.DevTool;
     deadCode?: DeadCodeParams;
     https?: HttpsServerOptions;
@@ -71,7 +71,7 @@ export interface IConfig {
     };
     extraBabelPlugins?: IBabelPlugin[];
     extraBabelPresets?: IBabelPlugin[];
-    extraBabelIncludes?: string[];
+    extraBabelIncludes?: Array<string | RegExp>;
     extraPostCSSPlugins?: any[];
     hash?: boolean;
     ignoreMomentLocale?: boolean;

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.20220819.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.20220819.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220819.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.20220819.1",
+    "@umijs/utils": "4.0.0-canary.20220819.1",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",