@4399ywkf/core 5.1.5 → 5.1.6

package/dist/cli/index.js

@@ -2743,12 +2743,13 @@ function LazyRoute({
 
 import React, { lazy, Suspense } from "react";
 import { createBrowserRouter, type RouteObject } from "react-router";
+import { RouteErrorBoundary } from "@4399ywkf/core/runtime";
+${errorImports.length > 0 ? `
+// \u540C\u6B65\u9519\u8BEF\u8FB9\u754C\u7EC4\u4EF6
+${errorImports.join("\n")}` : ""}
 
 // \u61D2\u52A0\u8F7D\u9875\u9762\u7EC4\u4EF6
 ${lazyImports.join("\n")}
-${errorImports.length > 0 ? `
-// \u9519\u8BEF\u8FB9\u754C\u7EC4\u4EF6
-${errorImports.join("\n")}` : ""}
 ${loadingImports.length > 0 ? `
 // \u52A0\u8F7D\u72B6\u6001\u7EC4\u4EF6
 ${loadingImports.join("\n")}` : ""}
@@ -2783,7 +2784,7 @@ export default routes;
       }
       if (route.errorFile) {
         errorImports.push(
-          `const ${name}Error = lazy(() => import("@/pages/${toImportPath(route.errorFile)}"));`
+          `import ${name}Error from "@/pages/${toImportPath(route.errorFile)}";`
         );
       }
       if (route.loadingFile) {
@@ -2798,13 +2799,13 @@ export default routes;
       }
     }
   }
-  emitRouteArray(routes, parentPath) {
-    const items = routes.map((r) => this.emitRouteObject(r, parentPath));
+  emitRouteArray(routes, parentPath, depth = 0) {
+    const items = routes.map((r) => this.emitRouteObject(r, parentPath, depth));
     return `[
   ${items.join(",\n  ")}
 ]`;
   }
-  emitRouteObject(route, parentPath) {
+  emitRouteObject(route, parentPath, depth) {
     const parts = [];
     const name = route.name;
     if (route.index) {
@@ -2825,11 +2826,13 @@ export default routes;
       parts.push(`element: <LazyRoute Component={${name}Page} />`);
     }
     if (route.errorFile) {
-      parts.push(`errorElement: <LazyRoute Component={${name}Error} />`);
+      parts.push(`errorElement: <RouteErrorBoundary fallback={<${name}Error />} />`);
+    } else if (depth === 0) {
+      parts.push(`errorElement: <RouteErrorBoundary />`);
     }
     if (route.children && route.children.length > 0) {
       const childParent = route.pathless ? parentPath : route.path;
-      parts.push(`children: ${this.emitRouteArray(route.children, childParent)}`);
+      parts.push(`children: ${this.emitRouteArray(route.children, childParent, depth + 1)}`);
     }
     return `{
     ${parts.join(",\n    ")}
@@ -3438,10 +3441,20 @@ var YwkfGeneratorPlugin = class {
 var require2 = createRequire(import.meta.url);
 var __dirname = dirname(fileURLToPath(import.meta.url));
 var coreNodeModules = join12(__dirname, "../../node_modules");
+function resolveYwkfBuildId(appName) {
+  const releaseId = [
+    process.env.YWKF_BUILD_ID,
+    process.env.CI_COMMIT_SHA,
+    process.env.GITHUB_SHA,
+    process.env.GIT_COMMIT
+  ].find((value) => value?.trim())?.trim();
+  return `${appName}:${releaseId || Date.now().toString(36)}`;
+}
 function createBaseConfig(config, cwd, options = {}) {
   const isDev = options.isDev ?? process.env.NODE_ENV !== "production";
   const { resolveApp } = createPathResolver(cwd);
   const { appName, appCName, output, html, alias: userAlias, microFrontend, router, reactCompiler } = config;
+  const buildId = resolveYwkfBuildId(appName);
   const ywkfOutputDir = resolveApp(".ywkf");
   const defaultAlias = {
     "@": resolveApp("src"),
@@ -3565,6 +3578,7 @@ function createBaseConfig(config, cwd, options = {}) {
         Buffer: ["buffer", "Buffer"]
       }),
       new rspack2.DefinePlugin({
+        "globalThis.__YWKF_BUILD_ID__": JSON.stringify(buildId),
         "process.env": JSON.stringify(process.env)
       }),
       new rspack2.HtmlRspackPlugin({