@umijs/preset-umi 4.0.75 → 4.0.77

package/dist/features/configPlugins/configPlugins.js

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

package/dist/features/configPlugins/schema.js

@@ -91,6 +91,9 @@ function getSchemas() {
       message: 'publicPath must be "auto" or end with /'
     }),
     reactRouter5Compat: ({ zod }) => zod.union([zod.boolean(), zod.object({})]),
+    routeLoader: ({ zod }) => zod.object({
+      moduleType: zod.enum(["esm", "cjs"])
+    }),
     routes: ({ zod }) => {
       const routeSchema = zod.union([
         zod.object({

package/dist/features/exportStatic/exportStatic.js

@@ -65,6 +65,9 @@ function getExportHtmlData(routes) {
 }
 async function getPreRenderedHTML(api, htmlTpl, path) {
   var _a, _b;
+  const {
+    exportStatic: { ignorePreRenderError = false }
+  } = api.config;
   markupRender ?? (markupRender = require((0, import_utils2.absServerBuildPath)(api))._markupGenerator);
   try {
     const markup = await markupRender(path);
@@ -80,6 +83,9 @@ async function getPreRenderedHTML(api, htmlTpl, path) {
     import_utils.logger.info(`Pre-render for ${path}`);
   } catch (err) {
     import_utils.logger.error(`Pre-render ${path} error: ${err}`);
+    if (!ignorePreRenderError) {
+      throw err;
+    }
   }
   return htmlTpl;
 }
@@ -105,7 +111,8 @@ var exportStatic_default = (api) => {
         extraRoutePaths: zod.union([
           zod.function(),
           zod.array(zod.string())
-        ])
+        ]),
+        ignorePreRenderError: zod.boolean().default(false)
       }).deepPartial()
     },
     enableBy: api.EnableBy.config

package/dist/features/tmpFiles/routes.js

@@ -180,6 +180,7 @@ async function getRoutes(opts) {
 }
 async function getRouteComponents(opts) {
   const imports = Object.keys(opts.routes).map((key) => {
+    var _a;
     const useSuspense = opts.api.appData.framework === "react" ? true : false;
     const route = opts.routes[key];
     if (!route.file) {
@@ -209,6 +210,11 @@ async function getRouteComponents(opts) {
     if (process.env.NODE_ENV === "test") {
       return `'${key}': require('${(0, import_utils.winPath)(path)}').default,`;
     }
+    if (((_a = opts.api.config.routeLoader) == null ? void 0 : _a.moduleType) === "cjs") {
+      return useSuspense ? `'${key}': React.lazy(() => Promise.resolve(require('${(0, import_utils.winPath)(
+        path
+      )}'))),` : `'${key}': () => Promise.resolve(require('${(0, import_utils.winPath)(path)}')),`;
+    }
     return useSuspense ? `'${key}': React.lazy(() => import(/* webpackChunkName: "${webpackChunkName}" */'${(0, import_utils.winPath)(
       path
     )}')),` : `'${key}': () => import(/* webpackChunkName: "${webpackChunkName}" */'${(0, import_utils.winPath)(

package/package.json

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