@umijs/preset-umi 4.3.35 → 4.4.0

package/dist/features/exportStatic/exportStatic.js

@@ -68,7 +68,9 @@ async function getPreRenderedHTML(api, htmlTpl, path) {
     exportStatic: { ignorePreRenderError = false },
     base
   } = api.config;
-  markupRender ?? (markupRender = require((0, import_utils2.absServerBuildPath)(api))._markupGenerator);
+  await import((0, import_utils2.absServerBuildPath)(api)).then(
+    (res) => markupRender ?? (markupRender = res.default._markupGenerator)
+  );
   try {
     const location = `${base.endsWith("/") ? base.slice(0, -1) : base}${path}`;
     const html = await markupRender(location);

package/dist/features/routePrefetch/routePrefetch.js

@@ -22,49 +22,28 @@ __export(routePrefetch_exports, {
   default: () => routePrefetch_default
 });
 module.exports = __toCommonJS(routePrefetch_exports);
-var import_fs = require("fs");
-var import_path = require("path");
 var routePrefetch_default = (api) => {
   api.describe({
     config: {
       schema({ zod }) {
-        return zod.object({});
+        return zod.object({
+          defaultPrefetch: zod.enum(["none", "intent", "render", "viewport"]).optional(),
+          defaultPrefetchTimeout: zod.number().optional()
+        });
       }
     },
     enableBy: api.EnableBy.config
   });
-  api.onCheck(() => {
-    if (!api.config.manifest) {
-      throw new Error("You must enable manifest to use routePrefetch feature!");
-    }
-  });
-  api.onBuildComplete(() => {
-    const manifest = (0, import_fs.readFileSync)(
-      (0, import_path.join)(
-        api.paths.absOutputPath,
-        api.config.manifest.fileName || "asset-manifest.json"
-      ),
-      "utf-8"
-    );
-    const manifestObj = JSON.parse(manifest);
-    const umiJsFileKey = Object.keys(manifestObj).find(
-      (key) => key.match(/^umi(.*)\.js$/)
-    );
-    if (!umiJsFileKey) {
-      throw new Error("Cannot find umi.js in manifest.json");
-    }
-    const umiJsFileName = manifestObj[umiJsFileKey].replace(
-      new RegExp("^" + api.config.publicPath),
-      ""
-    );
-    const umiJsFile = (0, import_fs.readFileSync)(
-      (0, import_path.join)(api.paths.absOutputPath, umiJsFileName),
-      "utf-8"
-    );
-    const prependJS = `window.__umi_manifest__ = ` + manifest + ";";
-    (0, import_fs.writeFileSync)(
-      (0, import_path.join)(api.paths.absOutputPath, umiJsFileName),
-      prependJS + umiJsFile
-    );
+  api.addEntryCodeAhead(() => {
+    return `if(typeof window !== 'undefined') window.__umi_route_prefetch__ =
+      {
+        defaultPrefetch: ${JSON.stringify(
+      api.config.routePrefetch.defaultPrefetch || "none"
+    )},
+        defaultPrefetchTimeout: ${JSON.stringify(
+      api.config.routePrefetch.defaultPrefetchTimeout || 50
+    )},
+      };
+    `;
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.3.35",
+  "version": "4.4.0",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/bundler-mako": "0.9.7",
+    "@umijs/bundler-mako": "0.9.9",
     "@umijs/es-module-parser": "0.0.7",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
@@ -41,21 +41,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.3.35",
-    "@umijs/bundler-vite": "4.3.35",
-    "@umijs/babel-preset-umi": "4.3.35",
-    "@umijs/bundler-webpack": "4.3.35",
-    "@umijs/core": "4.3.35",
-    "@umijs/bundler-utils": "4.3.35",
-    "@umijs/mfsu": "4.3.35",
-    "@umijs/plugin-run": "4.3.35",
-    "@umijs/server": "4.3.35",
-    "@umijs/renderer-react": "4.3.35",
-    "@umijs/utils": "4.3.35",
-    "@umijs/bundler-esbuild": "4.3.35",
-    "@umijs/zod2ts": "4.3.35",
-    "@umijs/ui": "3.0.1",
-    "@umijs/did-you-know": "1.0.3"
+    "@umijs/ast": "4.4.0",
+    "@umijs/babel-preset-umi": "4.4.0",
+    "@umijs/bundler-utils": "4.4.0",
+    "@umijs/bundler-webpack": "4.4.0",
+    "@umijs/core": "4.4.0",
+    "@umijs/mfsu": "4.4.0",
+    "@umijs/bundler-vite": "4.4.0",
+    "@umijs/bundler-esbuild": "4.4.0",
+    "@umijs/did-you-know": "1.0.3",
+    "@umijs/plugin-run": "4.4.0",
+    "@umijs/renderer-react": "4.4.0",
+    "@umijs/server": "4.4.0",
+    "@umijs/utils": "4.4.0",
+    "@umijs/zod2ts": "4.4.0",
+    "@umijs/ui": "3.0.1"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",