@umijs/bundler-webpack 4.0.13 → 4.0.16

package/dist/config/assetRules.js

@@ -36,7 +36,7 @@ async function addAssetRules(opts) {
       maxSize: inlineLimit
     }
   });
-  const fallback = rule.oneOf("fallback").exclude.add(/^$/).add(/\.(js|mjs|jsx|ts|tsx)$/).add(/\.(css|less|sass|scss|stylus)$/).add(/\.html$/).add(/\.json$/);
+  const fallback = rule.oneOf("fallback").exclude.add(/^$/).add(/\.(js|mjs|cjs|jsx|ts|tsx)$/).add(/\.(css|less|sass|scss|stylus)$/).add(/\.html$/).add(/\.json$/);
   if (userConfig.mdx) {
     fallback.add(/\.mdx?$/);
   }

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

@@ -103,10 +103,11 @@ async function getConfig(opts) {
   config.devtool(isDev ? userConfig.devtool === false ? false : userConfig.devtool || import_constants.DEFAULT_DEVTOOL : userConfig.devtool);
   const absOutputPath = (0, import_path.resolve)(opts.cwd, userConfig.outputPath || import_constants.DEFAULT_OUTPUT_PATH);
   const disableCompress = process.env.COMPRESS === "none";
-  config.output.path(absOutputPath).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).set("assetModuleFilename", `${applyOpts.staticPathPrefix}[name].[hash:8][ext]`);
+  config.output.path(absOutputPath).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).set("assetModuleFilename", `${applyOpts.staticPathPrefix}[name].[hash:8][ext]`).set("hashFunction", "xxhash64");
   config.resolve.set("symlinks", true).modules.add("node_modules").end().alias.merge(userConfig.alias || {}).end().extensions.merge([
     ".wasm",
     ".mjs",
+    ".cjs",
     ".js",
     ".jsx",
     ".ts",

package/dist/config/detectDeadCode.d.ts

@@ -7,6 +7,6 @@ export interface Options extends DeadCodeParams {
     detectUnusedFiles: boolean;
     detectUnusedExport: boolean;
 }
-export declare const disabledFolders: string[];
+export declare const ignores: string[];
 declare const detectDeadCode: (compilation: Compilation, options: Options) => void;
 export default detectDeadCode;

package/dist/config/detectDeadCode.js

@@ -23,22 +23,37 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var detectDeadCode_exports = {};
 __export(detectDeadCode_exports, {
   default: () => detectDeadCode_default,
-  disabledFolders: () => disabledFolders
+  ignores: () => ignores
 });
 module.exports = __toCommonJS(detectDeadCode_exports);
 var import_webpack = require("@umijs/bundler-webpack/compiled/webpack");
 var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
-var disabledFolders = [
-  "node_modules",
-  ".umi",
-  ".umi-production",
-  "dist"
+var ignores = [
+  "**/node_modules/**",
+  "**/.umi/**",
+  "**/.umi-production/**",
+  "**/.umi-test/**",
+  "coverage/**",
+  "dist/**",
+  "config/**",
+  "public/**",
+  "mock/**"
 ];
 var detectDeadCode = (compilation, options) => {
   const assets = getWebpackAssets(compilation);
   const compiledFilesDictionary = convertFilesToDict(assets);
-  const includedFiles = getPattern(options).map((pattern) => import_utils.glob.sync(pattern)).flat();
+  const context = options.context;
+  if (!options.patterns.length) {
+    options.patterns = getDefaultSourcePattern({ cwd: context });
+  }
+  const includedFiles = options.patterns.map((pattern) => {
+    return import_utils.glob.sync(pattern, {
+      ignore: [...ignores, ...options.exclude],
+      cwd: context,
+      absolute: true
+    });
+  }).flat();
   const unusedFiles = options.detectUnusedFiles ? includedFiles.filter((file) => !compiledFilesDictionary[file]) : [];
   const unusedExportMap = options.detectUnusedExport ? getUnusedExportMap(convertFilesToDict(includedFiles), compilation) : {};
   logUnusedFiles(unusedFiles);
@@ -48,9 +63,6 @@ var detectDeadCode = (compilation, options) => {
     process.exit(2);
   }
 };
-var getPattern = (options) => {
-  return options.patterns.map((pattern) => import_path.default.resolve(options.context || "", pattern)).concat(options.exclude.map((pattern) => import_path.default.resolve(options.context || "", `!${pattern}`))).map(convertToUnixPath);
-};
 var getUnusedExportMap = (includedFileMap, compilation) => {
   const unusedExportMap = {};
   compilation.chunks.forEach((chunk) => {
@@ -64,7 +76,7 @@ var outputUnusedExportMap = (compilation, chunk, module2, includedFileMap, unuse
   if (!(module2 instanceof import_webpack.NormalModule) || !module2.resource) {
     return;
   }
-  const path2 = convertToUnixPath(module2.resource);
+  const path2 = (0, import_utils.winPath)(module2.resource);
   if (!/^((?!(node_modules)).)*$/.test(path2))
     return;
   const providedExports = compilation.chunkGraph.moduleGraph.getProvidedExports(module2);
@@ -111,8 +123,8 @@ var getWebpackAssets = (compilation) => {
   return assets;
 };
 var convertFilesToDict = (assets) => {
-  return assets.filter((file) => Boolean(file) && disabledFolders.every((disabledPath) => !file.includes(disabledPath))).reduce((fileDictionary, file) => {
-    const unixFile = convertToUnixPath(file);
+  return assets.filter((path2) => !/(node_modules|(\.umi))/.test(path2) && Boolean(path2)).reduce((fileDictionary, file) => {
+    const unixFile = (0, import_utils.winPath)(file);
     fileDictionary[unixFile] = true;
     return fileDictionary;
   }, {});
@@ -124,9 +136,22 @@ var logUnusedFiles = (unusedFiles) => {
   console.log(import_utils.chalk.yellow.bold("\nWarning:"), import_utils.chalk.yellow(`There are ${unusedFiles.length} unused files:`), ...unusedFiles.map((file, index) => `
 ${index + 1}. ${import_utils.chalk.yellow(file)}`), import_utils.chalk.red.bold("\nPlease be careful if you want to remove them (\xAC\xBA-\xB0)\xAC.\n"));
 };
-var convertToUnixPath = (path2) => path2.replace(/\\+/g, "/");
+function isDirExist(p) {
+  return import_utils.fsExtra.existsSync(p) && import_utils.fsExtra.statSync(p).isDirectory();
+}
+function getDefaultSourcePattern(opts) {
+  const { cwd } = opts;
+  const srcPath = import_path.default.join(cwd, "src");
+  if (isDirExist(srcPath)) {
+    return ["src/**/*"];
+  }
+  const dirs = import_utils.fsExtra.readdirSync(cwd).filter((p) => {
+    return !p.startsWith(".") && isDirExist(p);
+  });
+  return dirs.map((dir) => `${dir}/**/*`);
+}
 var detectDeadCode_default = detectDeadCode;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  disabledFolders
+  ignores
 });

package/dist/config/detectDeadCodePlugin.js

@@ -45,7 +45,7 @@ module.exports = __toCommonJS(detectDeadCodePlugin_exports);
 var import_types = require("../types");
 var import_detectDeadCode = __toESM(require("./detectDeadCode"));
 var defaultOptions = {
-  patterns: [`!(${import_detectDeadCode.disabledFolders.join("|")})/**/*.*`],
+  patterns: [],
   exclude: [],
   failOnHint: false,
   detectUnusedFiles: true,

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

@@ -39,13 +39,16 @@ async function addJavaScriptRules(opts) {
   const useFastRefresh = isDev && userConfig.fastRefresh !== false && name !== import_constants.MFSU_NAME;
   const depPkgs = Object.assign({}, (0, import_depMatch.es5ImcompatibleVersionsToPkg)());
   const srcRules = [
-    config.module.rule("src").test(/\.(js|mjs)$/).include.add([
+    config.module.rule("src").test(/\.(js|mjs|cjs)$/).include.add([
       cwd,
       ...process.env.APP_ROOT ? [process.cwd()] : []
     ]).end().exclude.add(/node_modules/).end(),
     config.module.rule("jsx-ts-tsx").test(/\.(jsx|ts|tsx)$/),
-    config.module.rule("extra-src").test(/\.(js|mjs)$/).include.add([
+    config.module.rule("extra-src").test(/\.(js|mjs|cjs)$/).include.add([
       ...opts.extraBabelIncludes.map((p) => {
+        if (import_utils.lodash.isRegExp(p)) {
+          return p;
+        }
         if ((0, import_path.isAbsolute)(p)) {
           return p;
         }
@@ -77,7 +80,7 @@ async function addJavaScriptRules(opts) {
     srcRules.push(config.module.rule("markdown").test(/\.mdx?$/));
   }
   const depRules = [
-    config.module.rule("dep").test(/\.(js|mjs)$/).include.add(/node_modules/).end().exclude.add((path) => {
+    config.module.rule("dep").test(/\.(js|mjs|cjs)$/).include.add(/node_modules/).end().exclude.add((path) => {
       try {
         return (0, import_depMatch.isMatch)({ path, pkgs: depPkgs });
       } catch (e) {

package/dist/dev.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import type { Worker } from 'worker_threads';
 import { IOpts as IConfigOpts } from './config/config';
 import { IConfig } from './types';
 declare type IOpts = {
@@ -8,6 +10,7 @@ declare type IOpts = {
     onMFSUProgress?: Function;
     port?: number;
     host?: string;
+    ip?: string;
     babelPreset?: any;
     chainWebpack?: Function;
     modifyWebpackConfig?: Function;
@@ -21,7 +24,9 @@ declare type IOpts = {
     entry: Record<string, string>;
     mfsuStrategy?: 'eager' | 'normal';
     mfsuInclude?: string[];
+    mfsuServerBase?: string;
     srcCodeCache?: any;
+    startBuildWorker?: (deps: any[]) => Worker;
 } & Pick<IConfigOpts, 'cache' | 'pkg'>;
 export declare function stripUndefined(obj: any): any;
 export declare function dev(opts: IOpts): Promise<void>;

package/dist/dev.js

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

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) => {
@@ -167,7 +169,7 @@ async function createServer(opts) {
             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);
+            (_b = proxy2.onProxyReq) == null ? void 0 : _b.call(proxy2, proxyReq, req, res, proxy2);
           },
           onProxyRes(proxyRes, req, res) {
             var _a, _b;
@@ -209,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);

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import type { Config as SwcConfig } from '@swc/core';
 import type { HttpsServerOptions } from '@umijs/bundler-utils';
-import type { Options as ProxyOptions } from '../compiled/http-proxy-middleware';
+import type { Options as HPMOptions } from '../compiled/http-proxy-middleware';
 import { Configuration } from '../compiled/webpack';
 import Config from '../compiled/webpack-5-chain';
 export declare enum Env {
@@ -33,7 +33,9 @@ export interface ICopy {
 declare type WebpackConfig = Required<Configuration>;
 declare type IBabelPlugin = Function | string | [string, {
     [key: string]: any;
-}];
+}] | [string, {
+    [key: string]: any;
+}, string];
 export interface DeadCodeParams {
     patterns?: string[];
     exclude?: string[];
@@ -42,6 +44,12 @@ export interface DeadCodeParams {
     detectUnusedExport?: boolean;
     context?: string;
 }
+declare type HPMFnArgs = Parameters<NonNullable<HPMOptions['onProxyReq']>>;
+export interface ProxyOptions extends HPMOptions {
+    target?: string;
+    context?: string | string[];
+    bypass?: (...args: [HPMFnArgs[1], HPMFnArgs[2], HPMFnArgs[3]]) => string | boolean | null | void;
+}
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
@@ -71,7 +79,7 @@ export interface IConfig {
     };
     extraBabelPlugins?: IBabelPlugin[];
     extraBabelPresets?: IBabelPlugin[];
-    extraBabelIncludes?: string[];
+    extraBabelIncludes?: Array<string | RegExp>;
     extraPostCSSPlugins?: any[];
     hash?: boolean;
     ignoreMomentLocale?: boolean;
@@ -88,7 +96,7 @@ export interface IConfig {
     };
     proxy?: {
         [key: string]: ProxyOptions;
-    };
+    } | ProxyOptions[];
     publicPath?: string;
     purgeCSS?: {
         [key: string]: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.13",
+  "version": "4.0.16",
   "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.13",
-    "@umijs/bundler-utils": "4.0.13",
+    "@umijs/babel-preset-umi": "4.0.16",
+    "@umijs/bundler-utils": "4.0.16",
     "@umijs/case-sensitive-paths-webpack-plugin": "^1.0.1",
-    "@umijs/mfsu": "4.0.13",
-    "@umijs/utils": "4.0.13",
+    "@umijs/mfsu": "4.0.16",
+    "@umijs/utils": "4.0.16",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",