@umijs/preset-umi 4.0.26 → 4.0.28

package/dist/commands/build.js

@@ -147,15 +147,29 @@ umi build --clean
         });
         const { vite } = api.args;
         const markupArgs = await (0, import_getMarkupArgs.getMarkupArgs)({ api });
-        const markup = await (0, import_server.getMarkup)({
+        const finalMarkUpArgs = {
           ...markupArgs,
           styles: markupArgs.styles.concat(api.config.vite ? [] : assetsMap["umi.css"] || []),
           scripts: (api.config.vite ? [] : assetsMap["umi.js"] || []).concat(markupArgs.scripts),
           esmScript: !!opts.config.esm || vite,
           path: "/"
+        };
+        const htmlFiles = await api.applyPlugins({
+          key: "modifyExportHTMLFiles",
+          initialValue: [
+            {
+              path: "index.html",
+              content: await (0, import_server.getMarkup)(finalMarkUpArgs)
+            }
+          ],
+          args: { markupArgs: finalMarkUpArgs, getMarkup: import_server.getMarkup }
+        });
+        htmlFiles.forEach(({ path, content }) => {
+          const absPath = (0, import_path.resolve)(api.paths.absOutputPath, path);
+          import_utils.fsExtra.mkdirpSync((0, import_path.dirname)(absPath));
+          (0, import_fs.writeFileSync)(absPath, content, "utf-8");
+          import_utils.logger.event(`Build ${path}`);
         });
-        (0, import_fs.writeFileSync)((0, import_path.join)(api.paths.absOutputPath, "index.html"), markup, "utf-8");
-        import_utils.logger.event("Build index.html");
       }
       await api.applyPlugins({
         key: "onBuildHtmlComplete",

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

@@ -24,10 +24,11 @@ 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");
 }
+(0, import_utils.setNoDeprecation)();
+setupWorkerEnv();
 var bundlerWebpackPath = (0, import_path.dirname)(require.resolve("@umijs/bundler-webpack"));
 var bufferedRequest = [];
 async function start() {
@@ -106,3 +107,7 @@ function makeArray(a) {
     return a;
   return [a];
 }
+function setupWorkerEnv() {
+  process.env.DID_YOU_KNOW = "none";
+  process.env.IS_UMI_BUILD_WORKER = "true";
+}

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

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

package/dist/features/exportStatic/exportStatic.d.ts

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

package/dist/features/exportStatic/exportStatic.js

@@ -0,0 +1,106 @@
+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/features/exportStatic/exportStatic.ts
+var exportStatic_exports = {};
+__export(exportStatic_exports, {
+  default: () => exportStatic_default
+});
+module.exports = __toCommonJS(exportStatic_exports);
+var import_path = require("path");
+var import_server = require("@umijs/server");
+var import_utils = require("@umijs/utils");
+var import_assert = __toESM(require("assert"));
+var IS_WIN = process.platform === "win32";
+function getExportHtmlData(routes) {
+  const map = /* @__PURE__ */ new Map();
+  Object.values(routes).forEach((route) => {
+    if (!route.isLayout && (!IS_WIN || !route.path.includes("/:")) && !route.path.includes("*")) {
+      const file = (0, import_path.join)(".", route.absPath, "index.html");
+      map.set(file, {
+        route: {
+          path: route.absPath,
+          redirect: route.redirect
+        },
+        file
+      });
+    }
+  });
+  return Array.from(map.values());
+}
+var exportStatic_default = (api) => {
+  api.describe({
+    config: {
+      schema: (Joi) => Joi.object()
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.onCheck(() => {
+    (0, import_assert.default)(!api.config.mpa, "`exportStatic` is not supported in `mpa` mode.");
+  });
+  api.modifyExportHTMLFiles(async (_defaultFiles, opts) => {
+    const { publicPath } = api.config;
+    const htmlData = getExportHtmlData(api.appData.routes);
+    const htmlFiles = [];
+    for (const { file } of htmlData) {
+      let { markupArgs } = opts;
+      if (publicPath.startsWith(".")) {
+        (0, import_assert.default)(api.config.runtimePublicPath, "`runtimePublicPath` should be enable when `publicPath` is relative!");
+        const rltPrefix = (0, import_path.relative)((0, import_path.dirname)(file), ".");
+        if (rltPrefix) {
+          const picked = import_utils.lodash.clone(import_utils.lodash.pick(markupArgs, [
+            "favicons",
+            "links",
+            "styles",
+            "headScripts",
+            "scripts"
+          ]));
+          picked.favicons.forEach((item, i) => {
+            if (item.startsWith(publicPath)) {
+              picked.favicons[i] = (0, import_utils.winPath)((0, import_path.join)(rltPrefix, item));
+            }
+          });
+          picked.links.forEach((link) => {
+            var _a;
+            if ((_a = link.href) == null ? void 0 : _a.startsWith(publicPath)) {
+              link.href = (0, import_utils.winPath)((0, import_path.join)(rltPrefix, link.href));
+            }
+          });
+          [picked.headScripts, picked.scripts, picked.styles].forEach((group) => {
+            group.forEach((script, i) => {
+              var _a;
+              if (typeof script === "string" && script.startsWith(publicPath)) {
+                group[i] = (0, import_utils.winPath)((0, import_path.join)(rltPrefix, script));
+              } else if (typeof script === "object" && ((_a = script.src) == null ? void 0 : _a.startsWith(publicPath))) {
+                script.src = (0, import_utils.winPath)((0, import_path.join)(rltPrefix, script.src));
+              }
+            });
+          });
+          markupArgs = Object.assign({}, markupArgs, picked);
+        }
+      }
+      htmlFiles.push({ path: file, content: await (0, import_server.getMarkup)(markupArgs) });
+    }
+    return htmlFiles;
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/overrides/overrides.js

@@ -36,16 +36,16 @@ var overrides_default = (api) => {
       memo.extraPostCSSPlugins ?? (memo.extraPostCSSPlugins = []);
       memo.extraPostCSSPlugins.push([
         require("postcss-prefix-selector")({
-          prefix: "#fake",
-          transform(_p, selector, _ps, filePath) {
+          prefix: "body",
+          transform(_p, selector, prefixedSelector, 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 (isOverridesFile) {
               if (selector === "html") {
                 return `html:first-child`;
-              } else if (selector === "body") {
-                return `* + body`;
+              } else if (/^body([\s+~>[:]|$)/.test(selector)) {
+                return `* + ${selector}`;
               }
-              return `#${api.config.mountElementId} ${selector}`;
+              return prefixedSelector;
             }
             return selector;
           }

package/dist/index.js

@@ -39,6 +39,7 @@ var src_default = () => {
       require.resolve("./features/depsOnDemand/depsOnDemand"),
       require.resolve("./features/devTool/devTool"),
       require.resolve("./features/esmi/esmi"),
+      require.resolve("./features/exportStatic/exportStatic"),
       require.resolve("./features/favicons/favicons"),
       require.resolve("./features/mock/mock"),
       require.resolve("./features/mpa/mpa"),

package/dist/libs/folderCache/AutoUpdateSourceCodeCache.js

@@ -37,7 +37,8 @@ var AutoUpdateSrcCodeCache = class {
     this.listeners = [];
     this.ignores = [
       "**/*.d.ts",
-      "**/*.test.{js,ts,jsx,tsx}",
+      "**/*.{test,spec}.{js,ts,jsx,tsx}",
+      "**/cypress/**",
       "**/.umi-production/**",
       "**/.umi-test/**",
       "**/node_modules/**",

package/dist/registerMethods.js

@@ -69,6 +69,7 @@ var registerMethods_default = (api) => {
     "modifyEntry",
     "modifyHTMLFavicon",
     "modifyHTML",
+    "modifyExportHTMLFiles",
     "modifyWebpackConfig",
     "modifyViteConfig",
     "modifyRendererPath",

package/dist/types.d.ts

@@ -4,8 +4,10 @@ import type WebpackChain from '@umijs/bundler-webpack/compiled/webpack-5-chain';
 import type { IConfig } from '@umijs/bundler-webpack/dist/types';
 import type { IAdd, IEvent, IModify, IRoute as ICoreRoute, IServicePluginAPI, PluginAPI } from '@umijs/core';
 import { Env } from '@umijs/core';
+import type { getMarkup } from '@umijs/server';
 import type { CheerioAPI } from '@umijs/utils/compiled/cheerio';
 import type { InlineConfig as ViteInlineConfig } from 'vite';
+import type { getMarkupArgs } from './commands/dev/getMarkupArgs';
 import type CodeFrameError from './features/transform/CodeFrameError';
 export { UmiApiRequest, UmiApiResponse } from './features/apiRoute';
 export { webpack, IConfig };
@@ -91,6 +93,13 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
     };
     modifyBabelPresetOpts: IModify<any, null>;
     modifyEntry: IModify<Record<string, string>, null>;
+    modifyExportHTMLFiles: IModify<{
+        content: string;
+        path: string;
+    }[], {
+        getMarkup: typeof getMarkup;
+        markupArgs: Awaited<ReturnType<typeof getMarkupArgs>>;
+    }>;
     modifyHTML: IModify<CheerioAPI, {
         path: string;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.26",
+  "version": "4.0.28",
   "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.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/ast": "4.0.28",
+    "@umijs/babel-preset-umi": "4.0.28",
+    "@umijs/bundler-utils": "4.0.28",
+    "@umijs/bundler-vite": "4.0.28",
+    "@umijs/bundler-webpack": "4.0.28",
+    "@umijs/core": "4.0.28",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@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",
+    "@umijs/mfsu": "4.0.28",
+    "@umijs/plugin-run": "4.0.28",
+    "@umijs/renderer-react": "4.0.28",
+    "@umijs/server": "4.0.28",
+    "@umijs/utils": "4.0.28",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",