react-router 0.0.0-experimental-17b9b60af → 0.0.0-experimental-d82b9430b

package/dist/development/{chunk-MV33LHGM.mjs → chunk-KBNUQA6K.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-17b9b60af
+ * react-router v0.0.0-experimental-d82b9430b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -45,19 +45,19 @@ function createMemoryHistory(options = {}) {
     return entries[index];
   }
   function createMemoryLocation(to, state = null, key) {
-    let location2 = createLocation(
+    let location = createLocation(
       entries ? getCurrentLocation().pathname : "/",
       to,
       state,
       key
     );
     warning(
-      location2.pathname.charAt(0) === "/",
+      location.pathname.charAt(0) === "/",
       `relative pathnames are not supported in memory history: ${JSON.stringify(
         to
       )}`
     );
-    return location2;
+    return location;
   }
   function createHref2(to) {
     return typeof to === "string" ? to : createPath(to);
@@ -168,9 +168,9 @@ function createHashHistory(options = {}) {
     }
     return href2 + "#" + (typeof to === "string" ? to : createPath(to));
   }
-  function validateHashLocation(location2, to) {
+  function validateHashLocation(location, to) {
     warning(
-      location2.pathname.charAt(0) === "/",
+      location.pathname.charAt(0) === "/",
       `relative pathnames are not supported in hash history.push(${JSON.stringify(
         to
       )})`
@@ -200,15 +200,15 @@ function warning(cond, message) {
 function createKey() {
   return Math.random().toString(36).substring(2, 10);
 }
-function getHistoryState(location2, index) {
+function getHistoryState(location, index) {
   return {
-    usr: location2.state,
-    key: location2.key,
+    usr: location.state,
+    key: location.key,
     idx: index
   };
 }
 function createLocation(current, to, state = null, key) {
-  let location2 = {
+  let location = {
     pathname: typeof current === "string" ? current : current.pathname,
     search: "",
     hash: "",
@@ -220,7 +220,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 location2;
+  return location;
 }
 function createPath({
   pathname = "/",
@@ -277,11 +277,11 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
   }
   function push(to, state) {
     action = "PUSH" /* Push */;
-    let location2 = createLocation(history.location, to, state);
-    if (validateLocation) validateLocation(location2, to);
+    let location = createLocation(history.location, to, state);
+    if (validateLocation) validateLocation(location, to);
     index = getIndex() + 1;
-    let historyState = getHistoryState(location2, index);
-    let url = history.createHref(location2);
+    let historyState = getHistoryState(location, index);
+    let url = history.createHref(location);
     try {
       globalHistory.pushState(historyState, "", url);
     } catch (error) {
@@ -296,11 +296,11 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
   }
   function replace2(to, state) {
     action = "REPLACE" /* Replace */;
-    let location2 = createLocation(history.location, to, state);
-    if (validateLocation) validateLocation(location2, to);
+    let location = createLocation(history.location, to, state);
+    if (validateLocation) validateLocation(location, to);
     index = getIndex();
-    let historyState = getHistoryState(location2, index);
-    let url = history.createHref(location2);
+    let historyState = getHistoryState(location, index);
+    let url = history.createHref(location);
     globalHistory.replaceState(historyState, "", url);
     if (v5Compat && listener) {
       listener({ action, location: history.location, delta: 0 });
@@ -419,7 +419,7 @@ function isUnsupportedLazyRouteFunctionKey(key) {
 function isIndexRoute(route) {
   return route.index === true;
 }
-function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [], manifest = {}, allowInPlaceMutations = false) {
+function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [], manifest = {}) {
   return routes.map((route, index) => {
     let treePath = [...parentPath, String(index)];
     let id = typeof route.id === "string" ? route.id : treePath.join("-");
@@ -428,7 +428,7 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
       `Cannot specify children on an index route`
     );
     invariant(
-      allowInPlaceMutations || !manifest[id],
+      !manifest[id],
       `Found a route id collision on id "${id}".  Route id's must be globally unique within Data Router usages`
     );
     if (isIndexRoute(route)) {
@@ -452,8 +452,7 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
           route.children,
           mapRouteProperties2,
           treePath,
-          manifest,
-          allowInPlaceMutations
+          manifest
         );
       }
       return pathOrLayoutRoute;
@@ -464,8 +463,8 @@ function matchRoutes(routes, locationArg, basename = "/") {
   return matchRoutesImpl(routes, locationArg, basename, false);
 }
 function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
-  let location2 = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
-  let pathname = stripBasename(location2.pathname || "/", basename);
+  let location = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
+  let pathname = stripBasename(location.pathname || "/", basename);
   if (pathname == null) {
     return null;
   }
@@ -1073,7 +1072,7 @@ function createRouter(init) {
   let pendingRevalidationDfd = null;
   function initialize() {
     unlistenHistory = init.history.listen(
-      ({ action: historyAction, location: location2, delta }) => {
+      ({ action: historyAction, location, delta }) => {
         if (unblockBlockerHistoryUpdate) {
           unblockBlockerHistoryUpdate();
           unblockBlockerHistoryUpdate = void 0;
@@ -1085,7 +1084,7 @@ function createRouter(init) {
         );
         let blockerKey = shouldBlockNavigation({
           currentLocation: state.location,
-          nextLocation: location2,
+          nextLocation: location,
           historyAction
         });
         if (blockerKey && delta != null) {
@@ -1095,13 +1094,13 @@ function createRouter(init) {
           init.history.go(delta * -1);
           updateBlocker(blockerKey, {
             state: "blocked",
-            location: location2,
+            location,
             proceed() {
               updateBlocker(blockerKey, {
                 state: "proceeding",
                 proceed: void 0,
                 reset: void 0,
-                location: location2
+                location
               });
               nextHistoryUpdatePromise.then(() => init.history.go(delta));
             },
@@ -1113,7 +1112,7 @@ function createRouter(init) {
           });
           return;
         }
-        return startNavigation(historyAction, location2);
+        return startNavigation(historyAction, location);
       }
     );
     if (isBrowser2) {
@@ -1146,19 +1145,6 @@ 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
@@ -1189,8 +1175,8 @@ function createRouter(init) {
     unmountedFetchers.forEach((key) => deleteFetcher(key));
     mountedFetchers.forEach((key) => state.fetchers.delete(key));
   }
-  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;
+  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;
     let actionData;
     if (newState.actionData) {
       if (Object.keys(newState.actionData).length > 0) {
@@ -1214,7 +1200,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) && location2.state?._isRedirect !== true;
+    let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && location.state?._isRedirect !== true;
     if (inFlightDataRoutes) {
       dataRoutes = inFlightDataRoutes;
       inFlightDataRoutes = void 0;
@@ -1222,35 +1208,35 @@ function createRouter(init) {
     if (isUninterruptedRevalidation) {
     } else if (pendingAction === "POP" /* Pop */) {
     } else if (pendingAction === "PUSH" /* Push */) {
-      init.history.push(location2, location2.state);
+      init.history.push(location, location.state);
     } else if (pendingAction === "REPLACE" /* Replace */) {
-      init.history.replace(location2, location2.state);
+      init.history.replace(location, location.state);
     }
     let viewTransitionOpts;
     if (pendingAction === "POP" /* Pop */) {
       let priorPaths = appliedViewTransitions.get(state.location.pathname);
-      if (priorPaths && priorPaths.has(location2.pathname)) {
+      if (priorPaths && priorPaths.has(location.pathname)) {
         viewTransitionOpts = {
           currentLocation: state.location,
-          nextLocation: location2
+          nextLocation: location
         };
-      } else if (appliedViewTransitions.has(location2.pathname)) {
+      } else if (appliedViewTransitions.has(location.pathname)) {
         viewTransitionOpts = {
-          currentLocation: location2,
+          currentLocation: location,
           nextLocation: state.location
         };
       }
     } else if (pendingViewTransitionEnabled) {
       let toPaths = appliedViewTransitions.get(state.location.pathname);
       if (toPaths) {
-        toPaths.add(location2.pathname);
+        toPaths.add(location.pathname);
       } else {
-        toPaths = /* @__PURE__ */ new Set([location2.pathname]);
+        toPaths = /* @__PURE__ */ new Set([location.pathname]);
         appliedViewTransitions.set(state.location.pathname, toPaths);
       }
       viewTransitionOpts = {
         currentLocation: state.location,
-        nextLocation: location2
+        nextLocation: location
       };
     }
     updateState(
@@ -1260,12 +1246,12 @@ function createRouter(init) {
         actionData,
         loaderData,
         historyAction: pendingAction,
-        location: location2,
+        location,
         initialized: true,
         navigation: IDLE_NAVIGATION,
         revalidation: "idle",
         restoreScrollPosition: getSavedScrollPosition(
-          location2,
+          location,
           newState.matches || state.matches
         ),
         preventScrollReset,
@@ -1382,7 +1368,7 @@ function createRouter(init) {
     );
     return promise;
   }
-  async function startNavigation(historyAction, location2, opts) {
+  async function startNavigation(historyAction, location, opts) {
     pendingNavigationController && pendingNavigationController.abort();
     pendingNavigationController = null;
     pendingAction = historyAction;
@@ -1395,22 +1381,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, location2, basename);
+    ) : matchRoutes(routesToUse, location, basename);
     let flushSync = (opts && opts.flushSync) === true;
-    if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location2) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
-      completeNavigation(location2, { matches }, { flushSync });
+    if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
+      completeNavigation(location, { matches }, { flushSync });
       return;
     }
-    let fogOfWar = checkFogOfWar(matches, routesToUse, location2.pathname);
+    let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
     if (fogOfWar.active && fogOfWar.matches) {
       matches = fogOfWar.matches;
     }
     if (!matches) {
       let { error, notFoundMatches, route } = handleNavigational404(
-        location2.pathname
+        location.pathname
       );
       completeNavigation(
-        location2,
+        location,
         {
           matches: notFoundMatches,
           loaderData: {},
@@ -1425,7 +1411,7 @@ function createRouter(init) {
     pendingNavigationController = new AbortController();
     let request = createClientSideRequest(
       init.history,
-      location2,
+      location,
       pendingNavigationController.signal,
       opts && opts.submission
     );
@@ -1441,7 +1427,7 @@ function createRouter(init) {
     } else if (opts && opts.submission && isMutationMethod(opts.submission.formMethod)) {
       let actionResult = await handleAction(
         request,
-        location2,
+        location,
         opts.submission,
         matches,
         scopedContext,
@@ -1456,7 +1442,7 @@ function createRouter(init) {
         let [routeId, result] = actionResult.pendingActionResult;
         if (isErrorResult(result) && isRouteErrorResponse(result.error) && result.error.status === 404) {
           pendingNavigationController = null;
-          completeNavigation(location2, {
+          completeNavigation(location, {
             matches: actionResult.matches,
             loaderData: {},
             errors: {
@@ -1468,7 +1454,7 @@ function createRouter(init) {
       }
       matches = actionResult.matches || matches;
       pendingActionResult = actionResult.pendingActionResult;
-      loadingNavigation = getLoadingNavigation(location2, opts.submission);
+      loadingNavigation = getLoadingNavigation(location, opts.submission);
       flushSync = false;
       fogOfWar.active = false;
       request = createClientSideRequest(
@@ -1484,7 +1470,7 @@ function createRouter(init) {
       errors
     } = await handleLoaders(
       request,
-      location2,
+      location,
       matches,
       scopedContext,
       fogOfWar.active,
@@ -1500,21 +1486,21 @@ function createRouter(init) {
       return;
     }
     pendingNavigationController = null;
-    completeNavigation(location2, {
+    completeNavigation(location, {
       matches: updatedMatches || matches,
       ...getActionDataForCommit(pendingActionResult),
       loaderData,
       errors
     });
   }
-  async function handleAction(request, location2, submission, matches, scopedContext, isFogOfWar, initialHydration, opts = {}) {
+  async function handleAction(request, location, submission, matches, scopedContext, isFogOfWar, initialHydration, opts = {}) {
     interruptActiveLoads();
-    let navigation = getSubmittingNavigation(location2, submission);
+    let navigation = getSubmittingNavigation(location, submission);
     updateState({ navigation }, { flushSync: opts.flushSync === true });
     if (isFogOfWar) {
       let discoverResult = await discoverRoutes(
         matches,
-        location2.pathname,
+        location.pathname,
         request.signal
       );
       if (discoverResult.type === "aborted") {
@@ -1533,7 +1519,7 @@ function createRouter(init) {
         };
       } else if (!discoverResult.matches) {
         let { notFoundMatches, error, route } = handleNavigational404(
-          location2.pathname
+          location.pathname
         );
         return {
           matches: notFoundMatches,
@@ -1550,13 +1536,13 @@ function createRouter(init) {
       }
     }
     let result;
-    let actionMatch = getTargetMatch(matches, location2);
+    let actionMatch = getTargetMatch(matches, location);
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       result = {
         type: "error" /* error */,
         error: getInternalRouterError(405, {
           method: request.method,
-          pathname: location2.pathname,
+          pathname: location.pathname,
           routeId: actionMatch.route.id
         })
       };
@@ -1594,12 +1580,12 @@ function createRouter(init) {
       if (opts && opts.replace != null) {
         replace2 = opts.replace;
       } else {
-        let location3 = normalizeRedirectLocation(
+        let location2 = normalizeRedirectLocation(
           result.response.headers.get("Location"),
           new URL(request.url),
           basename
         );
-        replace2 = location3 === state.location.pathname + state.location.search;
+        replace2 = location2 === state.location.pathname + state.location.search;
       }
       await startRedirectNavigation(request, result, true, {
         submission,
@@ -1626,8 +1612,8 @@ function createRouter(init) {
       pendingActionResult: [actionMatch.route.id, result]
     };
   }
-  async function handleLoaders(request, location2, matches, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync, pendingActionResult) {
-    let loadingNavigation = overrideNavigation || getLoadingNavigation(location2, submission);
+  async function handleLoaders(request, location, matches, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync, pendingActionResult) {
+    let loadingNavigation = overrideNavigation || getLoadingNavigation(location, submission);
     let activeSubmission = submission || fetcherSubmission || getSubmissionFromNavigation(loadingNavigation);
     let shouldUpdateNavigationState = !isUninterruptedRevalidation && !initialHydration;
     if (isFogOfWar) {
@@ -1645,7 +1631,7 @@ function createRouter(init) {
       }
       let discoverResult = await discoverRoutes(
         matches,
-        location2.pathname,
+        location.pathname,
         request.signal
       );
       if (discoverResult.type === "aborted") {
@@ -1661,7 +1647,7 @@ function createRouter(init) {
         };
       } else if (!discoverResult.matches) {
         let { error, notFoundMatches, route } = handleNavigational404(
-          location2.pathname
+          location.pathname
         );
         return {
           matches: notFoundMatches,
@@ -1684,7 +1670,7 @@ function createRouter(init) {
       state,
       matches,
       activeSubmission,
-      location2,
+      location,
       initialHydration ? [] : hydrationRouteProperties2,
       initialHydration === true,
       isRevalidationRequired,
@@ -1701,7 +1687,7 @@ function createRouter(init) {
     if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
-        location2,
+        location,
         {
           matches,
           loaderData: {},
@@ -2213,31 +2199,31 @@ function createRouter(init) {
     if (redirect2.response.headers.has("X-Remix-Revalidate")) {
       isRevalidationRequired = true;
     }
-    let location2 = redirect2.response.headers.get("Location");
-    invariant(location2, "Expected a Location header on the redirect Response");
-    location2 = normalizeRedirectLocation(
-      location2,
+    let location = redirect2.response.headers.get("Location");
+    invariant(location, "Expected a Location header on the redirect Response");
+    location = normalizeRedirectLocation(
+      location,
       new URL(request.url),
       basename
     );
-    let redirectLocation = createLocation(state.location, location2, {
+    let redirectLocation = createLocation(state.location, location, {
       _isRedirect: true
     });
     if (isBrowser2) {
       let isDocumentReload = false;
       if (redirect2.response.headers.has("X-Remix-Reload-Document")) {
         isDocumentReload = true;
-      } else if (ABSOLUTE_URL_REGEX.test(location2)) {
-        const url = createBrowserURLImpl(location2, true);
+      } else if (ABSOLUTE_URL_REGEX.test(location)) {
+        const url = createBrowserURLImpl(location, true);
         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(location2);
+          routerWindow.location.replace(location);
         } else {
-          routerWindow.location.assign(location2);
+          routerWindow.location.assign(location);
         }
         return;
       }
@@ -2253,7 +2239,7 @@ function createRouter(init) {
       await startNavigation(redirectNavigationType, redirectLocation, {
         submission: {
           ...activeSubmission,
-          formAction: location2
+          formAction: location
         },
         // Preserve these flags across redirects
         preventScrollReset: preventScrollReset || pendingPreventScrollReset,
@@ -2527,25 +2513,25 @@ function createRouter(init) {
       getScrollRestorationKey2 = null;
     };
   }
-  function getScrollKey(location2, matches) {
+  function getScrollKey(location, matches) {
     if (getScrollRestorationKey2) {
       let key = getScrollRestorationKey2(
-        location2,
+        location,
         matches.map((m) => convertRouteMatchToUiMatch(m, state.loaderData))
       );
-      return key || location2.key;
+      return key || location.key;
     }
-    return location2.key;
+    return location.key;
   }
-  function saveScrollPosition(location2, matches) {
+  function saveScrollPosition(location, matches) {
     if (savedScrollPositions2 && getScrollPosition) {
-      let key = getScrollKey(location2, matches);
+      let key = getScrollKey(location, matches);
       savedScrollPositions2[key] = getScrollPosition();
     }
   }
-  function getSavedScrollPosition(location2, matches) {
+  function getSavedScrollPosition(location, matches) {
     if (savedScrollPositions2) {
-      let key = getScrollKey(location2, matches);
+      let key = getScrollKey(location, matches);
       let y = savedScrollPositions2[key];
       if (typeof y === "number") {
         return y;
@@ -2599,8 +2585,7 @@ function createRouter(init) {
               children,
               routesToUse,
               localManifest,
-              mapRouteProperties2,
-              false
+              mapRouteProperties2
             );
           }
         });
@@ -2641,7 +2626,7 @@ function createRouter(init) {
       manifest
     );
   }
-  function patchRoutes(routeId, children, unstable_allowElementMutations = false) {
+  function patchRoutes(routeId, children) {
     let isNonHMR = inFlightDataRoutes == null;
     let routesToUse = inFlightDataRoutes || dataRoutes;
     patchRoutesImpl(
@@ -2649,8 +2634,7 @@ function createRouter(init) {
       children,
       routesToUse,
       manifest,
-      mapRouteProperties2,
-      unstable_allowElementMutations
+      mapRouteProperties2
     );
     if (isNonHMR) {
       dataRoutes = [...dataRoutes];
@@ -2692,10 +2676,7 @@ function createRouter(init) {
     _internalFetchControllers: fetchControllers,
     // TODO: Remove setRoutes, it's temporary to avoid dealing with
     // updating the tree while validating the update algorithm.
-    _internalSetRoutes,
-    _internalSetStateDoNotUseOrYouWillBreakYourApp(newState) {
-      updateState(newState);
-    }
+    _internalSetRoutes
   };
   return router;
 }
@@ -2719,26 +2700,19 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    unstable_stream: stream,
     unstable_respond: respond
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
-    let location2 = createLocation("", createPath(url), null, "default");
-    let matches = matchRoutes(dataRoutes, location2, basename);
+    let location = createLocation("", createPath(url), null, "default");
+    let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new unstable_RouterContextProvider();
-    let respondOrStreamStaticContext = (ctx) => {
-      return stream ? stream(
-        requestContext,
-        () => Promise.resolve(ctx)
-      ) : respond ? respond(ctx) : void 0;
-    };
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
       let staticContext = {
         basename,
-        location: location2,
+        location,
         matches: methodNotAllowedMatches,
         loaderData: {},
         actionData: null,
@@ -2749,13 +2723,13 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return respondOrStreamStaticContext(staticContext) || staticContext;
+      return respond ? respond(staticContext) : staticContext;
     } else if (!matches) {
-      let error = getInternalRouterError(404, { pathname: location2.pathname });
+      let error = getInternalRouterError(404, { pathname: location.pathname });
       let { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
       let staticContext = {
         basename,
-        location: location2,
+        location,
         matches: notFoundMatches,
         loaderData: {},
         actionData: null,
@@ -2766,9 +2740,9 @@ function createStaticHandler(routes, opts) {
         loaderHeaders: {},
         actionHeaders: {}
       };
-      return respondOrStreamStaticContext(staticContext) || staticContext;
+      return respond ? respond(staticContext) : staticContext;
     }
-    if (stream || respond && matches.some(
+    if (respond && matches.some(
       (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
     )) {
       invariant(
@@ -2793,30 +2767,9 @@ function createStaticHandler(routes, opts) {
           },
           true,
           async () => {
-            if (stream) {
-              let res2 = await stream(
-                requestContext,
-                async (revalidationRequest) => {
-                  let result3 = await queryImpl(
-                    revalidationRequest,
-                    location2,
-                    matches,
-                    requestContext,
-                    dataStrategy || null,
-                    skipLoaderErrorBubbling === true,
-                    null,
-                    filterMatchesToLoad || null,
-                    skipRevalidation === true
-                  );
-                  return isResponse(result3) ? result3 : { location: location2, basename, ...result3 };
-                }
-              );
-              return res2;
-            }
-            invariant(respond, "Expected respond to be defined");
             let result2 = await queryImpl(
               request,
-              location2,
+              location,
               matches,
               requestContext,
               dataStrategy || null,
@@ -2828,7 +2781,7 @@ function createStaticHandler(routes, opts) {
             if (isResponse(result2)) {
               return result2;
             }
-            renderedStaticContext = { location: location2, basename, ...result2 };
+            renderedStaticContext = { location, basename, ...result2 };
             let res = await respond(renderedStaticContext);
             return res;
           },
@@ -2840,13 +2793,14 @@ function createStaticHandler(routes, opts) {
               if (routeId in renderedStaticContext.loaderData) {
                 renderedStaticContext.loaderData[routeId] = void 0;
               }
-              let staticContext = getStaticContextFromError(
-                dataRoutes,
-                renderedStaticContext,
-                error,
-                skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, routeId).route.id
+              return respond(
+                getStaticContextFromError(
+                  dataRoutes,
+                  renderedStaticContext,
+                  error,
+                  skipLoaderErrorBubbling ? routeId : findNearestBoundary(matches, routeId).route.id
+                )
               );
-              return respondOrStreamStaticContext(staticContext) || staticContext;
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
@@ -2854,9 +2808,9 @@ function createStaticHandler(routes, opts) {
                   (m) => m.route.id === routeId || m.route.loader
                 )?.route.id || routeId
               ).route.id;
-              let staticContext = {
+              return respond({
                 matches,
-                location: location2,
+                location,
                 basename,
                 loaderData: {},
                 actionData: null,
@@ -2866,8 +2820,7 @@ function createStaticHandler(routes, opts) {
                 statusCode: isRouteErrorResponse(error) ? error.status : 500,
                 actionHeaders: {},
                 loaderHeaders: {}
-              };
-              return respondOrStreamStaticContext(staticContext) || staticContext;
+              });
             }
           }
         );
@@ -2882,7 +2835,7 @@ function createStaticHandler(routes, opts) {
     }
     let result = await queryImpl(
       request,
-      location2,
+      location,
       matches,
       requestContext,
       dataStrategy || null,
@@ -2894,7 +2847,7 @@ function createStaticHandler(routes, opts) {
     if (isResponse(result)) {
       return result;
     }
-    return { location: location2, basename, ...result };
+    return { location, basename, ...result };
   }
   async function queryRoute(request, {
     routeId,
@@ -2904,22 +2857,22 @@ function createStaticHandler(routes, opts) {
   } = {}) {
     let url = new URL(request.url);
     let method = request.method;
-    let location2 = createLocation("", createPath(url), null, "default");
-    let matches = matchRoutes(dataRoutes, location2, basename);
+    let location = createLocation("", createPath(url), null, "default");
+    let matches = matchRoutes(dataRoutes, location, 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: location2.pathname });
+      throw getInternalRouterError(404, { pathname: location.pathname });
     }
-    let match = routeId ? matches.find((m) => m.route.id === routeId) : getTargetMatch(matches, location2);
+    let match = routeId ? matches.find((m) => m.route.id === routeId) : getTargetMatch(matches, location);
     if (routeId && !match) {
       throw getInternalRouterError(403, {
-        pathname: location2.pathname,
+        pathname: location.pathname,
         routeId
       });
     } else if (!match) {
-      throw getInternalRouterError(404, { pathname: location2.pathname });
+      throw getInternalRouterError(404, { pathname: location.pathname });
     }
     if (respond && matches.some(
       (m) => m.route.unstable_middleware || typeof m.route.lazy === "object" && m.route.lazy.unstable_middleware
@@ -2942,7 +2895,7 @@ function createStaticHandler(routes, opts) {
         async () => {
           let result2 = await queryImpl(
             request,
-            location2,
+            location,
             matches,
             requestContext,
             dataStrategy || null,
@@ -2975,7 +2928,7 @@ function createStaticHandler(routes, opts) {
     }
     let result = await queryImpl(
       request,
-      location2,
+      location,
       matches,
       requestContext,
       dataStrategy || null,
@@ -2999,7 +2952,7 @@ function createStaticHandler(routes, opts) {
     }
     return void 0;
   }
-  async function queryImpl(request, location2, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
+  async function queryImpl(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(
       request.signal,
       "query()/queryRoute() requests must contain an AbortController signal"
@@ -3009,7 +2962,7 @@ function createStaticHandler(routes, opts) {
         let result2 = await submit(
           request,
           matches,
-          routeMatch || getTargetMatch(matches, location2),
+          routeMatch || getTargetMatch(matches, location),
           requestContext,
           dataStrategy,
           skipLoaderErrorBubbling,
@@ -3325,7 +3278,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(location2, matches, basename, to, fromRouteId, relative) {
+function normalizeTo(location, matches, basename, to, fromRouteId, relative) {
   let contextualMatches;
   let activeRouteMatch;
   if (fromRouteId) {
@@ -3344,12 +3297,12 @@ function normalizeTo(location2, matches, basename, to, fromRouteId, relative) {
   let path = resolveTo(
     to ? to : ".",
     getResolveToMatches(contextualMatches),
-    stripBasename(location2.pathname, basename) || location2.pathname,
+    stripBasename(location.pathname, basename) || location.pathname,
     relative === "path"
   );
   if (to == null) {
-    path.search = location2.search;
-    path.hash = location2.hash;
+    path.search = location.search;
+    path.hash = location.hash;
   }
   if ((to == null || to === "" || to === ".") && activeRouteMatch) {
     let nakedIndex = hasNakedIndexQuery(path.search);
@@ -3476,10 +3429,10 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
   parsedPath.search = `?${searchParams}`;
   return { path: createPath(parsedPath), submission };
 }
-function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location2, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, pendingActionResult) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, 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(location2);
+  let nextUrl = history.createURL(location);
   let maxIdx;
   if (initialHydration && state.errors) {
     let boundaryId = Object.keys(state.errors)[0];
@@ -3682,7 +3635,7 @@ function shouldRevalidateLoader(loaderMatch, arg) {
   }
   return arg.defaultShouldRevalidate;
 }
-function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2, allowElementMutations) {
+function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2) {
   let childrenToPatch;
   if (routeId) {
     let route = manifest[routeId];
@@ -3697,47 +3650,18 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
   } else {
     childrenToPatch = routesToUse;
   }
-  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
-      });
-    }
-  }
+  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);
 }
 function isSameRoute(newRoute, existingRoute) {
   if ("id" in newRoute && "id" in existingRoute && newRoute.id === existingRoute.id) {
@@ -4086,7 +4010,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, match, laz
       return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
-      if (isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) {
+      if (isUsingNewApi || shouldLoad || handlerOverride && request.method === "GET" && (match.route.lazy || match.route.loader)) {
         return callLoaderOrAction({
           request,
           match,
@@ -4346,39 +4270,39 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   return { type: "data" /* data */, data: result };
 }
 function normalizeRelativeRoutingRedirectResponse(response, request, routeId, matches, basename) {
-  let location2 = response.headers.get("Location");
+  let location = response.headers.get("Location");
   invariant(
-    location2,
+    location,
     "Redirects returned/thrown from loaders/actions must have a Location header"
   );
-  if (!ABSOLUTE_URL_REGEX.test(location2)) {
+  if (!ABSOLUTE_URL_REGEX.test(location)) {
     let trimmedMatches = matches.slice(
       0,
       matches.findIndex((m) => m.route.id === routeId) + 1
     );
-    location2 = normalizeTo(
+    location = normalizeTo(
       new URL(request.url),
       trimmedMatches,
       basename,
-      location2
+      location
     );
-    response.headers.set("Location", location2);
+    response.headers.set("Location", location);
   }
   return response;
 }
-function normalizeRedirectLocation(location2, currentUrl, basename) {
-  if (ABSOLUTE_URL_REGEX.test(location2)) {
-    let normalizedLocation = location2;
+function normalizeRedirectLocation(location, currentUrl, basename) {
+  if (ABSOLUTE_URL_REGEX.test(location)) {
+    let normalizedLocation = location;
     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 location2;
+  return location;
 }
-function createClientSideRequest(history, location2, signal, submission) {
-  let url = history.createURL(stripHashFromPath(location2)).toString();
+function createClientSideRequest(history, location, signal, submission) {
+  let url = history.createURL(stripHashFromPath(location)).toString();
   let init = { signal };
   if (submission && isMutationMethod(submission.formMethod)) {
     let { formMethod, formEncType } = submission;
@@ -4650,8 +4574,8 @@ function isMutationMethod(method) {
 function hasNakedIndexQuery(search) {
   return new URLSearchParams(search).getAll("index").some((v) => v === "");
 }
-function getTargetMatch(matches, location2) {
-  let search = typeof location2 === "string" ? parsePath(location2).search : location2.search;
+function getTargetMatch(matches, location) {
+  let search = typeof location === "string" ? parsePath(location).search : location.search;
   if (matches[matches.length - 1].route.index && hasNakedIndexQuery(search || "")) {
     return matches[matches.length - 1];
   }
@@ -4692,11 +4616,11 @@ function getSubmissionFromNavigation(navigation) {
     };
   }
 }
-function getLoadingNavigation(location2, submission) {
+function getLoadingNavigation(location, submission) {
   if (submission) {
     let navigation = {
       state: "loading",
-      location: location2,
+      location,
       formMethod: submission.formMethod,
       formAction: submission.formAction,
       formEncType: submission.formEncType,
@@ -4708,7 +4632,7 @@ function getLoadingNavigation(location2, submission) {
   } else {
     let navigation = {
       state: "loading",
-      location: location2,
+      location,
       formMethod: void 0,
       formAction: void 0,
       formEncType: void 0,
@@ -4719,10 +4643,10 @@ function getLoadingNavigation(location2, submission) {
     return navigation;
   }
 }
-function getSubmittingNavigation(location2, submission) {
+function getSubmittingNavigation(location, submission) {
   let navigation = {
     state: "submitting",
-    location: location2,
+    location,
     formMethod: submission.formMethod,
     formAction: submission.formAction,
     formEncType: submission.formEncType,
@@ -5048,18 +4972,18 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     );
   }
   let locationFromContext = useLocation();
-  let location2;
+  let location;
   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.`
     );
-    location2 = parsedLocationArg;
+    location = parsedLocationArg;
   } else {
-    location2 = locationFromContext;
+    location = locationFromContext;
   }
-  let pathname = location2.pathname || "/";
+  let pathname = location.pathname || "/";
   let remainingPathname = pathname;
   if (parentPathnameBase !== "/") {
     let parentSegments = parentPathnameBase.replace(/^\//, "").split("/");
@@ -5070,11 +4994,11 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
   if (ENABLE_DEV_WARNINGS) {
     warning(
       parentRoute || matches != null,
-      `No routes matched location "${location2.pathname}${location2.search}${location2.hash}" `
+      `No routes matched location "${location.pathname}${location.search}${location.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 "${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.`
+      `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.`
     );
   }
   let renderedMatches = _renderMatches(
@@ -5108,7 +5032,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             hash: "",
             state: null,
             key: "default",
-            ...location2
+            ...location
           },
           navigationType: "POP" /* Pop */
         }
@@ -5276,7 +5200,6 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
       } else {
         children = outlet;
       }
-      children = /* @__PURE__ */ React2.createElement(RedirectBoundary, null, children);
       return /* @__PURE__ */ React2.createElement(
         RenderedRoute,
         {
@@ -5303,19 +5226,6 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
     ) : getChildren();
   }, null);
 }
-var RedirectBoundary = class extends React2.Component {
-  // If the error is Symbol.for("react-router.redirect"), keep rendering children.
-  // If it's anything else, re-throw to bubble it up.
-  static getDerivedStateFromError(error) {
-    if (error === Symbol.for("react-router.redirect")) {
-      return null;
-    }
-    throw error;
-  }
-  render() {
-    return this.props.children;
-  }
-};
 function getDataRouterConsoleError(hookName) {
   return `${hookName} must be used within a data router.  See https://reactrouter.com/en/main/routers/picking-a-router.`;
 }
@@ -5884,9 +5794,9 @@ function Router({
 }
 function Routes({
   children,
-  location: location2
+  location
 }) {
-  return useRoutes(createRoutesFromChildren(children), location2);
+  return useRoutes(createRoutesFromChildren(children), location);
 }
 function Await({
   children,
@@ -6310,7 +6220,7 @@ async function getKeyedPrefetchLinks(matches, manifest, routeModules) {
     )
   );
 }
-function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, location2, mode) {
+function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, location, mode) {
   let isNew = (match, index) => {
     if (!currentMatches[index]) return true;
     return match.route.id !== currentMatches[index].route.id;
@@ -6340,7 +6250,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
       if (match.route.shouldRevalidate) {
         let routeChoice = match.route.shouldRevalidate({
           currentUrl: new URL(
-            location2.pathname + location2.search + location2.hash,
+            location.pathname + location.search + location.hash,
             window.origin
           ),
           currentParams: currentMatches[0]?.params || {},
@@ -6970,7 +6880,7 @@ async function decodeDeferred(reader) {
 }
 function encode(input, options) {
   const { plugins, postPlugins, signal } = options ?? {};
-  const encoder3 = {
+  const encoder2 = {
     deferred: {},
     index: 0,
     indices: /* @__PURE__ */ new Map(),
@@ -6983,7 +6893,7 @@ function encode(input, options) {
   let lastSentIndex = 0;
   const readable = new ReadableStream({
     async start(controller) {
-      const id = flatten.call(encoder3, input);
+      const id = flatten.call(encoder2, input);
       if (Array.isArray(id)) {
         throw new Error("This should never happen");
       }
@@ -6992,13 +6902,13 @@ function encode(input, options) {
 `));
       } else {
         controller.enqueue(
-          textEncoder.encode(`[${encoder3.stringified.join(",")}]
+          textEncoder.encode(`[${encoder2.stringified.join(",")}]
 `)
         );
-        lastSentIndex = encoder3.stringified.length - 1;
+        lastSentIndex = encoder2.stringified.length - 1;
       }
       const seenPromises = /* @__PURE__ */ new WeakSet();
-      if (Object.keys(encoder3.deferred).length) {
+      if (Object.keys(encoder2.deferred).length) {
         let raceDone;
         const racePromise = new Promise((resolve, reject) => {
           raceDone = resolve;
@@ -7013,19 +6923,19 @@ function encode(input, options) {
             }
           }
         });
-        while (Object.keys(encoder3.deferred).length > 0) {
+        while (Object.keys(encoder2.deferred).length > 0) {
           for (const [deferredId, deferred] of Object.entries(
-            encoder3.deferred
+            encoder2.deferred
           )) {
             if (seenPromises.has(deferred)) continue;
             seenPromises.add(
               // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
-              encoder3.deferred[Number(deferredId)] = Promise.race([
+              encoder2.deferred[Number(deferredId)] = Promise.race([
                 racePromise,
                 deferred
               ]).then(
                 (resolved) => {
-                  const id2 = flatten.call(encoder3, resolved);
+                  const id2 = flatten.call(encoder2, resolved);
                   if (Array.isArray(id2)) {
                     controller.enqueue(
                       textEncoder.encode(
@@ -7033,7 +6943,7 @@ function encode(input, options) {
 `
                       )
                     );
-                    encoder3.index++;
+                    encoder2.index++;
                     lastSentIndex++;
                   } else if (id2 < 0) {
                     controller.enqueue(
@@ -7043,21 +6953,21 @@ function encode(input, options) {
                       )
                     );
                   } else {
-                    const values = encoder3.stringified.slice(lastSentIndex + 1).join(",");
+                    const values = encoder2.stringified.slice(lastSentIndex + 1).join(",");
                     controller.enqueue(
                       textEncoder.encode(
                         `${TYPE_PROMISE}${deferredId}:[${values}]
 `
                       )
                     );
-                    lastSentIndex = encoder3.stringified.length - 1;
+                    lastSentIndex = encoder2.stringified.length - 1;
                   }
                 },
                 (reason) => {
                   if (!reason || typeof reason !== "object" || !(reason instanceof Error)) {
                     reason = new Error("An unknown error occurred");
                   }
-                  const id2 = flatten.call(encoder3, reason);
+                  const id2 = flatten.call(encoder2, reason);
                   if (Array.isArray(id2)) {
                     controller.enqueue(
                       textEncoder.encode(
@@ -7065,7 +6975,7 @@ function encode(input, options) {
 `
                       )
                     );
-                    encoder3.index++;
+                    encoder2.index++;
                     lastSentIndex++;
                   } else if (id2 < 0) {
                     controller.enqueue(
@@ -7073,26 +6983,26 @@ function encode(input, options) {
 `)
                     );
                   } else {
-                    const values = encoder3.stringified.slice(lastSentIndex + 1).join(",");
+                    const values = encoder2.stringified.slice(lastSentIndex + 1).join(",");
                     controller.enqueue(
                       textEncoder.encode(
                         `${TYPE_ERROR}${deferredId}:[${values}]
 `
                       )
                     );
-                    lastSentIndex = encoder3.stringified.length - 1;
+                    lastSentIndex = encoder2.stringified.length - 1;
                   }
                 }
               ).finally(() => {
-                delete encoder3.deferred[Number(deferredId)];
+                delete encoder2.deferred[Number(deferredId)];
               })
             );
           }
-          await Promise.race(Object.values(encoder3.deferred));
+          await Promise.race(Object.values(encoder2.deferred));
         }
         raceDone();
       }
-      await Promise.all(Object.values(encoder3.deferred));
+      await Promise.all(Object.values(encoder2.deferred));
       controller.close();
     }
   });
@@ -7211,7 +7121,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
   );
   return async (args) => args.unstable_runClientMiddleware(dataStrategy);
 }
-function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
+function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename) {
   return async (args) => {
     let { request, matches, fetcherKey } = args;
     let router = getRouter();
@@ -7234,8 +7144,7 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
       getRouteInfo,
       fetchAndDecode,
       ssr,
-      basename,
-      shouldAllowOptOut
+      basename
     );
   };
 }
@@ -7287,7 +7196,7 @@ async function nonSsrStrategy(args, getRouteInfo, fetchAndDecode, basename) {
   );
   return results;
 }
-async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
+async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, basename) {
   let routesParams = /* @__PURE__ */ new Set();
   let foundOptOutRoute = false;
   let routeDfds = args.matches.map(() => createDeferred2());
@@ -7307,7 +7216,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
           hasShouldRevalidate === true);
           return;
         }
-        if (shouldAllowOptOut(m) && hasClientLoader) {
+        if (hasClientLoader) {
           if (hasLoader) {
             foundOptOutRoute = true;
           }
@@ -7410,7 +7319,7 @@ function stripIndexParam(url) {
   }
   return url;
 }
-function singleFetchUrl(reqUrl, basename, extension) {
+function singleFetchUrl(reqUrl, basename) {
   let url = typeof reqUrl === "string" ? new URL(
     reqUrl,
     // This can be called during the SSR flow via PrefetchPageLinksImpl so
@@ -7418,17 +7327,17 @@ function singleFetchUrl(reqUrl, basename, extension) {
     typeof window === "undefined" ? "server://singlefetch/" : window.location.origin
   ) : reqUrl;
   if (url.pathname === "/") {
-    url.pathname = `_root.${extension}`;
+    url.pathname = "_root.data";
   } else if (basename && stripBasename(url.pathname, basename) === "/") {
-    url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`;
+    url.pathname = `${basename.replace(/\/$/, "")}/_root.data`;
   } else {
-    url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`;
+    url.pathname = `${url.pathname.replace(/\/$/, "")}.data`;
   }
   return url;
 }
 async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
   let { request } = args;
-  let url = singleFetchUrl(request.url, basename, "data");
+  let url = singleFetchUrl(request.url, basename);
   if (request.method === "GET") {
     url = stripIndexParam(url);
     if (targetRoutes) {
@@ -7525,13 +7434,13 @@ function decodeViaTurboStream(body, global2) {
 function unwrapSingleFetchResult(result, routeId) {
   if ("redirect" in result) {
     let {
-      redirect: location2,
+      redirect: location,
       revalidate,
       reload,
       replace: replace2,
       status
     } = result.redirect;
-    throw redirect(location2, {
+    throw redirect(location, {
       status,
       headers: {
         // Three R's of redirecting (lol Veep)
@@ -8462,7 +8371,7 @@ function PrefetchPageLinksImpl({
   matches: nextMatches,
   ...linkProps
 }) {
-  let location2 = useLocation();
+  let location = useLocation();
   let { manifest, routeModules } = useFrameworkContext();
   let { basename } = useDataRouterContext2();
   let { loaderData, matches } = useDataRouterStateContext();
@@ -8472,10 +8381,10 @@ function PrefetchPageLinksImpl({
       nextMatches,
       matches,
       manifest,
-      location2,
+      location,
       "data"
     ),
-    [page, nextMatches, matches, manifest, location2]
+    [page, nextMatches, matches, manifest, location]
   );
   let newMatchesForAssets = React9.useMemo(
     () => getNewMatchesForLinks(
@@ -8483,13 +8392,13 @@ function PrefetchPageLinksImpl({
       nextMatches,
       matches,
       manifest,
-      location2,
+      location,
       "assets"
     ),
-    [page, nextMatches, matches, manifest, location2]
+    [page, nextMatches, matches, manifest, location]
   );
   let dataHrefs = React9.useMemo(() => {
-    if (page === location2.pathname + location2.search + location2.hash) {
+    if (page === location.pathname + location.search + location.hash) {
       return [];
     }
     let routesParams = /* @__PURE__ */ new Set();
@@ -8510,7 +8419,7 @@ function PrefetchPageLinksImpl({
     if (routesParams.size === 0) {
       return [];
     }
-    let url = singleFetchUrl(page, basename, "data");
+    let url = singleFetchUrl(page, basename);
     if (foundOptOutRoute && routesParams.size > 0) {
       url.searchParams.set(
         "_routes",
@@ -8521,7 +8430,7 @@ function PrefetchPageLinksImpl({
   }, [
     basename,
     loaderData,
-    location2,
+    location,
     manifest,
     newMatchesForData,
     nextMatches,
@@ -8546,7 +8455,7 @@ function Meta() {
     matches: routerMatches,
     loaderData
   } = useDataRouterStateContext();
-  let location2 = useLocation();
+  let location = useLocation();
   let _matches = getActiveMatches(routerMatches, errors, isSpaMode);
   let error = null;
   if (errors) {
@@ -8576,7 +8485,7 @@ function Meta() {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         params,
-        location: location2,
+        location,
         matches,
         error
       }) : Array.isArray(routeModule.meta) ? [...routeModule.meta] : routeModule.meta;
@@ -8808,7 +8717,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-17b9b60af";
+    window.__reactRouterVersion = "0.0.0-experimental-d82b9430b";
   }
 } catch (e) {
 }
@@ -9066,14 +8975,14 @@ var NavLink = React10.forwardRef(
     ...rest
   }, ref) {
     let path = useResolvedPath(to, { relative: rest.relative });
-    let location2 = useLocation();
+    let location = useLocation();
     let routerState = React10.useContext(DataRouterStateContext);
     let { navigator, 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 = navigator.encodeLocation ? navigator.encodeLocation(path).pathname : path.pathname;
-    let locationPathname = location2.pathname;
+    let locationPathname = location.pathname;
     let nextLocationPathname = routerState && routerState.navigation && routerState.navigation.location ? routerState.navigation.location.pathname : null;
     if (!caseSensitive) {
       locationPathname = locationPathname.toLowerCase();
@@ -9178,19 +9087,19 @@ function ScrollRestoration({
 }) {
   let remixContext = React10.useContext(FrameworkContext);
   let { basename } = React10.useContext(NavigationContext);
-  let location2 = useLocation();
+  let location = useLocation();
   let matches = useMatches();
   useScrollRestoration({ getKey, storageKey });
   let ssrKey = React10.useMemo(
     () => {
       if (!remixContext || !getKey) return null;
       let userKey = getScrollRestorationKey(
-        location2,
+        location,
         matches,
         basename,
         getKey
       );
-      return userKey !== location2.key ? userKey : null;
+      return userKey !== location.key ? userKey : null;
     },
     // Nah, we only need this the first time for the SSR render
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -9251,13 +9160,13 @@ function useLinkClickHandler(to, {
   viewTransition
 } = {}) {
   let navigate = useNavigate();
-  let location2 = useLocation();
+  let location = useLocation();
   let path = useResolvedPath(to, { relative });
   return React10.useCallback(
     (event) => {
       if (shouldProcessLinkClick(event, target)) {
         event.preventDefault();
-        let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location2) === createPath(path);
+        let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location) === createPath(path);
         navigate(to, {
           replace: replace2,
           state,
@@ -9268,7 +9177,7 @@ function useLinkClickHandler(to, {
       }
     },
     [
-      location2,
+      location,
       navigate,
       path,
       replaceProp,
@@ -9288,18 +9197,18 @@ function useSearchParams(defaultInit) {
   );
   let defaultSearchParamsRef = React10.useRef(createSearchParams(defaultInit));
   let hasSetSearchParamsRef = React10.useRef(false);
-  let location2 = useLocation();
+  let location = 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(
-        location2.search,
+        location.search,
         hasSetSearchParamsRef.current ? null : defaultSearchParamsRef.current
       )
     ),
-    [location2.search]
+    [location.search]
   );
   let navigate = useNavigate();
   let setSearchParams = React10.useCallback(
@@ -9360,9 +9269,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 location2 = useLocation();
+  let location = useLocation();
   if (action == null) {
-    path.search = location2.search;
+    path.search = location.search;
     let params = new URLSearchParams(path.search);
     let indexValues = params.getAll("index");
     let hasNakedIndexParam = indexValues.some((v) => v === "");
@@ -9454,23 +9363,23 @@ function useFetchers() {
 }
 var SCROLL_RESTORATION_STORAGE_KEY = "react-router-scroll-positions";
 var savedScrollPositions = {};
-function getScrollRestorationKey(location2, matches, basename, getKey) {
+function getScrollRestorationKey(location, matches, basename, getKey) {
   let key = null;
   if (getKey) {
     if (basename !== "/") {
       key = getKey(
         {
-          ...location2,
-          pathname: stripBasename(location2.pathname, basename) || location2.pathname
+          ...location,
+          pathname: stripBasename(location.pathname, basename) || location.pathname
         },
         matches
       );
     } else {
-      key = getKey(location2, matches);
+      key = getKey(location, matches);
     }
   }
   if (key == null) {
-    key = location2.key;
+    key = location.key;
   }
   return key;
 }
@@ -9483,7 +9392,7 @@ function useScrollRestoration({
     "useScrollRestoration" /* UseScrollRestoration */
   );
   let { basename } = React10.useContext(NavigationContext);
-  let location2 = useLocation();
+  let location = useLocation();
   let matches = useMatches();
   let navigation = useNavigation();
   React10.useEffect(() => {
@@ -9495,7 +9404,7 @@ function useScrollRestoration({
   usePageHide(
     React10.useCallback(() => {
       if (navigation.state === "idle") {
-        let key = getScrollRestorationKey(location2, matches, basename, getKey);
+        let key = getScrollRestorationKey(location, matches, basename, getKey);
         savedScrollPositions[key] = window.scrollY;
       }
       try {
@@ -9510,7 +9419,7 @@ function useScrollRestoration({
         );
       }
       window.history.scrollRestoration = "auto";
-    }, [navigation.state, getKey, basename, location2, matches, storageKey])
+    }, [navigation.state, getKey, basename, location, matches, storageKey])
   );
   if (typeof document !== "undefined") {
     React10.useLayoutEffect(() => {
@@ -9528,7 +9437,7 @@ function useScrollRestoration({
       let disableScrollRestoration = router?.enableScrollRestoration(
         savedScrollPositions,
         () => window.scrollY,
-        getKey ? (location3, matches2) => getScrollRestorationKey(location3, matches2, basename, getKey) : void 0
+        getKey ? (location2, matches2) => getScrollRestorationKey(location2, matches2, basename, getKey) : void 0
       );
       return () => disableScrollRestoration && disableScrollRestoration();
     }, [router, basename, getKey]);
@@ -9540,9 +9449,9 @@ function useScrollRestoration({
         window.scrollTo(0, restoreScrollPosition);
         return;
       }
-      if (location2.hash) {
+      if (location.hash) {
         let el = document.getElementById(
-          decodeURIComponent(location2.hash.slice(1))
+          decodeURIComponent(location.hash.slice(1))
         );
         if (el) {
           el.scrollIntoView();
@@ -9553,7 +9462,7 @@ function useScrollRestoration({
         return;
       }
       window.scrollTo(0, 0);
-    }, [location2, restoreScrollPosition, preventScrollReset]);
+    }, [location, restoreScrollPosition, preventScrollReset]);
   }
 }
 function useBeforeUnload(callback, options) {
@@ -9626,7 +9535,7 @@ function StaticRouter({
     locationProp = parsePath(locationProp);
   }
   let action = "POP" /* Pop */;
-  let location2 = {
+  let location = {
     pathname: locationProp.pathname || "/",
     search: locationProp.search || "",
     hash: locationProp.hash || "",
@@ -9639,7 +9548,7 @@ function StaticRouter({
     {
       basename,
       children,
-      location: location2,
+      location,
       navigationType: action,
       navigator: staticNavigator,
       static: true
@@ -9858,9 +9767,6 @@ function createStaticRouter(routes, context, opts = {}) {
     _internalFetchControllers: /* @__PURE__ */ new Map(),
     _internalSetRoutes() {
       throw msg("_internalSetRoutes");
-    },
-    _internalSetStateDoNotUseOrYouWillBreakYourApp() {
-      throw msg("_internalSetStateDoNotUseOrYouWillBreakYourApp");
     }
   };
 }
@@ -10522,7 +10428,7 @@ function createServerHandoffString(serverHandoff) {
 
 // lib/server-runtime/headers.ts
 import { splitCookiesString } from "set-cookie-parser";
-function getDocumentHeaders(context, build) {
+function getDocumentHeaders(build, context) {
   return getDocumentHeadersImpl(context, (m) => {
     let route = build.routes[m.route.id];
     invariant3(route, `Route with id "${m.route.id}" not found in build`);
@@ -10599,7 +10505,7 @@ 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(context, build);
+      let headers = getDocumentHeaders(build, context);
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: getSingleFetchRedirect(
@@ -10674,7 +10580,7 @@ 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(context, build);
+      let headers = getDocumentHeaders(build, context);
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: {
@@ -11141,7 +11047,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     if (isResponse(context)) {
       return context;
     }
-    let headers = getDocumentHeaders(context, build);
+    let headers = getDocumentHeaders(build, context);
     if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) {
       return new Response(null, { status: context.statusCode, headers });
     }
@@ -11482,819 +11388,6 @@ function href(path, ...args) {
   }).filter((segment) => segment !== void 0).join("/");
 }
 
-// lib/rsc/browser.tsx
-import * as React14 from "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 === "redirect") {
-      if (payload.reload) {
-        window.location.href = payload.location;
-        return;
-      }
-      let reject;
-      const promise = new Promise((resolve, rejectFn) => {
-        reject = rejectFn;
-      });
-      const unsubscribe = window.__router.subscribe(({ navigation }) => {
-        if (navigation.state === "idle") {
-          unsubscribe();
-          reject(Symbol.for("react-router.redirect"));
-        }
-      });
-      window.__router.navigate(payload.location, {
-        replace: payload.replace
-      });
-      return promise;
-    }
-    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({ path, signal }) {
-      if (discoveredPaths2.has(path)) {
-        return;
-      }
-      await fetchAndApplyManifestPatches2([path], decode2, signal);
-    },
-    // 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,
-    // If we don't have an element, we need to hit the server loader flow
-    // regardless of whether the client loader calls `serverLoader` or not,
-    // otherwise we'll have nothing to render.
-    // TODO: Do we need to account for API routes? Do we need a
-    // `match.hasComponent` flag?
-    (match) => match.route.element != null
-  );
-  return async (args) => args.unstable_runClientMiddleware(async () => {
-    let context = args.context;
-    context.set(renderedRoutesContext, []);
-    let results = await dataStrategy(args);
-    const renderedRoutesById = /* @__PURE__ */ new Map();
-    for (const route of context.get(renderedRoutesContext)) {
-      if (!renderedRoutesById.has(route.id)) {
-        renderedRoutesById.set(route.id, []);
-      }
-      renderedRoutesById.get(route.id).push(route);
-    }
-    for (const match of args.matches) {
-      const renderedRoutes = renderedRoutesById.get(match.route.id);
-      if (renderedRoutes) {
-        for (const rendered of renderedRoutes) {
-          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,
-  routeDiscovery = "eager"
-}) {
-  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();
-    }
-  }, []);
-  React14.useEffect(() => {
-    if (routeDiscovery === "lazy" || // @ts-expect-error - TS doesn't know about this yet
-    window.navigator?.connection?.saveData === true) {
-      return;
-    }
-    function registerElement(el) {
-      let path = el.tagName === "FORM" ? el.getAttribute("action") : el.getAttribute("href");
-      if (!path) {
-        return;
-      }
-      let pathname = el.tagName === "A" ? el.pathname : new URL(path, window.location.origin).pathname;
-      if (!discoveredPaths2.has(pathname)) {
-        nextPaths2.add(pathname);
-      }
-    }
-    async function fetchPatches() {
-      document.querySelectorAll("a[data-discover], form[data-discover]").forEach(registerElement);
-      let paths = Array.from(nextPaths2.keys()).filter((path) => {
-        if (discoveredPaths2.has(path)) {
-          nextPaths2.delete(path);
-          return false;
-        }
-        return true;
-      });
-      if (paths.length === 0) {
-        return;
-      }
-      try {
-        await fetchAndApplyManifestPatches2(paths, decode2);
-      } catch (e) {
-        console.error("Failed to fetch manifest patches", e);
-      }
-    }
-    let debouncedFetchPatches = debounce2(fetchPatches, 100);
-    fetchPatches();
-    let observer = new MutationObserver(() => debouncedFetchPatches());
-    observer.observe(document.documentElement, {
-      subtree: true,
-      childList: true,
-      attributes: true,
-      attributeFilter: ["data-discover", "href", "action"]
-    });
-  }, [routeDiscovery, decode2]);
-  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: []
-      }
-    },
-    routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    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 || // If we don't have an element, we need to hit the server loader flow
-  // regardless of whether the client loader calls `serverLoader` or not,
-  // otherwise we'll have nothing to render.
-  // TODO: Do we need to account for API routes? Do we need a
-  // `match.hasComponent` flag?
-  !match.element;
-  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);
-  }
-}
-var nextPaths2 = /* @__PURE__ */ new Set();
-var discoveredPathsMaxSize2 = 1e3;
-var discoveredPaths2 = /* @__PURE__ */ new Set();
-var URL_LIMIT2 = 7680;
-async function fetchAndApplyManifestPatches2(paths, decode2, signal) {
-  let basename = (window.__router.basename ?? "").replace(/^\/|\/$/g, "");
-  let url = new URL(`${basename}/.manifest`, window.location.origin);
-  paths.sort().forEach((path) => url.searchParams.append("p", path));
-  if (url.toString().length > URL_LIMIT2) {
-    nextPaths2.clear();
-    return;
-  }
-  let response = await fetch(url, { signal });
-  if (!response.body || response.status < 200 || response.status >= 300) {
-    throw new Error("Unable to fetch new route matches from the server");
-  }
-  let payload = await decode2(response.body);
-  if (payload.type !== "manifest") {
-    throw new Error("Failed to patch routes");
-  }
-  paths.forEach((p) => addToFifoQueue2(p, discoveredPaths2));
-  payload.patches.forEach((p) => {
-    window.__router.patchRoutes(p.parentId ?? null, [
-      createRouteFromServerManifest(p)
-    ]);
-  });
-}
-function addToFifoQueue2(path, queue) {
-  if (queue.size >= discoveredPathsMaxSize2) {
-    let first = queue.values().next().value;
-    queue.delete(first);
-  }
-  queue.add(path);
-}
-function debounce2(callback, wait) {
-  let timeoutId;
-  return (...args) => {
-    window.clearTimeout(timeoutId);
-    timeoutId = window.setTimeout(() => callback(...args), wait);
-  };
-}
-
-// lib/rsc/server.ssr.tsx
-import * as React15 from "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,
-  callServer,
-  decode: decode2,
-  renderHTML,
-  hydrate: hydrate2 = true
-}) {
-  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 callServer(serverRequest);
-  if (respondWithRSCPayload) {
-    return serverResponse;
-  }
-  if (!serverResponse.body) {
-    throw new Error("Missing body in server response");
-  }
-  let serverResponseB = null;
-  if (hydrate2) {
-    serverResponseB = serverResponse.clone();
-  }
-  const body = serverResponse.body;
-  let payloadPromise;
-  const getPayload = async () => {
-    if (payloadPromise) return payloadPromise;
-    payloadPromise = decode2(body);
-    return payloadPromise;
-  };
-  try {
-    const html = await renderHTML(getPayload);
-    const headers = new Headers(serverResponse.headers);
-    headers.set("Content-Type", "text/html");
-    if (!hydrate2) {
-      return new Response(html, {
-        status: serverResponse.status,
-        headers
-      });
-    }
-    if (!serverResponseB?.body) {
-      throw new Error("Failed to clone server response");
-    }
-    const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
-    return new Response(body2, {
-      status: serverResponse.status,
-      headers
-    });
-  } catch (reason) {
-    if (reason instanceof Response) {
-      return reason;
-    }
-    throw reason;
-  }
-}
-function RSCStaticRouter({
-  getPayload
-}) {
-  const payload = React15.use(getPayload());
-  if (payload.type === "redirect") {
-    throw new Response(null, {
-      status: payload.status,
-      headers: {
-        Location: payload.location
-      }
-    });
-  }
-  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: []
-      }
-    },
-    routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
-    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;
@@ -12332,6 +11425,32 @@ 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;
+}
+
 export {
   Action,
   createBrowserHistory,
@@ -12450,11 +11569,6 @@ export {
   createCookieSessionStorage,
   createMemorySessionStorage,
   href,
-  getHydrationData,
-  createCallServer,
-  RSCHydratedRouter,
-  routeRSCServerRequest,
-  RSCStaticRouter,
-  getServerStream,
-  deserializeErrors2 as deserializeErrors
+  deserializeErrors2 as deserializeErrors,
+  getHydrationData
 };