react-router 0.0.0-experimental-818f8e08d → 0.0.0-experimental-e56aa53bc

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-818f8e08d
+ * react-router v0.0.0-experimental-e56aa53bc
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,6 +9,7 @@
  * @license MIT
  */
 "use strict";
+"use client";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -62,6 +63,8 @@ __export(react_router_exports, {
   NavigationType: () => Action,
   Outlet: () => Outlet,
   PrefetchPageLinks: () => PrefetchPageLinks,
+  RSCHydratedRouter: () => RSCHydratedRouter,
+  RSCStaticRouter: () => RSCStaticRouter,
   Route: () => Route,
   Router: () => Router,
   RouterProvider: () => RouterProvider,
@@ -83,6 +86,9 @@ __export(react_router_exports, {
   UNSAFE_ServerMode: () => ServerMode,
   UNSAFE_SingleFetchRedirectSymbol: () => SingleFetchRedirectSymbol,
   UNSAFE_ViewTransitionContext: () => ViewTransitionContext,
+  UNSAFE_WithErrorBoundaryProps: () => WithErrorBoundaryProps,
+  UNSAFE_WithHydrateFallbackProps: () => WithHydrateFallbackProps,
+  UNSAFE_WithRouteComponentProps: () => WithRouteComponentProps,
   UNSAFE_createBrowserHistory: () => createBrowserHistory,
   UNSAFE_createClientRoutes: () => createClientRoutes,
   UNSAFE_createClientRoutesWithHMRRevalidationOptOut: () => createClientRoutesWithHMRRevalidationOptOut,
@@ -99,6 +105,7 @@ __export(react_router_exports, {
   UNSAFE_useFogOFWarDiscovery: () => useFogOFWarDiscovery,
   UNSAFE_useScrollRestoration: () => useScrollRestoration,
   createBrowserRouter: () => createBrowserRouter,
+  createCallServer: () => createCallServer,
   createCookie: () => createCookie,
   createCookieSessionStorage: () => createCookieSessionStorage,
   createHashRouter: () => createHashRouter,
@@ -116,6 +123,7 @@ __export(react_router_exports, {
   createStaticRouter: () => createStaticRouter,
   data: () => data,
   generatePath: () => generatePath,
+  getServerStream: () => getServerStream,
   href: () => href,
   isCookie: () => isCookie,
   isRouteErrorResponse: () => isRouteErrorResponse,
@@ -128,6 +136,7 @@ __export(react_router_exports, {
   renderMatches: () => renderMatches,
   replace: () => replace,
   resolvePath: () => resolvePath,
+  routeRSCServerRequest: () => routeRSCServerRequest,
   unstable_HistoryRouter: () => HistoryRouter,
   unstable_RouterContextProvider: () => unstable_RouterContextProvider,
   unstable_createContext: () => unstable_createContext,
@@ -195,19 +204,19 @@ function createMemoryHistory(options = {}) {
     return entries[index];
   }
   function createMemoryLocation(to, state = null, key) {
-    let location = createLocation(
+    let location2 = createLocation(
       entries ? getCurrentLocation().pathname : "/",
       to,
       state,
       key
     );
     warning(
-      location.pathname.charAt(0) === "/",
+      location2.pathname.charAt(0) === "/",
       `relative pathnames are not supported in memory history: ${JSON.stringify(
         to
       )}`
     );
-    return location;
+    return location2;
   }
   function createHref2(to) {
     return typeof to === "string" ? to : createPath(to);
@@ -318,9 +327,9 @@ function createHashHistory(options = {}) {
     }
     return href2 + "#" + (typeof to === "string" ? to : createPath(to));
   }
-  function validateHashLocation(location, to) {
+  function validateHashLocation(location2, to) {
     warning(
-      location.pathname.charAt(0) === "/",
+      location2.pathname.charAt(0) === "/",
       `relative pathnames are not supported in hash history.push(${JSON.stringify(
         to
       )})`
@@ -350,15 +359,15 @@ function warning(cond, message) {
 function createKey() {
   return Math.random().toString(36).substring(2, 10);
 }
-function getHistoryState(location, index) {
+function getHistoryState(location2, index) {
   return {
-    usr: location.state,
-    key: location.key,
+    usr: location2.state,
+    key: location2.key,
     idx: index
   };
 }
 function createLocation(current, to, state = null, key) {
-  let location = {
+  let location2 = {
     pathname: typeof current === "string" ? current : current.pathname,
     search: "",
     hash: "",
@@ -370,7 +379,7 @@ function createLocation(current, to, state = null, key) {
     // keep as is for the time being and just let any incoming keys take precedence
     key: to && to.key || key || createKey()
   };
-  return location;
+  return location2;
 }
 function createPath({
   pathname = "/",
@@ -427,11 +436,11 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
   }
   function push(to, state) {
     action = "PUSH" /* Push */;
-    let location = createLocation(history.location, to, state);
-    if (validateLocation) validateLocation(location, to);
+    let location2 = createLocation(history.location, to, state);
+    if (validateLocation) validateLocation(location2, to);
     index = getIndex() + 1;
-    let historyState = getHistoryState(location, index);
-    let url = history.createHref(location);
+    let historyState = getHistoryState(location2, index);
+    let url = history.createHref(location2);
     try {
       globalHistory.pushState(historyState, "", url);
     } catch (error) {
@@ -446,11 +455,11 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
   }
   function replace2(to, state) {
     action = "REPLACE" /* Replace */;
-    let location = createLocation(history.location, to, state);
-    if (validateLocation) validateLocation(location, to);
+    let location2 = createLocation(history.location, to, state);
+    if (validateLocation) validateLocation(location2, to);
     index = getIndex();
-    let historyState = getHistoryState(location, index);
-    let url = history.createHref(location);
+    let historyState = getHistoryState(location2, index);
+    let url = history.createHref(location2);
     globalHistory.replaceState(historyState, "", url);
     if (v5Compat && listener) {
       listener({ action, location: history.location, delta: 0 });
@@ -563,7 +572,7 @@ function isUnsupportedLazyRouteFunctionKey(key) {
 function isIndexRoute(route) {
   return route.index === true;
 }
-function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [], manifest = {}) {
+function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [], manifest = {}, allowInPlaceMutations = false) {
   return routes.map((route, index) => {
     let treePath = [...parentPath, String(index)];
     let id = typeof route.id === "string" ? route.id : treePath.join("-");
@@ -572,7 +581,7 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
       `Cannot specify children on an index route`
     );
     invariant(
-      !manifest[id],
+      allowInPlaceMutations || !manifest[id],
       `Found a route id collision on id "${id}".  Route id's must be globally unique within Data Router usages`
     );
     if (isIndexRoute(route)) {
@@ -596,7 +605,8 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
           route.children,
           mapRouteProperties2,
           treePath,
-          manifest
+          manifest,
+          allowInPlaceMutations
         );
       }
       return pathOrLayoutRoute;
@@ -607,8 +617,8 @@ function matchRoutes(routes, locationArg, basename = "/") {
   return matchRoutesImpl(routes, locationArg, basename, false);
 }
 function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
-  let location = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
-  let pathname = stripBasename(location.pathname || "/", basename);
+  let location2 = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
+  let pathname = stripBasename(location2.pathname || "/", basename);
   if (pathname == null) {
     return null;
   }
@@ -1212,7 +1222,7 @@ function createRouter(init) {
   let pendingRevalidationDfd = null;
   function initialize() {
     unlistenHistory = init.history.listen(
-      ({ action: historyAction, location, delta }) => {
+      ({ action: historyAction, location: location2, delta }) => {
         if (unblockBlockerHistoryUpdate) {
           unblockBlockerHistoryUpdate();
           unblockBlockerHistoryUpdate = void 0;
@@ -1224,7 +1234,7 @@ function createRouter(init) {
         );
         let blockerKey = shouldBlockNavigation({
           currentLocation: state.location,
-          nextLocation: location,
+          nextLocation: location2,
           historyAction
         });
         if (blockerKey && delta != null) {
@@ -1234,13 +1244,13 @@ function createRouter(init) {
           init.history.go(delta * -1);
           updateBlocker(blockerKey, {
             state: "blocked",
-            location,
+            location: location2,
             proceed() {
               updateBlocker(blockerKey, {
                 state: "proceeding",
                 proceed: void 0,
                 reset: void 0,
-                location
+                location: location2
               });
               nextHistoryUpdatePromise.then(() => init.history.go(delta));
             },
@@ -1252,7 +1262,7 @@ function createRouter(init) {
           });
           return;
         }
-        return startNavigation(historyAction, location);
+        return startNavigation(historyAction, location2);
       }
     );
     if (isBrowser2) {
@@ -1285,6 +1295,19 @@ function createRouter(init) {
     return () => subscribers.delete(fn);
   }
   function updateState(newState, opts = {}) {
+    if (newState.matches) {
+      newState.matches = newState.matches.map((m) => {
+        let route = manifest[m.route.id];
+        let matchRoute = m.route;
+        if (matchRoute.element !== route.element || matchRoute.errorElement !== route.errorElement || matchRoute.hydrateFallbackElement !== route.hydrateFallbackElement) {
+          return {
+            ...m,
+            route
+          };
+        }
+        return m;
+      });
+    }
     state = {
       ...state,
       ...newState
@@ -1315,8 +1338,8 @@ function createRouter(init) {
     unmountedFetchers.forEach((key) => deleteFetcher(key));
     mountedFetchers.forEach((key) => state.fetchers.delete(key));
   }
-  function completeNavigation(location, newState, { flushSync } = {}) {
-    let isActionReload = state.actionData != null && state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && state.navigation.state === "loading" && location.state?._isRedirect !== true;
+  function completeNavigation(location2, newState, { flushSync } = {}) {
+    let isActionReload = state.actionData != null && state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && state.navigation.state === "loading" && location2.state?._isRedirect !== true;
     let actionData;
     if (newState.actionData) {
       if (Object.keys(newState.actionData).length > 0) {
@@ -1340,7 +1363,7 @@ function createRouter(init) {
       blockers = new Map(blockers);
       blockers.forEach((_, k) => blockers.set(k, IDLE_BLOCKER));
     }
-    let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && location.state?._isRedirect !== true;
+    let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && location2.state?._isRedirect !== true;
     if (inFlightDataRoutes) {
       dataRoutes = inFlightDataRoutes;
       inFlightDataRoutes = void 0;
@@ -1348,35 +1371,35 @@ function createRouter(init) {
     if (isUninterruptedRevalidation) {
     } else if (pendingAction === "POP" /* Pop */) {
     } else if (pendingAction === "PUSH" /* Push */) {
-      init.history.push(location, location.state);
+      init.history.push(location2, location2.state);
     } else if (pendingAction === "REPLACE" /* Replace */) {
-      init.history.replace(location, location.state);
+      init.history.replace(location2, location2.state);
     }
     let viewTransitionOpts;
     if (pendingAction === "POP" /* Pop */) {
       let priorPaths = appliedViewTransitions.get(state.location.pathname);
-      if (priorPaths && priorPaths.has(location.pathname)) {
+      if (priorPaths && priorPaths.has(location2.pathname)) {
         viewTransitionOpts = {
           currentLocation: state.location,
-          nextLocation: location
+          nextLocation: location2
         };
-      } else if (appliedViewTransitions.has(location.pathname)) {
+      } else if (appliedViewTransitions.has(location2.pathname)) {
         viewTransitionOpts = {
-          currentLocation: location,
+          currentLocation: location2,
           nextLocation: state.location
         };
       }
     } else if (pendingViewTransitionEnabled) {
       let toPaths = appliedViewTransitions.get(state.location.pathname);
       if (toPaths) {
-        toPaths.add(location.pathname);
+        toPaths.add(location2.pathname);
       } else {
-        toPaths = /* @__PURE__ */ new Set([location.pathname]);
+        toPaths = /* @__PURE__ */ new Set([location2.pathname]);
         appliedViewTransitions.set(state.location.pathname, toPaths);
       }
       viewTransitionOpts = {
         currentLocation: state.location,
-        nextLocation: location
+        nextLocation: location2
       };
     }
     updateState(
@@ -1386,12 +1409,12 @@ function createRouter(init) {
         actionData,
         loaderData,
         historyAction: pendingAction,
-        location,
+        location: location2,
         initialized: true,
         navigation: IDLE_NAVIGATION,
         revalidation: "idle",
         restoreScrollPosition: getSavedScrollPosition(
-          location,
+          location2,
           newState.matches || state.matches
         ),
         preventScrollReset,
@@ -1508,7 +1531,7 @@ function createRouter(init) {
     );
     return promise;
   }
-  async function startNavigation(historyAction, location, opts) {
+  async function startNavigation(historyAction, location2, opts) {
     pendingNavigationController && pendingNavigationController.abort();
     pendingNavigationController = null;
     pendingAction = historyAction;
@@ -1521,22 +1544,22 @@ function createRouter(init) {
     let matches = opts?.initialHydration && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ? (
       // `matchRoutes()` has already been called if we're in here via `router.initialize()`
       state.matches
-    ) : matchRoutes(routesToUse, location, basename);
+    ) : matchRoutes(routesToUse, location2, basename);
     let flushSync = (opts && opts.flushSync) === true;
-    if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
-      completeNavigation(location, { matches }, { flushSync });
+    if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location2) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
+      completeNavigation(location2, { matches }, { flushSync });
       return;
     }
-    let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
+    let fogOfWar = checkFogOfWar(matches, routesToUse, location2.pathname);
     if (fogOfWar.active && fogOfWar.matches) {
       matches = fogOfWar.matches;
     }
     if (!matches) {
       let { error, notFoundMatches, route } = handleNavigational404(
-        location.pathname
+        location2.pathname
       );
       completeNavigation(
-        location,
+        location2,
         {
           matches: notFoundMatches,
           loaderData: {},
@@ -1551,7 +1574,7 @@ function createRouter(init) {
     pendingNavigationController = new AbortController();
     let request = createClientSideRequest(
       init.history,
-      location,
+      location2,
       pendingNavigationController.signal,
       opts && opts.submission
     );
@@ -1567,7 +1590,7 @@ function createRouter(init) {
     } else if (opts && opts.submission && isMutationMethod(opts.submission.formMethod)) {
       let actionResult = await handleAction(
         request,
-        location,
+        location2,
         opts.submission,
         matches,
         scopedContext,
@@ -1582,7 +1605,7 @@ function createRouter(init) {
         let [routeId, result] = actionResult.pendingActionResult;
         if (isErrorResult(result) && isRouteErrorResponse(result.error) && result.error.status === 404) {
           pendingNavigationController = null;
-          completeNavigation(location, {
+          completeNavigation(location2, {
             matches: actionResult.matches,
             loaderData: {},
             errors: {
@@ -1594,7 +1617,7 @@ function createRouter(init) {
       }
       matches = actionResult.matches || matches;
       pendingActionResult = actionResult.pendingActionResult;
-      loadingNavigation = getLoadingNavigation(location, opts.submission);
+      loadingNavigation = getLoadingNavigation(location2, opts.submission);
       flushSync = false;
       fogOfWar.active = false;
       request = createClientSideRequest(
@@ -1610,7 +1633,7 @@ function createRouter(init) {
       errors
     } = await handleLoaders(
       request,
-      location,
+      location2,
       matches,
       scopedContext,
       fogOfWar.active,
@@ -1626,21 +1649,21 @@ function createRouter(init) {
       return;
     }
     pendingNavigationController = null;
-    completeNavigation(location, {
+    completeNavigation(location2, {
       matches: updatedMatches || matches,
       ...getActionDataForCommit(pendingActionResult),
       loaderData,
       errors
     });
   }
-  async function handleAction(request, location, submission, matches, scopedContext, isFogOfWar, initialHydration, opts = {}) {
+  async function handleAction(request, location2, submission, matches, scopedContext, isFogOfWar, initialHydration, opts = {}) {
     interruptActiveLoads();
-    let navigation = getSubmittingNavigation(location, submission);
+    let navigation = getSubmittingNavigation(location2, submission);
     updateState({ navigation }, { flushSync: opts.flushSync === true });
     if (isFogOfWar) {
       let discoverResult = await discoverRoutes(
         matches,
-        location.pathname,
+        location2.pathname,
         request.signal
       );
       if (discoverResult.type === "aborted") {
@@ -1659,7 +1682,7 @@ function createRouter(init) {
         };
       } else if (!discoverResult.matches) {
         let { notFoundMatches, error, route } = handleNavigational404(
-          location.pathname
+          location2.pathname
         );
         return {
           matches: notFoundMatches,
@@ -1676,13 +1699,13 @@ function createRouter(init) {
       }
     }
     let result;
-    let actionMatch = getTargetMatch(matches, location);
+    let actionMatch = getTargetMatch(matches, location2);
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       result = {
         type: "error" /* error */,
         error: getInternalRouterError(405, {
           method: request.method,
-          pathname: location.pathname,
+          pathname: location2.pathname,
           routeId: actionMatch.route.id
         })
       };
@@ -1720,12 +1743,12 @@ function createRouter(init) {
       if (opts && opts.replace != null) {
         replace2 = opts.replace;
       } else {
-        let location2 = normalizeRedirectLocation(
+        let location3 = normalizeRedirectLocation(
           result.response.headers.get("Location"),
           new URL(request.url),
           basename
         );
-        replace2 = location2 === state.location.pathname + state.location.search;
+        replace2 = location3 === state.location.pathname + state.location.search;
       }
       await startRedirectNavigation(request, result, true, {
         submission,
@@ -1740,11 +1763,7 @@ function createRouter(init) {
       }
       return {
         matches,
-        pendingActionResult: [
-          boundaryMatch.route.id,
-          result,
-          actionMatch.route.id
-        ]
+        pendingActionResult: [boundaryMatch.route.id, result]
       };
     }
     return {
@@ -1752,8 +1771,8 @@ function createRouter(init) {
       pendingActionResult: [actionMatch.route.id, result]
     };
   }
-  async function handleLoaders(request, location, matches, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync, pendingActionResult) {
-    let loadingNavigation = overrideNavigation || getLoadingNavigation(location, submission);
+  async function handleLoaders(request, location2, matches, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync, pendingActionResult) {
+    let loadingNavigation = overrideNavigation || getLoadingNavigation(location2, submission);
     let activeSubmission = submission || fetcherSubmission || getSubmissionFromNavigation(loadingNavigation);
     let shouldUpdateNavigationState = !isUninterruptedRevalidation && !initialHydration;
     if (isFogOfWar) {
@@ -1771,7 +1790,7 @@ function createRouter(init) {
       }
       let discoverResult = await discoverRoutes(
         matches,
-        location.pathname,
+        location2.pathname,
         request.signal
       );
       if (discoverResult.type === "aborted") {
@@ -1787,7 +1806,7 @@ function createRouter(init) {
         };
       } else if (!discoverResult.matches) {
         let { error, notFoundMatches, route } = handleNavigational404(
-          location.pathname
+          location2.pathname
         );
         return {
           matches: notFoundMatches,
@@ -1810,7 +1829,7 @@ function createRouter(init) {
       state,
       matches,
       activeSubmission,
-      location,
+      location2,
       initialHydration ? [] : hydrationRouteProperties2,
       initialHydration === true,
       isRevalidationRequired,
@@ -1826,7 +1845,7 @@ function createRouter(init) {
     if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
-        location,
+        location2,
         {
           matches,
           loaderData: {},
@@ -2337,31 +2356,31 @@ function createRouter(init) {
     if (redirect2.response.headers.has("X-Remix-Revalidate")) {
       isRevalidationRequired = true;
     }
-    let location = redirect2.response.headers.get("Location");
-    invariant(location, "Expected a Location header on the redirect Response");
-    location = normalizeRedirectLocation(
-      location,
+    let location2 = redirect2.response.headers.get("Location");
+    invariant(location2, "Expected a Location header on the redirect Response");
+    location2 = normalizeRedirectLocation(
+      location2,
       new URL(request.url),
       basename
     );
-    let redirectLocation = createLocation(state.location, location, {
+    let redirectLocation = createLocation(state.location, location2, {
       _isRedirect: true
     });
     if (isBrowser2) {
       let isDocumentReload = false;
       if (redirect2.response.headers.has("X-Remix-Reload-Document")) {
         isDocumentReload = true;
-      } else if (ABSOLUTE_URL_REGEX.test(location)) {
-        const url = init.history.createURL(location);
+      } else if (ABSOLUTE_URL_REGEX.test(location2)) {
+        const url = init.history.createURL(location2);
         isDocumentReload = // Hard reload if it's an absolute URL to a new origin
         url.origin !== routerWindow.location.origin || // Hard reload if it's an absolute URL that does not match our basename
         stripBasename(url.pathname, basename) == null;
       }
       if (isDocumentReload) {
         if (replace2) {
-          routerWindow.location.replace(location);
+          routerWindow.location.replace(location2);
         } else {
-          routerWindow.location.assign(location);
+          routerWindow.location.assign(location2);
         }
         return;
       }
@@ -2377,7 +2396,7 @@ function createRouter(init) {
       await startNavigation(redirectNavigationType, redirectLocation, {
         submission: {
           ...activeSubmission,
-          formAction: location
+          formAction: location2
         },
         // Preserve these flags across redirects
         preventScrollReset: preventScrollReset || pendingPreventScrollReset,
@@ -2648,25 +2667,25 @@ function createRouter(init) {
       getScrollRestorationKey2 = null;
     };
   }
-  function getScrollKey(location, matches) {
+  function getScrollKey(location2, matches) {
     if (getScrollRestorationKey2) {
       let key = getScrollRestorationKey2(
-        location,
+        location2,
         matches.map((m) => convertRouteMatchToUiMatch(m, state.loaderData))
       );
-      return key || location.key;
+      return key || location2.key;
     }
-    return location.key;
+    return location2.key;
   }
-  function saveScrollPosition(location, matches) {
+  function saveScrollPosition(location2, matches) {
     if (savedScrollPositions2 && getScrollPosition) {
-      let key = getScrollKey(location, matches);
+      let key = getScrollKey(location2, matches);
       savedScrollPositions2[key] = getScrollPosition();
     }
   }
-  function getSavedScrollPosition(location, matches) {
+  function getSavedScrollPosition(location2, matches) {
     if (savedScrollPositions2) {
-      let key = getScrollKey(location, matches);
+      let key = getScrollKey(location2, matches);
       let y = savedScrollPositions2[key];
       if (typeof y === "number") {
         return y;
@@ -2720,7 +2739,8 @@ function createRouter(init) {
               children,
               routesToUse,
               localManifest,
-              mapRouteProperties2
+              mapRouteProperties2,
+              false
             );
           }
         });
@@ -2761,7 +2781,7 @@ function createRouter(init) {
       manifest
     );
   }
-  function patchRoutes(routeId, children) {
+  function patchRoutes(routeId, children, unstable_allowElementMutations = false) {
     let isNonHMR = inFlightDataRoutes == null;
     let routesToUse = inFlightDataRoutes || dataRoutes;
     patchRoutesImpl(
@@ -2769,7 +2789,8 @@ function createRouter(init) {
       children,
       routesToUse,
       manifest,
-      mapRouteProperties2
+      mapRouteProperties2,
+      unstable_allowElementMutations
     );
     if (isNonHMR) {
       dataRoutes = [...dataRoutes];
@@ -2811,7 +2832,10 @@ function createRouter(init) {
     _internalFetchControllers: fetchControllers,
     // TODO: Remove setRoutes, it's temporary to avoid dealing with
     // updating the tree while validating the update algorithm.
-    _internalSetRoutes
+    _internalSetRoutes,
+    _internalSetStateDoNotUseOrYouWillBreakYourApp(newState) {
+      updateState(newState);
+    }
   };
   return router;
 }
@@ -2839,15 +2863,15 @@ function createStaticHandler(routes, opts) {
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
-    let location = createLocation("", createPath(url), null, "default");
-    let matches = matchRoutes(dataRoutes, location, basename);
+    let location2 = createLocation("", createPath(url), null, "default");
+    let matches = matchRoutes(dataRoutes, location2, basename);
     requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
       let staticContext = {
         basename,
-        location,
+        location: location2,
         matches: methodNotAllowedMatches,
         loaderData: {},
         actionData: null,
@@ -2860,11 +2884,11 @@ function createStaticHandler(routes, opts) {
       };
       return respond ? respond(staticContext) : staticContext;
     } else if (!matches) {
-      let error = getInternalRouterError(404, { pathname: location.pathname });
+      let error = getInternalRouterError(404, { pathname: location2.pathname });
       let { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
       let staticContext = {
         basename,
-        location,
+        location: location2,
         matches: notFoundMatches,
         loaderData: {},
         actionData: null,
@@ -2904,7 +2928,7 @@ function createStaticHandler(routes, opts) {
           async () => {
             let result2 = await queryImpl(
               request,
-              location,
+              location2,
               matches,
               requestContext,
               dataStrategy || null,
@@ -2916,7 +2940,7 @@ function createStaticHandler(routes, opts) {
             if (isResponse(result2)) {
               return result2;
             }
-            renderedStaticContext = { location, basename, ...result2 };
+            renderedStaticContext = { location: location2, basename, ...result2 };
             let res = await respond(renderedStaticContext);
             return res;
           },
@@ -2941,7 +2965,7 @@ function createStaticHandler(routes, opts) {
               let boundary = loaderIdx >= 0 ? findNearestBoundary(matches, matches[loaderIdx].route.id) : findNearestBoundary(matches);
               return respond({
                 matches,
-                location,
+                location: location2,
                 basename,
                 loaderData: {},
                 actionData: null,
@@ -2966,7 +2990,7 @@ function createStaticHandler(routes, opts) {
     }
     let result = await queryImpl(
       request,
-      location,
+      location2,
       matches,
       requestContext,
       dataStrategy || null,
@@ -2978,7 +3002,7 @@ function createStaticHandler(routes, opts) {
     if (isResponse(result)) {
       return result;
     }
-    return { location, basename, ...result };
+    return { location: location2, basename, ...result };
   }
   async function queryRoute(request, {
     routeId,
@@ -2988,22 +3012,22 @@ function createStaticHandler(routes, opts) {
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
-    let location = createLocation("", createPath(url), null, "default");
-    let matches = matchRoutes(dataRoutes, location, basename);
+    let location2 = createLocation("", createPath(url), null, "default");
+    let matches = matchRoutes(dataRoutes, location2, basename);
     requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
       throw getInternalRouterError(405, { method });
     } else if (!matches) {
-      throw getInternalRouterError(404, { pathname: location.pathname });
+      throw getInternalRouterError(404, { pathname: location2.pathname });
     }
-    let match = routeId ? matches.find((m) => m.route.id === routeId) : getTargetMatch(matches, location);
+    let match = routeId ? matches.find((m) => m.route.id === routeId) : getTargetMatch(matches, location2);
     if (routeId && !match) {
       throw getInternalRouterError(403, {
-        pathname: location.pathname,
+        pathname: location2.pathname,
         routeId
       });
     } else if (!match) {
-      throw getInternalRouterError(404, { pathname: location.pathname });
+      throw getInternalRouterError(404, { pathname: location2.pathname });
     }
     if (respond && matches.some(
       (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
@@ -3026,7 +3050,7 @@ function createStaticHandler(routes, opts) {
         async () => {
           let result2 = await queryImpl(
             request,
-            location,
+            location2,
             matches,
             requestContext,
             dataStrategy || null,
@@ -3059,7 +3083,7 @@ function createStaticHandler(routes, opts) {
     }
     let result = await queryImpl(
       request,
-      location,
+      location2,
       matches,
       requestContext,
       dataStrategy || null,
@@ -3083,7 +3107,7 @@ function createStaticHandler(routes, opts) {
     }
     return void 0;
   }
-  async function queryImpl(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
+  async function queryImpl(request, location2, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(
       request.signal,
       "query()/queryRoute() requests must contain an AbortController signal"
@@ -3093,7 +3117,7 @@ function createStaticHandler(routes, opts) {
         let result2 = await submit(
           request,
           matches,
-          routeMatch || getTargetMatch(matches, location),
+          routeMatch || getTargetMatch(matches, location2),
           requestContext,
           dataStrategy,
           skipLoaderErrorBubbling,
@@ -3409,7 +3433,7 @@ function throwStaticHandlerAbortedError(request, isRouteRequest) {
 function isSubmissionNavigation(opts) {
   return opts != null && ("formData" in opts && opts.formData != null || "body" in opts && opts.body !== void 0);
 }
-function normalizeTo(location, matches, basename, to, fromRouteId, relative) {
+function normalizeTo(location2, matches, basename, to, fromRouteId, relative) {
   let contextualMatches;
   let activeRouteMatch;
   if (fromRouteId) {
@@ -3428,12 +3452,12 @@ function normalizeTo(location, matches, basename, to, fromRouteId, relative) {
   let path = resolveTo(
     to ? to : ".",
     getResolveToMatches(contextualMatches),
-    stripBasename(location.pathname, basename) || location.pathname,
+    stripBasename(location2.pathname, basename) || location2.pathname,
     relative === "path"
   );
   if (to == null) {
-    path.search = location.search;
-    path.hash = location.hash;
+    path.search = location2.search;
+    path.hash = location2.hash;
   }
   if ((to == null || to === "" || to === ".") && activeRouteMatch) {
     let nakedIndex = hasNakedIndexQuery(path.search);
@@ -3560,10 +3584,10 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
   parsedPath.search = `?${searchParams}`;
   return { path: createPath(parsedPath), submission };
 }
-function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, pendingActionResult) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location2, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, pendingActionResult) {
   let actionResult = pendingActionResult ? isErrorResult(pendingActionResult[1]) ? pendingActionResult[1].error : pendingActionResult[1].data : void 0;
   let currentUrl = history.createURL(state.location);
-  let nextUrl = history.createURL(location);
+  let nextUrl = history.createURL(location2);
   let maxIdx;
   if (initialHydration && state.errors) {
     let boundaryId = Object.keys(state.errors)[0];
@@ -3762,7 +3786,7 @@ function shouldRevalidateLoader(loaderMatch, arg) {
   }
   return arg.defaultShouldRevalidate;
 }
-function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2) {
+function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2, allowElementMutations) {
   let childrenToPatch;
   if (routeId) {
     let route = manifest[routeId];
@@ -3777,18 +3801,47 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
   } else {
     childrenToPatch = routesToUse;
   }
-  let uniqueChildren = children.filter(
-    (newRoute) => !childrenToPatch.some(
-      (existingRoute) => isSameRoute(newRoute, existingRoute)
-    )
-  );
-  let newRoutes = convertRoutesToDataRoutes(
-    uniqueChildren,
-    mapRouteProperties2,
-    [routeId || "_", "patch", String(childrenToPatch?.length || "0")],
-    manifest
-  );
-  childrenToPatch.push(...newRoutes);
+  let uniqueChildren = [];
+  let existingChildren = [];
+  children.forEach((newRoute) => {
+    let existingRoute = childrenToPatch.find(
+      (existingRoute2) => isSameRoute(newRoute, existingRoute2)
+    );
+    if (existingRoute) {
+      existingChildren.push({ existingRoute, newRoute });
+    } else {
+      uniqueChildren.push(newRoute);
+    }
+  });
+  if (uniqueChildren.length > 0) {
+    let newRoutes = convertRoutesToDataRoutes(
+      uniqueChildren,
+      mapRouteProperties2,
+      [routeId || "_", "patch", String(childrenToPatch?.length || "0")],
+      manifest
+    );
+    childrenToPatch.push(...newRoutes);
+  }
+  if (allowElementMutations && existingChildren.length > 0) {
+    for (let i = 0; i < existingChildren.length; i++) {
+      let { existingRoute, newRoute } = existingChildren[i];
+      let existingRouteTyped = existingRoute;
+      let [newRouteTyped] = convertRoutesToDataRoutes(
+        [newRoute],
+        mapRouteProperties2,
+        [],
+        // Doesn't matter for mutated routes since they already have an id
+        {},
+        // Don't touch the manifest here since we're updating in place
+        true
+      );
+      Object.assign(existingRouteTyped, {
+        element: newRouteTyped.element ? newRouteTyped.element : existingRouteTyped.element,
+        errorElement: newRouteTyped.errorElement ? newRouteTyped.errorElement : existingRouteTyped.errorElement,
+        hydrateFallbackElement: newRouteTyped.hydrateFallbackElement ? newRouteTyped.hydrateFallbackElement : existingRouteTyped.hydrateFallbackElement
+      });
+    }
+  }
 }
 function isSameRoute(newRoute, existingRoute) {
   if ("id" in newRoute && "id" in existingRoute && newRoute.id === existingRoute.id) {
@@ -4137,7 +4190,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, match, laz
       return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
-      if (isUsingNewApi || shouldLoad || handlerOverride && request.method === "GET" && (match.route.lazy || match.route.loader)) {
+      if (isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) {
         return callLoaderOrAction({
           request,
           match,
@@ -4397,39 +4450,39 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   return { type: "data" /* data */, data: result };
 }
 function normalizeRelativeRoutingRedirectResponse(response, request, routeId, matches, basename) {
-  let location = response.headers.get("Location");
+  let location2 = response.headers.get("Location");
   invariant(
-    location,
+    location2,
     "Redirects returned/thrown from loaders/actions must have a Location header"
   );
-  if (!ABSOLUTE_URL_REGEX.test(location)) {
+  if (!ABSOLUTE_URL_REGEX.test(location2)) {
     let trimmedMatches = matches.slice(
       0,
       matches.findIndex((m) => m.route.id === routeId) + 1
     );
-    location = normalizeTo(
+    location2 = normalizeTo(
       new URL(request.url),
       trimmedMatches,
       basename,
-      location
+      location2
     );
-    response.headers.set("Location", location);
+    response.headers.set("Location", location2);
   }
   return response;
 }
-function normalizeRedirectLocation(location, currentUrl, basename) {
-  if (ABSOLUTE_URL_REGEX.test(location)) {
-    let normalizedLocation = location;
+function normalizeRedirectLocation(location2, currentUrl, basename) {
+  if (ABSOLUTE_URL_REGEX.test(location2)) {
+    let normalizedLocation = location2;
     let url = normalizedLocation.startsWith("//") ? new URL(currentUrl.protocol + normalizedLocation) : new URL(normalizedLocation);
     let isSameBasename = stripBasename(url.pathname, basename) != null;
     if (url.origin === currentUrl.origin && isSameBasename) {
       return url.pathname + url.search + url.hash;
     }
   }
-  return location;
+  return location2;
 }
-function createClientSideRequest(history, location, signal, submission) {
-  let url = history.createURL(stripHashFromPath(location)).toString();
+function createClientSideRequest(history, location2, signal, submission) {
+  let url = history.createURL(stripHashFromPath(location2)).toString();
   let init = { signal };
   if (submission && isMutationMethod(submission.formMethod)) {
     let { formMethod, formEncType } = submission;
@@ -4515,9 +4568,7 @@ function processRouteLoaderData(matches, results, pendingActionResult, isStaticH
   });
   if (pendingError !== void 0 && pendingActionResult) {
     errors = { [pendingActionResult[0]]: pendingError };
-    if (pendingActionResult[2]) {
-      loaderData[pendingActionResult[2]] = void 0;
-    }
+    loaderData[pendingActionResult[0]] = void 0;
   }
   return {
     loaderData,
@@ -4701,8 +4752,8 @@ function isMutationMethod(method) {
 function hasNakedIndexQuery(search) {
   return new URLSearchParams(search).getAll("index").some((v) => v === "");
 }
-function getTargetMatch(matches, location) {
-  let search = typeof location === "string" ? parsePath(location).search : location.search;
+function getTargetMatch(matches, location2) {
+  let search = typeof location2 === "string" ? parsePath(location2).search : location2.search;
   if (matches[matches.length - 1].route.index && hasNakedIndexQuery(search || "")) {
     return matches[matches.length - 1];
   }
@@ -4743,11 +4794,11 @@ function getSubmissionFromNavigation(navigation) {
     };
   }
 }
-function getLoadingNavigation(location, submission) {
+function getLoadingNavigation(location2, submission) {
   if (submission) {
     let navigation = {
       state: "loading",
-      location,
+      location: location2,
       formMethod: submission.formMethod,
       formAction: submission.formAction,
       formEncType: submission.formEncType,
@@ -4759,7 +4810,7 @@ function getLoadingNavigation(location, submission) {
   } else {
     let navigation = {
       state: "loading",
-      location,
+      location: location2,
       formMethod: void 0,
       formAction: void 0,
       formEncType: void 0,
@@ -4770,10 +4821,10 @@ function getLoadingNavigation(location, submission) {
     return navigation;
   }
 }
-function getSubmittingNavigation(location, submission) {
+function getSubmittingNavigation(location2, submission) {
   let navigation = {
     state: "submitting",
-    location,
+    location: location2,
     formMethod: submission.formMethod,
     formAction: submission.formAction,
     formEncType: submission.formEncType,
@@ -5099,18 +5150,18 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     );
   }
   let locationFromContext = useLocation();
-  let location;
+  let location2;
   if (locationArg) {
     let parsedLocationArg = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
     invariant(
       parentPathnameBase === "/" || parsedLocationArg.pathname?.startsWith(parentPathnameBase),
       `When overriding the location using \`<Routes location>\` or \`useRoutes(routes, location)\`, the location pathname must begin with the portion of the URL pathname that was matched by all parent routes. The current pathname base is "${parentPathnameBase}" but pathname "${parsedLocationArg.pathname}" was given in the \`location\` prop.`
     );
-    location = parsedLocationArg;
+    location2 = parsedLocationArg;
   } else {
-    location = locationFromContext;
+    location2 = locationFromContext;
   }
-  let pathname = location.pathname || "/";
+  let pathname = location2.pathname || "/";
   let remainingPathname = pathname;
   if (parentPathnameBase !== "/") {
     let parentSegments = parentPathnameBase.replace(/^\//, "").split("/");
@@ -5121,11 +5172,11 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
   if (ENABLE_DEV_WARNINGS) {
     warning(
       parentRoute || matches != null,
-      `No routes matched location "${location.pathname}${location.search}${location.hash}" `
+      `No routes matched location "${location2.pathname}${location2.search}${location2.hash}" `
     );
     warning(
       matches == null || matches[matches.length - 1].route.element !== void 0 || matches[matches.length - 1].route.Component !== void 0 || matches[matches.length - 1].route.lazy !== void 0,
-      `Matched leaf route at location "${location.pathname}${location.search}${location.hash}" does not have an element or Component. This means it will render an <Outlet /> with a null value by default resulting in an "empty" page.`
+      `Matched leaf route at location "${location2.pathname}${location2.search}${location2.hash}" does not have an element or Component. This means it will render an <Outlet /> with a null value by default resulting in an "empty" page.`
     );
   }
   let renderedMatches = _renderMatches(
@@ -5159,7 +5210,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             hash: "",
             state: null,
             key: "default",
-            ...location
+            ...location2
           },
           navigationType: "POP" /* Pop */
         }
@@ -5924,9 +5975,9 @@ function Router({
 }
 function Routes({
   children,
-  location
+  location: location2
 }) {
-  return useRoutes(createRoutesFromChildren(children), location);
+  return useRoutes(createRoutesFromChildren(children), location2);
 }
 function Await({
   children,
@@ -5996,6 +6047,38 @@ function ResolveAwait({
   let toRender = typeof children === "function" ? children(data2) : children;
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, toRender);
 }
+function WithRouteComponentProps({
+  children
+}) {
+  let props = {
+    loaderData: useLoaderData(),
+    actionData: useActionData(),
+    params: useParams(),
+    matches: useMatches()
+  };
+  return React3.cloneElement(children, props);
+}
+function WithHydrateFallbackProps({
+  children
+}) {
+  let props = {
+    loaderData: useLoaderData(),
+    actionData: useActionData(),
+    params: useParams()
+  };
+  return React3.cloneElement(children, props);
+}
+function WithErrorBoundaryProps({
+  children
+}) {
+  let props = {
+    loaderData: useLoaderData(),
+    actionData: useActionData(),
+    params: useParams(),
+    error: useRouteError()
+  };
+  return React3.cloneElement(children, props);
+}
 function createRoutesFromChildren(children, parentPath = []) {
   let routes = [];
   React3.Children.forEach(children, (element, index) => {
@@ -6318,7 +6401,7 @@ async function getKeyedPrefetchLinks(matches, manifest, routeModules) {
     )
   );
 }
-function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, location, mode) {
+function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, location2, mode) {
   let isNew = (match, index) => {
     if (!currentMatches[index]) return true;
     return match.route.id !== currentMatches[index].route.id;
@@ -6348,7 +6431,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
       if (match.route.shouldRevalidate) {
         let routeChoice = match.route.shouldRevalidate({
           currentUrl: new URL(
-            location.pathname + location.search + location.hash,
+            location2.pathname + location2.search + location2.hash,
             window.origin
           ),
           currentParams: currentMatches[0]?.params || {},
@@ -6468,7 +6551,6 @@ async function createRequestInit(request) {
 
 // lib/dom/ssr/single-fetch.tsx
 var SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
-var SINGLE_FETCH_REDIRECT_STATUS = 202;
 var NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([100, 101, 204, 205]);
 function StreamTransfer({
   context,
@@ -6681,8 +6763,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
     )
   );
   await Promise.all(routeDfds.map((d) => d.promise));
-  let isInitialLoad = !router.state.initialized && router.state.navigation.state === "idle";
-  if ((isInitialLoad || routesParams.size === 0) && !window.__reactRouterHdrActive) {
+  if ((!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
     singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
@@ -6722,7 +6803,7 @@ function stripIndexParam(url) {
   }
   return url;
 }
-function singleFetchUrl(reqUrl, basename) {
+function singleFetchUrl(reqUrl, basename, extension) {
   let url = typeof reqUrl === "string" ? new URL(
     reqUrl,
     // This can be called during the SSR flow via PrefetchPageLinksImpl so
@@ -6730,17 +6811,17 @@ function singleFetchUrl(reqUrl, basename) {
     typeof window === "undefined" ? "server://singlefetch/" : window.location.origin
   ) : reqUrl;
   if (url.pathname === "/") {
-    url.pathname = "_root.data";
+    url.pathname = `_root.${extension}`;
   } else if (basename && stripBasename(url.pathname, basename) === "/") {
-    url.pathname = `${basename.replace(/\/$/, "")}/_root.data`;
+    url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`;
   } else {
-    url.pathname = `${url.pathname.replace(/\/$/, "")}.data`;
+    url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`;
   }
   return url;
 }
 async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
   let { request } = args;
-  let url = singleFetchUrl(request.url, basename);
+  let url = singleFetchUrl(request.url, basename, "data");
   if (request.method === "GET") {
     url = stripIndexParam(url);
     if (targetRoutes) {
@@ -6751,20 +6832,6 @@ async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
   if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
     throw new ErrorResponseImpl(404, "Not Found", true);
   }
-  if (res.status === 204 && res.headers.has("X-Remix-Redirect")) {
-    return {
-      status: SINGLE_FETCH_REDIRECT_STATUS,
-      data: {
-        redirect: {
-          redirect: res.headers.get("X-Remix-Redirect"),
-          status: Number(res.headers.get("X-Remix-Status") || "302"),
-          revalidate: res.headers.get("X-Remix-Revalidate") === "true",
-          reload: res.headers.get("X-Remix-Reload-Document") === "true",
-          replace: res.headers.get("X-Remix-Replace") === "true"
-        }
-      }
-    };
-  }
   if (NO_BODY_STATUS_CODES.has(res.status)) {
     let routes = {};
     if (targetRoutes && request.method !== "GET") {
@@ -6837,13 +6904,13 @@ function decodeViaTurboStream(body, global2) {
 function unwrapSingleFetchResult(result, routeId) {
   if ("redirect" in result) {
     let {
-      redirect: location,
+      redirect: location2,
       revalidate,
       reload,
       replace: replace2,
       status
     } = result.redirect;
-    throw redirect(location, {
+    throw redirect(location2, {
       status,
       headers: {
         // Three R's of redirecting (lol Veep)
@@ -6854,12 +6921,13 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
+  invariant2(routeResult, `No response found for routeId "${routeId}"`);
   if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
   } else {
-    throw new Error(`No response found for routeId "${routeId}"`);
+    throw new Error(`Invalid response found for routeId "${routeId}"`);
   }
 }
 function createDeferred2() {
@@ -7424,8 +7492,8 @@ var nextPaths = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize = 1e3;
 var discoveredPaths = /* @__PURE__ */ new Set();
 var URL_LIMIT = 7680;
-function isFogOfWarEnabled(routeDiscovery, ssr) {
-  return routeDiscovery.mode === "lazy" && ssr === true;
+function isFogOfWarEnabled(ssr) {
+  return ssr === true;
 }
 function getPartialManifest({ sri, ...manifest }, router) {
   let routeIds = new Set(router.state.matches.map((m) => m.route.id));
@@ -7452,8 +7520,8 @@ function getPartialManifest({ sri, ...manifest }, router) {
     sri: sri ? true : void 0
   };
 }
-function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename) {
-  if (!isFogOfWarEnabled(routeDiscovery, ssr)) {
+function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, isSpaMode, basename) {
+  if (!isFogOfWarEnabled(ssr)) {
     return void 0;
   }
   return async ({ path, patch, signal, fetcherKey }) => {
@@ -7468,15 +7536,14 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDi
       ssr,
       isSpaMode,
       basename,
-      routeDiscovery.manifestPath,
       patch,
       signal
     );
   };
 }
-function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
+function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
   React8.useEffect(() => {
-    if (!isFogOfWarEnabled(routeDiscovery, ssr) || navigator.connection?.saveData === true) {
+    if (!isFogOfWarEnabled(ssr) || navigator.connection?.saveData === true) {
       return;
     }
     function registerElement(el) {
@@ -7510,7 +7577,6 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
           ssr,
           isSpaMode,
           router.basename,
-          routeDiscovery.manifestPath,
           router.patchRoutes
         );
       } catch (e) {
@@ -7527,21 +7593,15 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
       attributeFilter: ["data-discover", "href", "action"]
     });
     return () => observer.disconnect();
-  }, [ssr, isSpaMode, manifest, routeModules, router, routeDiscovery]);
-}
-function getManifestPath(_manifestPath, basename) {
-  let manifestPath = _manifestPath || "/__manifest";
-  if (basename == null) {
-    return manifestPath;
-  }
-  return `${basename}${manifestPath}`.replace(/\/+/g, "/");
+  }, [ssr, isSpaMode, manifest, routeModules, router]);
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
-async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
-  let url = new URL(
-    getManifestPath(manifestPath, basename),
-    window.location.origin
+async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, patchRoutes, signal) {
+  let manifestPath = `${basename != null ? basename : "/"}/__manifest`.replace(
+    /\/+/g,
+    "/"
   );
+  let url = new URL(manifestPath, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
   url.searchParams.set("version", manifest.version);
   if (url.toString().length > URL_LIMIT) {
@@ -7568,9 +7628,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
       }
       sessionStorage.setItem(MANIFEST_VERSION_STORAGE_KEY, manifest.version);
       window.location.href = errorReloadPath;
-      console.warn("Detected manifest version mismatch, reloading...");
-      await new Promise(() => {
-      });
+      throw new Error("Detected manifest version mismatch, reloading...");
     } else if (res.status >= 400) {
       throw new Error(await res.text());
     }
@@ -7769,7 +7827,7 @@ function PrefetchPageLinksImpl({
   matches: nextMatches,
   ...linkProps
 }) {
-  let location = useLocation();
+  let location2 = useLocation();
   let { manifest, routeModules } = useFrameworkContext();
   let { basename } = useDataRouterContext2();
   let { loaderData, matches } = useDataRouterStateContext();
@@ -7779,10 +7837,10 @@ function PrefetchPageLinksImpl({
       nextMatches,
       matches,
       manifest,
-      location,
+      location2,
       "data"
     ),
-    [page, nextMatches, matches, manifest, location]
+    [page, nextMatches, matches, manifest, location2]
   );
   let newMatchesForAssets = React9.useMemo(
     () => getNewMatchesForLinks(
@@ -7790,13 +7848,13 @@ function PrefetchPageLinksImpl({
       nextMatches,
       matches,
       manifest,
-      location,
+      location2,
       "assets"
     ),
-    [page, nextMatches, matches, manifest, location]
+    [page, nextMatches, matches, manifest, location2]
   );
   let dataHrefs = React9.useMemo(() => {
-    if (page === location.pathname + location.search + location.hash) {
+    if (page === location2.pathname + location2.search + location2.hash) {
       return [];
     }
     let routesParams = /* @__PURE__ */ new Set();
@@ -7817,7 +7875,7 @@ function PrefetchPageLinksImpl({
     if (routesParams.size === 0) {
       return [];
     }
-    let url = singleFetchUrl(page, basename);
+    let url = singleFetchUrl(page, basename, ".data");
     if (foundOptOutRoute && routesParams.size > 0) {
       url.searchParams.set(
         "_routes",
@@ -7828,7 +7886,7 @@ function PrefetchPageLinksImpl({
   }, [
     basename,
     loaderData,
-    location,
+    location2,
     manifest,
     newMatchesForData,
     nextMatches,
@@ -7853,7 +7911,7 @@ function Meta() {
     matches: routerMatches,
     loaderData
   } = useDataRouterStateContext();
-  let location = useLocation();
+  let location2 = useLocation();
   let _matches = getActiveMatches(routerMatches, errors, isSpaMode);
   let error = null;
   if (errors) {
@@ -7883,7 +7941,7 @@ function Meta() {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         params,
-        location,
+        location: location2,
         matches,
         error
       }) : Array.isArray(routeModule.meta) ? [...routeModule.meta] : routeModule.meta;
@@ -7949,17 +8007,10 @@ function isValidMetaTag(tagName) {
 }
 var isHydrated = false;
 function Scripts(props) {
-  let {
-    manifest,
-    serverHandoffString,
-    isSpaMode,
-    renderMeta,
-    routeDiscovery,
-    ssr
-  } = useFrameworkContext();
+  let { manifest, serverHandoffString, isSpaMode, ssr, renderMeta } = useFrameworkContext();
   let { router, static: isStatic, staticContext } = useDataRouterContext2();
   let { matches: routerMatches } = useDataRouterStateContext();
-  let enableFogOfWar = isFogOfWarEnabled(routeDiscovery, ssr);
+  let enableFogOfWar = isFogOfWarEnabled(ssr);
   if (renderMeta) {
     renderMeta.didRenderScripts = true;
   }
@@ -8115,7 +8166,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-818f8e08d";
+    window.__reactRouterVersion = "0.0.0-experimental-e56aa53bc";
   }
 } catch (e) {
 }
@@ -8373,14 +8424,14 @@ var NavLink = React10.forwardRef(
     ...rest
   }, ref) {
     let path = useResolvedPath(to, { relative: rest.relative });
-    let location = useLocation();
+    let location2 = useLocation();
     let routerState = React10.useContext(DataRouterStateContext);
     let { navigator: navigator2, basename } = React10.useContext(NavigationContext);
     let isTransitioning = routerState != null && // Conditional usage is OK here because the usage of a data router is static
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useViewTransitionState(path) && viewTransition === true;
     let toPathname = navigator2.encodeLocation ? navigator2.encodeLocation(path).pathname : path.pathname;
-    let locationPathname = location.pathname;
+    let locationPathname = location2.pathname;
     let nextLocationPathname = routerState && routerState.navigation && routerState.navigation.location ? routerState.navigation.location.pathname : null;
     if (!caseSensitive) {
       locationPathname = locationPathname.toLowerCase();
@@ -8485,19 +8536,19 @@ function ScrollRestoration({
 }) {
   let remixContext = React10.useContext(FrameworkContext);
   let { basename } = React10.useContext(NavigationContext);
-  let location = useLocation();
+  let location2 = useLocation();
   let matches = useMatches();
   useScrollRestoration({ getKey, storageKey });
   let ssrKey = React10.useMemo(
     () => {
       if (!remixContext || !getKey) return null;
       let userKey = getScrollRestorationKey(
-        location,
+        location2,
         matches,
         basename,
         getKey
       );
-      return userKey !== location.key ? userKey : null;
+      return userKey !== location2.key ? userKey : null;
     },
     // Nah, we only need this the first time for the SSR render
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -8558,13 +8609,13 @@ function useLinkClickHandler(to, {
   viewTransition
 } = {}) {
   let navigate = useNavigate();
-  let location = useLocation();
+  let location2 = useLocation();
   let path = useResolvedPath(to, { relative });
   return React10.useCallback(
     (event) => {
       if (shouldProcessLinkClick(event, target)) {
         event.preventDefault();
-        let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location) === createPath(path);
+        let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location2) === createPath(path);
         navigate(to, {
           replace: replace2,
           state,
@@ -8575,7 +8626,7 @@ function useLinkClickHandler(to, {
       }
     },
     [
-      location,
+      location2,
       navigate,
       path,
       replaceProp,
@@ -8595,18 +8646,18 @@ function useSearchParams(defaultInit) {
   );
   let defaultSearchParamsRef = React10.useRef(createSearchParams(defaultInit));
   let hasSetSearchParamsRef = React10.useRef(false);
-  let location = useLocation();
+  let location2 = useLocation();
   let searchParams = React10.useMemo(
     () => (
       // Only merge in the defaults if we haven't yet called setSearchParams.
       // Once we call that we want those to take precedence, otherwise you can't
       // remove a param with setSearchParams({}) if it has an initial value
       getSearchParamsForLocation(
-        location.search,
+        location2.search,
         hasSetSearchParamsRef.current ? null : defaultSearchParamsRef.current
       )
     ),
-    [location.search]
+    [location2.search]
   );
   let navigate = useNavigate();
   let setSearchParams = React10.useCallback(
@@ -8667,9 +8718,9 @@ function useFormAction(action, { relative } = {}) {
   invariant(routeContext, "useFormAction must be used inside a RouteContext");
   let [match] = routeContext.matches.slice(-1);
   let path = { ...useResolvedPath(action ? action : ".", { relative }) };
-  let location = useLocation();
+  let location2 = useLocation();
   if (action == null) {
-    path.search = location.search;
+    path.search = location2.search;
     let params = new URLSearchParams(path.search);
     let indexValues = params.getAll("index");
     let hasNakedIndexParam = indexValues.some((v) => v === "");
@@ -8761,23 +8812,23 @@ function useFetchers() {
 }
 var SCROLL_RESTORATION_STORAGE_KEY = "react-router-scroll-positions";
 var savedScrollPositions = {};
-function getScrollRestorationKey(location, matches, basename, getKey) {
+function getScrollRestorationKey(location2, matches, basename, getKey) {
   let key = null;
   if (getKey) {
     if (basename !== "/") {
       key = getKey(
         {
-          ...location,
-          pathname: stripBasename(location.pathname, basename) || location.pathname
+          ...location2,
+          pathname: stripBasename(location2.pathname, basename) || location2.pathname
         },
         matches
       );
     } else {
-      key = getKey(location, matches);
+      key = getKey(location2, matches);
     }
   }
   if (key == null) {
-    key = location.key;
+    key = location2.key;
   }
   return key;
 }
@@ -8790,7 +8841,7 @@ function useScrollRestoration({
     "useScrollRestoration" /* UseScrollRestoration */
   );
   let { basename } = React10.useContext(NavigationContext);
-  let location = useLocation();
+  let location2 = useLocation();
   let matches = useMatches();
   let navigation = useNavigation();
   React10.useEffect(() => {
@@ -8802,7 +8853,7 @@ function useScrollRestoration({
   usePageHide(
     React10.useCallback(() => {
       if (navigation.state === "idle") {
-        let key = getScrollRestorationKey(location, matches, basename, getKey);
+        let key = getScrollRestorationKey(location2, matches, basename, getKey);
         savedScrollPositions[key] = window.scrollY;
       }
       try {
@@ -8817,7 +8868,7 @@ function useScrollRestoration({
         );
       }
       window.history.scrollRestoration = "auto";
-    }, [navigation.state, getKey, basename, location, matches, storageKey])
+    }, [navigation.state, getKey, basename, location2, matches, storageKey])
   );
   if (typeof document !== "undefined") {
     React10.useLayoutEffect(() => {
@@ -8835,7 +8886,7 @@ function useScrollRestoration({
       let disableScrollRestoration = router?.enableScrollRestoration(
         savedScrollPositions,
         () => window.scrollY,
-        getKey ? (location2, matches2) => getScrollRestorationKey(location2, matches2, basename, getKey) : void 0
+        getKey ? (location3, matches2) => getScrollRestorationKey(location3, matches2, basename, getKey) : void 0
       );
       return () => disableScrollRestoration && disableScrollRestoration();
     }, [router, basename, getKey]);
@@ -8847,9 +8898,9 @@ function useScrollRestoration({
         window.scrollTo(0, restoreScrollPosition);
         return;
       }
-      if (location.hash) {
+      if (location2.hash) {
         let el = document.getElementById(
-          decodeURIComponent(location.hash.slice(1))
+          decodeURIComponent(location2.hash.slice(1))
         );
         if (el) {
           el.scrollIntoView();
@@ -8860,7 +8911,7 @@ function useScrollRestoration({
         return;
       }
       window.scrollTo(0, 0);
-    }, [location, restoreScrollPosition, preventScrollReset]);
+    }, [location2, restoreScrollPosition, preventScrollReset]);
   }
 }
 function useBeforeUnload(callback, options) {
@@ -8933,7 +8984,7 @@ function StaticRouter({
     locationProp = parsePath(locationProp);
   }
   let action = "POP" /* Pop */;
-  let location = {
+  let location2 = {
     pathname: locationProp.pathname || "/",
     search: locationProp.search || "",
     hash: locationProp.hash || "",
@@ -8946,7 +8997,7 @@ function StaticRouter({
     {
       basename,
       children,
-      location,
+      location: location2,
       navigationType: action,
       navigator: staticNavigator,
       static: true
@@ -9165,6 +9216,9 @@ function createStaticRouter(routes, context, opts = {}) {
     _internalFetchControllers: /* @__PURE__ */ new Map(),
     _internalSetRoutes() {
       throw msg("_internalSetRoutes");
+    },
+    _internalSetStateDoNotUseOrYouWillBreakYourApp() {
+      throw msg("_internalSetStateDoNotUseOrYouWillBreakYourApp");
     }
   };
 }
@@ -9239,7 +9293,6 @@ function ServerRouter({
         future: context.future,
         ssr: context.ssr,
         isSpaMode: context.isSpaMode,
-        routeDiscovery: context.routeDiscovery,
         serializeError: context.serializeError,
         renderMeta: context.renderMeta
       }
@@ -9289,8 +9342,7 @@ function createRoutesStub(routes, unstable_getContext) {
         },
         routeModules: {},
         ssr: false,
-        isSpaMode: false,
-        routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" }
+        isSpaMode: false
       };
       let patched = processRoutes(
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
@@ -9694,26 +9746,6 @@ function invariant3(value, message) {
   }
 }
 
-// lib/server-runtime/dev.ts
-var globalDevServerHooksKey = "__reactRouterDevServerHooks";
-function setDevServerHooks(devServerHooks) {
-  globalThis[globalDevServerHooksKey] = devServerHooks;
-}
-function getDevServerHooks() {
-  return globalThis[globalDevServerHooksKey];
-}
-function getBuildTimeHeader(request, headerName) {
-  if (typeof process !== "undefined") {
-    try {
-      if (process.env?.IS_RR_BUILD_REQUEST === "yes") {
-        return request.headers.get(headerName);
-      }
-    } catch (e) {
-    }
-  }
-  return null;
-}
-
 // lib/server-runtime/routes.ts
 function groupRoutesByParentId2(manifest) {
   let routes = {};
@@ -9745,11 +9777,10 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
       // Need to use RR's version in the param typed here to permit the optional
       // context even though we know it'll always be provided in remix
       loader: route.module.loader ? async (args) => {
-        let preRenderedData = getBuildTimeHeader(
-          args.request,
-          "X-React-Router-Prerender-Data"
-        );
-        if (preRenderedData != null) {
+        if (args.request.headers.has("X-React-Router-Prerender-Data")) {
+          const preRenderedData = args.request.headers.get(
+            "X-React-Router-Prerender-Data"
+          );
           let encoded = preRenderedData ? decodeURI(preRenderedData) : preRenderedData;
           invariant3(encoded, "Missing prerendered data for route");
           let uint8array = new TextEncoder().encode(encoded);
@@ -9824,12 +9855,21 @@ function createServerHandoffString(serverHandoff) {
   return escapeHtml2(JSON.stringify(serverHandoff));
 }
 
+// lib/server-runtime/dev.ts
+var globalDevServerHooksKey = "__reactRouterDevServerHooks";
+function setDevServerHooks(devServerHooks) {
+  globalThis[globalDevServerHooksKey] = devServerHooks;
+}
+function getDevServerHooks() {
+  return globalThis[globalDevServerHooksKey];
+}
+
 // lib/server-runtime/single-fetch.ts
 var import_turbo_stream2 = require("turbo-stream");
 
 // lib/server-runtime/headers.ts
 var import_set_cookie_parser = require("set-cookie-parser");
-function getDocumentHeaders(build, context) {
+function getDocumentHeaders(context, getRouteHeadersFn) {
   let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
   let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
   let errorHeaders;
@@ -9847,14 +9887,12 @@ function getDocumentHeaders(build, context) {
   }
   return matches.reduce((parentHeaders, match, idx) => {
     let { id } = match.route;
-    let route = build.routes[id];
-    invariant3(route, `Route with id "${id}" not found in build`);
-    let routeModule = route.module;
     let loaderHeaders = context.loaderHeaders[id] || new Headers();
     let actionHeaders = context.actionHeaders[id] || new Headers();
     let includeErrorHeaders = errorHeaders != null && idx === matches.length - 1;
     let includeErrorCookies = includeErrorHeaders && errorHeaders !== loaderHeaders && errorHeaders !== actionHeaders;
-    if (routeModule.headers == null) {
+    let headersFn = getRouteHeadersFn(match);
+    if (headersFn == null) {
       let headers2 = new Headers(parentHeaders);
       if (includeErrorCookies) {
         prependCookies(errorHeaders, headers2);
@@ -9864,12 +9902,12 @@ function getDocumentHeaders(build, context) {
       return headers2;
     }
     let headers = new Headers(
-      routeModule.headers ? typeof routeModule.headers === "function" ? routeModule.headers({
+      typeof headersFn === "function" ? headersFn({
         loaderHeaders,
         parentHeaders,
         actionHeaders,
         errorHeaders: includeErrorHeaders ? errorHeaders : void 0
-      }) : routeModule.headers : void 0
+      }) : headersFn
     );
     if (includeErrorCookies) {
       prependCookies(errorHeaders, headers);
@@ -9894,6 +9932,7 @@ function prependCookies(parentHeaders, childHeaders) {
 }
 
 // lib/server-runtime/single-fetch.ts
+var SINGLE_FETCH_REDIRECT_STATUS = 202;
 var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
   ...NO_BODY_STATUS_CODES,
   304
@@ -9901,7 +9940,10 @@ var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
 async function singleFetchAction(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
   try {
     let respond2 = function(context) {
-      let headers = getDocumentHeaders(build, context);
+      let headers = getDocumentHeaders(
+        context,
+        (m) => build.routes[m.route.id]?.module.headers
+      );
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: getSingleFetchRedirect(
@@ -9976,7 +10018,10 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
 async function singleFetchLoaders(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
   try {
     let respond2 = function(context) {
-      let headers = getDocumentHeaders(build, context);
+      let headers = getDocumentHeaders(
+        context,
+        (m) => build.routes[m.route.id]?.module.headers
+      );
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: {
@@ -10232,10 +10277,9 @@ Error: ${e instanceof Error ? e.toString() : e}`
     if (stripBasename(normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
       normalizedPath = normalizedPath.slice(0, -1);
     }
-    let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
     if (!_build.ssr) {
       if (_build.prerender.length === 0) {
-        isSpaMode = true;
+        request.headers.set("X-React-Router-SPA-Mode", "yes");
       } else if (!_build.prerender.includes(normalizedPath) && !_build.prerender.includes(normalizedPath + "/")) {
         if (url.pathname.endsWith(".data")) {
           errorHandler(
@@ -10255,14 +10299,11 @@ Error: ${e instanceof Error ? e.toString() : e}`
             statusText: "Not Found"
           });
         } else {
-          isSpaMode = true;
+          request.headers.set("X-React-Router-SPA-Mode", "yes");
         }
       }
     }
-    let manifestUrl = getManifestPath(
-      _build.routeDiscovery.manifestPath,
-      normalizedBasename
-    );
+    let manifestUrl = `${normalizedBasename}/__manifest`.replace(/\/+/g, "/");
     if (url.pathname === manifestUrl) {
       try {
         let res = await handleManifestRequest(_build, routes, url);
@@ -10272,7 +10313,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPath, _build.basename);
+    let matches = matchServerRoutes(routes, url.pathname, _build.basename);
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
@@ -10327,7 +10368,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
           );
         }
       }
-    } else if (!isSpaMode && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
+    } else if (!request.headers.has("X-React-Router-SPA-Mode") && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
       response = await handleResourceRequest(
         serverMode,
         _build,
@@ -10352,7 +10393,6 @@ Error: ${e instanceof Error ? e.toString() : e}`
         request,
         loadContext,
         handleError,
-        isSpaMode,
         criticalCss
       );
     }
@@ -10428,7 +10468,8 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
   );
   return response;
 }
-async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, isSpaMode, criticalCss) {
+async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, criticalCss) {
+  let isSpaMode = request.headers.has("X-React-Router-SPA-Mode");
   try {
     let response = await staticHandler.query(request, {
       requestContext: loadContext,
@@ -10443,7 +10484,10 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     if (isResponse(context)) {
       return context;
     }
-    let headers = getDocumentHeaders(build, context);
+    let headers = getDocumentHeaders(
+      context,
+      (m) => build.routes[m.route.id]?.module.headers
+    );
     if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) {
       return new Response(null, { status: context.statusCode, headers });
     }
@@ -10460,21 +10504,17 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       actionData: context.actionData,
       errors: serializeErrors2(context.errors, serverMode)
     };
-    let baseServerHandoff = {
-      basename: build.basename,
-      future: build.future,
-      routeDiscovery: build.routeDiscovery,
-      ssr: build.ssr,
-      isSpaMode: isSpaMode2
-    };
     let entryContext = {
       manifest: build.assets,
       routeModules: createEntryRouteModules(build.routes),
       staticHandlerContext: context,
       criticalCss,
       serverHandoffString: createServerHandoffString({
-        ...baseServerHandoff,
-        criticalCss
+        basename: build.basename,
+        criticalCss,
+        future: build.future,
+        ssr: build.ssr,
+        isSpaMode: isSpaMode2
       }),
       serverHandoffStream: encodeViaTurboStream(
         state,
@@ -10485,7 +10525,6 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       renderMeta: {},
       future: build.future,
       ssr: build.ssr,
-      routeDiscovery: build.routeDiscovery,
       isSpaMode: isSpaMode2,
       serializeError: (err) => serializeError(err, serverMode)
     };
@@ -10528,7 +10567,12 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       entryContext = {
         ...entryContext,
         staticHandlerContext: context,
-        serverHandoffString: createServerHandoffString(baseServerHandoff),
+        serverHandoffString: createServerHandoffString({
+          basename: build.basename,
+          future: build.future,
+          ssr: build.ssr,
+          isSpaMode: isSpaMode2
+        }),
         serverHandoffStream: encodeViaTurboStream(
           state2,
           request.signal,
@@ -10701,7 +10745,7 @@ function createSessionStorage({
 function warnOnceAboutSigningSessionCookie(cookie) {
   warnOnce(
     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.`
+    `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://remix.run/utils/cookies#signing-cookies for more information.`
   );
 }
 
@@ -10781,6 +10825,680 @@ function href(path, ...args) {
   }).filter((segment) => segment !== void 0).join("/");
 }
 
+// lib/rsc/browser.tsx
+var React14 = __toESM(require("react"));
+
+// lib/dom/ssr/hydration.tsx
+function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
+  let hydrationData = {
+    ...state,
+    loaderData: { ...state.loaderData }
+  };
+  let initialMatches = matchRoutes(routes, location2, basename);
+  if (initialMatches) {
+    for (let match of initialMatches) {
+      let routeId = match.route.id;
+      let routeInfo = getRouteInfo(routeId);
+      if (shouldHydrateRouteLoader(
+        routeId,
+        routeInfo.clientLoader,
+        routeInfo.hasLoader,
+        isSpaMode
+      ) && (routeInfo.hasHydrateFallback || !routeInfo.hasLoader)) {
+        delete hydrationData.loaderData[routeId];
+      } else if (!routeInfo.hasLoader) {
+        hydrationData.loaderData[routeId] = null;
+      }
+    }
+  }
+  return hydrationData;
+}
+
+// lib/rsc/browser.tsx
+function createCallServer({
+  decode: decode2,
+  encodeAction
+}) {
+  let landedActionId = 0;
+  return async (id, args) => {
+    let actionId = window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
+    const response = await fetch(location.href, {
+      body: await encodeAction(args),
+      method: "POST",
+      headers: {
+        Accept: "text/x-component",
+        "rsc-action-id": id
+      }
+    });
+    if (!response.body) {
+      throw new Error("No response body");
+    }
+    const payload = await decode2(response.body);
+    if (payload.type !== "action") {
+      throw new Error("Unexpected payload type");
+    }
+    if (payload.rerender) {
+      (async () => {
+        const rerender = await payload.rerender;
+        if (!rerender) return;
+        if (landedActionId < actionId && window.__routerActionID <= actionId) {
+          landedActionId = actionId;
+          if (rerender.type === "redirect") {
+            if (rerender.reload) {
+              window.location.href = rerender.location;
+              return;
+            }
+            window.__router.navigate(rerender.location, {
+              replace: rerender.replace
+            });
+            return;
+          }
+          let lastMatch;
+          for (const match of rerender.matches) {
+            window.__router.patchRoutes(
+              lastMatch?.id ?? null,
+              [createRouteFromServerManifest(match)],
+              true
+            );
+            lastMatch = match;
+          }
+          window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({});
+          React14.startTransition(() => {
+            window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
+              loaderData: Object.assign(
+                {},
+                window.__router.state.loaderData,
+                rerender.loaderData
+              ),
+              errors: rerender.errors ? Object.assign(
+                {},
+                window.__router.state.errors,
+                rerender.errors
+              ) : null
+            });
+          });
+        }
+      })();
+    }
+    return payload.actionResult;
+  };
+}
+function createRouterFromPayload({
+  decode: decode2,
+  payload
+}) {
+  if (window.__router) return window.__router;
+  if (payload.type !== "render") throw new Error("Invalid payload type");
+  let patches = /* @__PURE__ */ new Map();
+  payload.patches?.forEach((patch) => {
+    invariant(patch.parentId, "Invalid patch parentId");
+    if (!patches.has(patch.parentId)) {
+      patches.set(patch.parentId, []);
+    }
+    patches.get(patch.parentId)?.push(patch);
+  });
+  let routes = payload.matches.reduceRight((previous, match) => {
+    const route = createRouteFromServerManifest(
+      match,
+      payload
+    );
+    if (previous.length > 0) {
+      route.children = previous;
+      let childrenToPatch = patches.get(match.id);
+      if (childrenToPatch) {
+        route.children.push(
+          ...childrenToPatch.map((r) => createRouteFromServerManifest(r))
+        );
+      }
+    }
+    return [route];
+  }, []);
+  window.__router = createRouter({
+    routes,
+    basename: payload.basename,
+    history: createBrowserHistory(),
+    hydrationData: getHydrationData(
+      {
+        loaderData: payload.loaderData,
+        actionData: payload.actionData,
+        errors: payload.errors
+      },
+      routes,
+      (routeId) => {
+        let match = payload.matches.find((m) => m.id === routeId);
+        invariant(match, "Route not found in payload");
+        return {
+          clientLoader: match.clientLoader,
+          hasLoader: match.hasLoader,
+          hasHydrateFallback: match.hydrateFallbackElement != null
+        };
+      },
+      payload.location,
+      void 0,
+      false
+    ),
+    async patchRoutesOnNavigation({ patch, path, signal }) {
+      let response = await fetch(`${path}.manifest`, { signal });
+      if (!response.body || response.status < 200 || response.status >= 300) {
+        throw new Error("Unable to fetch new route matches from the server");
+      }
+      let payload2 = await decode2(response.body);
+      if (payload2.type !== "manifest") {
+        throw new Error("Failed to patch routes on navigation");
+      }
+      payload2.matches.forEach(
+        (match, i) => patch(payload2.matches[i - 1]?.id ?? null, [
+          createRouteFromServerManifest(match)
+        ])
+      );
+      payload2.patches.forEach((p) => {
+        patch(p.parentId ?? null, [createRouteFromServerManifest(p)]);
+      });
+    },
+    // FIXME: Pass `build.ssr` and `build.basename` into this function
+    dataStrategy: getRSCSingleFetchDataStrategy(
+      () => window.__router,
+      true,
+      void 0,
+      decode2
+    )
+  });
+  if (window.__router.state.initialized) {
+    window.__routerInitialized = true;
+    window.__router.initialize();
+  } else {
+    window.__routerInitialized = false;
+  }
+  let lastLoaderData = void 0;
+  window.__router.subscribe(({ loaderData, actionData }) => {
+    if (lastLoaderData !== loaderData) {
+      window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
+    }
+  });
+  return window.__router;
+}
+var renderedRoutesContext = unstable_createContext();
+function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
+  let dataStrategy = getSingleFetchDataStrategyImpl(
+    getRouter,
+    (match) => {
+      let M = match;
+      return {
+        hasLoader: M.route.hasLoader,
+        hasClientLoader: M.route.hasClientLoader,
+        hasAction: M.route.hasAction,
+        hasClientAction: M.route.hasClientAction,
+        hasShouldRevalidate: M.route.hasShouldRevalidate
+      };
+    },
+    // pass map into fetchAndDecode so it can add payloads
+    getFetchAndDecodeViaRSC(decode2),
+    ssr,
+    basename
+  );
+  return async (args) => args.unstable_runClientMiddleware(async () => {
+    let context = args.context;
+    context.set(renderedRoutesContext, []);
+    let results = await dataStrategy(args);
+    const renderedRouteById = new Map(
+      context.get(renderedRoutesContext).map((r) => [r.id, r])
+    );
+    for (const match of args.matches) {
+      const rendered = renderedRouteById.get(match.route.id);
+      if (rendered) {
+        window.__router.patchRoutes(
+          rendered.parentId ?? null,
+          [createRouteFromServerManifest(rendered)],
+          true
+        );
+      }
+    }
+    return results;
+  });
+}
+function getFetchAndDecodeViaRSC(decode2) {
+  return async (args, basename, targetRoutes) => {
+    let { request, context } = args;
+    let url = singleFetchUrl(request.url, basename, "rsc");
+    if (request.method === "GET") {
+      url = stripIndexParam(url);
+      if (targetRoutes) {
+        url.searchParams.set("_routes", targetRoutes.join(","));
+      }
+    }
+    let res = await fetch(url, await createRequestInit(request));
+    if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
+      throw new ErrorResponseImpl(404, "Not Found", true);
+    }
+    invariant(res.body, "No response body to decode");
+    try {
+      const payload = await decode2(res.body);
+      if (payload.type === "redirect") {
+        return {
+          status: res.status,
+          data: {
+            redirect: {
+              redirect: payload.location,
+              reload: false,
+              replace: payload.replace,
+              revalidate: false,
+              status: payload.status
+            }
+          }
+        };
+      }
+      if (payload.type !== "render") {
+        throw new Error("Unexpected payload type");
+      }
+      context.get(renderedRoutesContext).push(...payload.matches);
+      let results = { routes: {} };
+      const dataKey = isMutationMethod(request.method) ? "actionData" : "loaderData";
+      for (let [routeId, data2] of Object.entries(payload[dataKey] || {})) {
+        results.routes[routeId] = { data: data2 };
+      }
+      if (payload.errors) {
+        for (let [routeId, error] of Object.entries(payload.errors)) {
+          results.routes[routeId] = { error };
+        }
+      }
+      return { status: res.status, data: results };
+    } catch (e) {
+      throw new Error("Unable to decode RSC response");
+    }
+  };
+}
+function RSCHydratedRouter({
+  decode: decode2,
+  payload
+}) {
+  if (payload.type !== "render") throw new Error("Invalid payload type");
+  let router = React14.useMemo(
+    () => createRouterFromPayload({ decode: decode2, payload }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  );
+  React14.useLayoutEffect(() => {
+    if (!window.__routerInitialized) {
+      window.__routerInitialized = true;
+      window.__router.initialize();
+    }
+  }, []);
+  const frameworkContext = {
+    future: {
+      // These flags have no runtime impact so can always be false.  If we add
+      // flags that drive runtime behavior they'll need to be proxied through.
+      unstable_middleware: false,
+      unstable_subResourceIntegrity: false
+    },
+    isSpaMode: true,
+    ssr: true,
+    criticalCss: "",
+    manifest: {
+      routes: {},
+      version: "1",
+      url: "",
+      entry: {
+        module: "",
+        imports: []
+      }
+    },
+    routeModules: {}
+  };
+  return /* @__PURE__ */ React14.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React14.createElement(RouterProvider, { router }));
+}
+function createRouteFromServerManifest(match, payload) {
+  let hasInitialData = payload && match.id in payload.loaderData;
+  let initialData = payload?.loaderData[match.id];
+  let hasInitialError = payload?.errors && match.id in payload.errors;
+  let initialError = payload?.errors?.[match.id];
+  let isHydrationRequest = match.clientLoader?.hydrate === true || !match.hasLoader;
+  let dataRoute = {
+    id: match.id,
+    element: match.element,
+    errorElement: match.errorElement,
+    handle: match.handle,
+    hasErrorBoundary: match.hasErrorBoundary,
+    hydrateFallbackElement: match.hydrateFallbackElement,
+    index: match.index,
+    loader: match.clientLoader ? async (args, singleFetch) => {
+      try {
+        let result = await match.clientLoader({
+          ...args,
+          serverLoader: () => {
+            preventInvalidServerHandlerCall2(
+              "loader",
+              match.id,
+              match.hasLoader
+            );
+            if (isHydrationRequest) {
+              if (hasInitialData) {
+                return initialData;
+              }
+              if (hasInitialError) {
+                throw initialError;
+              }
+            }
+            return callSingleFetch(singleFetch);
+          }
+        });
+        return result;
+      } finally {
+        isHydrationRequest = false;
+      }
+    } : (
+      // We always make the call in this RSC world since even if we don't
+      // have a `loader` we may need to get the `element` implementation
+      (_, singleFetch) => callSingleFetch(singleFetch)
+    ),
+    action: match.clientAction ? (args, singleFetch) => match.clientAction({
+      ...args,
+      serverAction: async () => {
+        preventInvalidServerHandlerCall2(
+          "loader",
+          match.id,
+          match.hasLoader
+        );
+        return await callSingleFetch(singleFetch);
+      }
+    }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : void 0,
+    path: match.path,
+    shouldRevalidate: match.shouldRevalidate,
+    // We always have a "loader" in this RSC world since even if we don't
+    // have a `loader` we may need to get the `element` implementation
+    hasLoader: true,
+    hasClientLoader: match.clientLoader != null,
+    hasAction: match.hasAction,
+    hasClientAction: match.clientAction != null,
+    hasShouldRevalidate: match.shouldRevalidate != null
+  };
+  if (typeof dataRoute.loader === "function") {
+    dataRoute.loader.hydrate = shouldHydrateRouteLoader(
+      match.id,
+      match.clientLoader,
+      match.hasLoader,
+      false
+    );
+  }
+  return dataRoute;
+}
+function callSingleFetch(singleFetch) {
+  invariant(typeof singleFetch === "function", "Invalid singleFetch parameter");
+  return singleFetch();
+}
+function preventInvalidServerHandlerCall2(type, routeId, hasHandler) {
+  if (!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 ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
+  }
+}
+
+// lib/rsc/server.ssr.tsx
+var React15 = __toESM(require("react"));
+
+// lib/rsc/html-stream/server.ts
+var encoder2 = new TextEncoder();
+var trailer = "</body></html>";
+function injectRSCPayload(rscStream) {
+  let decoder = new TextDecoder();
+  let resolveFlightDataPromise;
+  let flightDataPromise = new Promise(
+    (resolve) => resolveFlightDataPromise = resolve
+  );
+  let startedRSC = false;
+  let buffered = [];
+  let timeout = null;
+  function flushBufferedChunks(controller) {
+    for (let chunk of buffered) {
+      let buf = decoder.decode(chunk, { stream: true });
+      if (buf.endsWith(trailer)) {
+        buf = buf.slice(0, -trailer.length);
+      }
+      controller.enqueue(encoder2.encode(buf));
+    }
+    buffered.length = 0;
+    timeout = null;
+  }
+  return new TransformStream({
+    transform(chunk, controller) {
+      buffered.push(chunk);
+      if (timeout) {
+        return;
+      }
+      timeout = setTimeout(async () => {
+        flushBufferedChunks(controller);
+        if (!startedRSC) {
+          startedRSC = true;
+          writeRSCStream(rscStream, controller).catch((err) => controller.error(err)).then(resolveFlightDataPromise);
+        }
+      }, 0);
+    },
+    async flush(controller) {
+      await flightDataPromise;
+      if (timeout) {
+        clearTimeout(timeout);
+        flushBufferedChunks(controller);
+      }
+      controller.enqueue(encoder2.encode("</body></html>"));
+    }
+  });
+}
+async function writeRSCStream(rscStream, controller) {
+  let decoder = new TextDecoder("utf-8", { fatal: true });
+  const reader = rscStream.getReader();
+  try {
+    let read;
+    while ((read = await reader.read()) && !read.done) {
+      const chunk = read.value;
+      try {
+        writeChunk(
+          JSON.stringify(decoder.decode(chunk, { stream: true })),
+          controller
+        );
+      } catch (err) {
+        let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
+        writeChunk(
+          `Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`,
+          controller
+        );
+      }
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  let remaining = decoder.decode();
+  if (remaining.length) {
+    writeChunk(JSON.stringify(remaining), controller);
+  }
+}
+function writeChunk(chunk, controller) {
+  controller.enqueue(
+    encoder2.encode(
+      `<script>${escapeScript(
+        `(self.__FLIGHT_DATA||=[]).push(${chunk})`
+      )}</script>`
+    )
+  );
+}
+function escapeScript(script) {
+  return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
+}
+
+// lib/rsc/server.ssr.tsx
+async function routeRSCServerRequest(request, requestServer, decode2, renderHTML) {
+  const url = new URL(request.url);
+  let serverRequest = request;
+  const isDataRequest = isReactServerRequest(url);
+  const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
+  if (isDataRequest) {
+    const serverURL = new URL(request.url);
+    serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
+    let headers = new Headers(request.headers);
+    headers.set("X-React-Router-Data-Request", "true");
+    serverRequest = new Request(serverURL, {
+      body: request.body,
+      duplex: request.body ? "half" : void 0,
+      headers,
+      method: request.method,
+      signal: request.signal
+    });
+  }
+  const serverResponse = await requestServer(serverRequest);
+  if (respondWithRSCPayload) {
+    return serverResponse;
+  }
+  if (!serverResponse.body) {
+    throw new Error("Missing body in server response");
+  }
+  const serverResponseB = serverResponse.clone();
+  if (!serverResponseB.body) {
+    throw new Error("Failed to clone server response");
+  }
+  const payload = await decode2(serverResponse.body);
+  if (payload.type === "redirect") {
+    return new Response(null, {
+      status: payload.status,
+      headers: {
+        Location: payload.location
+      }
+    });
+  }
+  const html = await renderHTML(payload);
+  try {
+    const body = html.pipeThrough(injectRSCPayload(serverResponseB.body));
+    const headers = new Headers(serverResponse.headers);
+    headers.set("Content-Type", "text/html");
+    return new Response(body, {
+      status: serverResponse.status,
+      headers
+    });
+  } catch (reason) {
+    throw reason;
+  }
+}
+function RSCStaticRouter({ payload }) {
+  if (payload.type !== "render") return null;
+  const context = {
+    actionData: payload.actionData,
+    actionHeaders: {},
+    basename: payload.basename,
+    errors: payload.errors,
+    loaderData: payload.loaderData,
+    loaderHeaders: {},
+    location: payload.location,
+    statusCode: 200,
+    matches: payload.matches.map((match) => ({
+      params: match.params,
+      pathname: match.pathname,
+      pathnameBase: match.pathnameBase,
+      route: {
+        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,
+        shouldRevalidate: match.shouldRevalidate
+      }
+    }))
+  };
+  const router = createStaticRouter(
+    payload.matches.reduceRight((previous, match) => {
+      const route = {
+        id: match.id,
+        action: match.hasAction || !!match.clientAction,
+        element: match.element,
+        errorElement: match.errorElement,
+        handle: match.handle,
+        hasErrorBoundary: !!match.errorElement,
+        hydrateFallbackElement: match.hydrateFallbackElement,
+        index: match.index,
+        loader: match.hasLoader || !!match.clientLoader,
+        path: match.path,
+        shouldRevalidate: match.shouldRevalidate
+      };
+      if (previous.length > 0) {
+        route.children = previous;
+      }
+      return [route];
+    }, []),
+    context
+  );
+  const frameworkContext = {
+    future: {
+      // These flags have no runtime impact so can always be false.  If we add
+      // flags that drive runtime behavior they'll need to be proxied through.
+      unstable_middleware: false,
+      unstable_subResourceIntegrity: false
+    },
+    isSpaMode: false,
+    ssr: true,
+    criticalCss: "",
+    manifest: {
+      routes: {},
+      version: "1",
+      url: "",
+      entry: {
+        module: "",
+        imports: []
+      }
+    },
+    routeModules: {}
+  };
+  return /* @__PURE__ */ React15.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React15.createElement(
+    StaticRouterProvider,
+    {
+      context,
+      router,
+      hydrate: false,
+      nonce: payload.nonce
+    }
+  ));
+}
+function isReactServerRequest(url) {
+  return url.pathname.endsWith(".rsc");
+}
+function isManifestRequest(url) {
+  return url.pathname.endsWith(".manifest");
+}
+
+// lib/rsc/html-stream/browser.ts
+function getServerStream() {
+  let encoder3 = new TextEncoder();
+  let streamController = null;
+  let rscStream = new ReadableStream({
+    start(controller) {
+      if (typeof window === "undefined") {
+        return;
+      }
+      let handleChunk = (chunk) => {
+        if (typeof chunk === "string") {
+          controller.enqueue(encoder3.encode(chunk));
+        } else {
+          controller.enqueue(chunk);
+        }
+      };
+      window.__FLIGHT_DATA || (window.__FLIGHT_DATA = []);
+      window.__FLIGHT_DATA.forEach(handleChunk);
+      window.__FLIGHT_DATA.push = (chunk) => {
+        handleChunk(chunk);
+        return 0;
+      };
+      streamController = controller;
+    }
+  });
+  if (typeof document !== "undefined" && document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", () => {
+      streamController?.close();
+    });
+  } else {
+    streamController?.close();
+  }
+  return rscStream;
+}
+
 // lib/dom/ssr/errors.ts
 function deserializeErrors2(errors) {
   if (!errors) return null;
@@ -10817,32 +11535,6 @@ function deserializeErrors2(errors) {
   }
   return serialized;
 }
-
-// lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, location, basename, isSpaMode) {
-  let hydrationData = {
-    ...state,
-    loaderData: { ...state.loaderData }
-  };
-  let initialMatches = matchRoutes(routes, location, basename);
-  if (initialMatches) {
-    for (let match of initialMatches) {
-      let routeId = match.route.id;
-      let routeInfo = getRouteInfo(routeId);
-      if (shouldHydrateRouteLoader(
-        routeId,
-        routeInfo.clientLoader,
-        routeInfo.hasLoader,
-        isSpaMode
-      ) && (routeInfo.hasHydrateFallback || !routeInfo.hasLoader)) {
-        delete hydrationData.loaderData[routeId];
-      } else if (!routeInfo.hasLoader) {
-        hydrationData.loaderData[routeId] = null;
-      }
-    }
-  }
-  return hydrationData;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Await,
@@ -10861,6 +11553,8 @@ function getHydrationData(state, routes, getRouteInfo, location, basename, isSpa
   NavigationType,
   Outlet,
   PrefetchPageLinks,
+  RSCHydratedRouter,
+  RSCStaticRouter,
   Route,
   Router,
   RouterProvider,
@@ -10882,6 +11576,9 @@ function getHydrationData(state, routes, getRouteInfo, location, basename, isSpa
   UNSAFE_ServerMode,
   UNSAFE_SingleFetchRedirectSymbol,
   UNSAFE_ViewTransitionContext,
+  UNSAFE_WithErrorBoundaryProps,
+  UNSAFE_WithHydrateFallbackProps,
+  UNSAFE_WithRouteComponentProps,
   UNSAFE_createBrowserHistory,
   UNSAFE_createClientRoutes,
   UNSAFE_createClientRoutesWithHMRRevalidationOptOut,
@@ -10898,6 +11595,7 @@ function getHydrationData(state, routes, getRouteInfo, location, basename, isSpa
   UNSAFE_useFogOFWarDiscovery,
   UNSAFE_useScrollRestoration,
   createBrowserRouter,
+  createCallServer,
   createCookie,
   createCookieSessionStorage,
   createHashRouter,
@@ -10915,6 +11613,7 @@ function getHydrationData(state, routes, getRouteInfo, location, basename, isSpa
   createStaticRouter,
   data,
   generatePath,
+  getServerStream,
   href,
   isCookie,
   isRouteErrorResponse,
@@ -10927,6 +11626,7 @@ function getHydrationData(state, routes, getRouteInfo, location, basename, isSpa
   renderMatches,
   replace,
   resolvePath,
+  routeRSCServerRequest,
   unstable_HistoryRouter,
   unstable_RouterContextProvider,
   unstable_createContext,