react-router 7.8.0 → 7.8.1-pre.0

package/dist/development/index.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.8.0
+ * react-router v7.8.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -54,7 +54,7 @@
 
 
 
-var _chunkVC6RBZTRjs = require('./chunk-VC6RBZTR.js');
+var _chunk3JLHOGU7js = require('./chunk-3JLHOGU7.js');
 
 
 
@@ -142,7 +142,8 @@ var _chunkVC6RBZTRjs = require('./chunk-VC6RBZTR.js');
 
 
 
-var _chunkEVX7OBGBjs = require('./chunk-EVX7OBGB.js');
+
+var _chunkCXAO7FY7js = require('./chunk-CXAO7FY7.js');
 
 // lib/dom/ssr/server.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React4 = _interopRequireWildcard(_react); var React5 = _interopRequireWildcard(_react);
@@ -155,7 +156,7 @@ function ServerRouter({
     url = new URL(url);
   }
   let { manifest, routeModules, criticalCss, serverHandoffString } = context;
-  let routes = _chunkEVX7OBGBjs.createServerRoutes.call(void 0, 
+  let routes = _chunkCXAO7FY7js.createServerRoutes.call(void 0, 
     manifest.routes,
     routeModules,
     context.future,
@@ -168,7 +169,7 @@ function ServerRouter({
     let routeId = match.route.id;
     let route = routeModules[routeId];
     let manifestRoute = context.manifest.routes[routeId];
-    if (route && manifestRoute && _chunkEVX7OBGBjs.shouldHydrateRouteLoader.call(void 0, 
+    if (route && manifestRoute && _chunkCXAO7FY7js.shouldHydrateRouteLoader.call(void 0, 
       routeId,
       route.clientLoader,
       manifestRoute.hasLoader,
@@ -177,9 +178,9 @@ function ServerRouter({
       delete context.staticHandlerContext.loaderData[routeId];
     }
   }
-  let router = _chunkVC6RBZTRjs.createStaticRouter.call(void 0, routes, context.staticHandlerContext);
+  let router = _chunk3JLHOGU7js.createStaticRouter.call(void 0, routes, context.staticHandlerContext);
   return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
-    _chunkEVX7OBGBjs.FrameworkContext.Provider,
+    _chunkCXAO7FY7js.FrameworkContext.Provider,
     {
       value: {
         manifest,
@@ -194,8 +195,8 @@ function ServerRouter({
         renderMeta: context.renderMeta
       }
     },
-    /* @__PURE__ */ React.createElement(_chunkEVX7OBGBjs.RemixErrorBoundary, { location: router.state.location }, /* @__PURE__ */ React.createElement(
-      _chunkVC6RBZTRjs.StaticRouterProvider,
+    /* @__PURE__ */ React.createElement(_chunkCXAO7FY7js.RemixErrorBoundary, { location: router.state.location }, /* @__PURE__ */ React.createElement(
+      _chunk3JLHOGU7js.StaticRouterProvider,
       {
         router,
         context: context.staticHandlerContext,
@@ -203,7 +204,7 @@ function ServerRouter({
       }
     ))
   ), context.serverHandoffStream ? /* @__PURE__ */ React.createElement(React.Suspense, null, /* @__PURE__ */ React.createElement(
-    _chunkEVX7OBGBjs.StreamTransfer,
+    _chunkCXAO7FY7js.StreamTransfer,
     {
       context,
       identifier: 0,
@@ -245,18 +246,18 @@ function createRoutesStub(routes, _context) {
       let patched = processRoutes(
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
         // types compared to `AgnosticRouteObject`
-        _chunkEVX7OBGBjs.convertRoutesToDataRoutes.call(void 0, routes, (r) => r),
-        _context !== void 0 ? _context : _optionalChain([future, 'optionalAccess', _4 => _4.unstable_middleware]) ? new (0, _chunkEVX7OBGBjs.unstable_RouterContextProvider)() : {},
+        _chunkCXAO7FY7js.convertRoutesToDataRoutes.call(void 0, routes, (r) => r),
+        _context !== void 0 ? _context : _optionalChain([future, 'optionalAccess', _4 => _4.unstable_middleware]) ? new (0, _chunkCXAO7FY7js.unstable_RouterContextProvider)() : {},
         frameworkContextRef.current.manifest,
         frameworkContextRef.current.routeModules
       );
-      routerRef.current = _chunkVC6RBZTRjs.createMemoryRouter.call(void 0, patched, {
+      routerRef.current = _chunk3JLHOGU7js.createMemoryRouter.call(void 0, patched, {
         initialEntries,
         initialIndex,
         hydrationData
       });
     }
-    return /* @__PURE__ */ React2.createElement(_chunkEVX7OBGBjs.FrameworkContext.Provider, { value: frameworkContextRef.current }, /* @__PURE__ */ React2.createElement(_chunkVC6RBZTRjs.RouterProvider, { router: routerRef.current }));
+    return /* @__PURE__ */ React2.createElement(_chunkCXAO7FY7js.FrameworkContext.Provider, { value: frameworkContextRef.current }, /* @__PURE__ */ React2.createElement(_chunk3JLHOGU7js.RouterProvider, { router: routerRef.current }));
   };
 }
 function processRoutes(routes, context, manifest, routeModules, parentId) {
@@ -270,9 +271,9 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
       id: route.id,
       path: route.path,
       index: route.index,
-      Component: route.Component ? _chunkVC6RBZTRjs.withComponentProps.call(void 0, route.Component) : void 0,
-      HydrateFallback: route.HydrateFallback ? _chunkVC6RBZTRjs.withHydrateFallbackProps.call(void 0, route.HydrateFallback) : void 0,
-      ErrorBoundary: route.ErrorBoundary ? _chunkVC6RBZTRjs.withErrorBoundaryProps.call(void 0, route.ErrorBoundary) : void 0,
+      Component: route.Component ? _chunk3JLHOGU7js.withComponentProps.call(void 0, route.Component) : void 0,
+      HydrateFallback: route.HydrateFallback ? _chunk3JLHOGU7js.withHydrateFallbackProps.call(void 0, route.HydrateFallback) : void 0,
+      ErrorBoundary: route.ErrorBoundary ? _chunk3JLHOGU7js.withErrorBoundaryProps.call(void 0, route.ErrorBoundary) : void 0,
       action: route.action ? (args) => route.action({ ...args, context }) : void 0,
       loader: route.loader ? (args) => route.loader({ ...args, context }) : void 0,
       handle: route.handle,
@@ -301,7 +302,7 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
     };
     manifest.routes[newRoute.id] = entryRoute;
     routeModules[route.id] = {
-      default: newRoute.Component || _chunkVC6RBZTRjs.Outlet,
+      default: newRoute.Component || _chunk3JLHOGU7js.Outlet,
       ErrorBoundary: newRoute.ErrorBoundary || void 0,
       handle: route.handle,
       links: route.links,
@@ -496,7 +497,7 @@ function myUnescape(value) {
   return result;
 }
 function warnOnceAboutExpiresCookie(name, expires) {
-  _chunkEVX7OBGBjs.warnOnce.call(void 0, 
+  _chunkCXAO7FY7js.warnOnce.call(void 0, 
     !expires,
     `The "${name}" cookie has an "expires" property set. This will cause the expires value to not be updated when the session is committed. Instead, you should set the expires value when serializing the cookie. You can use \`commitSession(session, { expires })\` if using a session storage object, or \`cookie.serialize("value", { expires })\` if you're using the cookie directly.`
   );
@@ -550,7 +551,7 @@ function serializeErrors(errors, serverMode) {
   let entries = Object.entries(errors);
   let serialized = {};
   for (let [key, val] of entries) {
-    if (_chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, val)) {
+    if (_chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, val)) {
       serialized[key] = { ...val, __type: "RouteErrorResponse" };
     } else if (val instanceof Error) {
       let sanitized = sanitizeError(val, serverMode);
@@ -575,7 +576,7 @@ function serializeErrors(errors, serverMode) {
 
 // lib/server-runtime/routeMatching.ts
 function matchServerRoutes(routes, pathname, basename) {
-  let matches = _chunkEVX7OBGBjs.matchRoutes.call(void 0, 
+  let matches = _chunkCXAO7FY7js.matchRoutes.call(void 0, 
     routes,
     pathname,
     basename
@@ -595,7 +596,7 @@ async function callRouteHandler(handler, args) {
     params: args.params,
     context: args.context
   });
-  if (_chunkEVX7OBGBjs.isDataWithResponseInit.call(void 0, result) && result.init && result.init.status && _chunkEVX7OBGBjs.isRedirectStatusCode.call(void 0, result.init.status)) {
+  if (_chunkCXAO7FY7js.isDataWithResponseInit.call(void 0, result) && result.init && result.init.status && _chunkCXAO7FY7js.isRedirectStatusCode.call(void 0, result.init.status)) {
     throw new Response(null, result.init);
   }
   return result;
@@ -714,17 +715,17 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
               controller.close();
             }
           });
-          let decoded = await _chunkEVX7OBGBjs.decodeViaTurboStream.call(void 0, stream, global);
+          let decoded = await _chunkCXAO7FY7js.decodeViaTurboStream.call(void 0, stream, global);
           let data2 = decoded.value;
-          if (data2 && _chunkEVX7OBGBjs.SingleFetchRedirectSymbol in data2) {
-            let result = data2[_chunkEVX7OBGBjs.SingleFetchRedirectSymbol];
+          if (data2 && _chunkCXAO7FY7js.SingleFetchRedirectSymbol in data2) {
+            let result = data2[_chunkCXAO7FY7js.SingleFetchRedirectSymbol];
             let init = { status: result.status };
             if (result.reload) {
-              throw _chunkEVX7OBGBjs.redirectDocument.call(void 0, result.redirect, init);
+              throw _chunkCXAO7FY7js.redirectDocument.call(void 0, result.redirect, init);
             } else if (result.replace) {
-              throw _chunkEVX7OBGBjs.replace.call(void 0, result.redirect, init);
+              throw _chunkCXAO7FY7js.replace.call(void 0, result.redirect, init);
             } else {
-              throw _chunkEVX7OBGBjs.redirect.call(void 0, result.redirect, init);
+              throw _chunkCXAO7FY7js.redirect.call(void 0, result.redirect, init);
             }
           } else {
             invariant2(
@@ -853,7 +854,7 @@ function prependCookies(parentHeaders, childHeaders) {
 
 // lib/server-runtime/single-fetch.ts
 var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
-  ..._chunkEVX7OBGBjs.NO_BODY_STATUS_CODES,
+  ..._chunkCXAO7FY7js.NO_BODY_STATUS_CODES,
   304
 ]);
 async function singleFetchAction(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
@@ -883,10 +884,10 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     return handleQueryError(error);
   }
   function handleQueryResult(result) {
-    if (!_chunkEVX7OBGBjs.isResponse.call(void 0, result)) {
+    if (!_chunkCXAO7FY7js.isResponse.call(void 0, result)) {
       result = staticContextToResponse(result);
     }
-    if (_chunkEVX7OBGBjs.isRedirectResponse.call(void 0, result)) {
+    if (_chunkCXAO7FY7js.isRedirectResponse.call(void 0, result)) {
       return generateSingleFetchResponse(request, build, serverMode, {
         result: getSingleFetchRedirect(
           result.status,
@@ -894,7 +895,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
           build.basename
         ),
         headers: result.headers,
-        status: _chunkEVX7OBGBjs.SINGLE_FETCH_REDIRECT_STATUS
+        status: _chunkCXAO7FY7js.SINGLE_FETCH_REDIRECT_STATUS
       });
     }
     return result;
@@ -909,7 +910,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
   }
   function staticContextToResponse(context) {
     let headers = getDocumentHeaders(context, build);
-    if (_chunkEVX7OBGBjs.isRedirectStatusCode.call(void 0, context.statusCode) && headers.has("Location")) {
+    if (_chunkCXAO7FY7js.isRedirectStatusCode.call(void 0, context.statusCode) && headers.has("Location")) {
       return generateSingleFetchResponse(request, build, serverMode, {
         result: getSingleFetchRedirect(
           context.statusCode,
@@ -917,12 +918,12 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
           build.basename
         ),
         headers,
-        status: _chunkEVX7OBGBjs.SINGLE_FETCH_REDIRECT_STATUS
+        status: _chunkCXAO7FY7js.SINGLE_FETCH_REDIRECT_STATUS
       });
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
-        if (!_chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, err) || err.error) {
+        if (!_chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, err) || err.error) {
           handleError(err);
         }
       });
@@ -969,18 +970,18 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
     return handleQueryError(error);
   }
   function handleQueryResult(result) {
-    let response = _chunkEVX7OBGBjs.isResponse.call(void 0, result) ? result : staticContextToResponse(result);
-    if (_chunkEVX7OBGBjs.isRedirectResponse.call(void 0, response)) {
+    let response = _chunkCXAO7FY7js.isResponse.call(void 0, result) ? result : staticContextToResponse(result);
+    if (_chunkCXAO7FY7js.isRedirectResponse.call(void 0, response)) {
       return generateSingleFetchResponse(request, build, serverMode, {
         result: {
-          [_chunkEVX7OBGBjs.SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+          [_chunkCXAO7FY7js.SingleFetchRedirectSymbol]: getSingleFetchRedirect(
             response.status,
             response.headers,
             build.basename
           )
         },
         headers: response.headers,
-        status: _chunkEVX7OBGBjs.SINGLE_FETCH_REDIRECT_STATUS
+        status: _chunkCXAO7FY7js.SINGLE_FETCH_REDIRECT_STATUS
       });
     }
     return response;
@@ -995,22 +996,22 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
   }
   function staticContextToResponse(context) {
     let headers = getDocumentHeaders(context, build);
-    if (_chunkEVX7OBGBjs.isRedirectStatusCode.call(void 0, context.statusCode) && headers.has("Location")) {
+    if (_chunkCXAO7FY7js.isRedirectStatusCode.call(void 0, context.statusCode) && headers.has("Location")) {
       return generateSingleFetchResponse(request, build, serverMode, {
         result: {
-          [_chunkEVX7OBGBjs.SingleFetchRedirectSymbol]: getSingleFetchRedirect(
+          [_chunkCXAO7FY7js.SingleFetchRedirectSymbol]: getSingleFetchRedirect(
             context.statusCode,
             headers,
             build.basename
           )
         },
         headers,
-        status: _chunkEVX7OBGBjs.SINGLE_FETCH_REDIRECT_STATUS
+        status: _chunkCXAO7FY7js.SINGLE_FETCH_REDIRECT_STATUS
       });
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
-        if (!_chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, err) || err.error) {
+        if (!_chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, err) || err.error) {
           handleError(err);
         }
       });
@@ -1067,7 +1068,7 @@ function generateSingleFetchResponse(request, build, serverMode, {
 function getSingleFetchRedirect(status, headers, basename) {
   let redirect2 = headers.get("Location");
   if (basename) {
-    redirect2 = _chunkEVX7OBGBjs.stripBasename.call(void 0, redirect2, basename) || redirect2;
+    redirect2 = _chunkCXAO7FY7js.stripBasename.call(void 0, redirect2, basename) || redirect2;
   }
   return {
     redirect: redirect2,
@@ -1093,7 +1094,7 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
     typeof streamTimeout === "number" ? streamTimeout : 4950
   );
   requestSignal.addEventListener("abort", () => clearTimeout(timeoutId));
-  return _chunkEVX7OBGBjs.encode.call(void 0, data2, {
+  return _chunkCXAO7FY7js.encode.call(void 0, data2, {
     signal: controller.signal,
     plugins: [
       (value) => {
@@ -1101,12 +1102,12 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
           let { name, message, stack } = serverMode === "production" /* Production */ ? sanitizeError(value, serverMode) : value;
           return ["SanitizedError", name, message, stack];
         }
-        if (value instanceof _chunkEVX7OBGBjs.ErrorResponseImpl) {
+        if (value instanceof _chunkCXAO7FY7js.ErrorResponseImpl) {
           let { data: data3, status, statusText } = value;
           return ["ErrorResponse", data3, status, statusText];
         }
-        if (value && typeof value === "object" && _chunkEVX7OBGBjs.SingleFetchRedirectSymbol in value) {
-          return ["SingleFetchRedirect", value[_chunkEVX7OBGBjs.SingleFetchRedirectSymbol]];
+        if (value && typeof value === "object" && _chunkCXAO7FY7js.SingleFetchRedirectSymbol in value) {
+          return ["SingleFetchRedirect", value[_chunkCXAO7FY7js.SingleFetchRedirectSymbol]];
         }
       }
     ],
@@ -1129,14 +1130,14 @@ function derive(build, mode) {
   let routes = createRoutes(build.routes);
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
   let serverMode = isServerMode(mode) ? mode : "production" /* Production */;
-  let staticHandler = _chunkEVX7OBGBjs.createStaticHandler.call(void 0, dataRoutes, {
+  let staticHandler = _chunkCXAO7FY7js.createStaticHandler.call(void 0, dataRoutes, {
     basename: build.basename
   });
   let errorHandler = build.entry.module.handleError || ((error, { request }) => {
     if (serverMode !== "test" /* Test */ && !request.signal.aborted) {
       console.error(
         // @ts-expect-error This is "private" from users but intended for internal use
-        _chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, error) && error.error ? error.error : error
+        _chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, error) && error.error ? error.error : error
       );
     }
   });
@@ -1182,37 +1183,59 @@ var createRequestHandler = (build, mode) => {
       });
     };
     if (_build.future.unstable_middleware) {
-      if (initialContext && !(initialContext instanceof _chunkEVX7OBGBjs.unstable_RouterContextProvider)) {
+      if (initialContext && !(initialContext instanceof _chunkCXAO7FY7js.unstable_RouterContextProvider)) {
         let error = new Error(
           "Invalid `context` value provided to `handleRequest`. When middleware is enabled you must return an instance of `unstable_RouterContextProvider` from your `getLoadContext` function."
         );
         handleError(error);
         return returnLastResortErrorResponse(error, serverMode);
       }
-      loadContext = initialContext || new (0, _chunkEVX7OBGBjs.unstable_RouterContextProvider)();
+      loadContext = initialContext || new (0, _chunkCXAO7FY7js.unstable_RouterContextProvider)();
     } else {
       loadContext = initialContext || {};
     }
     let url = new URL(request.url);
     let normalizedBasename = _build.basename || "/";
     let normalizedPath = url.pathname;
-    if (_chunkEVX7OBGBjs.stripBasename.call(void 0, normalizedPath, normalizedBasename) === "/_root.data") {
+    if (_chunkCXAO7FY7js.stripBasename.call(void 0, normalizedPath, normalizedBasename) === "/_root.data") {
       normalizedPath = normalizedBasename;
     } else if (normalizedPath.endsWith(".data")) {
       normalizedPath = normalizedPath.replace(/\.data$/, "");
     }
-    if (_chunkEVX7OBGBjs.stripBasename.call(void 0, normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
+    if (_chunkCXAO7FY7js.stripBasename.call(void 0, normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
       normalizedPath = normalizedPath.slice(0, -1);
     }
     let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
     if (!_build.ssr) {
       let decodedPath = decodeURI(normalizedPath);
+      if (normalizedBasename !== "/") {
+        let strippedPath = _chunkCXAO7FY7js.stripBasename.call(void 0, decodedPath, normalizedBasename);
+        if (strippedPath == null) {
+          errorHandler(
+            new (0, _chunkCXAO7FY7js.ErrorResponseImpl)(
+              404,
+              "Not Found",
+              `Refusing to prerender the \`${decodedPath}\` path because it does not start with the basename \`${normalizedBasename}\``
+            ),
+            {
+              context: loadContext,
+              params,
+              request
+            }
+          );
+          return new Response("Not Found", {
+            status: 404,
+            statusText: "Not Found"
+          });
+        }
+        decodedPath = strippedPath;
+      }
       if (_build.prerender.length === 0) {
         isSpaMode = true;
       } else if (!_build.prerender.includes(decodedPath) && !_build.prerender.includes(decodedPath + "/")) {
         if (url.pathname.endsWith(".data")) {
           errorHandler(
-            new (0, _chunkEVX7OBGBjs.ErrorResponseImpl)(
+            new (0, _chunkCXAO7FY7js.ErrorResponseImpl)(
               404,
               "Not Found",
               `Refusing to SSR the path \`${decodedPath}\` because \`ssr:false\` is set and the path is not included in the \`prerender\` config, so in production the path will be a 404.`
@@ -1232,7 +1255,7 @@ var createRequestHandler = (build, mode) => {
         }
       }
     }
-    let manifestUrl = _chunkEVX7OBGBjs.getManifestPath.call(void 0, 
+    let manifestUrl = _chunkCXAO7FY7js.getManifestPath.call(void 0, 
       _build.routeDiscovery.manifestPath,
       normalizedBasename
     );
@@ -1273,7 +1296,7 @@ var createRequestHandler = (build, mode) => {
           params: singleFetchMatches ? singleFetchMatches[0].params : {},
           request
         });
-        if (_chunkEVX7OBGBjs.isRedirectResponse.call(void 0, response)) {
+        if (_chunkCXAO7FY7js.isRedirectResponse.call(void 0, response)) {
           let result = getSingleFetchRedirect(
             response.status,
             response.headers,
@@ -1281,7 +1304,7 @@ var createRequestHandler = (build, mode) => {
           );
           if (request.method === "GET") {
             result = {
-              [_chunkEVX7OBGBjs.SingleFetchRedirectSymbol]: result
+              [_chunkCXAO7FY7js.SingleFetchRedirectSymbol]: result
             };
           }
           let headers = new Headers(response.headers);
@@ -1294,7 +1317,7 @@ var createRequestHandler = (build, mode) => {
               serverMode
             ),
             {
-              status: _chunkEVX7OBGBjs.SINGLE_FETCH_REDIRECT_STATUS,
+              status: _chunkCXAO7FY7js.SINGLE_FETCH_REDIRECT_STATUS,
               headers
             }
           );
@@ -1408,7 +1431,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       unstable_generateMiddlewareResponse: build.future.unstable_middleware ? async (query) => {
         try {
           let innerResult = await query(request);
-          if (!_chunkEVX7OBGBjs.isResponse.call(void 0, innerResult)) {
+          if (!_chunkCXAO7FY7js.isResponse.call(void 0, innerResult)) {
             innerResult = await renderHtml(innerResult, isSpaMode);
           }
           return innerResult;
@@ -1418,7 +1441,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
         }
       } : void 0
     });
-    if (!_chunkEVX7OBGBjs.isResponse.call(void 0, result)) {
+    if (!_chunkCXAO7FY7js.isResponse.call(void 0, result)) {
       result = await renderHtml(result, isSpaMode);
     }
     return result;
@@ -1433,7 +1456,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     }
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
-        if (!_chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, err) || err.error) {
+        if (!_chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, err) || err.error) {
           handleError(err);
         }
       });
@@ -1485,10 +1508,10 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     } catch (error) {
       handleError(error);
       let errorForSecondRender = error;
-      if (_chunkEVX7OBGBjs.isResponse.call(void 0, error)) {
+      if (_chunkCXAO7FY7js.isResponse.call(void 0, error)) {
         try {
           let data2 = await unwrapResponse(error);
-          errorForSecondRender = new (0, _chunkEVX7OBGBjs.ErrorResponseImpl)(
+          errorForSecondRender = new (0, _chunkCXAO7FY7js.ErrorResponseImpl)(
             error.status,
             error.statusText,
             data2
@@ -1496,7 +1519,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
         } catch (e) {
         }
       }
-      context = _chunkEVX7OBGBjs.getStaticContextFromError.call(void 0, 
+      context = _chunkCXAO7FY7js.getStaticContextFromError.call(void 0, 
         staticHandler.dataRoutes,
         context,
         errorForSecondRender
@@ -1555,7 +1578,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
     return handleQueryRouteError(error);
   }
   function handleQueryRouteResult(result) {
-    if (_chunkEVX7OBGBjs.isResponse.call(void 0, result)) {
+    if (_chunkCXAO7FY7js.isResponse.call(void 0, result)) {
       return result;
     }
     if (typeof result === "string") {
@@ -1564,11 +1587,11 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
     return Response.json(result);
   }
   function handleQueryRouteError(error) {
-    if (_chunkEVX7OBGBjs.isResponse.call(void 0, error)) {
+    if (_chunkCXAO7FY7js.isResponse.call(void 0, error)) {
       error.headers.set("X-Remix-Catch", "yes");
       return error;
     }
-    if (_chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, error)) {
+    if (_chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, error)) {
       handleError(error);
       return errorResponseToJson(error, serverMode);
     }
@@ -1694,7 +1717,7 @@ function createSessionStorage({
   };
 }
 function warnOnceAboutSigningSessionCookie(cookie) {
-  _chunkEVX7OBGBjs.warnOnce.call(void 0, 
+  _chunkCXAO7FY7js.warnOnce.call(void 0, 
     cookie.isSigned,
     `The "${cookie.name}" cookie is not signed, but session cookies should be signed to prevent tampering on the client before they are sent back to the server. See https://reactrouter.com/explanation/sessions-and-cookies#signing-cookies for more information.`
   );
@@ -1789,12 +1812,12 @@ function getHydrationData(state, routes, getRouteInfo, location2, basename, isSp
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = _chunkEVX7OBGBjs.matchRoutes.call(void 0, routes, location2, basename);
+  let initialMatches = _chunkCXAO7FY7js.matchRoutes.call(void 0, routes, location2, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
       let routeInfo = getRouteInfo(routeId);
-      if (_chunkEVX7OBGBjs.shouldHydrateRouteLoader.call(void 0, 
+      if (_chunkCXAO7FY7js.shouldHydrateRouteLoader.call(void 0, 
         routeId,
         routeInfo.clientLoader,
         routeInfo.hasLoader,
@@ -1872,7 +1895,7 @@ function RSCDefaultRootErrorBoundaryImpl({
       }
     }
   );
-  if (_chunkEVX7OBGBjs.isRouteErrorResponse.call(void 0, error)) {
+  if (_chunkCXAO7FY7js.isRouteErrorResponse.call(void 0, error)) {
     return /* @__PURE__ */ React.default.createElement(
       ErrorWrapper,
       {
@@ -1880,7 +1903,7 @@ function RSCDefaultRootErrorBoundaryImpl({
         title: "Unhandled Thrown Response!"
       },
       /* @__PURE__ */ React.default.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText),
-      _chunkEVX7OBGBjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
+      _chunkCXAO7FY7js.ENABLE_DEV_WARNINGS ? heyDeveloper : null
     );
   }
   let errorInstance;
@@ -1906,7 +1929,7 @@ function RSCDefaultRootErrorBoundaryImpl({
 function RSCDefaultRootErrorBoundary({
   hasRootLayout
 }) {
-  let error = _chunkEVX7OBGBjs.useRouteError.call(void 0, );
+  let error = _chunkCXAO7FY7js.useRouteError.call(void 0, );
   if (hasRootLayout === void 0) {
     throw new Error("Missing 'hasRootLayout' prop");
   }
@@ -1919,6 +1942,26 @@ function RSCDefaultRootErrorBoundary({
   );
 }
 
+// lib/rsc/route-modules.ts
+function createRSCRouteModules(payload) {
+  const routeModules = {};
+  for (const match of payload.matches) {
+    populateRSCRouteModules(routeModules, match);
+  }
+  return routeModules;
+}
+function populateRSCRouteModules(routeModules, matches) {
+  matches = Array.isArray(matches) ? matches : [matches];
+  for (const match of matches) {
+    routeModules[match.id] = {
+      links: match.links,
+      meta: match.meta,
+      default: noopComponent
+    };
+  }
+}
+var noopComponent = () => null;
+
 // lib/rsc/browser.tsx
 function createCallServer({
   createFromReadableStream,
@@ -1952,7 +1995,7 @@ function createCallServer({
         window.location.href = payload.location;
         return;
       }
-      globalVar.__router.navigate(payload.location, {
+      globalVar.__reactRouterDataRouter.navigate(payload.location, {
         replace: payload.replace
       });
       return payload.actionResult;
@@ -1973,34 +2016,38 @@ function createCallServer({
                 window.location.href = rerender.location;
                 return;
               }
-              globalVar.__router.navigate(rerender.location, {
+              globalVar.__reactRouterDataRouter.navigate(rerender.location, {
                 replace: rerender.replace
               });
               return;
             }
             let lastMatch;
             for (const match of rerender.matches) {
-              globalVar.__router.patchRoutes(
+              globalVar.__reactRouterDataRouter.patchRoutes(
                 _nullishCoalesce(_optionalChain([lastMatch, 'optionalAccess', _19 => _19.id]), () => ( null)),
                 [createRouteFromServerManifest(match)],
                 true
               );
               lastMatch = match;
             }
-            window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({});
+            window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
+              {}
+            );
             React4.startTransition(() => {
-              window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
-                loaderData: Object.assign(
-                  {},
-                  globalVar.__router.state.loaderData,
-                  rerender.loaderData
-                ),
-                errors: rerender.errors ? Object.assign(
-                  {},
-                  globalVar.__router.state.errors,
-                  rerender.errors
-                ) : null
-              });
+              window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
+                {
+                  loaderData: Object.assign(
+                    {},
+                    globalVar.__reactRouterDataRouter.state.loaderData,
+                    rerender.loaderData
+                  ),
+                  errors: rerender.errors ? Object.assign(
+                    {},
+                    globalVar.__reactRouterDataRouter.state.errors,
+                    rerender.errors
+                  ) : null
+                }
+              );
             });
           }
         }
@@ -2016,11 +2063,17 @@ function createRouterFromPayload({
   payload
 }) {
   const globalVar = window;
-  if (globalVar.__router) return globalVar.__router;
+  if (globalVar.__reactRouterDataRouter && globalVar.__reactRouterRouteModules)
+    return {
+      router: globalVar.__reactRouterDataRouter,
+      routeModules: globalVar.__reactRouterRouteModules
+    };
   if (payload.type !== "render") throw new Error("Invalid payload type");
+  globalVar.__reactRouterRouteModules = _nullishCoalesce(globalVar.__reactRouterRouteModules, () => ( {}));
+  populateRSCRouteModules(globalVar.__reactRouterRouteModules, payload.matches);
   let patches = /* @__PURE__ */ new Map();
   _optionalChain([payload, 'access', _20 => _20.patches, 'optionalAccess', _21 => _21.forEach, 'call', _22 => _22((patch) => {
-    _chunkEVX7OBGBjs.invariant.call(void 0, patch.parentId, "Invalid patch parentId");
+    _chunkCXAO7FY7js.invariant.call(void 0, patch.parentId, "Invalid patch parentId");
     if (!patches.has(patch.parentId)) {
       patches.set(patch.parentId, []);
     }
@@ -2042,11 +2095,11 @@ function createRouterFromPayload({
     }
     return [route];
   }, []);
-  globalVar.__router = _chunkEVX7OBGBjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunkCXAO7FY7js.createRouter.call(void 0, {
     routes,
     unstable_getContext,
     basename: payload.basename,
-    history: _chunkEVX7OBGBjs.createBrowserHistory.call(void 0, ),
+    history: _chunkCXAO7FY7js.createBrowserHistory.call(void 0, ),
     hydrationData: getHydrationData(
       {
         loaderData: payload.loaderData,
@@ -2056,7 +2109,7 @@ function createRouterFromPayload({
       routes,
       (routeId) => {
         let match = payload.matches.find((m) => m.id === routeId);
-        _chunkEVX7OBGBjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunkCXAO7FY7js.invariant.call(void 0, match, "Route not found in payload");
         return {
           clientLoader: match.clientLoader,
           hasLoader: match.hasLoader,
@@ -2080,30 +2133,83 @@ function createRouterFromPayload({
     },
     // FIXME: Pass `build.ssr` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
-      () => globalVar.__router,
+      () => globalVar.__reactRouterDataRouter,
       true,
       payload.basename,
       createFromReadableStream,
       fetchImplementation
     )
   });
-  if (globalVar.__router.state.initialized) {
+  if (globalVar.__reactRouterDataRouter.state.initialized) {
     globalVar.__routerInitialized = true;
-    globalVar.__router.initialize();
+    globalVar.__reactRouterDataRouter.initialize();
   } else {
     globalVar.__routerInitialized = false;
   }
   let lastLoaderData = void 0;
-  globalVar.__router.subscribe(({ loaderData, actionData }) => {
+  globalVar.__reactRouterDataRouter.subscribe(({ loaderData, actionData }) => {
     if (lastLoaderData !== loaderData) {
       globalVar.__routerActionID = (_nullishCoalesce(globalVar.__routerActionID, () => ( (globalVar.__routerActionID = 0)))) + 1;
     }
   });
-  return globalVar.__router;
+  globalVar.__reactRouterDataRouter._updateRoutesForHMR = (routeUpdateByRouteId) => {
+    const oldRoutes = window.__reactRouterDataRouter.routes;
+    const newRoutes = [];
+    function walkRoutes(routes2, parentId) {
+      return routes2.map((route) => {
+        const routeUpdate = routeUpdateByRouteId.get(route.id);
+        if (routeUpdate) {
+          const {
+            routeModule,
+            hasAction,
+            hasComponent,
+            hasErrorBoundary,
+            hasLoader
+          } = routeUpdate;
+          const newRoute = createRouteFromServerManifest({
+            clientAction: routeModule.clientAction,
+            clientLoader: routeModule.clientLoader,
+            element: route.element,
+            errorElement: route.errorElement,
+            handle: route.handle,
+            hasAction,
+            hasComponent,
+            hasErrorBoundary,
+            hasLoader,
+            hydrateFallbackElement: route.hydrateFallbackElement,
+            id: route.id,
+            index: route.index,
+            links: routeModule.links,
+            meta: routeModule.meta,
+            parentId,
+            path: route.path,
+            shouldRevalidate: routeModule.shouldRevalidate
+          });
+          if (route.children) {
+            newRoute.children = walkRoutes(route.children, route.id);
+          }
+          return newRoute;
+        }
+        const updatedRoute = { ...route };
+        if (route.children) {
+          updatedRoute.children = walkRoutes(route.children, route.id);
+        }
+        return updatedRoute;
+      });
+    }
+    newRoutes.push(
+      ...walkRoutes(oldRoutes, void 0)
+    );
+    window.__reactRouterDataRouter._internalSetRoutes(newRoutes);
+  };
+  return {
+    router: globalVar.__reactRouterDataRouter,
+    routeModules: globalVar.__reactRouterRouteModules
+  };
 }
-var renderedRoutesContext = _chunkEVX7OBGBjs.unstable_createContext.call(void 0, );
+var renderedRoutesContext = _chunkCXAO7FY7js.unstable_createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunkEVX7OBGBjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunkCXAO7FY7js.getSingleFetchDataStrategyImpl.call(void 0, 
     getRouter,
     (match) => {
       let M = match;
@@ -2143,7 +2249,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
       const renderedRoutes = renderedRoutesById.get(match.route.id);
       if (renderedRoutes) {
         for (const rendered of renderedRoutes) {
-          window.__router.patchRoutes(
+          window.__reactRouterDataRouter.patchRoutes(
             _nullishCoalesce(rendered.parentId, () => ( null)),
             [createRouteFromServerManifest(rendered)],
             true
@@ -2157,20 +2263,20 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
 function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
   return async (args, basename, targetRoutes) => {
     let { request, context } = args;
-    let url = _chunkEVX7OBGBjs.singleFetchUrl.call(void 0, request.url, basename, "rsc");
+    let url = _chunkCXAO7FY7js.singleFetchUrl.call(void 0, request.url, basename, "rsc");
     if (request.method === "GET") {
-      url = _chunkEVX7OBGBjs.stripIndexParam.call(void 0, url);
+      url = _chunkCXAO7FY7js.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunkEVX7OBGBjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunkCXAO7FY7js.createRequestInit.call(void 0, request))
     );
     if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunkEVX7OBGBjs.ErrorResponseImpl)(404, "Not Found", true);
+      throw new (0, _chunkCXAO7FY7js.ErrorResponseImpl)(404, "Not Found", true);
     }
-    _chunkEVX7OBGBjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunkCXAO7FY7js.invariant.call(void 0, res.body, "No response body to decode");
     try {
       const payload = await createFromReadableStream(res.body, {
         temporaryReferences: void 0
@@ -2194,7 +2300,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
       }
       context.get(renderedRoutesContext).push(...payload.matches);
       let results = { routes: {} };
-      const dataKey = _chunkEVX7OBGBjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunkCXAO7FY7js.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
       for (let [routeId, data2] of Object.entries(payload[dataKey] || {})) {
         results.routes[routeId] = { data: data2 };
       }
@@ -2217,7 +2323,7 @@ function RSCHydratedRouter({
   unstable_getContext
 }) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
-  let router = React4.useMemo(
+  let { router, routeModules } = React4.useMemo(
     () => createRouterFromPayload({
       payload,
       fetchImplementation,
@@ -2231,11 +2337,14 @@ function RSCHydratedRouter({
       unstable_getContext
     ]
   );
+  React4.useEffect(() => {
+    _chunkCXAO7FY7js.setIsHydrated.call(void 0, );
+  }, []);
   React4.useLayoutEffect(() => {
     const globalVar = window;
     if (!globalVar.__routerInitialized) {
       globalVar.__routerInitialized = true;
-      globalVar.__router.initialize();
+      globalVar.__reactRouterDataRouter.initialize();
     }
   }, []);
   let [location2, setLocation] = React4.useState(router.state.location);
@@ -2301,7 +2410,7 @@ function RSCHydratedRouter({
       unstable_middleware: false,
       unstable_subResourceIntegrity: false
     },
-    isSpaMode: true,
+    isSpaMode: false,
     ssr: true,
     criticalCss: "",
     manifest: {
@@ -2314,9 +2423,9 @@ function RSCHydratedRouter({
       }
     },
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    routeModules: {}
+    routeModules
   };
-  return /* @__PURE__ */ React4.createElement(_chunkEVX7OBGBjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(_chunkEVX7OBGBjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(_chunkVC6RBZTRjs.RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
+  return /* @__PURE__ */ React4.createElement(_chunkCXAO7FY7js.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(_chunkCXAO7FY7js.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(_chunk3JLHOGU7js.RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
 }
 function createRouteFromServerManifest(match, payload) {
   let hasInitialData = payload && match.id in payload.loaderData;
@@ -2327,6 +2436,8 @@ function createRouteFromServerManifest(match, payload) {
   // the server loader flow regardless of whether the client loader calls
   // `serverLoader` or not, otherwise we'll have nothing to render.
   match.hasComponent && !match.element;
+  _chunkCXAO7FY7js.invariant.call(void 0, window.__reactRouterRouteModules);
+  populateRSCRouteModules(window.__reactRouterRouteModules, match);
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -2376,7 +2487,7 @@ function createRouteFromServerManifest(match, payload) {
         return await callSingleFetch(singleFetch);
       }
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : () => {
-      throw _chunkEVX7OBGBjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunkCXAO7FY7js.noActionDefinedError.call(void 0, "action", match.id);
     },
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
@@ -2389,7 +2500,7 @@ function createRouteFromServerManifest(match, payload) {
     hasShouldRevalidate: match.shouldRevalidate != null
   };
   if (typeof dataRoute.loader === "function") {
-    dataRoute.loader.hydrate = _chunkEVX7OBGBjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunkCXAO7FY7js.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -2399,7 +2510,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunkEVX7OBGBjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunkCXAO7FY7js.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
   return singleFetch();
 }
 function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
@@ -2407,7 +2518,7 @@ function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${routeId}")`;
     console.error(msg);
-    throw new (0, _chunkEVX7OBGBjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunkCXAO7FY7js.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
   }
 }
 var nextPaths = /* @__PURE__ */ new Set();
@@ -2422,7 +2533,10 @@ function getManifestUrl(paths) {
     return new URL(`${paths[0]}.manifest`, window.location.origin);
   }
   const globalVar = window;
-  let basename = (_nullishCoalesce(globalVar.__router.basename, () => ( ""))).replace(/^\/|\/$/g, "");
+  let basename = (_nullishCoalesce(globalVar.__reactRouterDataRouter.basename, () => ( ""))).replace(
+    /^\/|\/$/g,
+    ""
+  );
   let url = new URL(`${basename}/.manifest`, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
   return url;
@@ -2448,7 +2562,7 @@ async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fet
   }
   paths.forEach((p) => addToFifoQueue(p, discoveredPaths));
   payload.patches.forEach((p) => {
-    window.__router.patchRoutes(
+    window.__reactRouterDataRouter.patchRoutes(
       _nullishCoalesce(p.parentId, () => ( null)),
       [createRouteFromServerManifest(p)]
     );
@@ -2599,7 +2713,7 @@ async function routeRSCServerRequest({
   };
   try {
     const payload = await getPayload();
-    if (serverResponse.status === _chunkEVX7OBGBjs.SINGLE_FETCH_REDIRECT_STATUS && payload.type === "redirect") {
+    if (serverResponse.status === _chunkCXAO7FY7js.SINGLE_FETCH_REDIRECT_STATUS && payload.type === "redirect") {
       const headers2 = new Headers(serverResponse.headers);
       headers2.delete("Content-Encoding");
       headers2.delete("Content-Length");
@@ -2649,7 +2763,7 @@ function RSCStaticRouter({ getPayload }) {
   if (payload.type !== "render") return null;
   let patchedLoaderData = { ...payload.loaderData };
   for (const match of payload.matches) {
-    if (_chunkEVX7OBGBjs.shouldHydrateRouteLoader.call(void 0, 
+    if (_chunkCXAO7FY7js.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -2683,7 +2797,7 @@ function RSCStaticRouter({ getPayload }) {
       }
     }))
   };
-  const router = _chunkVC6RBZTRjs.createStaticRouter.call(void 0, 
+  const router = _chunk3JLHOGU7js.createStaticRouter.call(void 0, 
     payload.matches.reduceRight((previous, match) => {
       const route = {
         id: match.id,
@@ -2725,10 +2839,10 @@ function RSCStaticRouter({ getPayload }) {
       }
     },
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    routeModules: {}
+    routeModules: createRSCRouteModules(payload)
   };
-  return /* @__PURE__ */ React5.createElement(_chunkEVX7OBGBjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React5.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React5.createElement(_chunkEVX7OBGBjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React5.createElement(
-    _chunkVC6RBZTRjs.StaticRouterProvider,
+  return /* @__PURE__ */ React5.createElement(_chunkCXAO7FY7js.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React5.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React5.createElement(_chunkCXAO7FY7js.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React5.createElement(
+    _chunk3JLHOGU7js.StaticRouterProvider,
     {
       context,
       router,
@@ -2786,7 +2900,7 @@ function deserializeErrors(errors) {
   let serialized = {};
   for (let [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new (0, _chunkEVX7OBGBjs.ErrorResponseImpl)(
+      serialized[key] = new (0, _chunkCXAO7FY7js.ErrorResponseImpl)(
         val.status,
         val.statusText,
         val.data,
@@ -2944,4 +3058,4 @@ function deserializeErrors(errors) {
 
 
 
-exports.Await = _chunkVC6RBZTRjs.Await; exports.BrowserRouter = _chunkVC6RBZTRjs.BrowserRouter; exports.Form = _chunkVC6RBZTRjs.Form; exports.HashRouter = _chunkVC6RBZTRjs.HashRouter; exports.IDLE_BLOCKER = _chunkEVX7OBGBjs.IDLE_BLOCKER; exports.IDLE_FETCHER = _chunkEVX7OBGBjs.IDLE_FETCHER; exports.IDLE_NAVIGATION = _chunkEVX7OBGBjs.IDLE_NAVIGATION; exports.Link = _chunkVC6RBZTRjs.Link; exports.Links = _chunkEVX7OBGBjs.Links; exports.MemoryRouter = _chunkVC6RBZTRjs.MemoryRouter; exports.Meta = _chunkEVX7OBGBjs.Meta; exports.NavLink = _chunkVC6RBZTRjs.NavLink; exports.Navigate = _chunkVC6RBZTRjs.Navigate; exports.NavigationType = _chunkEVX7OBGBjs.Action; exports.Outlet = _chunkVC6RBZTRjs.Outlet; exports.PrefetchPageLinks = _chunkEVX7OBGBjs.PrefetchPageLinks; exports.Route = _chunkVC6RBZTRjs.Route; exports.Router = _chunkVC6RBZTRjs.Router; exports.RouterProvider = _chunkVC6RBZTRjs.RouterProvider; exports.Routes = _chunkVC6RBZTRjs.Routes; exports.Scripts = _chunkEVX7OBGBjs.Scripts; exports.ScrollRestoration = _chunkVC6RBZTRjs.ScrollRestoration; exports.ServerRouter = ServerRouter; exports.StaticRouter = _chunkVC6RBZTRjs.StaticRouter; exports.StaticRouterProvider = _chunkVC6RBZTRjs.StaticRouterProvider; exports.UNSAFE_DataRouterContext = _chunkEVX7OBGBjs.DataRouterContext; exports.UNSAFE_DataRouterStateContext = _chunkEVX7OBGBjs.DataRouterStateContext; exports.UNSAFE_ErrorResponseImpl = _chunkEVX7OBGBjs.ErrorResponseImpl; exports.UNSAFE_FetchersContext = _chunkEVX7OBGBjs.FetchersContext; exports.UNSAFE_FrameworkContext = _chunkEVX7OBGBjs.FrameworkContext; exports.UNSAFE_LocationContext = _chunkEVX7OBGBjs.LocationContext; exports.UNSAFE_NavigationContext = _chunkEVX7OBGBjs.NavigationContext; exports.UNSAFE_RSCDefaultRootErrorBoundary = RSCDefaultRootErrorBoundary; exports.UNSAFE_RemixErrorBoundary = _chunkEVX7OBGBjs.RemixErrorBoundary; exports.UNSAFE_RouteContext = _chunkEVX7OBGBjs.RouteContext; exports.UNSAFE_ServerMode = ServerMode; exports.UNSAFE_SingleFetchRedirectSymbol = _chunkEVX7OBGBjs.SingleFetchRedirectSymbol; exports.UNSAFE_ViewTransitionContext = _chunkEVX7OBGBjs.ViewTransitionContext; exports.UNSAFE_WithComponentProps = _chunkVC6RBZTRjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkVC6RBZTRjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkVC6RBZTRjs.WithHydrateFallbackProps; exports.UNSAFE_createBrowserHistory = _chunkEVX7OBGBjs.createBrowserHistory; exports.UNSAFE_createClientRoutes = _chunkEVX7OBGBjs.createClientRoutes; exports.UNSAFE_createClientRoutesWithHMRRevalidationOptOut = _chunkEVX7OBGBjs.createClientRoutesWithHMRRevalidationOptOut; exports.UNSAFE_createRouter = _chunkEVX7OBGBjs.createRouter; exports.UNSAFE_decodeViaTurboStream = _chunkEVX7OBGBjs.decodeViaTurboStream; exports.UNSAFE_deserializeErrors = deserializeErrors; exports.UNSAFE_getHydrationData = getHydrationData; exports.UNSAFE_getPatchRoutesOnNavigationFunction = _chunkEVX7OBGBjs.getPatchRoutesOnNavigationFunction; exports.UNSAFE_getTurboStreamSingleFetchDataStrategy = _chunkEVX7OBGBjs.getTurboStreamSingleFetchDataStrategy; exports.UNSAFE_hydrationRouteProperties = _chunkVC6RBZTRjs.hydrationRouteProperties; exports.UNSAFE_invariant = _chunkEVX7OBGBjs.invariant; exports.UNSAFE_mapRouteProperties = _chunkVC6RBZTRjs.mapRouteProperties; exports.UNSAFE_shouldHydrateRouteLoader = _chunkEVX7OBGBjs.shouldHydrateRouteLoader; exports.UNSAFE_useFogOFWarDiscovery = _chunkEVX7OBGBjs.useFogOFWarDiscovery; exports.UNSAFE_useScrollRestoration = _chunkVC6RBZTRjs.useScrollRestoration; exports.UNSAFE_withComponentProps = _chunkVC6RBZTRjs.withComponentProps; exports.UNSAFE_withErrorBoundaryProps = _chunkVC6RBZTRjs.withErrorBoundaryProps; exports.UNSAFE_withHydrateFallbackProps = _chunkVC6RBZTRjs.withHydrateFallbackProps; exports.createBrowserRouter = _chunkVC6RBZTRjs.createBrowserRouter; exports.createCookie = createCookie; exports.createCookieSessionStorage = createCookieSessionStorage; exports.createHashRouter = _chunkVC6RBZTRjs.createHashRouter; exports.createMemoryRouter = _chunkVC6RBZTRjs.createMemoryRouter; exports.createMemorySessionStorage = createMemorySessionStorage; exports.createPath = _chunkEVX7OBGBjs.createPath; exports.createRequestHandler = createRequestHandler; exports.createRoutesFromChildren = _chunkVC6RBZTRjs.createRoutesFromChildren; exports.createRoutesFromElements = _chunkVC6RBZTRjs.createRoutesFromElements; exports.createRoutesStub = createRoutesStub; exports.createSearchParams = _chunkVC6RBZTRjs.createSearchParams; exports.createSession = createSession; exports.createSessionStorage = createSessionStorage; exports.createStaticHandler = _chunkVC6RBZTRjs.createStaticHandler; exports.createStaticRouter = _chunkVC6RBZTRjs.createStaticRouter; exports.data = _chunkEVX7OBGBjs.data; exports.generatePath = _chunkEVX7OBGBjs.generatePath; exports.href = href; exports.isCookie = isCookie; exports.isRouteErrorResponse = _chunkEVX7OBGBjs.isRouteErrorResponse; exports.isSession = isSession; exports.matchPath = _chunkEVX7OBGBjs.matchPath; exports.matchRoutes = _chunkEVX7OBGBjs.matchRoutes; exports.parsePath = _chunkEVX7OBGBjs.parsePath; exports.redirect = _chunkEVX7OBGBjs.redirect; exports.redirectDocument = _chunkEVX7OBGBjs.redirectDocument; exports.renderMatches = _chunkVC6RBZTRjs.renderMatches; exports.replace = _chunkEVX7OBGBjs.replace; exports.resolvePath = _chunkEVX7OBGBjs.resolvePath; exports.unstable_HistoryRouter = _chunkVC6RBZTRjs.HistoryRouter; exports.unstable_RSCHydratedRouter = RSCHydratedRouter; exports.unstable_RSCStaticRouter = RSCStaticRouter; exports.unstable_RouterContextProvider = _chunkEVX7OBGBjs.unstable_RouterContextProvider; exports.unstable_createCallServer = createCallServer; exports.unstable_createContext = _chunkEVX7OBGBjs.unstable_createContext; exports.unstable_getRSCStream = getRSCStream; exports.unstable_routeRSCServerRequest = routeRSCServerRequest; exports.unstable_setDevServerHooks = setDevServerHooks; exports.unstable_usePrompt = _chunkVC6RBZTRjs.usePrompt; exports.useActionData = _chunkEVX7OBGBjs.useActionData; exports.useAsyncError = _chunkEVX7OBGBjs.useAsyncError; exports.useAsyncValue = _chunkEVX7OBGBjs.useAsyncValue; exports.useBeforeUnload = _chunkVC6RBZTRjs.useBeforeUnload; exports.useBlocker = _chunkEVX7OBGBjs.useBlocker; exports.useFetcher = _chunkVC6RBZTRjs.useFetcher; exports.useFetchers = _chunkVC6RBZTRjs.useFetchers; exports.useFormAction = _chunkVC6RBZTRjs.useFormAction; exports.useHref = _chunkEVX7OBGBjs.useHref; exports.useInRouterContext = _chunkEVX7OBGBjs.useInRouterContext; exports.useLinkClickHandler = _chunkVC6RBZTRjs.useLinkClickHandler; exports.useLoaderData = _chunkEVX7OBGBjs.useLoaderData; exports.useLocation = _chunkEVX7OBGBjs.useLocation; exports.useMatch = _chunkEVX7OBGBjs.useMatch; exports.useMatches = _chunkEVX7OBGBjs.useMatches; exports.useNavigate = _chunkEVX7OBGBjs.useNavigate; exports.useNavigation = _chunkEVX7OBGBjs.useNavigation; exports.useNavigationType = _chunkEVX7OBGBjs.useNavigationType; exports.useOutlet = _chunkEVX7OBGBjs.useOutlet; exports.useOutletContext = _chunkEVX7OBGBjs.useOutletContext; exports.useParams = _chunkEVX7OBGBjs.useParams; exports.useResolvedPath = _chunkEVX7OBGBjs.useResolvedPath; exports.useRevalidator = _chunkEVX7OBGBjs.useRevalidator; exports.useRouteError = _chunkEVX7OBGBjs.useRouteError; exports.useRouteLoaderData = _chunkEVX7OBGBjs.useRouteLoaderData; exports.useRoutes = _chunkEVX7OBGBjs.useRoutes; exports.useSearchParams = _chunkVC6RBZTRjs.useSearchParams; exports.useSubmit = _chunkVC6RBZTRjs.useSubmit; exports.useViewTransitionState = _chunkVC6RBZTRjs.useViewTransitionState;
+exports.Await = _chunk3JLHOGU7js.Await; exports.BrowserRouter = _chunk3JLHOGU7js.BrowserRouter; exports.Form = _chunk3JLHOGU7js.Form; exports.HashRouter = _chunk3JLHOGU7js.HashRouter; exports.IDLE_BLOCKER = _chunkCXAO7FY7js.IDLE_BLOCKER; exports.IDLE_FETCHER = _chunkCXAO7FY7js.IDLE_FETCHER; exports.IDLE_NAVIGATION = _chunkCXAO7FY7js.IDLE_NAVIGATION; exports.Link = _chunk3JLHOGU7js.Link; exports.Links = _chunkCXAO7FY7js.Links; exports.MemoryRouter = _chunk3JLHOGU7js.MemoryRouter; exports.Meta = _chunkCXAO7FY7js.Meta; exports.NavLink = _chunk3JLHOGU7js.NavLink; exports.Navigate = _chunk3JLHOGU7js.Navigate; exports.NavigationType = _chunkCXAO7FY7js.Action; exports.Outlet = _chunk3JLHOGU7js.Outlet; exports.PrefetchPageLinks = _chunkCXAO7FY7js.PrefetchPageLinks; exports.Route = _chunk3JLHOGU7js.Route; exports.Router = _chunk3JLHOGU7js.Router; exports.RouterProvider = _chunk3JLHOGU7js.RouterProvider; exports.Routes = _chunk3JLHOGU7js.Routes; exports.Scripts = _chunkCXAO7FY7js.Scripts; exports.ScrollRestoration = _chunk3JLHOGU7js.ScrollRestoration; exports.ServerRouter = ServerRouter; exports.StaticRouter = _chunk3JLHOGU7js.StaticRouter; exports.StaticRouterProvider = _chunk3JLHOGU7js.StaticRouterProvider; exports.UNSAFE_DataRouterContext = _chunkCXAO7FY7js.DataRouterContext; exports.UNSAFE_DataRouterStateContext = _chunkCXAO7FY7js.DataRouterStateContext; exports.UNSAFE_ErrorResponseImpl = _chunkCXAO7FY7js.ErrorResponseImpl; exports.UNSAFE_FetchersContext = _chunkCXAO7FY7js.FetchersContext; exports.UNSAFE_FrameworkContext = _chunkCXAO7FY7js.FrameworkContext; exports.UNSAFE_LocationContext = _chunkCXAO7FY7js.LocationContext; exports.UNSAFE_NavigationContext = _chunkCXAO7FY7js.NavigationContext; exports.UNSAFE_RSCDefaultRootErrorBoundary = RSCDefaultRootErrorBoundary; exports.UNSAFE_RemixErrorBoundary = _chunkCXAO7FY7js.RemixErrorBoundary; exports.UNSAFE_RouteContext = _chunkCXAO7FY7js.RouteContext; exports.UNSAFE_ServerMode = ServerMode; exports.UNSAFE_SingleFetchRedirectSymbol = _chunkCXAO7FY7js.SingleFetchRedirectSymbol; exports.UNSAFE_ViewTransitionContext = _chunkCXAO7FY7js.ViewTransitionContext; exports.UNSAFE_WithComponentProps = _chunk3JLHOGU7js.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk3JLHOGU7js.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk3JLHOGU7js.WithHydrateFallbackProps; exports.UNSAFE_createBrowserHistory = _chunkCXAO7FY7js.createBrowserHistory; exports.UNSAFE_createClientRoutes = _chunkCXAO7FY7js.createClientRoutes; exports.UNSAFE_createClientRoutesWithHMRRevalidationOptOut = _chunkCXAO7FY7js.createClientRoutesWithHMRRevalidationOptOut; exports.UNSAFE_createRouter = _chunkCXAO7FY7js.createRouter; exports.UNSAFE_decodeViaTurboStream = _chunkCXAO7FY7js.decodeViaTurboStream; exports.UNSAFE_deserializeErrors = deserializeErrors; exports.UNSAFE_getHydrationData = getHydrationData; exports.UNSAFE_getPatchRoutesOnNavigationFunction = _chunkCXAO7FY7js.getPatchRoutesOnNavigationFunction; exports.UNSAFE_getTurboStreamSingleFetchDataStrategy = _chunkCXAO7FY7js.getTurboStreamSingleFetchDataStrategy; exports.UNSAFE_hydrationRouteProperties = _chunk3JLHOGU7js.hydrationRouteProperties; exports.UNSAFE_invariant = _chunkCXAO7FY7js.invariant; exports.UNSAFE_mapRouteProperties = _chunk3JLHOGU7js.mapRouteProperties; exports.UNSAFE_shouldHydrateRouteLoader = _chunkCXAO7FY7js.shouldHydrateRouteLoader; exports.UNSAFE_useFogOFWarDiscovery = _chunkCXAO7FY7js.useFogOFWarDiscovery; exports.UNSAFE_useScrollRestoration = _chunk3JLHOGU7js.useScrollRestoration; exports.UNSAFE_withComponentProps = _chunk3JLHOGU7js.withComponentProps; exports.UNSAFE_withErrorBoundaryProps = _chunk3JLHOGU7js.withErrorBoundaryProps; exports.UNSAFE_withHydrateFallbackProps = _chunk3JLHOGU7js.withHydrateFallbackProps; exports.createBrowserRouter = _chunk3JLHOGU7js.createBrowserRouter; exports.createCookie = createCookie; exports.createCookieSessionStorage = createCookieSessionStorage; exports.createHashRouter = _chunk3JLHOGU7js.createHashRouter; exports.createMemoryRouter = _chunk3JLHOGU7js.createMemoryRouter; exports.createMemorySessionStorage = createMemorySessionStorage; exports.createPath = _chunkCXAO7FY7js.createPath; exports.createRequestHandler = createRequestHandler; exports.createRoutesFromChildren = _chunk3JLHOGU7js.createRoutesFromChildren; exports.createRoutesFromElements = _chunk3JLHOGU7js.createRoutesFromElements; exports.createRoutesStub = createRoutesStub; exports.createSearchParams = _chunk3JLHOGU7js.createSearchParams; exports.createSession = createSession; exports.createSessionStorage = createSessionStorage; exports.createStaticHandler = _chunk3JLHOGU7js.createStaticHandler; exports.createStaticRouter = _chunk3JLHOGU7js.createStaticRouter; exports.data = _chunkCXAO7FY7js.data; exports.generatePath = _chunkCXAO7FY7js.generatePath; exports.href = href; exports.isCookie = isCookie; exports.isRouteErrorResponse = _chunkCXAO7FY7js.isRouteErrorResponse; exports.isSession = isSession; exports.matchPath = _chunkCXAO7FY7js.matchPath; exports.matchRoutes = _chunkCXAO7FY7js.matchRoutes; exports.parsePath = _chunkCXAO7FY7js.parsePath; exports.redirect = _chunkCXAO7FY7js.redirect; exports.redirectDocument = _chunkCXAO7FY7js.redirectDocument; exports.renderMatches = _chunk3JLHOGU7js.renderMatches; exports.replace = _chunkCXAO7FY7js.replace; exports.resolvePath = _chunkCXAO7FY7js.resolvePath; exports.unstable_HistoryRouter = _chunk3JLHOGU7js.HistoryRouter; exports.unstable_RSCHydratedRouter = RSCHydratedRouter; exports.unstable_RSCStaticRouter = RSCStaticRouter; exports.unstable_RouterContextProvider = _chunkCXAO7FY7js.unstable_RouterContextProvider; exports.unstable_createCallServer = createCallServer; exports.unstable_createContext = _chunkCXAO7FY7js.unstable_createContext; exports.unstable_getRSCStream = getRSCStream; exports.unstable_routeRSCServerRequest = routeRSCServerRequest; exports.unstable_setDevServerHooks = setDevServerHooks; exports.unstable_usePrompt = _chunk3JLHOGU7js.usePrompt; exports.useActionData = _chunkCXAO7FY7js.useActionData; exports.useAsyncError = _chunkCXAO7FY7js.useAsyncError; exports.useAsyncValue = _chunkCXAO7FY7js.useAsyncValue; exports.useBeforeUnload = _chunk3JLHOGU7js.useBeforeUnload; exports.useBlocker = _chunkCXAO7FY7js.useBlocker; exports.useFetcher = _chunk3JLHOGU7js.useFetcher; exports.useFetchers = _chunk3JLHOGU7js.useFetchers; exports.useFormAction = _chunk3JLHOGU7js.useFormAction; exports.useHref = _chunkCXAO7FY7js.useHref; exports.useInRouterContext = _chunkCXAO7FY7js.useInRouterContext; exports.useLinkClickHandler = _chunk3JLHOGU7js.useLinkClickHandler; exports.useLoaderData = _chunkCXAO7FY7js.useLoaderData; exports.useLocation = _chunkCXAO7FY7js.useLocation; exports.useMatch = _chunkCXAO7FY7js.useMatch; exports.useMatches = _chunkCXAO7FY7js.useMatches; exports.useNavigate = _chunkCXAO7FY7js.useNavigate; exports.useNavigation = _chunkCXAO7FY7js.useNavigation; exports.useNavigationType = _chunkCXAO7FY7js.useNavigationType; exports.useOutlet = _chunkCXAO7FY7js.useOutlet; exports.useOutletContext = _chunkCXAO7FY7js.useOutletContext; exports.useParams = _chunkCXAO7FY7js.useParams; exports.useResolvedPath = _chunkCXAO7FY7js.useResolvedPath; exports.useRevalidator = _chunkCXAO7FY7js.useRevalidator; exports.useRouteError = _chunkCXAO7FY7js.useRouteError; exports.useRouteLoaderData = _chunkCXAO7FY7js.useRouteLoaderData; exports.useRoutes = _chunkCXAO7FY7js.useRoutes; exports.useSearchParams = _chunk3JLHOGU7js.useSearchParams; exports.useSubmit = _chunk3JLHOGU7js.useSubmit; exports.useViewTransitionState = _chunk3JLHOGU7js.useViewTransitionState;