@umijs/preset-umi 4.0.24 → 4.0.26

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

@@ -24,6 +24,7 @@ var import_path = require("path");
 var import_worker_threads = require("worker_threads");
 var import_depBuilder = require("./depBuilder");
 var import_getConfig = require("./getConfig");
+(0, import_utils.setNoDeprecation)();
 if (import_worker_threads.isMainThread) {
   throw Error("MFSU-eager builder can only be called in a worker thread");
 }

package/dist/features/apiRoute/request.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type { IRoute } from '../../types';
 declare class UmiApiRequest {

package/dist/features/appData/appData.js

@@ -30,6 +30,7 @@ var import_ini = require("../../../compiled/ini");
 var import_os_locale = require("../../../compiled/os-locale");
 var import_watch = require("../../commands/dev/watch");
 var import_scan = require("../../libs/scan");
+var import_overrides = require("../overrides/overrides");
 var import_routes = require("../tmpFiles/routes");
 var appData_default = (api) => {
   api.modifyAppData(async (memo) => {
@@ -67,9 +68,10 @@ var appData_default = (api) => {
     memo.appJS = await getAppJsInfo();
     memo.locale = await (0, import_os_locale.osLocale)();
     memo.vite = api.config.vite ? {} : void 0;
-    const { globalCSS, globalJS } = getGlobalFiles();
+    const { globalCSS, globalJS, overridesCSS } = getGlobalFiles();
     memo.globalCSS = globalCSS;
     memo.globalJS = globalJS;
+    memo.overridesCSS = overridesCSS;
     const gitDir = findGitDir(api.paths.cwd);
     if (gitDir) {
       const git = {};
@@ -104,9 +106,10 @@ var appData_default = (api) => {
     async fn(args) {
       if (!args.isFirstTime) {
         api.appData.appJS = await getAppJsInfo();
-        const { globalCSS, globalJS } = getGlobalFiles();
+        const { globalCSS, globalJS, overridesCSS } = getGlobalFiles();
         api.appData.globalCSS = globalCSS;
         api.appData.globalJS = globalJS;
+        api.appData.overridesCSS = overridesCSS;
       }
     },
     stage: Number.NEGATIVE_INFINITY
@@ -157,9 +160,11 @@ var appData_default = (api) => {
     };
     const globalCSS = (0, import_watch.expandCSSPaths)((0, import_path.join)(absSrcPath, "global")).reduce(existsAndPushFile, []);
     const globalJS = (0, import_watch.expandJSPaths)((0, import_path.join)(absSrcPath, "global")).reduce(existsAndPushFile, []);
+    const overridesCSS = [(0, import_overrides.getOverridesCSS)(api.paths.absSrcPath)].filter(Boolean);
     return {
       globalCSS,
-      globalJS
+      globalJS,
+      overridesCSS
     };
   }
 };

package/dist/features/check/check.js

@@ -44,13 +44,17 @@ var check_default = (api) => {
     });
   });
   api.onCheckCode(({ CodeFrameError, ...args }) => {
-    if (["cnpm", "tnpm"].includes(api.appData.npmClient)) {
-      args.imports.forEach(({ source, loc }) => {
+    args.imports.forEach(({ source, loc }) => {
+      if (["cnpm", "tnpm"].includes(api.appData.npmClient)) {
         if (!isAbsolutePath(source) && /@\d/.test(source)) {
           throw new CodeFrameError(`${source} is not allowed to import.`, loc);
         }
-      });
-    }
+      }
+      if (!isAbsolutePath(source) && /\/\.umi(-(test|production))?\//.test(source)) {
+        const { importSource } = api.appData.umi;
+        throw new CodeFrameError(`${source} includes /.umi/, /.umi-test/ or /.umi-production/. It's not allowed to import. Please import from ${importSource} or the corresponding plugin.`, loc);
+      }
+    });
   });
   api.onCheckConfig(({ config }) => {
     if (config.publicPath.startsWith("./") && api.env === "development") {

package/dist/features/configPlugins/configPlugins.js

@@ -76,7 +76,8 @@ var configPlugins_default = (api) => {
     base: "/",
     history: { type: "browser" },
     svgr: {},
-    ignoreMomentLocale: true
+    ignoreMomentLocale: true,
+    mfsu: { strategy: "eager" }
   };
   const bundleSchemas = api.config.vite ? (0, import_schema.getSchemas)() : (0, import_schema2.getSchemas)();
   const extraSchemas = (0, import_schema3.getSchemas)();

package/dist/features/overrides/overrides.d.ts

@@ -0,0 +1,4 @@
+import type { IApi } from '../../types';
+export declare function getOverridesCSS(absSrcPath: string): string | undefined;
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/overrides/overrides.js

@@ -0,0 +1,61 @@
+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/overrides/overrides.ts
+var overrides_exports = {};
+__export(overrides_exports, {
+  default: () => overrides_default,
+  getOverridesCSS: () => getOverridesCSS
+});
+module.exports = __toCommonJS(overrides_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_watch = require("../../commands/dev/watch");
+function getOverridesCSS(absSrcPath) {
+  return (0, import_watch.expandCSSPaths)((0, import_path.join)(absSrcPath, "overrides")).find(import_fs.existsSync);
+}
+var overrides_default = (api) => {
+  api.modifyConfig((memo) => {
+    if (getOverridesCSS(api.paths.absSrcPath)) {
+      memo.extraPostCSSPlugins ?? (memo.extraPostCSSPlugins = []);
+      memo.extraPostCSSPlugins.push([
+        require("postcss-prefix-selector")({
+          prefix: "#fake",
+          transform(_p, selector, _ps, filePath) {
+            const isOverridesFile = (0, import_utils.winPath)(api.appData.overridesCSS[0]) === (0, import_utils.winPath)(filePath);
+            if (isOverridesFile && !new RegExp(`^#${api.config.mountElementId}([:[\\s]|$)`).test(selector)) {
+              if (selector === "html") {
+                return `html:first-child`;
+              } else if (selector === "body") {
+                return `* + body`;
+              }
+              return `#${api.config.mountElementId} ${selector}`;
+            }
+            return selector;
+          }
+        })
+      ]);
+    }
+    return memo;
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getOverridesCSS
+});

package/dist/features/tmpFiles/routes.js

@@ -198,7 +198,7 @@ function lastSlash(str) {
   return str[str.length - 1] === "/" ? str : `${str}/`;
 }
 function componentToChunkName(component, cwd) {
-  return typeof component === "string" ? component.replace(new RegExp(`^${import_utils.lodash.escapeRegExp(lastSlash((0, import_utils.winPath)(cwd || "/")))}`), "").replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/\.jsx?$/, "").replace(/\.tsx?$/, "").replace(/\.vue?$/, "").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/[\[\]]/g, "").replace(/^.umi-production__/, "t__").replace(/^pages__/, "p__") : "";
+  return typeof component === "string" ? component.replace(new RegExp(`^${import_utils.lodash.escapeRegExp(lastSlash((0, import_utils.winPath)(cwd || "/")))}`), "").replace(/^.(\/|\\)/, "").replace(/(\/|\\)/g, "__").replace(/\.jsx?$/, "").replace(/\.tsx?$/, "").replace(/\.vue?$/, "").replace(/^src__/, "").replace(/\.\.__/g, "").replace(/[\[\]]/g, "").replace(/^.umi-production__/, "t__").replace(/^\./, "").replace(/^pages__/, "p__") : "";
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/tmpFiles/tmpFiles.js

@@ -271,7 +271,11 @@ declare module '*.txt' {
         })).join("\n"),
         imports: (0, import_importsToStr.importsToStr)(await api.applyPlugins({
           key: "addEntryImports",
-          initialValue: []
+          initialValue: [
+            api.appData.overridesCSS.length && {
+              source: api.appData.overridesCSS[0]
+            }
+          ].filter(Boolean)
         })).join("\n"),
         basename: api.config.base,
         historyType: api.config.history.type,

package/dist/index.js

@@ -42,6 +42,7 @@ var src_default = () => {
       require.resolve("./features/favicons/favicons"),
       require.resolve("./features/mock/mock"),
       require.resolve("./features/mpa/mpa"),
+      require.resolve("./features/overrides/overrides"),
       require.resolve("./features/polyfill/polyfill"),
       require.resolve("./features/polyfill/publicPathPolyfill"),
       require.resolve("./features/routePrefetch/routePrefetch"),

package/dist/libs/folderCache/AutoUpdateSourceCodeCache.d.ts

@@ -11,6 +11,7 @@ export declare class AutoUpdateSrcCodeCache {
     private readonly cachePath;
     folderCache: AutoUpdateFolderCache;
     private listeners;
+    private ignores;
     constructor(opts: {
         cwd: string;
         cachePath: string;

package/dist/libs/folderCache/AutoUpdateSourceCodeCache.js

@@ -35,20 +35,25 @@ var import_AutoUpdateFolderCache = require("./AutoUpdateFolderCache");
 var AutoUpdateSrcCodeCache = class {
   constructor(opts) {
     this.listeners = [];
+    this.ignores = [
+      "**/*.d.ts",
+      "**/*.test.{js,ts,jsx,tsx}",
+      "**/.umi-production/**",
+      "**/.umi-test/**",
+      "**/node_modules/**",
+      "**/.git/**",
+      "**/dist/**",
+      "**/coverage/**",
+      "**/jest.config.{ts,js}",
+      "**/jest-setup.{ts,js}"
+    ];
     this.srcPath = opts.cwd;
     this.cachePath = opts.cachePath;
     this.folderCache = new import_AutoUpdateFolderCache.AutoUpdateFolderCache({
       cwd: this.srcPath,
       exts: ["ts", "js", "jsx", "tsx"],
-      ignored: [
-        "**/*.d.ts",
-        "**/*.test.{js,ts,jsx,tsx}",
-        "**/.umi-production/**",
-        "**/.umi-test/**",
-        "**/node_modules/**",
-        "**/.git/**"
-      ],
-      debouncedTimeout: 500,
+      ignored: this.ignores,
+      debouncedTimeout: 200,
       filesLoader: async (files) => {
         const loaded = {};
         await this.batchProcess(files);
@@ -72,15 +77,9 @@ var AutoUpdateSrcCodeCache = class {
   }
   async initFileList() {
     const start = Date.now();
-    const files = await (0, import_fast_glob.default)((0, import_path.join)(this.srcPath, "**", "*.{ts,js,jsx,tsx}"), {
+    const files = await (0, import_fast_glob.default)((0, import_utils.winPath)((0, import_path.join)(this.srcPath, "**", "*.{ts,js,jsx,tsx}")), {
       dot: true,
-      ignore: [
-        "**/*.d.ts",
-        "**/*.test.{js,ts,jsx,tsx}",
-        "**/.umi-production/**",
-        "**/node_modules/**",
-        "**/.git/**"
-      ]
+      ignore: this.ignores
     });
     import_utils.logger.debug("[MFSU][eager] fast-glob costs", Date.now() - start);
     return files;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.24",
+  "version": "4.0.26",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,19 +25,19 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/ast": "4.0.24",
-    "@umijs/babel-preset-umi": "4.0.24",
-    "@umijs/bundler-utils": "4.0.24",
-    "@umijs/bundler-vite": "4.0.24",
-    "@umijs/bundler-webpack": "4.0.24",
-    "@umijs/core": "4.0.24",
+    "@umijs/ast": "4.0.26",
+    "@umijs/babel-preset-umi": "4.0.26",
+    "@umijs/bundler-utils": "4.0.26",
+    "@umijs/bundler-vite": "4.0.26",
+    "@umijs/bundler-webpack": "4.0.26",
+    "@umijs/core": "4.0.26",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.24",
-    "@umijs/plugin-run": "4.0.24",
-    "@umijs/renderer-react": "4.0.24",
-    "@umijs/server": "4.0.24",
-    "@umijs/utils": "4.0.24",
+    "@umijs/mfsu": "4.0.26",
+    "@umijs/plugin-run": "4.0.26",
+    "@umijs/renderer-react": "4.0.26",
+    "@umijs/server": "4.0.26",
+    "@umijs/utils": "4.0.26",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",
@@ -46,6 +46,7 @@
     "html-webpack-plugin": "5.5.0",
     "magic-string": "0.26.2",
     "path-to-regexp": "1.7.0",
+    "postcss-prefix-selector": "1.16.0",
     "react": "18.1.0",
     "react-dom": "18.1.0",
     "react-router": "6.3.0",