@umijs/preset-umi 4.0.14 → 4.0.17

package/dist/commands/dev/depBuildWorker/depBuildWorker.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/dev/depBuildWorker/depBuildWorker.js

@@ -0,0 +1,107 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+
+// src/commands/dev/depBuildWorker/depBuildWorker.ts
+var import_bundler_webpack = require("@umijs/bundler-webpack");
+var import_constants = require("@umijs/bundler-webpack/dist/constants");
+var import_types = require("@umijs/bundler-webpack/dist/types");
+var import_mfsu = require("@umijs/mfsu");
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+var import_worker_threads = require("worker_threads");
+var import_depBuilder = require("./depBuilder");
+var import_getConfig = require("./getConfig");
+if (import_worker_threads.isMainThread) {
+  throw Error("MFSU-eager builder can only be called in a worker thread");
+}
+var bundlerWebpackPath = (0, import_path.dirname)(require.resolve("@umijs/bundler-webpack"));
+var bufferedRequest = [];
+async function start() {
+  var _a, _b, _c, _d, _e, _f, _g;
+  let builder = null;
+  function build(deps) {
+    import_utils.logger.info("[MFSU][eager] build worker start to build");
+    return builder.build({ deps }).catch((e) => {
+      import_utils.logger.error("[MFSU][eager] build worker failed", e);
+      import_worker_threads.parentPort.postMessage({ error: e });
+    });
+  }
+  function scheduleBuild() {
+    if (builder && !builder.isBuilding) {
+      const buildReq = bufferedRequest.shift();
+      if (buildReq) {
+        build(buildReq).finally(() => {
+          scheduleBuild();
+        });
+      }
+    }
+  }
+  import_worker_threads.parentPort.on("message", (buildReq) => {
+    bufferedRequest.push(buildReq);
+    scheduleBuild();
+  });
+  const start2 = Date.now();
+  const opts = await (0, import_getConfig.getDevConfig)();
+  const cacheDirectoryPath = (0, import_path.resolve)(opts.rootDir || opts.cwd, opts.config.cacheDirectoryPath || "node_modules/.cache");
+  const depConfig = await (0, import_bundler_webpack.getConfig)({
+    cwd: opts.cwd,
+    rootDir: opts.rootDir,
+    env: import_types.Env.development,
+    entry: opts.entry,
+    userConfig: opts.config,
+    hash: true,
+    staticPathPrefix: import_mfsu.MF_DEP_PREFIX,
+    name: import_constants.MFSU_NAME,
+    chainWebpack: (_a = opts.config.mfsu) == null ? void 0 : _a.chainWebpack,
+    extraBabelIncludes: opts.config.extraBabelIncludes,
+    cache: {
+      buildDependencies: (_b = opts.cache) == null ? void 0 : _b.buildDependencies,
+      cacheDirectory: (0, import_path.join)(cacheDirectoryPath, "mfsu-deps")
+    },
+    pkg: opts.pkg
+  });
+  (_c = depConfig.resolve).alias || (_c.alias = {});
+  ["@umijs/utils/compiled/strip-ansi", "react-error-overlay"].forEach((dep) => {
+    depConfig.resolve.alias[dep] = require.resolve(dep, {
+      paths: [bundlerWebpackPath]
+    });
+  });
+  const depEsBuildConfig = {
+    extraPostCSSPlugins: ((_d = opts.config) == null ? void 0 : _d.extraPostCSSPlugins) || []
+  };
+  const tmpBase = ((_e = opts.config.mfsu) == null ? void 0 : _e.cacheDirectory) || (0, import_path.join)(cacheDirectoryPath, "mfsu");
+  const externals = makeArray(opts.config.externals || []);
+  builder = new import_depBuilder.DepBuilderInWorker({
+    depConfig,
+    cwd: opts.cwd,
+    tmpBase,
+    mfName: ((_f = opts.config.mfsu) == null ? void 0 : _f.mfName) || import_mfsu.DEFAULT_MF_NAME,
+    shared: ((_g = opts.config.mfsu) == null ? void 0 : _g.shared) || {},
+    buildDepWithESBuild: false,
+    depEsBuildConfig,
+    externals
+  });
+  import_utils.logger.info("[MFSU][eager] worker init, takes", Date.now() - start2);
+  scheduleBuild();
+}
+start().catch((e) => {
+  import_utils.logger.error("[MFSU][eager] build worker start failed", e);
+});
+function makeArray(a) {
+  if (Array.isArray(a))
+    return a;
+  return [a];
+}

package/dist/commands/dev/depBuildWorker/depBuilder.d.ts

@@ -0,0 +1,37 @@
+import webpack from '@umijs/bundler-webpack/compiled/webpack';
+import { Dep } from '@umijs/mfsu/dist/dep/dep';
+declare type IOpts = {
+    depConfig: webpack.Configuration;
+    cwd: string;
+    tmpBase: string;
+    mfName: string;
+    shared: any;
+    buildDepWithESBuild: boolean;
+    depEsBuildConfig: any;
+    externals: any[];
+};
+export declare class DepBuilderInWorker {
+    completeFns: Function[];
+    isBuilding: boolean;
+    opts: IOpts;
+    constructor(opts: IOpts);
+    buildWithWebpack(opts: {
+        onBuildComplete: Function;
+        deps: Dep[];
+    }): Promise<unknown>;
+    buildWithESBuild(opts: {
+        onBuildComplete: Function;
+        deps: Dep[];
+    }): Promise<void>;
+    build(opts: {
+        deps: Dep[];
+    }): Promise<void>;
+    onBuildComplete(fn: Function): void;
+    writeMFFiles(opts: {
+        deps: Dep[];
+    }): Promise<void>;
+    getWebpackConfig(opts: {
+        deps: Dep[];
+    }): webpack.Configuration;
+}
+export {};

package/dist/commands/dev/depBuildWorker/depBuilder.js

@@ -0,0 +1,210 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/commands/dev/depBuildWorker/depBuilder.ts
+var depBuilder_exports = {};
+__export(depBuilder_exports, {
+  DepBuilderInWorker: () => DepBuilderInWorker
+});
+module.exports = __toCommonJS(depBuilder_exports);
+var import_bundler_esbuild = require("@umijs/bundler-esbuild");
+var import_webpack = __toESM(require("@umijs/bundler-webpack/compiled/webpack"));
+var import_mfsu = require("@umijs/mfsu");
+var import_dep = require("@umijs/mfsu/dist/dep/dep");
+var import_getESBuildEntry = require("@umijs/mfsu/dist/depBuilder/getESBuildEntry");
+var import_depChunkIdPrefixPlugin = require("@umijs/mfsu/dist/webpackPlugins/depChunkIdPrefixPlugin");
+var import_stripSourceMapUrlPlugin = require("@umijs/mfsu/dist/webpackPlugins/stripSourceMapUrlPlugin");
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_worker_threads = require("worker_threads");
+var DepBuilderInWorker = class {
+  constructor(opts) {
+    this.completeFns = [];
+    this.isBuilding = false;
+    this.opts = opts;
+  }
+  async buildWithWebpack(opts) {
+    const config = this.getWebpackConfig({ deps: opts.deps });
+    return new Promise((resolve, reject) => {
+      const compiler = (0, import_webpack.default)(config);
+      compiler.run((err, stats) => {
+        opts.onBuildComplete();
+        if (err || (stats == null ? void 0 : stats.hasErrors())) {
+          if (err) {
+            reject(err);
+          }
+          if (stats) {
+            const errorMsg = stats.toString("errors-only");
+            reject(new Error(errorMsg));
+          }
+        } else {
+          resolve(stats);
+        }
+        compiler.close(() => {
+        });
+      });
+    });
+  }
+  async buildWithESBuild(opts) {
+    var _a;
+    const alias = __spreadValues({}, (_a = this.opts.depConfig.resolve) == null ? void 0 : _a.alias);
+    const externals = this.opts.depConfig.externals;
+    const entryContent = (0, import_getESBuildEntry.getESBuildEntry)({ deps: opts.deps });
+    const ENTRY_FILE = "esbuild-entry.js";
+    const tmpDir = this.opts.tmpBase;
+    const entryPath = (0, import_path.join)(tmpDir, ENTRY_FILE);
+    (0, import_fs.writeFileSync)(entryPath, entryContent, "utf-8");
+    const date = new Date().getTime();
+    await (0, import_bundler_esbuild.build)({
+      cwd: this.opts.cwd,
+      entry: {
+        [`${import_mfsu.MF_VA_PREFIX}remoteEntry`]: entryPath
+      },
+      config: __spreadProps(__spreadValues({}, this.opts.depEsBuildConfig), {
+        outputPath: tmpDir,
+        alias,
+        externals
+      }),
+      inlineStyle: true
+    });
+    import_utils.logger.event(`[mfsu] compiled with esbuild successfully in ${+new Date() - date} ms`);
+    opts.onBuildComplete();
+  }
+  async build(opts) {
+    this.isBuilding = true;
+    const onBuildComplete = () => {
+      this.isBuilding = false;
+      import_worker_threads.parentPort.postMessage({
+        done: true
+      });
+    };
+    try {
+      await this.writeMFFiles({ deps: opts.deps.map((d) => new import_dep.Dep(d)) });
+      const newOpts = __spreadProps(__spreadValues({}, opts), {
+        onBuildComplete
+      });
+      if (this.opts.buildDepWithESBuild) {
+        await this.buildWithESBuild(newOpts);
+      } else {
+        await this.buildWithWebpack(newOpts);
+      }
+    } catch (e) {
+      onBuildComplete();
+      import_worker_threads.parentPort.postMessage({
+        error: e
+      });
+      throw e;
+    }
+  }
+  onBuildComplete(fn) {
+    if (this.isBuilding) {
+      this.completeFns.push(fn);
+    } else {
+      fn();
+    }
+  }
+  async writeMFFiles(opts) {
+    const tmpBase = this.opts.tmpBase;
+    import_utils.fsExtra.mkdirpSync(tmpBase);
+    for (const dep of opts.deps) {
+      const content = await dep.buildExposeContent();
+      (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, dep.filePath), content, "utf-8");
+    }
+    (0, import_fs.writeFileSync)((0, import_path.join)(tmpBase, "index.js"), '"\u{1F61B}"', "utf-8");
+  }
+  getWebpackConfig(opts) {
+    var _a, _b;
+    const mfName = this.opts.mfName;
+    const depConfig = import_utils.lodash.cloneDeep(this.opts.depConfig);
+    depConfig.entry = (0, import_path.join)(this.opts.tmpBase, "index.js");
+    depConfig.output.path = this.opts.tmpBase;
+    depConfig.output.publicPath = "auto";
+    depConfig.devtool = false;
+    if ((_a = depConfig.output) == null ? void 0 : _a.library)
+      delete depConfig.output.library;
+    if ((_b = depConfig.output) == null ? void 0 : _b.libraryTarget)
+      delete depConfig.output.libraryTarget;
+    depConfig.optimization || (depConfig.optimization = {});
+    depConfig.optimization.splitChunks = {
+      chunks: (chunk) => {
+        const hasShared = chunk.getModules().some((m) => {
+          return m.type === "consume-shared-module" || m.type === "provide-module" || m.type === "provide-shared-module";
+        });
+        return !hasShared;
+      },
+      maxInitialRequests: Infinity,
+      minSize: 0,
+      cacheGroups: {
+        vendor: {
+          test: /.+/,
+          name(_module, _chunks, cacheGroupKey) {
+            return `${import_mfsu.MF_DEP_PREFIX}___${cacheGroupKey}`;
+          }
+        }
+      }
+    };
+    depConfig.plugins = depConfig.plugins || [];
+    depConfig.plugins.push(new import_depChunkIdPrefixPlugin.DepChunkIdPrefixPlugin());
+    depConfig.plugins.push(new import_stripSourceMapUrlPlugin.StripSourceMapUrlPlugin({
+      webpack: import_webpack.default
+    }));
+    depConfig.plugins.push(new import_webpack.default.ProgressPlugin((percent, msg) => {
+      import_worker_threads.parentPort.postMessage({ progress: { percent, status: msg } });
+    }));
+    const exposes = opts.deps.reduce((memo, dep) => {
+      memo[`./${dep.file}`] = (0, import_path.join)(this.opts.tmpBase, dep.filePath);
+      return memo;
+    }, {});
+    depConfig.plugins.push(new import_webpack.default.container.ModuleFederationPlugin({
+      library: {
+        type: "global",
+        name: mfName
+      },
+      name: mfName,
+      filename: import_mfsu.REMOTE_FILE_FULL,
+      exposes,
+      shared: this.opts.shared || {}
+    }));
+    return depConfig;
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DepBuilderInWorker
+});

package/dist/commands/dev/depBuildWorker/dev-config.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from '../../../types';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/commands/dev/depBuildWorker/dev-config.js

@@ -0,0 +1,124 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/commands/dev/depBuildWorker/dev-config.ts
+var dev_config_exports = {};
+__export(dev_config_exports, {
+  default: () => dev_config_default
+});
+module.exports = __toCommonJS(dev_config_exports);
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+var import_getBabelOpts = require("../getBabelOpts");
+var MFSU_EAGER_DEFAULT_INCLUDE = [
+  "react",
+  "react-error-overlay",
+  "react/jsx-dev-runtime",
+  "@umijs/utils/compiled/strip-ansi"
+];
+var dev_config_default = (api) => {
+  api.describe({
+    enableBy() {
+      return api.name === "dev-config";
+    },
+    key: "dev-config"
+  });
+  api.registerCommand({
+    name: "dev-config",
+    description: "dev server for development",
+    details: ``,
+    async fn() {
+      var _a, _b, _c;
+      const {
+        babelPreset,
+        beforeBabelPlugins,
+        beforeBabelPresets,
+        extraBabelPlugins,
+        extraBabelPresets
+      } = await (0, import_getBabelOpts.getBabelOpts)({ api });
+      const chainWebpack = async (memo, args) => {
+        await api.applyPlugins({
+          key: "chainWebpack",
+          type: api.ApplyPluginsType.modify,
+          initialValue: memo,
+          args
+        });
+      };
+      const modifyWebpackConfig = async (memo, args) => {
+        return await api.applyPlugins({
+          key: "modifyWebpackConfig",
+          initialValue: memo,
+          args
+        });
+      };
+      const entry = await api.applyPlugins({
+        key: "modifyEntry",
+        initialValue: {
+          umi: (0, import_path.join)(api.paths.absTmpPath, "umi.ts")
+        }
+      });
+      const opts = __spreadProps(__spreadValues({
+        config: api.config,
+        pkg: api.pkg,
+        cwd: api.cwd,
+        rootDir: process.cwd(),
+        entry,
+        port: api.appData.port,
+        host: api.appData.host,
+        ip: api.appData.ip
+      }, { babelPreset, chainWebpack, modifyWebpackConfig }), {
+        beforeBabelPlugins,
+        beforeBabelPresets,
+        extraBabelPlugins,
+        extraBabelPresets,
+        mfsuWithESBuild: (_a = api.config.mfsu) == null ? void 0 : _a.esbuild,
+        mfsuStrategy: (_b = api.config.mfsu) == null ? void 0 : _b.strategy,
+        cache: {
+          buildDependencies: [
+            api.pkgPath,
+            api.service.configManager.mainConfigFile || ""
+          ].filter(Boolean)
+        },
+        mfsuInclude: import_utils.lodash.union([
+          ...MFSU_EAGER_DEFAULT_INCLUDE,
+          ...((_c = api.config.mfsu) == null ? void 0 : _c.include) || []
+        ])
+      });
+      return opts;
+    }
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/commands/dev/depBuildWorker/getConfig.d.ts

@@ -0,0 +1 @@
+export declare function getDevConfig(): Promise<any>;

package/dist/commands/dev/depBuildWorker/getConfig.js

@@ -0,0 +1,42 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/commands/dev/depBuildWorker/getConfig.ts
+var getConfig_exports = {};
+__export(getConfig_exports, {
+  getDevConfig: () => getDevConfig
+});
+module.exports = __toCommonJS(getConfig_exports);
+var import_service = require("umi/dist/service/service");
+async function getDevConfig() {
+  const service = new import_service.Service({
+    presets: [require.resolve("./workerPreset")]
+  });
+  const opts = await service.run({
+    name: "dev-config",
+    args: []
+  });
+  return opts;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDevConfig
+});

package/dist/commands/dev/depBuildWorker/workerPreset.d.ts

@@ -0,0 +1,4 @@
+declare const _default: () => {
+    plugins: string[];
+};
+export default _default;

package/dist/commands/dev/depBuildWorker/workerPreset.js

@@ -0,0 +1,34 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/commands/dev/depBuildWorker/workerPreset.ts
+var workerPreset_exports = {};
+__export(workerPreset_exports, {
+  default: () => workerPreset_default
+});
+module.exports = __toCommonJS(workerPreset_exports);
+var workerPreset_default = () => {
+  return {
+    plugins: [require.resolve("./dev-config")]
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/commands/dev/dev.js

@@ -45,6 +45,7 @@ module.exports = __toCommonJS(dev_exports);
 var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
+var import_worker_threads = require("worker_threads");
 var import_constants = require("../../constants");
 var import_AutoUpdateSourceCodeCache = require("../../libs/folderCache/AutoUpdateSourceCodeCache");
 var import_lazyImportFromCurrentPkg = require("../../utils/lazyImportFromCurrentPkg");
@@ -236,6 +237,8 @@ PORT=8888 umi dev
       };
       const debouncedPrintMemoryUsage = import_utils.lodash.debounce(import_printMemoryUsage.printMemoryUsage, 5e3);
       let srcCodeCache;
+      let startBuildWorker = () => {
+      };
       if (((_b = api.config.mfsu) == null ? void 0 : _b.strategy) === "eager") {
         srcCodeCache = new import_AutoUpdateSourceCodeCache.AutoUpdateSrcCodeCache({
           cwd: api.paths.absSrcPath,
@@ -245,6 +248,18 @@ PORT=8888 umi dev
         (0, import_watch.addUnWatch)(() => {
           srcCodeCache.unwatch();
         });
+        let currentWorker = null;
+        const initWorker = () => {
+          currentWorker = new import_worker_threads.Worker((0, import_path.join)(__dirname, "depBuildWorker/depBuildWorker.js"));
+          currentWorker.on("exit", () => {
+            initWorker();
+          });
+          return currentWorker;
+        };
+        currentWorker = initWorker();
+        startBuildWorker = () => {
+          return currentWorker;
+        };
       }
       const entry = await api.applyPlugins({
         key: "modifyEntry",
@@ -299,7 +314,8 @@ PORT=8888 umi dev
         mfsuInclude: import_utils.lodash.union([
           ...MFSU_EAGER_DEFAULT_INCLUDE,
           ...((_e = api.config.mfsu) == null ? void 0 : _e.include) || []
-        ])
+        ]),
+        startBuildWorker
       });
       if (api.config.mf) {
         opts.mfsuServerBase = `${api.config.https ? "https" : "http"}://${api.appData.ip}:${api.appData.port}`;

package/dist/commands/generators/jest.js

@@ -66,6 +66,7 @@ var jest_default = (api) => {
         initial: true
       });
       const hasSrc = api.paths.absSrcPath.endsWith("src");
+      const importSource = api.appData.umi.importSource;
       const basicDeps = {
         jest: "^27",
         "@types/jest": "^27",
@@ -79,12 +80,12 @@ var jest_default = (api) => {
       }) : basicDeps;
       h.addDevDeps(packageToInstall);
       h.addScript("test", "jest");
-      if (res.willUseTLR) {
-        (0, import_fs.writeFileSync)((0, import_path.join)(api.cwd, "jest-setup.ts"), `import '@testing-library/jest-dom';
-          `.trimLeft());
-        import_utils.logger.info("Write jest-setup.ts");
-      }
-      const importSource = api.appData.umi.importSource;
+      const setupImports = res.willUseTLR ? [
+        `import '@testing-library/jest-dom';`,
+        `import '${api.appData.umi.importSource}/test-setup'`
+      ] : [`import '${api.appData.umi.importSource}/test-setup'`];
+      (0, import_fs.writeFileSync)((0, import_path.join)(api.cwd, "jest-setup.ts"), setupImports.join("\n"));
+      import_utils.logger.info("Write jest-setup.ts");
       const collectCoverageFrom = hasSrc ? [
         "src/**/*.{ts,js,tsx,jsx}",
         "!src/.umi/**",
@@ -115,7 +116,9 @@ export default async () => {
       jsTransformerOpts: { jsx: 'automatic' },
     }),
     ${res.willUseTLR ? `setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],` : ""}
-    collectCoverageFrom: [${collectCoverageFrom.map((v) => `'${v}'`).join(", ")}],
+    collectCoverageFrom: [
+${collectCoverageFrom.map((v) => `      '${v}'`).join(",\n")}
+    ],
     // if you require some es-module npm package, please uncomment below line and insert your package name
     // transformIgnorePatterns: ['node_modules/(?!.*(lodash-es|your-es-pkg-name)/)']
   })) as Config.InitialOptions;

package/dist/features/404/404.d.ts

@@ -0,0 +1,5 @@
+import { IApi, IRoute } from '../../types';
+declare type Routes = Record<string, IRoute>;
+export declare function patchRoutes(routes: Routes): Routes;
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/404/404.js

@@ -0,0 +1,48 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/404/404.ts
+var __exports = {};
+__export(__exports, {
+  default: () => __default,
+  patchRoutes: () => patchRoutes
+});
+module.exports = __toCommonJS(__exports);
+function patchRoutes(routes) {
+  Object.keys(routes).forEach((key) => {
+    if (routes[key].path === "404") {
+      routes[key].path = "*";
+    }
+  });
+  return routes;
+}
+var __default = (api) => {
+  api.describe({
+    key: "404"
+  });
+  api.modifyRoutes(async (routes) => {
+    if (api.config.routes) {
+      return routes;
+    }
+    return patchRoutes(routes);
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patchRoutes
+});

package/dist/features/appData/appData.js

@@ -45,7 +45,8 @@ var appData_default = (api) => {
     memo.umi = {
       version: require("../../../package.json").version,
       name: "Umi",
-      importSource: "umi"
+      importSource: "umi",
+      cliName: "umi"
     };
     memo.bundleStatus = {
       done: false

package/dist/features/legacy/legacy.js

@@ -50,7 +50,8 @@ var legacy_default = (api) => {
     config: {
       schema(Joi) {
         return Joi.object({
-          buildOnly: Joi.boolean()
+          buildOnly: Joi.boolean(),
+          nodeModulesTransform: Joi.boolean()
         });
       }
     },
@@ -60,7 +61,7 @@ var legacy_default = (api) => {
     stage: Number.MAX_SAFE_INTEGER,
     fn: (memo) => {
       const { userConfig } = api;
-      const { buildOnly = true } = api.config.legacy || userConfig.legacy || {};
+      const { buildOnly = true, nodeModulesTransform = true } = api.config.legacy || userConfig.legacy || {};
       if (api.env === import_types.Env.development) {
         if (buildOnly) {
           return memo;
@@ -82,10 +83,6 @@ var legacy_default = (api) => {
       memo.targets = __spreadProps(__spreadValues({}, userConfig.targets), {
         ie: 11
       });
-      memo.extraBabelIncludes = [
-        ...memo.extraBabelIncludes || [],
-        /node_modules/
-      ];
       import_utils.logger.ready(`${import_utils.chalk.cyan("legacy")} mode is enabled, we automatically modify the ${[
         "srcTranspiler",
         "jsMinifier",
@@ -96,6 +93,10 @@ var legacy_default = (api) => {
         if (originChainWebpack) {
           originChainWebpack(memo2, ...args);
         }
+        if (nodeModulesTransform) {
+          memo2.module.rule("extra-src").include.add(/node_modules/).end();
+        }
+        memo2.module.rule("extra-src").exclude.add(/core-js/).add(/node_modules\/(css-loader)/).end();
         useBabelTransformSvgr(memo2, api);
         if (!import_utils.lodash.isEmpty(userConfig.externals)) {
           const externalsAsString = JSON.stringify(userConfig.externals);

package/dist/features/mpa/mpa.js

@@ -53,7 +53,10 @@ var mpa_default = (api) => {
     key: "mpa",
     config: {
       schema(Joi) {
-        return Joi.object({});
+        return Joi.object({
+          template: Joi.string(),
+          getConfigFromEntryFile: Joi.boolean()
+        });
       }
     },
     enableBy: api.EnableBy.config
@@ -63,13 +66,13 @@ var mpa_default = (api) => {
   });
   api.modifyAppData(async (memo) => {
     memo.mpa = {
-      entry: await collectEntryWithTimeCount(api.paths.absPagesPath)
+      entry: await collectEntryWithTimeCount(api.paths.absPagesPath, api.config.mpa)
     };
     return memo;
   });
   api.onGenerateFiles(async ({ isFirstTime }) => {
     if (!isFirstTime) {
-      api.appData.mpa.entry = await collectEntryWithTimeCount(api.paths.absPagesPath);
+      api.appData.mpa.entry = await collectEntryWithTimeCount(api.paths.absPagesPath, api.config.mpa);
     }
     const isReact18 = api.appData.react.version.startsWith("18.");
     api.appData.mpa.entry.forEach((entry) => {
@@ -118,7 +121,7 @@ ${renderer}
         {
           filename: `${entry.name}.html`,
           minify: false,
-          template: entry.template ? (0, import_path.resolve)(api.cwd, entry.template) : (0, import_path.join)(api.paths.absTmpPath, "mpa/template.html"),
+          template: entry.template ? (0, import_path.resolve)(api.cwd, entry.template) : api.config.mpa.template ? (0, import_path.resolve)(api.cwd, api.config.mpa.template) : (0, import_path.join)(api.paths.absTmpPath, "mpa/template.html"),
           templateParameters: entry,
           chunks: [entry.name]
         }
@@ -127,20 +130,20 @@ ${renderer}
     return memo;
   });
 };
-async function collectEntryWithTimeCount(root) {
+async function collectEntryWithTimeCount(root, opts) {
   const d = new Date();
-  const entries = await collectEntry(root);
+  const entries = await collectEntry(root, opts);
   import_utils.logger.info(`[MPA] Collect Entries in ${new Date().getTime() - d.getTime()}ms`);
   return entries;
 }
-async function collectEntry(root) {
+async function collectEntry(root, opts) {
   return await (0, import_fs.readdirSync)(root).reduce(async (memoP, dir) => {
     const memo = await memoP;
     const absDir = (0, import_path.join)(root, dir);
     if ((0, import_fs.existsSync)(absDir) && (0, import_fs.statSync)(absDir).isDirectory()) {
       const indexFile = getIndexFile(absDir);
       if (indexFile) {
-        const config = await getConfig(indexFile);
+        const config = opts.getConfigFromEntryFile ? await getConfigFromEntryFile(indexFile) : await getConfig(indexFile);
         memo.push(__spreadProps(__spreadValues({
           name: dir,
           file: indexFile,
@@ -166,6 +169,16 @@ function getIndexFile(dir) {
   return null;
 }
 async function getConfig(indexFile) {
+  const dir = (0, import_path.dirname)(indexFile);
+  if ((0, import_fs.existsSync)((0, import_path.join)(dir, "config.json"))) {
+    const config = JSON.parse((0, import_fs.readFileSync)((0, import_path.join)(dir, "config.json"), "utf-8"));
+    checkConfig(config);
+    return config;
+  } else {
+    return {};
+  }
+}
+async function getConfigFromEntryFile(indexFile) {
   const config = await (0, import_extractExports.extractExports)({
     entry: indexFile,
     exportName: "config"

package/dist/index.js

@@ -29,6 +29,8 @@ var src_default = () => {
   return {
     plugins: [
       require.resolve("./registerMethods"),
+      require.resolve("@umijs/did-you-know/dist/plugin"),
+      require.resolve("./features/404/404"),
       require.resolve("./features/appData/appData"),
       require.resolve("./features/check/check"),
       require.resolve("./features/clientLoader/clientLoader"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.14",
+  "version": "4.0.17",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -26,16 +26,18 @@
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.14",
-    "@umijs/babel-preset-umi": "4.0.14",
-    "@umijs/bundler-utils": "4.0.14",
-    "@umijs/bundler-vite": "4.0.14",
-    "@umijs/bundler-webpack": "4.0.14",
-    "@umijs/core": "4.0.14",
-    "@umijs/plugin-run": "4.0.14",
-    "@umijs/renderer-react": "4.0.14",
-    "@umijs/server": "4.0.14",
-    "@umijs/utils": "4.0.14",
+    "@umijs/ast": "4.0.17",
+    "@umijs/babel-preset-umi": "4.0.17",
+    "@umijs/bundler-utils": "4.0.17",
+    "@umijs/bundler-vite": "4.0.17",
+    "@umijs/bundler-webpack": "4.0.17",
+    "@umijs/core": "4.0.17",
+    "@umijs/did-you-know": "^1.0.0",
+    "@umijs/mfsu": "4.0.17",
+    "@umijs/plugin-run": "4.0.17",
+    "@umijs/renderer-react": "4.0.17",
+    "@umijs/server": "4.0.17",
+    "@umijs/utils": "4.0.17",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",