@umijs/preset-umi 4.1.2 → 4.1.3

package/dist/features/okam/okam.js

@@ -24,9 +24,14 @@ __export(okam_exports, {
 module.exports = __toCommonJS(okam_exports);
 var import_utils = require("@umijs/utils");
 var okam_default = (api) => {
+  api.describe({
+    enableBy: () => Boolean(process.env.OKAM)
+  });
   api.onCheck(() => {
-    if (api.userConfig.mako) {
-      (0, import_utils.checkVersion)(16, `Node 16 is required when using mako.`);
-    }
+    (0, import_utils.checkVersion)(16, `Node 16 is required when using mako.`);
+  });
+  api.modifyAppData((memo) => {
+    memo.bundler = "mako";
+    return memo;
   });
 };

package/dist/features/routePreloadOnLoad/routePreloadOnLoad.d.ts

@@ -0,0 +1,21 @@
+import type { IApi } from '../../types';
+export interface IRouteChunkFilesMap {
+    /**
+     * script attr prefix (package.json name)
+     */
+    p: string;
+    /**
+     * bundler type
+     */
+    b: string;
+    /**
+     * all chunk files
+     */
+    f: [string, string | number][];
+    /**
+     * route files index map
+     */
+    r: Record<string, number[]>;
+}
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/routePreloadOnLoad/routePreloadOnLoad.js

@@ -0,0 +1,214 @@
+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/routePreloadOnLoad/routePreloadOnLoad.ts
+var routePreloadOnLoad_exports = {};
+__export(routePreloadOnLoad_exports, {
+  default: () => routePreloadOnLoad_default
+});
+module.exports = __toCommonJS(routePreloadOnLoad_exports);
+var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
+var import_path = require("path");
+var import_constants = require("../../constants");
+var import_scan = require("../../libs/scan");
+var import_utils2 = require("./utils");
+var routeScoreCache = /* @__PURE__ */ new Map();
+function computeRouteScore(path) {
+  if (!routeScoreCache.get(path)) {
+    const paramRe = /^:[\w-]+$/;
+    const dynamicSegmentValue = 3;
+    const emptySegmentValue = 1;
+    const staticSegmentValue = 10;
+    const splatPenalty = -2;
+    const isSplat = (s) => s === "*";
+    let segments = path.split("/");
+    let initialScore = segments.length;
+    if (segments.some(isSplat)) {
+      initialScore += splatPenalty;
+    }
+    routeScoreCache.set(
+      path,
+      segments.filter((s) => !isSplat(s)).reduce(
+        (score, segment) => score + (paramRe.test(segment) ? dynamicSegmentValue : segment === "" ? emptySegmentValue : staticSegmentValue),
+        initialScore
+      )
+    );
+  }
+  return routeScoreCache.get(path);
+}
+async function getRouteChunkFilesMap(chunks, opts) {
+  var _a;
+  const { resolver, routeModuleName, routeModulePath } = opts;
+  const routeChunkFiles = {};
+  const routeFileChunksMap = {};
+  const pickPreloadFiles = (files) => files.filter((f) => f.endsWith(".js") || f.endsWith(".css"));
+  const routeFileResolveCache = {};
+  for (const chunk of chunks) {
+    if (chunk.entry)
+      continue;
+    const pickedFiles = pickPreloadFiles(chunk.files);
+    const routeOrigins = chunk.origins.filter(
+      (origin) => {
+        var _a2;
+        return (_a2 = origin.moduleName) == null ? void 0 : _a2.endsWith(routeModuleName);
+      }
+    );
+    for (const origin of routeOrigins) {
+      let fileAbsPath;
+      try {
+        fileAbsPath = routeFileResolveCache[_a = origin.request] ?? (routeFileResolveCache[_a] = await resolver.resolve((0, import_path.dirname)(routeModulePath), origin.request));
+      } catch (err) {
+        import_utils.logger.error(
+          `[routePreloadOnLoad]: route file resolve error, cannot preload for ${origin.request}`
+        );
+        continue;
+      }
+      pickedFiles.forEach((file) => {
+        routeChunkFiles[file] ?? (routeChunkFiles[file] = {
+          index: Object.keys(routeChunkFiles).length,
+          id: chunk.id
+        });
+      });
+      (routeFileChunksMap[fileAbsPath] ?? (routeFileChunksMap[fileAbsPath] = {
+        files: pickedFiles.slice()
+      })).files.push(...pickedFiles);
+    }
+  }
+  Object.values(routeFileChunksMap).forEach((item) => {
+    item.indexes = item.files.map((f) => routeChunkFiles[f].index);
+  });
+  return {
+    routeChunkFiles,
+    routeFileChunksMap
+  };
+}
+async function getRoutePathFilesMap(routes, fileChunksMap, opts) {
+  const { resolver, absPagesPath } = opts;
+  const routeFilesMap = {};
+  for (const route of Object.values(routes)) {
+    if (!route.file)
+      continue;
+    let current = route;
+    const files = [];
+    do {
+      if (current.file && !current.file.startsWith("(")) {
+        try {
+          const fileReqPath = (0, import_path.isAbsolute)(current.file) || current.file.startsWith("@/") ? current.file : (
+            // a => ./a
+            // .a => ./.a
+            current.file.replace(/^([^.]|\.[^./])/, "./$1")
+          );
+          const fileAbsPath = await resolver.resolve(absPagesPath, fileReqPath);
+          files.push(fileAbsPath);
+        } catch {
+          import_utils.logger.error(
+            `[routePreloadOnLoad]: route file resolve error, cannot preload for ${current.file}`
+          );
+        }
+      }
+      current = current.parentId ? routes[current.parentId] : void 0;
+    } while (current);
+    const indexes = Array.from(
+      // use set to avoid duplicated indexes
+      files.reduce((indexSet, file) => {
+        var _a;
+        (_a = fileChunksMap[file]) == null ? void 0 : _a.indexes.forEach((i) => indexSet.add(i));
+        return indexSet;
+      }, /* @__PURE__ */ new Set())
+    );
+    const { absPath } = route;
+    routeFilesMap[absPath] = // why different route may has same absPath?
+    // because umi implement route.wrappers via nested routes way, the wrapper route will has same absPath with the nested route
+    // so we always select the longest file indexes for the nested route
+    !routeFilesMap[absPath] || routeFilesMap[absPath].length < indexes.length ? indexes : routeFilesMap[absPath];
+  }
+  return routeFilesMap;
+}
+var routePreloadOnLoad_default = (api) => {
+  let routeChunkFilesMap;
+  api.describe({
+    enableBy: () => Boolean(api.pkg.name)
+  });
+  api.addHTMLHeadScripts(() => {
+    if (api.name === "build") {
+      return api.config.tern ? (
+        // map mode
+        [
+          {
+            type: import_utils2.PRELOAD_ROUTE_MAP_SCP_TYPE,
+            content: JSON.stringify(routeChunkFilesMap)
+          }
+        ]
+      ) : (
+        // script mode
+        [
+          {
+            content: (0, import_fs.readFileSync)(
+              (0, import_path.join)(
+                import_constants.TEMPLATES_DIR,
+                "routePreloadOnLoad/preloadRouteFilesScp.js"
+              ),
+              "utf-8"
+            ).replace(
+              '"{{routeChunkFilesMap}}"',
+              JSON.stringify(routeChunkFilesMap)
+            ).replace("{{basename}}", api.config.base).replace(
+              '"{{publicPath}}"',
+              `${// handle runtimePublicPath
+              api.config.runtimePublicPath ? "window.publicPath||" : ""}"${api.config.publicPath}"`
+            )
+          }
+        ]
+      );
+    }
+    return [];
+  });
+  api.onBuildComplete(async ({ err, stats }) => {
+    if (!err && !stats.hasErrors()) {
+      const routeModulePath = (0, import_path.join)(api.paths.absTmpPath, "core/route.tsx");
+      const resolver = (0, import_scan.createResolver)({ alias: api.config.alias });
+      const { chunks = [] } = stats.toJson ? (
+        // webpack
+        stats.toJson()
+      ) : (
+        // mako
+        stats.compilation
+      );
+      const { routeChunkFiles, routeFileChunksMap } = await getRouteChunkFilesMap(chunks, {
+        resolver,
+        routeModulePath,
+        routeModuleName: (0, import_utils.winPath)((0, import_path.relative)(api.cwd, routeModulePath))
+      });
+      const routeFilesMap = await getRoutePathFilesMap(
+        api.appData.routes,
+        routeFileChunksMap,
+        { resolver, absPagesPath: api.paths.absPagesPath }
+      );
+      routeChunkFilesMap = {
+        p: api.pkg.name,
+        b: api.appData.bundler,
+        f: Object.entries(routeChunkFiles).sort((a, b) => a[1].index - b[1].index).map(([k, { id }]) => [k, id]),
+        // sort similar to react-router@6
+        r: (0, import_utils.lodash)(routeFilesMap).toPairs().sort(
+          ([a], [b]) => computeRouteScore(a) - computeRouteScore(b)
+        ).fromPairs().value()
+      };
+    }
+  });
+};

package/dist/features/routePreloadOnLoad/utils.d.ts

@@ -0,0 +1,14 @@
+/**
+ * NOTE: DO NOT USE ADVANCED SYNTAX IN THIS FILE, TO AVOID INSERT HELPERS TO REDUCE SCRIPT SIZE.
+ */
+import type { IRouteChunkFilesMap } from './routePreloadOnLoad';
+export type { IRouteChunkFilesMap };
+export interface IPreloadRouteFile {
+    type: 'js' | 'css' | (string & {});
+    url: string;
+    attrs: ([string, string] | [string])[];
+}
+export declare const PRELOAD_ROUTE_MAP_SCP_TYPE = "umi-route-chunk-files-map";
+export declare function getPreloadRouteFiles(path: string, map: IRouteChunkFilesMap, opts: {
+    publicPath: string;
+}): IPreloadRouteFile[] | undefined;

package/dist/features/routePreloadOnLoad/utils.js

@@ -0,0 +1,57 @@
+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/routePreloadOnLoad/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  PRELOAD_ROUTE_MAP_SCP_TYPE: () => PRELOAD_ROUTE_MAP_SCP_TYPE,
+  getPreloadRouteFiles: () => getPreloadRouteFiles
+});
+module.exports = __toCommonJS(utils_exports);
+var PRELOAD_ROUTE_MAP_SCP_TYPE = "umi-route-chunk-files-map";
+function getPreloadRouteFiles(path, map, opts) {
+  var _a;
+  const matched = (
+    // search for static route
+    map.r[path] || // search for dynamic route
+    ((_a = Object.entries(map.r).find((p) => {
+      const route = p[0];
+      const reg = new RegExp(
+        // replace /:id to /[^/]+
+        // replace /* to /.+
+        `^${route.replace(/\/:[^/]+/g, "/[^/]+").replace("/*", "/.+")}$`
+      );
+      return reg.test(path);
+    })) == null ? void 0 : _a[1])
+  );
+  return matched == null ? void 0 : matched.map((i) => {
+    const id = map.f[i][1];
+    const file = map.f[i][0];
+    const ext = file.split(".").pop();
+    return {
+      type: ext,
+      url: `${opts.publicPath}${file}`,
+      attrs: [[`data-${map.b}`, `${map.p}:${id}`]]
+    };
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PRELOAD_ROUTE_MAP_SCP_TYPE,
+  getPreloadRouteFiles
+});

package/dist/index.js

@@ -86,6 +86,7 @@ var src_default = () => {
       require.resolve("./features/swc/swc"),
       require.resolve("./features/ui/ui"),
       require.resolve("./features/hmrGuardian/hmrGuardian"),
+      require.resolve("./features/routePreloadOnLoad/routePreloadOnLoad"),
       // commands
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -39,21 +39,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/babel-preset-umi": "4.1.2",
-    "@umijs/bundler-esbuild": "4.1.2",
-    "@umijs/bundler-utils": "4.1.2",
-    "@umijs/bundler-vite": "4.1.2",
-    "@umijs/core": "4.1.2",
-    "@umijs/bundler-webpack": "4.1.2",
-    "@umijs/mfsu": "4.1.2",
+    "@umijs/ast": "4.1.3",
+    "@umijs/babel-preset-umi": "4.1.3",
+    "@umijs/bundler-esbuild": "4.1.3",
+    "@umijs/bundler-utils": "4.1.3",
+    "@umijs/bundler-vite": "4.1.3",
+    "@umijs/bundler-webpack": "4.1.3",
+    "@umijs/core": "4.1.3",
+    "@umijs/mfsu": "4.1.3",
+    "@umijs/plugin-run": "4.1.3",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/plugin-run": "4.1.2",
-    "@umijs/ast": "4.1.2",
-    "@umijs/renderer-react": "4.1.2",
-    "@umijs/server": "4.1.2",
+    "@umijs/server": "4.1.3",
+    "@umijs/renderer-react": "4.1.3",
     "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.1.2",
-    "@umijs/zod2ts": "4.1.2"
+    "@umijs/utils": "4.1.3",
+    "@umijs/zod2ts": "4.1.3"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/routePreloadOnLoad/preloadRouteFilesScp.js

@@ -0,0 +1 @@
+!function(){"use strict";var t="{{basename}}".replace(/([^/])$/,"$1/"),e=location.pathname,n=e.startsWith(t)&&decodeURI("/".concat(e.slice(t.length)));if(n){var a=document,c=a.head,r=a.createElement.bind(a),i=function(t,e,n){var a,c=e.r[t]||(null===(a=Object.entries(e.r).find((function(e){var n=e[0];return new RegExp("^".concat(n.replace(/\/:[^/]+/g,"/[^/]+").replace("/*","/.+"),"$")).test(t)})))||void 0===a?void 0:a[1]);return null==c?void 0:c.map((function(t){var a=e.f[t][1],c=e.f[t][0];return{type:c.split(".").pop(),url:"".concat(n.publicPath).concat(c),attrs:[["data-".concat(e.b),"".concat(e.p,":").concat(a)]]}}))}(n,"{{routeChunkFilesMap}}",{publicPath:"{{publicPath}}"});null==i||i.forEach((function(t){var e,n=t.type,a=t.url;if("js"===n)(e=r("script")).src=a,e.async=!0;else{if("css"!==n)return;(e=r("link")).href=a,e.rel="preload",e.as="style"}t.attrs.forEach((function(t){e.setAttribute(t[0],t[1]||"")})),c.appendChild(e)}))}}();