@umijs/preset-umi 4.0.50 → 4.0.52

package/dist/commands/config/remove.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/commands/config/set.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

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

@@ -13,6 +13,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -68,6 +72,7 @@ var DepBuilderInWorker = class {
       });
     });
   }
+  // TODO: support watch and rebuild
   async buildWithESBuild(opts) {
     var _a;
     const alias = { ...(_a = this.opts.depConfig.resolve) == null ? void 0 : _a.alias };
@@ -175,6 +180,8 @@ var DepBuilderInWorker = class {
     depConfig.plugins = depConfig.plugins || [];
     depConfig.plugins.push(new import_depChunkIdPrefixPlugin.DepChunkIdPrefixPlugin());
     depConfig.plugins.push(
+      // FIXME remove ignore
+      // @ts-ignore
       new import_stripSourceMapUrlPlugin.StripSourceMapUrlPlugin({
         webpack: import_webpack.default
       })

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

@@ -86,6 +86,7 @@ var dev_config_default = (api) => {
         beforeBabelPresets,
         extraBabelPlugins,
         extraBabelPresets,
+        // vite 模式使用 ./plugins/ViteHtmlPlugin.ts 处理
         mfsuWithESBuild: (_a = api.config.mfsu) == null ? void 0 : _a.esbuild,
         mfsuStrategy: (_b = api.config.mfsu) == null ? void 0 : _b.strategy,
         cache: {

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

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

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/commands/dev/dev.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -33,6 +37,7 @@ var import_fs = require("fs");
 var import_path = require("path");
 var import_worker_threads = require("worker_threads");
 var import_constants = require("../../constants");
+var import_LazySourceCodeCache = require("../../libs/folderCache/LazySourceCodeCache");
 var import_lazyImportFromCurrentPkg = require("../../utils/lazyImportFromCurrentPkg");
 var import_createRouteMiddleware = require("./createRouteMiddleware");
 var import_faviconMiddleware = require("./faviconMiddleware");
@@ -40,7 +45,6 @@ var import_getBabelOpts = require("./getBabelOpts");
 var import_ViteHtmlPlugin = __toESM(require("./plugins/ViteHtmlPlugin"));
 var import_printMemoryUsage = require("./printMemoryUsage");
 var import_watch = require("./watch");
-var import_LazySourceCodeCache = require("../../libs/folderCache/LazySourceCodeCache");
 var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
 var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
 var MFSU_EAGER_DEFAULT_INCLUDE = [
@@ -98,7 +102,8 @@ PORT=8888 umi dev
           ...(0, import_watch.expandJSPaths)((0, import_path.join)(absSrcPath, "loading")),
           ...(0, import_watch.expandJSPaths)((0, import_path.join)(absSrcPath, "app")),
           ...(0, import_watch.expandJSPaths)((0, import_path.join)(absSrcPath, "global")),
-          ...(0, import_watch.expandCSSPaths)((0, import_path.join)(absSrcPath, "global"))
+          ...(0, import_watch.expandCSSPaths)((0, import_path.join)(absSrcPath, "global")),
+          ...(0, import_watch.expandCSSPaths)((0, import_path.join)(absSrcPath, "overrides"))
         ].filter(Boolean)
       });
       import_utils.lodash.uniq(watcherPaths.map(import_utils.winPath)).forEach((p) => {
@@ -207,7 +212,10 @@ PORT=8888 umi dev
             if (isPublicAvailable) {
               if (event === "unlinkDir" && path === publicDir) {
                 restartServer();
-              } else if (event === "unlink" && (0, import_fs.existsSync)(publicDir) && (0, import_fs.readdirSync)(publicDir).length === 0) {
+              } else if (
+                // listen public files all deleted
+                event === "unlink" && (0, import_fs.existsSync)(publicDir) && (0, import_fs.readdirSync)(publicDir).length === 0
+              ) {
                 restartServer();
               }
             } else {
@@ -312,8 +320,11 @@ PORT=8888 umi dev
         beforeMiddlewares: [].concat([
           ...beforeMiddlewares
         ]),
+        // vite 模式使用 ./plugins/ViteHtmlPlugin.ts 处理
         afterMiddlewares: enableVite ? [middlewares.concat(import_faviconMiddleware.faviconMiddleware)] : middlewares.concat([
           ...api.config.mpa ? [] : [(0, import_createRouteMiddleware.createRouteMiddleware)({ api })],
+          // 放置 favicon 在 webpack middleware 之后，兼容 public 目录下有 favicon.ico 的场景
+          // ref: https://github.com/umijs/umi/issues/8024
           import_faviconMiddleware.faviconMiddleware
         ]),
         onDevCompileDone(opts2) {

package/dist/commands/dev/getBabelOpts.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -37,6 +41,7 @@ async function getBabelOpts(opts) {
       presetEnv: {},
       presetReact: {
         runtime: isGTEReact17 ? "automatic" : "classic",
+        // importSource cannot be set when runtime is classic
         ...isGTEReact17 ? {} : { importSource: void 0 }
       },
       presetTypeScript: {},

package/dist/commands/dev/getMarkupArgs.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -68,6 +72,7 @@ async function getMarkupArgs(opts) {
     title: opts.api.config.title,
     async modifyHTML(memo, args) {
       let $ = import_cheerio.default.load(memo, {
+        // @ts-ignore
         decodeEntities: false
       });
       $ = await opts.api.applyPlugins({

package/dist/commands/dev/printMemoryUsage.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/commands/generators/jest.js

@@ -54,12 +54,15 @@ var jest_default = (api) => {
       const basicDeps = {
         jest: jestMajorVersion,
         "@types/jest": jestMajorVersion,
+        // we use `jest.config.ts` so jest needs ts and ts-node
         typescript: "^4",
         "ts-node": "^10",
         "cross-env": "^7"
       };
       const reactTestingDeps = {
+        // `jest-environment-jsdom` is no longer included in jest >= 28
         "jest-environment-jsdom": jestMajorVersion,
+        // RTL
         "@testing-library/jest-dom": "^5",
         "@testing-library/react": "^13"
       };
@@ -124,7 +127,7 @@ ${collectCoverageFrom.map((v) => `        '${v}'`).join(",\n")}
     throw e;
   }
 };
-`.trimLeft()
+`.trimStart()
       );
       import_utils.logger.info("Write jest.config.ts");
       h.installDeps();

package/dist/commands/generators/prettier.js

@@ -58,7 +58,7 @@ var prettier_default = (api) => {
   "overrides": [{ "files": ".prettierrc", "options": { "parser": "json" } }],
   "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-packagejson"]
 }
-`.trimLeft()
+`.trimStart()
       );
       import_utils.logger.info("Write .prettierrc");
       (0, import_fs.writeFileSync)(
@@ -67,7 +67,7 @@ var prettier_default = (api) => {
 node_modules
 .umi
 .umi-production
-`.trimLeft()
+`.trimStart()
       );
       import_utils.logger.info("Write .prettierignore");
       h.installDeps();

package/dist/commands/generators/tailwindcss.js

@@ -56,8 +56,8 @@ var tailwindcss_default = (api) => {
 module.exports = {
   content: [
     './${srcPrefix}pages/**/*.tsx',
-    './${srcPrefix}components/**.tsx',
-    './${srcPrefix}layouts/**.tsx',
+    './${srcPrefix}components/**/*.tsx',
+    './${srcPrefix}layouts/**/*.tsx',
   ],
 }
 `.trimStart()

package/dist/commands/lint.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));

package/dist/commands/mfsu/mfsu.js

@@ -0,0 +1,97 @@
+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/commands/mfsu/mfsu.ts
+var mfsu_exports = {};
+__export(mfsu_exports, {
+  default: () => mfsu_default
+});
+module.exports = __toCommonJS(mfsu_exports);
+var import_util = require("./util");
+var HELP_TEXT = `
+# MFSU CLI util
+# umi mfsu [action]
+
+# Show Help
+$ umi mfsu 
+
+# Manually build mfsu dependencies
+$ umi mfsu build 
+$ umi mfsu b 
+
+# list mfsu dependencies
+$ umi mfsu list 
+$ umi mfsu ls 
+`.trim();
+var mfsu_default = (api) => {
+  api.describe({
+    key: "mfsu-cli"
+  });
+  api.registerCommand({
+    name: "mfsu",
+    description: "umi mfsu CLI util",
+    details: HELP_TEXT,
+    configResolveMode: "strict",
+    async fn({ args }) {
+      var _a;
+      const { _ } = args;
+      const [command = "help"] = _;
+      if (api.config.mfsu === false) {
+        api.logger.info("MFSU is not enabled");
+        return;
+      }
+      const util = ((_a = api.config.mfsu) == null ? void 0 : _a.strategy) === "eager" ? new import_util.EagerUtil(api) : new import_util.NormalUtil(api);
+      switch (command) {
+        case "build":
+        case "b":
+          try {
+            const { force } = args;
+            util.removeCacheJSON();
+            await util.build(force);
+            process.exit(0);
+          } catch (e) {
+            process.exit(-1);
+          }
+          break;
+        case "list":
+        case "ls":
+        case "l":
+          util.listDeps();
+          break;
+        case "remove":
+          const { all } = args;
+          if (all) {
+            util.clearAllCache();
+          } else {
+            util.removeCacheJSON();
+          }
+          break;
+        case "help":
+          printHelpInfo();
+          break;
+        default:
+          throw new Error(`Unsupported mfsu action`);
+      }
+    }
+  });
+};
+function printHelpInfo() {
+  console.log(HELP_TEXT);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/commands/mfsu/util.d.ts

@@ -0,0 +1,28 @@
+import { IApi } from '../../types';
+export declare abstract class MFSUUtilBase {
+    readonly api: IApi;
+    protected mfsuCacheBase: string;
+    protected cliName: string;
+    constructor(api: IApi);
+    abstract jsonFilePath(): string;
+    abstract getCacheJSON(): string;
+    abstract listDeps(): void;
+    abstract build(force?: boolean): Promise<void>;
+    prepare(): Promise<any>;
+    removeCacheJSON(): void;
+    clearAllCache(): void;
+    printDeps(deps: any): void;
+}
+export declare class EagerUtil extends MFSUUtilBase {
+    jsonFilePath(): string;
+    getCacheJSON(): any;
+    build(): Promise<void>;
+    listDeps(): void;
+}
+export declare class NormalUtil extends MFSUUtilBase {
+    jsonFilePath(): string;
+    getCacheJSON(): any;
+    listDeps(): void;
+    build(force: boolean): Promise<void>;
+    private normalBuild;
+}