@bleedingdev/modern-js-runtime 3.2.0-ultramodern.99 → 3.4.0-ultramodern.0

package/dist/cjs/router/runtime/internal.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -26,40 +30,47 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     default: ()=>internal,
     modifyRoutes: ()=>external_plugin_js_namespaceObject.modifyRoutes,
+    registerRouterProvider: ()=>external_provider_js_namespaceObject.registerRouterProvider,
     renderRoutes: ()=>external_utils_js_namespaceObject.renderRoutes,
+    resolveRouterProvider: ()=>external_provider_js_namespaceObject.resolveRouterProvider,
     routerPlugin: ()=>routerPlugin
 });
 const merge_namespaceObject = require("@modern-js/runtime-utils/merge");
-const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_plugin_js_namespaceObject = require("./plugin.js");
-const plugin_js_namespaceObject = require("./tanstack/plugin.js");
+const external_provider_js_namespaceObject = require("./provider.js");
 const external_utils_js_namespaceObject = require("./utils.js");
+(0, external_provider_js_namespaceObject.registerRouterProvider)('react-router', external_plugin_js_namespaceObject.routerPlugin, {
+    isDefault: true
+});
 const routerPlugin = (userConfig = {})=>({
         name: '@modern-js/plugin-router',
-        registryHooks: {
-            onAfterCreateRouter: external_hooks_js_namespaceObject.onAfterCreateRouter,
-            onAfterHydrateRouter: external_hooks_js_namespaceObject.onAfterHydrateRouter,
-            onBeforeCreateRouter: external_hooks_js_namespaceObject.onBeforeCreateRouter,
-            modifyRoutes: external_hooks_js_namespaceObject.modifyRoutes,
-            onBeforeCreateRoutes: external_hooks_js_namespaceObject.onBeforeCreateRoutes,
-            onBeforeHydrateRouter: external_hooks_js_namespaceObject.onBeforeHydrateRouter
-        },
+        registryHooks: external_provider_js_namespaceObject.routerProviderRegistryHooks,
         setup: (api)=>{
             const mergedConfig = (0, merge_namespaceObject.merge)(api.getRuntimeConfig().router || {}, userConfig);
-            const framework = mergedConfig.framework || 'react-router';
-            const pluginFactory = 'tanstack' === framework ? plugin_js_namespaceObject.tanstackRouterPlugin : external_plugin_js_namespaceObject.routerPlugin;
-            pluginFactory(userConfig).setup?.(api);
+            const pluginFactory = (0, external_provider_js_namespaceObject.resolveRouterProvider)(mergedConfig.framework, {
+                localDefault: {
+                    name: 'react-router',
+                    factory: external_plugin_js_namespaceObject.routerPlugin
+                }
+            });
+            const providerPlugin = pluginFactory(userConfig);
+            (0, external_provider_js_namespaceObject.reportUnsupportedProviderRegistryHooks)(providerPlugin);
+            providerPlugin.setup?.(api);
         }
     });
 const internal = routerPlugin;
 exports["default"] = __webpack_exports__["default"];
 exports.modifyRoutes = __webpack_exports__.modifyRoutes;
+exports.registerRouterProvider = __webpack_exports__.registerRouterProvider;
 exports.renderRoutes = __webpack_exports__.renderRoutes;
+exports.resolveRouterProvider = __webpack_exports__.resolveRouterProvider;
 exports.routerPlugin = __webpack_exports__.routerPlugin;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "default",
     "modifyRoutes",
+    "registerRouterProvider",
     "renderRoutes",
+    "resolveRouterProvider",
     "routerPlugin"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/router/runtime/lifecycle.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -30,8 +34,19 @@ __webpack_require__.d(__webpack_exports__, {
     createRouterRuntimeState: ()=>createRouterRuntimeState,
     createRouterServerSnapshot: ()=>createRouterServerSnapshot,
     getRouterHydrationScripts: ()=>getRouterHydrationScripts,
-    getRouterMatchedRouteIds: ()=>getRouterMatchedRouteIds
+    getRouterMatchedRouteIds: ()=>getRouterMatchedRouteIds,
+    getRouterRuntimeState: ()=>getRouterRuntimeState,
+    getRouterServerSnapshot: ()=>getRouterServerSnapshot
 });
+const extensions_js_namespaceObject = require("../../core/context/extensions.js");
+const routerRuntimeStateExtension = (0, extensions_js_namespaceObject.createRuntimeContextExtension)('@modern-js/runtime:router-runtime-state');
+const routerServerSnapshotExtension = (0, extensions_js_namespaceObject.createRuntimeContextExtension)('@modern-js/runtime:router-server-snapshot');
+function getRouterRuntimeState(runtimeContext) {
+    return routerRuntimeStateExtension.get(runtimeContext);
+}
+function getRouterServerSnapshot(runtimeContext) {
+    return routerServerSnapshotExtension.get(runtimeContext);
+}
 function toHydrationScripts(state) {
     if (state.hydrationScripts?.length) return state.hydrationScripts;
     return state.hydrationScript ? [
@@ -95,12 +110,8 @@ function createRouterRuntimeState(state) {
 }
 function applyRouterRuntimeState(runtimeContext, state) {
     const normalized = createRouterRuntimeState(state);
-    runtimeContext.routerFramework = normalized.framework;
-    runtimeContext.routerInstance = normalized.instance;
-    runtimeContext.routerHydrationScript = normalized.hydrationScript;
-    runtimeContext.routerMatchedRouteIds = normalized.matchedRouteIds;
-    runtimeContext.routerRuntime = normalized;
-    if (normalized.serverSnapshot) runtimeContext.routerServerSnapshot = normalized.serverSnapshot;
+    routerRuntimeStateExtension.set(runtimeContext, normalized);
+    if (normalized.serverSnapshot) routerServerSnapshotExtension.set(runtimeContext, normalized.serverSnapshot);
     return runtimeContext;
 }
 function applyRouterServerPrepareResult(runtimeContext, result) {
@@ -113,18 +124,22 @@ function applyRouterServerPrepareResult(runtimeContext, result) {
     return runtimeContext;
 }
 function getRouterHydrationScripts(runtimeContext) {
-    return runtimeContext.routerServerSnapshot?.hydrationScripts ?? toHydrationScripts({
-        hydrationScript: runtimeContext.routerServerSnapshot?.hydrationScript
-    }) ?? runtimeContext.routerRuntime?.hydrationScripts ?? toHydrationScripts({
-        hydrationScript: runtimeContext.routerRuntime?.hydrationScript ?? runtimeContext.routerHydrationScript
+    const serverSnapshot = getRouterServerSnapshot(runtimeContext);
+    const runtimeState = getRouterRuntimeState(runtimeContext);
+    return serverSnapshot?.hydrationScripts ?? toHydrationScripts({
+        hydrationScript: serverSnapshot?.hydrationScript
+    }) ?? runtimeState?.hydrationScripts ?? toHydrationScripts({
+        hydrationScript: runtimeState?.hydrationScript
     }) ?? [];
 }
 function getRouterMatchedRouteIds(runtimeContext) {
-    return runtimeContext.routerServerSnapshot?.matchedRouteIds ?? getMatchedRouteIdsFromMatches(runtimeContext.routerServerSnapshot?.matches) ?? runtimeContext.routerRuntime?.matchedRouteIds ?? getMatchedRouteIdsFromMatches(runtimeContext.routerRuntime?.matches) ?? runtimeContext.routerMatchedRouteIds;
+    const serverSnapshot = getRouterServerSnapshot(runtimeContext);
+    const runtimeState = getRouterRuntimeState(runtimeContext);
+    return serverSnapshot?.matchedRouteIds ?? getMatchedRouteIdsFromMatches(serverSnapshot?.matches) ?? runtimeState?.matchedRouteIds ?? getMatchedRouteIdsFromMatches(runtimeState?.matches);
 }
 async function cleanupRouterRuntimeState(runtimeContext) {
     try {
-        await runtimeContext.routerRuntime?.cleanup?.();
+        await getRouterRuntimeState(runtimeContext)?.cleanup?.();
     } catch  {}
 }
 exports.applyRouterRuntimeState = __webpack_exports__.applyRouterRuntimeState;
@@ -134,6 +149,8 @@ exports.createRouterRuntimeState = __webpack_exports__.createRouterRuntimeState;
 exports.createRouterServerSnapshot = __webpack_exports__.createRouterServerSnapshot;
 exports.getRouterHydrationScripts = __webpack_exports__.getRouterHydrationScripts;
 exports.getRouterMatchedRouteIds = __webpack_exports__.getRouterMatchedRouteIds;
+exports.getRouterRuntimeState = __webpack_exports__.getRouterRuntimeState;
+exports.getRouterServerSnapshot = __webpack_exports__.getRouterServerSnapshot;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "applyRouterRuntimeState",
     "applyRouterServerPrepareResult",
@@ -141,7 +158,9 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "createRouterRuntimeState",
     "createRouterServerSnapshot",
     "getRouterHydrationScripts",
-    "getRouterMatchedRouteIds"
+    "getRouterMatchedRouteIds",
+    "getRouterRuntimeState",
+    "getRouterServerSnapshot"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/cjs/router/runtime/plugin.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -35,8 +39,8 @@ const router_namespaceObject = require("@modern-js/runtime-utils/router");
 const url_namespaceObject = require("@modern-js/runtime-utils/url");
 const external_react_namespaceObject = require("react");
 const index_js_namespaceObject = require("../../core/context/index.js");
-const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
+const external_provider_js_namespaceObject = require("./provider.js");
 const external_rsc_router_js_namespaceObject = require("./rsc-router.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 let finalRouteConfig = {
@@ -52,14 +56,7 @@ function modifyRoutes(modifyFunction) {
 }
 const routerPlugin = (userConfig = {})=>({
         name: '@modern-js/plugin-router',
-        registryHooks: {
-            onAfterCreateRouter: external_hooks_js_namespaceObject.onAfterCreateRouter,
-            onAfterHydrateRouter: external_hooks_js_namespaceObject.onAfterHydrateRouter,
-            onBeforeCreateRouter: external_hooks_js_namespaceObject.onBeforeCreateRouter,
-            modifyRoutes: external_hooks_js_namespaceObject.modifyRoutes,
-            onBeforeCreateRoutes: external_hooks_js_namespaceObject.onBeforeCreateRoutes,
-            onBeforeHydrateRouter: external_hooks_js_namespaceObject.onBeforeHydrateRouter
-        },
+        registryHooks: external_provider_js_namespaceObject.routerProviderRegistryHooks,
         setup: (api)=>{
             const routesContainer = {
                 current: []

package/dist/cjs/router/runtime/plugin.node.js

@@ -10,11 +10,15 @@ var __webpack_require__ = {};
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -47,8 +51,8 @@ const index_js_namespaceObject = require("../../core/context/index.js");
 const index_server_js_namespaceObject = require("../../core/context/serverPayload/index.server.js");
 const external_DeferredDataScripts_node_js_namespaceObject = require("./DeferredDataScripts.node.js");
 var external_DeferredDataScripts_node_js_default = /*#__PURE__*/ __webpack_require__.n(external_DeferredDataScripts_node_js_namespaceObject);
-const external_hooks_js_namespaceObject = require("./hooks.js");
 const external_lifecycle_js_namespaceObject = require("./lifecycle.js");
+const external_provider_js_namespaceObject = require("./provider.js");
 const external_rsc_router_js_namespaceObject = require("./rsc-router.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 function createRemixRequest(request) {
@@ -81,12 +85,7 @@ function createReactRouterServerSnapshot(routerContext, basename) {
 }
 const routerPlugin = (userConfig = {})=>({
         name: '@modern-js/plugin-router',
-        registryHooks: {
-            onAfterCreateRouter: external_hooks_js_namespaceObject.onAfterCreateRouter,
-            onBeforeCreateRouter: external_hooks_js_namespaceObject.onBeforeCreateRouter,
-            modifyRoutes: external_hooks_js_namespaceObject.modifyRoutes,
-            onBeforeCreateRoutes: external_hooks_js_namespaceObject.onBeforeCreateRoutes
-        },
+        registryHooks: external_provider_js_namespaceObject.routerProviderRegistryHooks,
         setup: (api)=>{
             let finalRouteConfig = {};
             api.onBeforeRender(async (context, interrupt)=>{

package/dist/cjs/router/runtime/provider.js

@@ -0,0 +1,107 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    registerRouterProvider: ()=>registerRouterProvider,
+    reportUnsupportedProviderRegistryHooks: ()=>reportUnsupportedProviderRegistryHooks,
+    resolveRouterProvider: ()=>resolveRouterProvider,
+    routerProviderRegistryHooks: ()=>routerProviderRegistryHooks,
+    unsafe_resetRouterProvidersForTesting: ()=>unsafe_resetRouterProvidersForTesting
+});
+const external_hooks_js_namespaceObject = require("./hooks.js");
+const routerProviderRegistryHooks = {
+    modifyRoutes: external_hooks_js_namespaceObject.modifyRoutes,
+    onBeforeCreateRoutes: external_hooks_js_namespaceObject.onBeforeCreateRoutes,
+    onBeforeCreateRouter: external_hooks_js_namespaceObject.onBeforeCreateRouter,
+    onAfterCreateRouter: external_hooks_js_namespaceObject.onAfterCreateRouter,
+    onBeforeHydrateRouter: external_hooks_js_namespaceObject.onBeforeHydrateRouter,
+    onAfterHydrateRouter: external_hooks_js_namespaceObject.onAfterHydrateRouter
+};
+function reportUnsupportedProviderRegistryHooks(providerPlugin) {
+    const unsupportedHookNames = Object.keys(providerPlugin.registryHooks ?? {}).filter((hookName)=>!(hookName in routerProviderRegistryHooks));
+    if (unsupportedHookNames.length > 0) console.warn(`[@modern-js/runtime] The router provider "${providerPlugin.name}" declares registry hooks outside the router hook contract: ${unsupportedHookNames.join(', ')}. These hooks are not registered when the provider is resolved through \`runtime.router.framework\` — declare them on a separate runtime plugin instead.`);
+    return unsupportedHookNames;
+}
+const REGISTRY_SLOT = Symbol.for('@modern-js/runtime:router-providers:v2');
+function getRegistry() {
+    const host = globalThis;
+    host[REGISTRY_SLOT] ??= {
+        providers: new Map(),
+        warnedDuplicates: new Set()
+    };
+    host[REGISTRY_SLOT].warnedDuplicates ??= new Set();
+    return host[REGISTRY_SLOT];
+}
+function registerRouterProvider(name, factory, options = {}) {
+    const registry = getRegistry();
+    const existing = registry.providers.get(name);
+    if (void 0 !== existing) {
+        if (existing !== factory && !registry.warnedDuplicates.has(name)) {
+            registry.warnedDuplicates.add(name);
+            console.warn(`[@modern-js/runtime] The router provider "${name}" was registered more than once with different module instances; keeping the first registration. This usually means two copies of the providing plugin were bundled — for Module Federation, add the provider runtime (e.g. '@modern-js/plugin-tanstack/runtime') to the shared modules of both the host and the remote to deduplicate it.`);
+        }
+        return;
+    }
+    if (true !== options.isDefault) {
+        if (void 0 !== registry.nonDefaultProvider && registry.nonDefaultProvider !== name) throw new Error(`[@modern-js/runtime] Cannot register router provider "${name}": the competing router provider "${registry.nonDefaultProvider}" is already registered. Only one non-default router provider may be installed at a time — remove one of the router plugins.`);
+        registry.nonDefaultProvider = name;
+    } else registry.defaultProvider = name;
+    registry.providers.set(name, factory);
+}
+function resolveRouterProvider(framework, options = {}) {
+    const registry = getRegistry();
+    const name = framework || registry.defaultProvider || options.localDefault?.name;
+    if (void 0 === name) throw new Error('[@modern-js/runtime] No default router provider is registered. This is a bug in the runtime setup.');
+    if (void 0 !== options.localDefault && name === options.localDefault.name) return options.localDefault.factory;
+    const factory = registry.providers.get(name);
+    if (void 0 !== factory) return factory;
+    if ('tanstack' === name) throw new Error("[@modern-js/runtime] `runtime.router.framework` is set to \"tanstack\", but no TanStack router provider is registered. Install @modern-js/plugin-tanstack, add `tanstackRouterPlugin()` to the `plugins` array in modern.config.ts, and make sure '@modern-js/plugin-tanstack/runtime' is imported (e.g. in modern.runtime.ts).");
+    throw new Error(`[@modern-js/runtime] Unknown router framework "${name}". Registered providers: ${[
+        ...registry.providers.keys()
+    ].join(', ') || '(none)'}. Install and register the plugin that provides this router framework.`);
+}
+function unsafe_resetRouterProvidersForTesting() {
+    const host = globalThis;
+    delete host[REGISTRY_SLOT];
+}
+exports.registerRouterProvider = __webpack_exports__.registerRouterProvider;
+exports.reportUnsupportedProviderRegistryHooks = __webpack_exports__.reportUnsupportedProviderRegistryHooks;
+exports.resolveRouterProvider = __webpack_exports__.resolveRouterProvider;
+exports.routerProviderRegistryHooks = __webpack_exports__.routerProviderRegistryHooks;
+exports.unsafe_resetRouterProvidersForTesting = __webpack_exports__.unsafe_resetRouterProvidersForTesting;
+for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "registerRouterProvider",
+    "reportUnsupportedProviderRegistryHooks",
+    "resolveRouterProvider",
+    "routerProviderRegistryHooks",
+    "unsafe_resetRouterProvidersForTesting"
+].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/cjs/router/runtime/routerHelper.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/runtime/rsc-router.js

@@ -10,11 +10,15 @@ var __webpack_require__ = {};
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -50,6 +54,7 @@ const safeUse = (value)=>{
     if ('function' == typeof reactUse) return reactUse(value);
     return null;
 };
+const hasRouteErrorBoundary = (route)=>Boolean(route.errorElement || route.ErrorBoundary);
 function collectCssFilesFromRoutes(matches, routes) {
     const cssFiles = [];
     for (const match of matches){
@@ -111,7 +116,7 @@ const createServerPayload = (routerContext, routes)=>{
                 errorElement: route.errorElement,
                 handle: route.handle,
                 hasAction: !!route.action,
-                hasErrorBoundary: !!route.hasErrorBoundary,
+                hasErrorBoundary: hasRouteErrorBoundary(route),
                 hasLoader: !!route.loader,
                 hasClientLoader: !!route.hasClientLoader,
                 id: route.id,
@@ -174,6 +179,12 @@ const mergeRoutes = (routes, originalRoutes)=>{
         });
     return mergeRoutesRecursive(originalRoutes);
 };
+const toReactRouterRoute = (route)=>{
+    const { hasErrorBoundary: _hasErrorBoundary, children, ...routeObject } = route;
+    const sanitizedRoute = routeObject;
+    if (children && Array.isArray(children)) sanitizedRoute.children = children.map(toReactRouterRoute);
+    return sanitizedRoute;
+};
 const findRouteInTree = (routes, routeId)=>{
     for (const route of routes){
         if (route.id === routeId) return route;
@@ -294,7 +305,7 @@ const createClientRouterFromPayload = (payload, originalRoutes, basename = '')=>
                 if (matchedRoute) {
                     const modernMatch = match.route;
                     router.patchRoutes(matchedRoute.parentId ?? null, [
-                        matchedRoute
+                        toReactRouterRoute(matchedRoute)
                     ], true);
                     if (modernMatch.isClientComponent && modernMatch.Component) delete modernMatch.Component;
                 }
@@ -327,7 +338,6 @@ const createRSCStaticRouterComponent = (payload, basename)=>{
                     id: match.id,
                     action: match.hasAction || !!match.clientAction,
                     handle: match.handle,
-                    hasErrorBoundary: match.hasErrorBoundary,
                     loader: match.hasLoader || !!match.clientLoader,
                     index: match.index,
                     path: match.path,
@@ -346,7 +356,7 @@ const createRSCStaticRouterComponent = (payload, basename)=>{
             route
         ];
     }, []);
-    const router = (0, router_namespaceObject.createStaticRouter)(processedRoutes, routerContext);
+    const router = (0, router_namespaceObject.createStaticRouter)(processedRoutes.map(toReactRouterRoute), routerContext);
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(router_namespaceObject.StaticRouterProvider, {
         context: routerContext,
         router: router,

package/dist/cjs/router/runtime/rsc.js

@@ -24,11 +24,15 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/runtime/server.js

@@ -24,11 +24,15 @@ function __webpack_require__(moduleId) {
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/router/runtime/utils.js

@@ -10,11 +10,15 @@ var __webpack_require__ = {};
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -107,7 +111,6 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
             id: route.id,
             loader: route.loader,
             action: route.action,
-            hasErrorBoundary: route.hasErrorBoundary,
             shouldRevalidate: route.shouldRevalidate,
             handle: {
                 ...route.handle,
@@ -145,7 +148,10 @@ function getRouteObjects(routes, { globalApp, ssrMode, props }) {
     }
     routeObjects.push({
         path: '*',
-        element: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_DefaultNotFound_js_namespaceObject.DefaultNotFound, {})
+        element: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_DefaultNotFound_js_namespaceObject.DefaultNotFound, {}),
+        loader: ()=>new Response('404', {
+                status: 404
+            })
     });
     return routeObjects;
 }
@@ -194,17 +200,40 @@ function serializeErrors(errors) {
     if (!errors) return null;
     const entries = Object.entries(errors);
     const serialized = {};
-    for (const [key, val] of entries)if ((0, router_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = {
-        ...val,
-        __type: 'RouteErrorResponse'
+    for (const [key, val] of entries)if ((0, router_namespaceObject.isRouteErrorResponse)(val)) serialized[key] = serializeRouteErrorResponse(val);
+    else if (val instanceof Error) serialized[key] = serializeError(val);
+    else serialized[key] = val;
+    return serialized;
+}
+function shouldRedactServerError() {
+    return 'development' !== process.env.NODE_ENV && 'test' !== process.env.NODE_ENV;
+}
+function serializeError(error) {
+    if (shouldRedactServerError()) return {
+        message: 'Unexpected Server Error',
+        stack: void 0,
+        __type: 'Error'
     };
-    else if (val instanceof Error) serialized[key] = {
-        message: val.message,
-        stack: val.stack,
+    return {
+        message: error.message,
+        stack: error.stack,
         __type: 'Error'
     };
-    else serialized[key] = val;
-    return serialized;
+}
+function serializeRouteErrorResponse(error) {
+    if (!(0, router_namespaceObject.isRouteErrorResponse)(error)) return error;
+    if (error.status >= 500 && shouldRedactServerError()) return {
+        status: error.status,
+        statusText: 'Internal Server Error',
+        data: 'Unexpected Server Error',
+        __type: 'RouteErrorResponse'
+    };
+    return {
+        status: error.status,
+        statusText: error.statusText,
+        data: error.data,
+        __type: 'RouteErrorResponse'
+    };
 }
 function deserializeErrors(errors) {
     if (!errors) return null;

package/dist/cjs/router/runtime/withRouter.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{