react-router 0.0.0-experimental-e56aa53bc → 0.0.0-experimental-aecfb0db1

package/dist/development/{chunk-RMWJZNG5.mjs → chunk-RXFCVJK2.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e56aa53bc
+ * react-router v0.0.0-experimental-aecfb0db1
  *
  * 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,25 +296,18 @@ 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 });
     }
   }
   function createURL(to) {
-    let base = window2.location.origin !== "null" ? window2.location.origin : window2.location.href;
-    let href2 = typeof to === "string" ? to : createPath(to);
-    href2 = href2.replace(/ $/, "%20");
-    invariant(
-      base,
-      `No window.location.(origin|href) available to create URL for href: ${href2}`
-    );
-    return new URL(href2, base);
+    return createBrowserURLImpl(to);
   }
   let history = {
     get action() {
@@ -354,6 +347,19 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
   };
   return history;
 }
+function createBrowserURLImpl(to, isAbsolute = false) {
+  let base = "http://localhost";
+  if (typeof window !== "undefined") {
+    base = window.location.origin !== "null" ? window.location.origin : window.location.href;
+  }
+  invariant(base, "No window.location.(origin|href) available to create URL");
+  let href2 = typeof to === "string" ? to : createPath(to);
+  href2 = href2.replace(/ $/, "%20");
+  if (!isAbsolute && href2.startsWith("//")) {
+    href2 = base + href2;
+  }
+  return new URL(href2, base);
+}
 
 // lib/router/utils.ts
 function unstable_createContext(defaultValue) {
@@ -413,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("-");
@@ -422,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)) {
@@ -446,8 +452,7 @@ function convertRoutesToDataRoutes(routes, mapRouteProperties2, parentPath = [],
           route.children,
           mapRouteProperties2,
           treePath,
-          manifest,
-          allowInPlaceMutations
+          manifest
         );
       }
       return pathOrLayoutRoute;
@@ -458,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;
   }
@@ -651,19 +656,19 @@ function generatePath(originalPath, params = {}) {
     path = path.replace(/\*$/, "/*");
   }
   const prefix = path.startsWith("/") ? "/" : "";
-  const stringify = (p) => p == null ? "" : typeof p === "string" ? p : String(p);
+  const stringify2 = (p) => p == null ? "" : typeof p === "string" ? p : String(p);
   const segments = path.split(/\/+/).map((segment, index, array) => {
     const isLastSegment = index === array.length - 1;
     if (isLastSegment && segment === "*") {
       const star = "*";
-      return stringify(params[star]);
+      return stringify2(params[star]);
     }
     const keyMatch = segment.match(/^:([\w-]+)(\??)$/);
     if (keyMatch) {
       const [, key, optional] = keyMatch;
       let param = params[key];
       invariant(optional === "?" || param != null, `Missing ":${key}" param`);
-      return stringify(param);
+      return stringify2(param);
     }
     return segment.replace(/\?$/g, "");
   }).filter((segment) => !!segment);
@@ -975,53 +980,57 @@ function createRouter(init) {
   let initialMatches = matchRoutes(dataRoutes, init.history.location, basename);
   let initialMatchesIsFOW = false;
   let initialErrors = null;
+  let initialized;
   if (initialMatches == null && !init.patchRoutesOnNavigation) {
     let error = getInternalRouterError(404, {
       pathname: init.history.location.pathname
     });
     let { matches, route } = getShortCircuitMatches(dataRoutes);
+    initialized = true;
     initialMatches = matches;
     initialErrors = { [route.id]: error };
-  }
-  if (initialMatches && !init.hydrationData) {
-    let fogOfWar = checkFogOfWar(
-      initialMatches,
-      dataRoutes,
-      init.history.location.pathname
-    );
-    if (fogOfWar.active) {
-      initialMatches = null;
-    }
-  }
-  let initialized;
-  if (!initialMatches) {
-    initialized = false;
-    initialMatches = [];
-    let fogOfWar = checkFogOfWar(
-      null,
-      dataRoutes,
-      init.history.location.pathname
-    );
-    if (fogOfWar.active && fogOfWar.matches) {
-      initialMatchesIsFOW = true;
-      initialMatches = fogOfWar.matches;
-    }
-  } else if (initialMatches.some((m) => m.route.lazy)) {
-    initialized = false;
-  } else if (!initialMatches.some((m) => m.route.loader)) {
-    initialized = true;
   } else {
-    let loaderData = init.hydrationData ? init.hydrationData.loaderData : null;
-    let errors = init.hydrationData ? init.hydrationData.errors : null;
-    if (errors) {
-      let idx = initialMatches.findIndex(
-        (m) => errors[m.route.id] !== void 0
+    if (initialMatches && !init.hydrationData) {
+      let fogOfWar = checkFogOfWar(
+        initialMatches,
+        dataRoutes,
+        init.history.location.pathname
       );
-      initialized = initialMatches.slice(0, idx + 1).every((m) => !shouldLoadRouteOnHydration(m.route, loaderData, errors));
-    } else {
-      initialized = initialMatches.every(
-        (m) => !shouldLoadRouteOnHydration(m.route, loaderData, errors)
+      if (fogOfWar.active) {
+        initialMatches = null;
+      }
+    }
+    if (!initialMatches) {
+      initialized = false;
+      initialMatches = [];
+      let fogOfWar = checkFogOfWar(
+        null,
+        dataRoutes,
+        init.history.location.pathname
       );
+      if (fogOfWar.active && fogOfWar.matches) {
+        initialMatchesIsFOW = true;
+        initialMatches = fogOfWar.matches;
+      }
+    } else if (initialMatches.some((m) => m.route.lazy)) {
+      initialized = false;
+    } else if (!initialMatches.some((m) => m.route.loader)) {
+      initialized = true;
+    } else {
+      let loaderData = init.hydrationData ? init.hydrationData.loaderData : null;
+      let errors = init.hydrationData ? init.hydrationData.errors : null;
+      if (errors) {
+        let idx = initialMatches.findIndex(
+          (m) => errors[m.route.id] !== void 0
+        );
+        initialized = initialMatches.slice(0, idx + 1).every(
+          (m) => !shouldLoadRouteOnHydration(m.route, loaderData, errors)
+        );
+      } else {
+        initialized = initialMatches.every(
+          (m) => !shouldLoadRouteOnHydration(m.route, loaderData, errors)
+        );
+      }
     }
   }
   let router;
@@ -1063,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;
@@ -1075,7 +1084,7 @@ function createRouter(init) {
         );
         let blockerKey = shouldBlockNavigation({
           currentLocation: state.location,
-          nextLocation: location2,
+          nextLocation: location,
           historyAction
         });
         if (blockerKey && delta != null) {
@@ -1085,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));
             },
@@ -1103,7 +1112,7 @@ function createRouter(init) {
           });
           return;
         }
-        return startNavigation(historyAction, location2);
+        return startNavigation(historyAction, location);
       }
     );
     if (isBrowser2) {
@@ -1136,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
@@ -1179,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) {
@@ -1204,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;
@@ -1212,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(
@@ -1250,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,
@@ -1372,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;
@@ -1385,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: {},
@@ -1415,7 +1411,7 @@ function createRouter(init) {
     pendingNavigationController = new AbortController();
     let request = createClientSideRequest(
       init.history,
-      location2,
+      location,
       pendingNavigationController.signal,
       opts && opts.submission
     );
@@ -1431,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,
@@ -1446,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: {
@@ -1458,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(
@@ -1474,7 +1470,7 @@ function createRouter(init) {
       errors
     } = await handleLoaders(
       request,
-      location2,
+      location,
       matches,
       scopedContext,
       fogOfWar.active,
@@ -1490,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") {
@@ -1523,7 +1519,7 @@ function createRouter(init) {
         };
       } else if (!discoverResult.matches) {
         let { notFoundMatches, error, route } = handleNavigational404(
-          location2.pathname
+          location.pathname
         );
         return {
           matches: notFoundMatches,
@@ -1540,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
         })
       };
@@ -1584,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,
@@ -1604,7 +1600,11 @@ function createRouter(init) {
       }
       return {
         matches,
-        pendingActionResult: [boundaryMatch.route.id, result]
+        pendingActionResult: [
+          boundaryMatch.route.id,
+          result,
+          actionMatch.route.id
+        ]
       };
     }
     return {
@@ -1612,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) {
@@ -1631,7 +1631,7 @@ function createRouter(init) {
       }
       let discoverResult = await discoverRoutes(
         matches,
-        location2.pathname,
+        location.pathname,
         request.signal
       );
       if (discoverResult.type === "aborted") {
@@ -1647,7 +1647,7 @@ function createRouter(init) {
         };
       } else if (!discoverResult.matches) {
         let { error, notFoundMatches, route } = handleNavigational404(
-          location2.pathname
+          location.pathname
         );
         return {
           matches: notFoundMatches,
@@ -1670,7 +1670,7 @@ function createRouter(init) {
       state,
       matches,
       activeSubmission,
-      location2,
+      location,
       initialHydration ? [] : hydrationRouteProperties2,
       initialHydration === true,
       isRevalidationRequired,
@@ -1686,7 +1686,7 @@ function createRouter(init) {
     if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && revalidatingFetchers.length === 0) {
       let updatedFetchers2 = markFetchRedirectsDone();
       completeNavigation(
-        location2,
+        location,
         {
           matches,
           loaderData: {},
@@ -2046,6 +2046,10 @@ function createRouter(init) {
     fetchReloadIds.delete(key);
     fetchControllers.delete(key);
     revalidatingFetchers.forEach((r) => fetchControllers.delete(r.key));
+    if (state.fetchers.has(key)) {
+      let doneFetcher = getDoneFetcher(actionResult.data);
+      state.fetchers.set(key, doneFetcher);
+    }
     let redirect2 = findRedirect(loaderResults);
     if (redirect2) {
       return startRedirectNavigation(
@@ -2073,10 +2077,6 @@ function createRouter(init) {
       revalidatingFetchers,
       fetcherResults
     );
-    if (state.fetchers.has(key)) {
-      let doneFetcher = getDoneFetcher(actionResult.data);
-      state.fetchers.set(key, doneFetcher);
-    }
     abortStaleFetchLoads(loadId);
     if (state.navigation.state === "loading" && loadId > pendingNavigationLoadId) {
       invariant(pendingAction, "Expected pending action");
@@ -2197,31 +2197,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 = init.history.createURL(location2);
+      } 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;
       }
@@ -2237,7 +2237,7 @@ function createRouter(init) {
       await startNavigation(redirectNavigationType, redirectLocation, {
         submission: {
           ...activeSubmission,
-          formAction: location2
+          formAction: location
         },
         // Preserve these flags across redirects
         preventScrollReset: preventScrollReset || pendingPreventScrollReset,
@@ -2279,6 +2279,9 @@ function createRouter(init) {
       });
       return dataResults;
     }
+    if (request.signal.aborted) {
+      return dataResults;
+    }
     for (let [routeId, result] of Object.entries(results)) {
       if (isRedirectDataStrategyResult(result)) {
         let response = result.result;
@@ -2508,25 +2511,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;
@@ -2580,8 +2583,7 @@ function createRouter(init) {
               children,
               routesToUse,
               localManifest,
-              mapRouteProperties2,
-              false
+              mapRouteProperties2
             );
           }
         });
@@ -2622,7 +2624,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(
@@ -2630,8 +2632,7 @@ function createRouter(init) {
       children,
       routesToUse,
       manifest,
-      mapRouteProperties2,
-      unstable_allowElementMutations
+      mapRouteProperties2
     );
     if (isNonHMR) {
       dataRoutes = [...dataRoutes];
@@ -2673,10 +2674,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;
 }
@@ -2704,15 +2702,15 @@ 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") {
       let error = getInternalRouterError(405, { method });
       let { matches: methodNotAllowedMatches, route } = getShortCircuitMatches(dataRoutes);
       let staticContext = {
         basename,
-        location: location2,
+        location,
         matches: methodNotAllowedMatches,
         loaderData: {},
         actionData: null,
@@ -2725,11 +2723,11 @@ function createStaticHandler(routes, opts) {
       };
       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,
@@ -2769,7 +2767,7 @@ function createStaticHandler(routes, opts) {
           async () => {
             let result2 = await queryImpl(
               request,
-              location2,
+              location,
               matches,
               requestContext,
               dataStrategy || null,
@@ -2781,7 +2779,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;
           },
@@ -2806,7 +2804,7 @@ function createStaticHandler(routes, opts) {
               let boundary = loaderIdx >= 0 ? findNearestBoundary(matches, matches[loaderIdx].route.id) : findNearestBoundary(matches);
               return respond({
                 matches,
-                location: location2,
+                location,
                 basename,
                 loaderData: {},
                 actionData: null,
@@ -2831,7 +2829,7 @@ function createStaticHandler(routes, opts) {
     }
     let result = await queryImpl(
       request,
-      location2,
+      location,
       matches,
       requestContext,
       dataStrategy || null,
@@ -2843,7 +2841,7 @@ function createStaticHandler(routes, opts) {
     if (isResponse(result)) {
       return result;
     }
-    return { location: location2, basename, ...result };
+    return { location, basename, ...result };
   }
   async function queryRoute(request, {
     routeId,
@@ -2853,22 +2851,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
@@ -2891,7 +2889,7 @@ function createStaticHandler(routes, opts) {
         async () => {
           let result2 = await queryImpl(
             request,
-            location2,
+            location,
             matches,
             requestContext,
             dataStrategy || null,
@@ -2924,7 +2922,7 @@ function createStaticHandler(routes, opts) {
     }
     let result = await queryImpl(
       request,
-      location2,
+      location,
       matches,
       requestContext,
       dataStrategy || null,
@@ -2948,7 +2946,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"
@@ -2958,7 +2956,7 @@ function createStaticHandler(routes, opts) {
         let result2 = await submit(
           request,
           matches,
-          routeMatch || getTargetMatch(matches, location2),
+          routeMatch || getTargetMatch(matches, location),
           requestContext,
           dataStrategy,
           skipLoaderErrorBubbling,
@@ -3274,7 +3272,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) {
@@ -3293,12 +3291,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);
@@ -3425,10 +3423,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, pendingActionResult) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, pendingActionResult) {
   let actionResult = pendingActionResult ? isErrorResult(pendingActionResult[1]) ? pendingActionResult[1].error : pendingActionResult[1].data : void 0;
   let currentUrl = history.createURL(state.location);
-  let nextUrl = history.createURL(location2);
+  let nextUrl = history.createURL(location);
   let maxIdx;
   if (initialHydration && state.errors) {
     let boundaryId = Object.keys(state.errors)[0];
@@ -3590,7 +3588,7 @@ function shouldLoadRouteOnHydration(route, loaderData, errors) {
   if (!route.loader) {
     return false;
   }
-  let hasData = loaderData != null && loaderData[route.id] !== void 0;
+  let hasData = loaderData != null && route.id in loaderData;
   let hasError = errors != null && errors[route.id] !== void 0;
   if (!hasData && hasError) {
     return false;
@@ -3627,7 +3625,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];
@@ -3642,47 +3640,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) {
@@ -4031,7 +4000,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,
@@ -4291,39 +4260,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;
@@ -4409,7 +4378,9 @@ function processRouteLoaderData(matches, results, pendingActionResult, isStaticH
   });
   if (pendingError !== void 0 && pendingActionResult) {
     errors = { [pendingActionResult[0]]: pendingError };
-    loaderData[pendingActionResult[0]] = void 0;
+    if (pendingActionResult[2]) {
+      loaderData[pendingActionResult[2]] = void 0;
+    }
   }
   return {
     loaderData,
@@ -4593,8 +4564,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];
   }
@@ -4635,11 +4606,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,
@@ -4651,7 +4622,7 @@ function getLoadingNavigation(location2, submission) {
   } else {
     let navigation = {
       state: "loading",
-      location: location2,
+      location,
       formMethod: void 0,
       formAction: void 0,
       formEncType: void 0,
@@ -4662,10 +4633,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,
@@ -4826,10 +4797,10 @@ var RouteContext = React.createContext({
 RouteContext.displayName = "Route";
 var RouteErrorContext = React.createContext(null);
 RouteErrorContext.displayName = "RouteError";
+var ENABLE_DEV_WARNINGS = true;
 
 // lib/hooks.tsx
 import * as React2 from "react";
-var ENABLE_DEV_WARNINGS = true;
 function useHref(to, { relative } = {}) {
   invariant(
     useInRouterContext(),
@@ -4837,13 +4808,13 @@ function useHref(to, { relative } = {}) {
     // router loaded. We can help them understand how to avoid that.
     `useHref() may be used only in the context of a <Router> component.`
   );
-  let { basename, navigator: navigator2 } = React2.useContext(NavigationContext);
+  let { basename, navigator } = React2.useContext(NavigationContext);
   let { hash, pathname, search } = useResolvedPath(to, { relative });
   let joinedPathname = pathname;
   if (basename !== "/") {
     joinedPathname = pathname === "/" ? basename : joinPaths([basename, pathname]);
   }
-  return navigator2.createHref({ pathname: joinedPathname, search, hash });
+  return navigator.createHref({ pathname: joinedPathname, search, hash });
 }
 function useInRouterContext() {
   return React2.useContext(LocationContext) != null;
@@ -4892,7 +4863,7 @@ function useNavigateUnstable() {
     `useNavigate() may be used only in the context of a <Router> component.`
   );
   let dataRouterContext = React2.useContext(DataRouterContext);
-  let { basename, navigator: navigator2 } = React2.useContext(NavigationContext);
+  let { basename, navigator } = React2.useContext(NavigationContext);
   let { matches } = React2.useContext(RouteContext);
   let { pathname: locationPathname } = useLocation();
   let routePathnamesJson = JSON.stringify(getResolveToMatches(matches));
@@ -4905,7 +4876,7 @@ function useNavigateUnstable() {
       warning(activeRef.current, navigateEffectWarning);
       if (!activeRef.current) return;
       if (typeof to === "number") {
-        navigator2.go(to);
+        navigator.go(to);
         return;
       }
       let path = resolveTo(
@@ -4917,7 +4888,7 @@ function useNavigateUnstable() {
       if (dataRouterContext == null && basename !== "/") {
         path.pathname = path.pathname === "/" ? basename : joinPaths([basename, path.pathname]);
       }
-      (!!options.replace ? navigator2.replace : navigator2.push)(
+      (!!options.replace ? navigator.replace : navigator.push)(
         path,
         options.state,
         options
@@ -4925,7 +4896,7 @@ function useNavigateUnstable() {
     },
     [
       basename,
-      navigator2,
+      navigator,
       routePathnamesJson,
       locationPathname,
       dataRouterContext
@@ -4973,7 +4944,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     // router loaded. We can help them understand how to avoid that.
     `useRoutes() may be used only in the context of a <Router> component.`
   );
-  let { navigator: navigator2, static: isStatic } = React2.useContext(NavigationContext);
+  let { navigator, static: isStatic } = React2.useContext(NavigationContext);
   let { matches: parentMatches } = React2.useContext(RouteContext);
   let routeMatch = parentMatches[parentMatches.length - 1];
   let parentParams = routeMatch ? routeMatch.params : {};
@@ -4991,18 +4962,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("/");
@@ -5013,11 +4984,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(
@@ -5027,12 +4998,12 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         pathname: joinPaths([
           parentPathnameBase,
           // Re-encode pathnames that were decoded inside matchRoutes
-          navigator2.encodeLocation ? navigator2.encodeLocation(match.pathname).pathname : match.pathname
+          navigator.encodeLocation ? navigator.encodeLocation(match.pathname).pathname : match.pathname
         ]),
         pathnameBase: match.pathnameBase === "/" ? parentPathnameBase : joinPaths([
           parentPathnameBase,
           // Re-encode pathnames that were decoded inside matchRoutes
-          navigator2.encodeLocation ? navigator2.encodeLocation(match.pathnameBase).pathname : match.pathnameBase
+          navigator.encodeLocation ? navigator.encodeLocation(match.pathnameBase).pathname : match.pathnameBase
         ])
       })
     ),
@@ -5051,7 +5022,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             hash: "",
             state: null,
             key: "default",
-            ...location2
+            ...location
           },
           navigationType: "POP" /* Pop */
         }
@@ -5411,7 +5382,6 @@ function warnOnce(condition, message) {
 }
 
 // lib/components.tsx
-var ENABLE_DEV_WARNINGS2 = true;
 function mapRouteProperties(route) {
   let updates = {
     // Note: this check also occurs in createRoutesFromChildren so update
@@ -5419,7 +5389,7 @@ function mapRouteProperties(route) {
     hasErrorBoundary: route.hasErrorBoundary || route.ErrorBoundary != null || route.errorElement != null
   };
   if (route.Component) {
-    if (ENABLE_DEV_WARNINGS2) {
+    if (ENABLE_DEV_WARNINGS) {
       if (route.element) {
         warning(
           false,
@@ -5433,7 +5403,7 @@ function mapRouteProperties(route) {
     });
   }
   if (route.HydrateFallback) {
-    if (ENABLE_DEV_WARNINGS2) {
+    if (ENABLE_DEV_WARNINGS) {
       if (route.hydrateFallbackElement) {
         warning(
           false,
@@ -5447,7 +5417,7 @@ function mapRouteProperties(route) {
     });
   }
   if (route.ErrorBoundary) {
-    if (ENABLE_DEV_WARNINGS2) {
+    if (ENABLE_DEV_WARNINGS) {
       if (route.errorElement) {
         warning(
           false,
@@ -5532,11 +5502,25 @@ function RouterProvider({
         viewTransitionOpts == null || isViewTransitionAvailable,
         "You provided the `viewTransition` option to a router update, but you do not appear to be running in a DOM environment as `window.startViewTransition` is not available."
       );
+      const resetTransition = () => {
+        setRenderDfd(void 0);
+        setTransition(void 0);
+        setPendingState(void 0);
+        setVtContext({ isTransitioning: false });
+      };
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
+        renderDfd?.resolve();
+        transition?.skipTransition();
         if (reactDomFlushSyncImpl && flushSync) {
-          reactDomFlushSyncImpl(() => setStateImpl(newState));
+          reactDomFlushSyncImpl(() => {
+            setStateImpl(newState);
+            resetTransition();
+          });
         } else {
-          React3.startTransition(() => setStateImpl(newState));
+          React3.startTransition(() => {
+            setStateImpl(newState);
+            resetTransition();
+          });
         }
         return;
       }
@@ -5557,12 +5541,7 @@ function RouterProvider({
           reactDomFlushSyncImpl(() => setStateImpl(newState));
         });
         t.finished.finally(() => {
-          reactDomFlushSyncImpl(() => {
-            setRenderDfd(void 0);
-            setTransition(void 0);
-            setPendingState(void 0);
-            setVtContext({ isTransitioning: false });
-          });
+          reactDomFlushSyncImpl(() => resetTransition());
         });
         reactDomFlushSyncImpl(() => setTransition(t));
         return;
@@ -5627,7 +5606,7 @@ function RouterProvider({
       setInterruption(void 0);
     }
   }, [vtContext.isTransitioning, interruption]);
-  let navigator2 = React3.useMemo(() => {
+  let navigator = React3.useMemo(() => {
     return {
       createHref: router.createHref,
       encodeLocation: router.encodeLocation,
@@ -5647,11 +5626,11 @@ function RouterProvider({
   let dataRouterContext = React3.useMemo(
     () => ({
       router,
-      navigator: navigator2,
+      navigator,
       static: false,
       basename
     }),
-    [router, navigator2, basename]
+    [router, navigator, basename]
   );
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React3.createElement(DataRouterStateContext.Provider, { value: state }, /* @__PURE__ */ React3.createElement(FetchersContext.Provider, { value: fetcherData.current }, /* @__PURE__ */ React3.createElement(ViewTransitionContext.Provider, { value: vtContext }, /* @__PURE__ */ React3.createElement(
     Router,
@@ -5659,7 +5638,7 @@ function RouterProvider({
       basename,
       location: state.location,
       navigationType: state.historyAction,
-      navigator: navigator2
+      navigator
     },
     /* @__PURE__ */ React3.createElement(
       MemoizedDataRoutes,
@@ -5762,7 +5741,7 @@ function Router({
   children = null,
   location: locationProp,
   navigationType = "POP" /* Pop */,
-  navigator: navigator2,
+  navigator,
   static: staticProp = false
 }) {
   invariant(
@@ -5773,11 +5752,11 @@ function Router({
   let navigationContext = React3.useMemo(
     () => ({
       basename,
-      navigator: navigator2,
+      navigator,
       static: staticProp,
       future: {}
     }),
-    [basename, navigator2, staticProp]
+    [basename, navigator, staticProp]
   );
   if (typeof locationProp === "string") {
     locationProp = parsePath(locationProp);
@@ -5816,9 +5795,9 @@ function Router({
 }
 function Routes({
   children,
-  location: location2
+  location
 }) {
-  return useRoutes(createRoutesFromChildren(children), location2);
+  return useRoutes(createRoutesFromChildren(children), location);
 }
 function Await({
   children,
@@ -5888,38 +5867,6 @@ function ResolveAwait({
   let toRender = typeof children === "function" ? children(data2) : children;
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, toRender);
 }
-function WithRouteComponentProps({
-  children
-}) {
-  let props = {
-    loaderData: useLoaderData(),
-    actionData: useActionData(),
-    params: useParams(),
-    matches: useMatches()
-  };
-  return React3.cloneElement(children, props);
-}
-function WithHydrateFallbackProps({
-  children
-}) {
-  let props = {
-    loaderData: useLoaderData(),
-    actionData: useActionData(),
-    params: useParams()
-  };
-  return React3.cloneElement(children, props);
-}
-function WithErrorBoundaryProps({
-  children
-}) {
-  let props = {
-    loaderData: useLoaderData(),
-    actionData: useActionData(),
-    params: useParams(),
-    error: useRouteError()
-  };
-  return React3.cloneElement(children, props);
-}
 function createRoutesFromChildren(children, parentPath = []) {
   let routes = [];
   React3.Children.forEach(children, (element, index) => {
@@ -6242,7 +6189,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;
@@ -6272,7 +6219,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 || {},
@@ -6367,7 +6314,669 @@ function createHtml(html) {
 
 // lib/dom/ssr/single-fetch.tsx
 import * as React4 from "react";
-import { decode } from "turbo-stream";
+
+// vendor/turbo-stream-v2/utils.ts
+var HOLE = -1;
+var NAN = -2;
+var NEGATIVE_INFINITY = -3;
+var NEGATIVE_ZERO = -4;
+var NULL = -5;
+var POSITIVE_INFINITY = -6;
+var UNDEFINED = -7;
+var TYPE_BIGINT = "B";
+var TYPE_DATE = "D";
+var TYPE_ERROR = "E";
+var TYPE_MAP = "M";
+var TYPE_NULL_OBJECT = "N";
+var TYPE_PROMISE = "P";
+var TYPE_REGEXP = "R";
+var TYPE_SET = "S";
+var TYPE_SYMBOL = "Y";
+var TYPE_URL = "U";
+var TYPE_PREVIOUS_RESOLVED = "Z";
+var Deferred2 = class {
+  constructor() {
+    this.promise = new Promise((resolve, reject) => {
+      this.resolve = resolve;
+      this.reject = reject;
+    });
+  }
+};
+function createLineSplittingTransform() {
+  const decoder = new TextDecoder();
+  let leftover = "";
+  return new TransformStream({
+    transform(chunk, controller) {
+      const str = decoder.decode(chunk, { stream: true });
+      const parts = (leftover + str).split("\n");
+      leftover = parts.pop() || "";
+      for (const part of parts) {
+        controller.enqueue(part);
+      }
+    },
+    flush(controller) {
+      if (leftover) {
+        controller.enqueue(leftover);
+      }
+    }
+  });
+}
+
+// vendor/turbo-stream-v2/flatten.ts
+function flatten(input) {
+  const { indices } = this;
+  const existing = indices.get(input);
+  if (existing) return [existing];
+  if (input === void 0) return UNDEFINED;
+  if (input === null) return NULL;
+  if (Number.isNaN(input)) return NAN;
+  if (input === Number.POSITIVE_INFINITY) return POSITIVE_INFINITY;
+  if (input === Number.NEGATIVE_INFINITY) return NEGATIVE_INFINITY;
+  if (input === 0 && 1 / input < 0) return NEGATIVE_ZERO;
+  const index = this.index++;
+  indices.set(input, index);
+  stringify.call(this, input, index);
+  return index;
+}
+function stringify(input, index) {
+  const { deferred, plugins, postPlugins } = this;
+  const str = this.stringified;
+  const stack = [[input, index]];
+  while (stack.length > 0) {
+    const [input2, index2] = stack.pop();
+    const partsForObj = (obj) => Object.keys(obj).map((k) => `"_${flatten.call(this, k)}":${flatten.call(this, obj[k])}`).join(",");
+    let error = null;
+    switch (typeof input2) {
+      case "boolean":
+      case "number":
+      case "string":
+        str[index2] = JSON.stringify(input2);
+        break;
+      case "bigint":
+        str[index2] = `["${TYPE_BIGINT}","${input2}"]`;
+        break;
+      case "symbol": {
+        const keyFor = Symbol.keyFor(input2);
+        if (!keyFor) {
+          error = new Error(
+            "Cannot encode symbol unless created with Symbol.for()"
+          );
+        } else {
+          str[index2] = `["${TYPE_SYMBOL}",${JSON.stringify(keyFor)}]`;
+        }
+        break;
+      }
+      case "object": {
+        if (!input2) {
+          str[index2] = `${NULL}`;
+          break;
+        }
+        const isArray = Array.isArray(input2);
+        let pluginHandled = false;
+        if (!isArray && plugins) {
+          for (const plugin of plugins) {
+            const pluginResult = plugin(input2);
+            if (Array.isArray(pluginResult)) {
+              pluginHandled = true;
+              const [pluginIdentifier, ...rest] = pluginResult;
+              str[index2] = `[${JSON.stringify(pluginIdentifier)}`;
+              if (rest.length > 0) {
+                str[index2] += `,${rest.map((v) => flatten.call(this, v)).join(",")}`;
+              }
+              str[index2] += "]";
+              break;
+            }
+          }
+        }
+        if (!pluginHandled) {
+          let result = isArray ? "[" : "{";
+          if (isArray) {
+            for (let i = 0; i < input2.length; i++)
+              result += (i ? "," : "") + (i in input2 ? flatten.call(this, input2[i]) : HOLE);
+            str[index2] = `${result}]`;
+          } else if (input2 instanceof Date) {
+            str[index2] = `["${TYPE_DATE}",${input2.getTime()}]`;
+          } else if (input2 instanceof URL) {
+            str[index2] = `["${TYPE_URL}",${JSON.stringify(input2.href)}]`;
+          } else if (input2 instanceof RegExp) {
+            str[index2] = `["${TYPE_REGEXP}",${JSON.stringify(
+              input2.source
+            )},${JSON.stringify(input2.flags)}]`;
+          } else if (input2 instanceof Set) {
+            if (input2.size > 0) {
+              str[index2] = `["${TYPE_SET}",${[...input2].map((val) => flatten.call(this, val)).join(",")}]`;
+            } else {
+              str[index2] = `["${TYPE_SET}"]`;
+            }
+          } else if (input2 instanceof Map) {
+            if (input2.size > 0) {
+              str[index2] = `["${TYPE_MAP}",${[...input2].flatMap(([k, v]) => [
+                flatten.call(this, k),
+                flatten.call(this, v)
+              ]).join(",")}]`;
+            } else {
+              str[index2] = `["${TYPE_MAP}"]`;
+            }
+          } else if (input2 instanceof Promise) {
+            str[index2] = `["${TYPE_PROMISE}",${index2}]`;
+            deferred[index2] = input2;
+          } else if (input2 instanceof Error) {
+            str[index2] = `["${TYPE_ERROR}",${JSON.stringify(input2.message)}`;
+            if (input2.name !== "Error") {
+              str[index2] += `,${JSON.stringify(input2.name)}`;
+            }
+            str[index2] += "]";
+          } else if (Object.getPrototypeOf(input2) === null) {
+            str[index2] = `["${TYPE_NULL_OBJECT}",{${partsForObj(input2)}}]`;
+          } else if (isPlainObject(input2)) {
+            str[index2] = `{${partsForObj(input2)}}`;
+          } else {
+            error = new Error("Cannot encode object with prototype");
+          }
+        }
+        break;
+      }
+      default: {
+        const isArray = Array.isArray(input2);
+        let pluginHandled = false;
+        if (!isArray && plugins) {
+          for (const plugin of plugins) {
+            const pluginResult = plugin(input2);
+            if (Array.isArray(pluginResult)) {
+              pluginHandled = true;
+              const [pluginIdentifier, ...rest] = pluginResult;
+              str[index2] = `[${JSON.stringify(pluginIdentifier)}`;
+              if (rest.length > 0) {
+                str[index2] += `,${rest.map((v) => flatten.call(this, v)).join(",")}`;
+              }
+              str[index2] += "]";
+              break;
+            }
+          }
+        }
+        if (!pluginHandled) {
+          error = new Error("Cannot encode function or unexpected type");
+        }
+      }
+    }
+    if (error) {
+      let pluginHandled = false;
+      if (postPlugins) {
+        for (const plugin of postPlugins) {
+          const pluginResult = plugin(input2);
+          if (Array.isArray(pluginResult)) {
+            pluginHandled = true;
+            const [pluginIdentifier, ...rest] = pluginResult;
+            str[index2] = `[${JSON.stringify(pluginIdentifier)}`;
+            if (rest.length > 0) {
+              str[index2] += `,${rest.map((v) => flatten.call(this, v)).join(",")}`;
+            }
+            str[index2] += "]";
+            break;
+          }
+        }
+      }
+      if (!pluginHandled) {
+        throw error;
+      }
+    }
+  }
+}
+var objectProtoNames = Object.getOwnPropertyNames(Object.prototype).sort().join("\0");
+function isPlainObject(thing) {
+  const proto = Object.getPrototypeOf(thing);
+  return proto === Object.prototype || proto === null || Object.getOwnPropertyNames(proto).sort().join("\0") === objectProtoNames;
+}
+
+// vendor/turbo-stream-v2/unflatten.ts
+var globalObj = typeof window !== "undefined" ? window : typeof globalThis !== "undefined" ? globalThis : void 0;
+function unflatten(parsed) {
+  const { hydrated, values } = this;
+  if (typeof parsed === "number") return hydrate.call(this, parsed);
+  if (!Array.isArray(parsed) || !parsed.length) throw new SyntaxError();
+  const startIndex = values.length;
+  for (const value of parsed) {
+    values.push(value);
+  }
+  hydrated.length = values.length;
+  return hydrate.call(this, startIndex);
+}
+function hydrate(index) {
+  const { hydrated, values, deferred, plugins } = this;
+  let result;
+  const stack = [
+    [
+      index,
+      (v) => {
+        result = v;
+      }
+    ]
+  ];
+  let postRun = [];
+  while (stack.length > 0) {
+    const [index2, set] = stack.pop();
+    switch (index2) {
+      case UNDEFINED:
+        set(void 0);
+        continue;
+      case NULL:
+        set(null);
+        continue;
+      case NAN:
+        set(NaN);
+        continue;
+      case POSITIVE_INFINITY:
+        set(Infinity);
+        continue;
+      case NEGATIVE_INFINITY:
+        set(-Infinity);
+        continue;
+      case NEGATIVE_ZERO:
+        set(-0);
+        continue;
+    }
+    if (hydrated[index2]) {
+      set(hydrated[index2]);
+      continue;
+    }
+    const value = values[index2];
+    if (!value || typeof value !== "object") {
+      hydrated[index2] = value;
+      set(value);
+      continue;
+    }
+    if (Array.isArray(value)) {
+      if (typeof value[0] === "string") {
+        const [type, b, c] = value;
+        switch (type) {
+          case TYPE_DATE:
+            set(hydrated[index2] = new Date(b));
+            continue;
+          case TYPE_URL:
+            set(hydrated[index2] = new URL(b));
+            continue;
+          case TYPE_BIGINT:
+            set(hydrated[index2] = BigInt(b));
+            continue;
+          case TYPE_REGEXP:
+            set(hydrated[index2] = new RegExp(b, c));
+            continue;
+          case TYPE_SYMBOL:
+            set(hydrated[index2] = Symbol.for(b));
+            continue;
+          case TYPE_SET:
+            const newSet = /* @__PURE__ */ new Set();
+            hydrated[index2] = newSet;
+            for (let i = value.length - 1; i > 0; i--)
+              stack.push([
+                value[i],
+                (v) => {
+                  newSet.add(v);
+                }
+              ]);
+            set(newSet);
+            continue;
+          case TYPE_MAP:
+            const map = /* @__PURE__ */ new Map();
+            hydrated[index2] = map;
+            for (let i = value.length - 2; i > 0; i -= 2) {
+              const r = [];
+              stack.push([
+                value[i + 1],
+                (v) => {
+                  r[1] = v;
+                }
+              ]);
+              stack.push([
+                value[i],
+                (k) => {
+                  r[0] = k;
+                }
+              ]);
+              postRun.push(() => {
+                map.set(r[0], r[1]);
+              });
+            }
+            set(map);
+            continue;
+          case TYPE_NULL_OBJECT:
+            const obj = /* @__PURE__ */ Object.create(null);
+            hydrated[index2] = obj;
+            for (const key of Object.keys(b).reverse()) {
+              const r = [];
+              stack.push([
+                b[key],
+                (v) => {
+                  r[1] = v;
+                }
+              ]);
+              stack.push([
+                Number(key.slice(1)),
+                (k) => {
+                  r[0] = k;
+                }
+              ]);
+              postRun.push(() => {
+                obj[r[0]] = r[1];
+              });
+            }
+            set(obj);
+            continue;
+          case TYPE_PROMISE:
+            if (hydrated[b]) {
+              set(hydrated[index2] = hydrated[b]);
+            } else {
+              const d = new Deferred2();
+              deferred[b] = d;
+              set(hydrated[index2] = d.promise);
+            }
+            continue;
+          case TYPE_ERROR:
+            const [, message, errorType] = value;
+            let error = errorType && globalObj && globalObj[errorType] ? new globalObj[errorType](message) : new Error(message);
+            hydrated[index2] = error;
+            set(error);
+            continue;
+          case TYPE_PREVIOUS_RESOLVED:
+            set(hydrated[index2] = hydrated[b]);
+            continue;
+          default:
+            if (Array.isArray(plugins)) {
+              const r = [];
+              const vals = value.slice(1);
+              for (let i = 0; i < vals.length; i++) {
+                const v = vals[i];
+                stack.push([
+                  v,
+                  (v2) => {
+                    r[i] = v2;
+                  }
+                ]);
+              }
+              postRun.push(() => {
+                for (const plugin of plugins) {
+                  const result2 = plugin(value[0], ...r);
+                  if (result2) {
+                    set(hydrated[index2] = result2.value);
+                    return;
+                  }
+                }
+                throw new SyntaxError();
+              });
+              continue;
+            }
+            throw new SyntaxError();
+        }
+      } else {
+        const array = [];
+        hydrated[index2] = array;
+        for (let i = 0; i < value.length; i++) {
+          const n = value[i];
+          if (n !== HOLE) {
+            stack.push([
+              n,
+              (v) => {
+                array[i] = v;
+              }
+            ]);
+          }
+        }
+        set(array);
+        continue;
+      }
+    } else {
+      const object = {};
+      hydrated[index2] = object;
+      for (const key of Object.keys(value).reverse()) {
+        const r = [];
+        stack.push([
+          value[key],
+          (v) => {
+            r[1] = v;
+          }
+        ]);
+        stack.push([
+          Number(key.slice(1)),
+          (k) => {
+            r[0] = k;
+          }
+        ]);
+        postRun.push(() => {
+          object[r[0]] = r[1];
+        });
+      }
+      set(object);
+      continue;
+    }
+  }
+  while (postRun.length > 0) {
+    postRun.pop()();
+  }
+  return result;
+}
+
+// vendor/turbo-stream-v2/turbo-stream.ts
+async function decode(readable, options) {
+  const { plugins } = options ?? {};
+  const done = new Deferred2();
+  const reader = readable.pipeThrough(createLineSplittingTransform()).getReader();
+  const decoder = {
+    values: [],
+    hydrated: [],
+    deferred: {},
+    plugins
+  };
+  const decoded = await decodeInitial.call(decoder, reader);
+  let donePromise = done.promise;
+  if (decoded.done) {
+    done.resolve();
+  } else {
+    donePromise = decodeDeferred.call(decoder, reader).then(done.resolve).catch((reason) => {
+      for (const deferred of Object.values(decoder.deferred)) {
+        deferred.reject(reason);
+      }
+      done.reject(reason);
+    });
+  }
+  return {
+    done: donePromise.then(() => reader.closed),
+    value: decoded.value
+  };
+}
+async function decodeInitial(reader) {
+  const read = await reader.read();
+  if (!read.value) {
+    throw new SyntaxError();
+  }
+  let line;
+  try {
+    line = JSON.parse(read.value);
+  } catch (reason) {
+    throw new SyntaxError();
+  }
+  return {
+    done: read.done,
+    value: unflatten.call(this, line)
+  };
+}
+async function decodeDeferred(reader) {
+  let read = await reader.read();
+  while (!read.done) {
+    if (!read.value) continue;
+    const line = read.value;
+    switch (line[0]) {
+      case TYPE_PROMISE: {
+        const colonIndex = line.indexOf(":");
+        const deferredId = Number(line.slice(1, colonIndex));
+        const deferred = this.deferred[deferredId];
+        if (!deferred) {
+          throw new Error(`Deferred ID ${deferredId} not found in stream`);
+        }
+        const lineData = line.slice(colonIndex + 1);
+        let jsonLine;
+        try {
+          jsonLine = JSON.parse(lineData);
+        } catch (reason) {
+          throw new SyntaxError();
+        }
+        const value = unflatten.call(this, jsonLine);
+        deferred.resolve(value);
+        break;
+      }
+      case TYPE_ERROR: {
+        const colonIndex = line.indexOf(":");
+        const deferredId = Number(line.slice(1, colonIndex));
+        const deferred = this.deferred[deferredId];
+        if (!deferred) {
+          throw new Error(`Deferred ID ${deferredId} not found in stream`);
+        }
+        const lineData = line.slice(colonIndex + 1);
+        let jsonLine;
+        try {
+          jsonLine = JSON.parse(lineData);
+        } catch (reason) {
+          throw new SyntaxError();
+        }
+        const value = unflatten.call(this, jsonLine);
+        deferred.reject(value);
+        break;
+      }
+      default:
+        throw new SyntaxError();
+    }
+    read = await reader.read();
+  }
+}
+function encode(input, options) {
+  const { plugins, postPlugins, signal } = options ?? {};
+  const encoder2 = {
+    deferred: {},
+    index: 0,
+    indices: /* @__PURE__ */ new Map(),
+    stringified: [],
+    plugins,
+    postPlugins,
+    signal
+  };
+  const textEncoder = new TextEncoder();
+  let lastSentIndex = 0;
+  const readable = new ReadableStream({
+    async start(controller) {
+      const id = flatten.call(encoder2, input);
+      if (Array.isArray(id)) {
+        throw new Error("This should never happen");
+      }
+      if (id < 0) {
+        controller.enqueue(textEncoder.encode(`${id}
+`));
+      } else {
+        controller.enqueue(
+          textEncoder.encode(`[${encoder2.stringified.join(",")}]
+`)
+        );
+        lastSentIndex = encoder2.stringified.length - 1;
+      }
+      const seenPromises = /* @__PURE__ */ new WeakSet();
+      if (Object.keys(encoder2.deferred).length) {
+        let raceDone;
+        const racePromise = new Promise((resolve, reject) => {
+          raceDone = resolve;
+          if (signal) {
+            const rejectPromise = () => reject(signal.reason || new Error("Signal was aborted."));
+            if (signal.aborted) {
+              rejectPromise();
+            } else {
+              signal.addEventListener("abort", (event) => {
+                rejectPromise();
+              });
+            }
+          }
+        });
+        while (Object.keys(encoder2.deferred).length > 0) {
+          for (const [deferredId, deferred] of Object.entries(
+            encoder2.deferred
+          )) {
+            if (seenPromises.has(deferred)) continue;
+            seenPromises.add(
+              // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
+              encoder2.deferred[Number(deferredId)] = Promise.race([
+                racePromise,
+                deferred
+              ]).then(
+                (resolved) => {
+                  const id2 = flatten.call(encoder2, resolved);
+                  if (Array.isArray(id2)) {
+                    controller.enqueue(
+                      textEncoder.encode(
+                        `${TYPE_PROMISE}${deferredId}:[["${TYPE_PREVIOUS_RESOLVED}",${id2[0]}]]
+`
+                      )
+                    );
+                    encoder2.index++;
+                    lastSentIndex++;
+                  } else if (id2 < 0) {
+                    controller.enqueue(
+                      textEncoder.encode(
+                        `${TYPE_PROMISE}${deferredId}:${id2}
+`
+                      )
+                    );
+                  } else {
+                    const values = encoder2.stringified.slice(lastSentIndex + 1).join(",");
+                    controller.enqueue(
+                      textEncoder.encode(
+                        `${TYPE_PROMISE}${deferredId}:[${values}]
+`
+                      )
+                    );
+                    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(encoder2, reason);
+                  if (Array.isArray(id2)) {
+                    controller.enqueue(
+                      textEncoder.encode(
+                        `${TYPE_ERROR}${deferredId}:[["${TYPE_PREVIOUS_RESOLVED}",${id2[0]}]]
+`
+                      )
+                    );
+                    encoder2.index++;
+                    lastSentIndex++;
+                  } else if (id2 < 0) {
+                    controller.enqueue(
+                      textEncoder.encode(`${TYPE_ERROR}${deferredId}:${id2}
+`)
+                    );
+                  } else {
+                    const values = encoder2.stringified.slice(lastSentIndex + 1).join(",");
+                    controller.enqueue(
+                      textEncoder.encode(
+                        `${TYPE_ERROR}${deferredId}:[${values}]
+`
+                      )
+                    );
+                    lastSentIndex = encoder2.stringified.length - 1;
+                  }
+                }
+              ).finally(() => {
+                delete encoder2.deferred[Number(deferredId)];
+              })
+            );
+          }
+          await Promise.race(Object.values(encoder2.deferred));
+        }
+        raceDone();
+      }
+      await Promise.all(Object.values(encoder2.deferred));
+      controller.close();
+    }
+  });
+  return readable;
+}
 
 // lib/dom/ssr/data.ts
 async function createRequestInit(request) {
@@ -6392,6 +7001,7 @@ async function createRequestInit(request) {
 
 // lib/dom/ssr/single-fetch.tsx
 var SingleFetchRedirectSymbol = Symbol("SingleFetchRedirect");
+var SINGLE_FETCH_REDIRECT_STATUS = 202;
 var NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([100, 101, 204, 205]);
 function StreamTransfer({
   context,
@@ -6519,7 +7129,7 @@ async function singleFetchActionStrategy(args, fetchAndDecode, basename) {
     });
     return result2;
   });
-  if (isResponse(result.result) || isRouteErrorResponse(result.result)) {
+  if (isResponse(result.result) || isRouteErrorResponse(result.result) || isDataWithResponseInit(result.result)) {
     return { [actionMatch.route.id]: result };
   }
   return {
@@ -6604,7 +7214,8 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
     )
   );
   await Promise.all(routeDfds.map((d) => d.promise));
-  if ((!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
+  let isInitialLoad = !router.state.initialized && router.state.navigation.state === "idle";
+  if ((isInitialLoad || routesParams.size === 0) && !window.__reactRouterHdrActive) {
     singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
@@ -6644,7 +7255,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
@@ -6652,17 +7263,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) {
@@ -6673,6 +7284,20 @@ async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
   if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
     throw new ErrorResponseImpl(404, "Not Found", true);
   }
+  if (res.status === 204 && res.headers.has("X-Remix-Redirect")) {
+    return {
+      status: SINGLE_FETCH_REDIRECT_STATUS,
+      data: {
+        redirect: {
+          redirect: res.headers.get("X-Remix-Redirect"),
+          status: Number(res.headers.get("X-Remix-Status") || "302"),
+          revalidate: res.headers.get("X-Remix-Revalidate") === "true",
+          reload: res.headers.get("X-Remix-Reload-Document") === "true",
+          replace: res.headers.get("X-Remix-Replace") === "true"
+        }
+      }
+    };
+  }
   if (NO_BODY_STATUS_CODES.has(res.status)) {
     let routes = {};
     if (targetRoutes && request.method !== "GET") {
@@ -6745,13 +7370,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)
@@ -6762,13 +7387,12 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
-  invariant2(routeResult, `No response found for routeId "${routeId}"`);
   if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
   } else {
-    throw new Error(`Invalid response found for routeId "${routeId}"`);
+    throw new Error(`No response found for routeId "${routeId}"`);
   }
 }
 function createDeferred2() {
@@ -6846,14 +7470,14 @@ function RemixRootDefaultErrorBoundary({
       dangerouslySetInnerHTML: {
         __html: `
         console.log(
-          "\u{1F4BF} Hey developer \u{1F44B}. You can provide a way better UX than this when your app throws errors. Check out https://remix.run/guides/errors for more information."
+          "\u{1F4BF} Hey developer \u{1F44B}. You can provide a way better UX than this when your app throws errors. Check out https://reactrouter.com/how-to/error-boundary for more information."
         );
       `
       }
     }
   );
   if (isRouteErrorResponse(error)) {
-    return /* @__PURE__ */ React5.createElement(BoundaryShell, { title: "Unhandled Thrown Response!" }, /* @__PURE__ */ React5.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText), heyDeveloper);
+    return /* @__PURE__ */ React5.createElement(BoundaryShell, { title: "Unhandled Thrown Response!" }, /* @__PURE__ */ React5.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText), ENABLE_DEV_WARNINGS ? heyDeveloper : null);
   }
   let errorInstance;
   if (error instanceof Error) {
@@ -6906,7 +7530,7 @@ function BoundaryShell({
 // lib/dom/ssr/fallback.tsx
 import * as React6 from "react";
 function RemixRootDefaultHydrateFallback() {
-  return /* @__PURE__ */ React6.createElement(BoundaryShell, { title: "Loading...", renderScripts: true }, /* @__PURE__ */ React6.createElement(
+  return /* @__PURE__ */ React6.createElement(BoundaryShell, { title: "Loading...", renderScripts: true }, ENABLE_DEV_WARNINGS ? /* @__PURE__ */ React6.createElement(
     "script",
     {
       dangerouslySetInnerHTML: {
@@ -6914,13 +7538,13 @@ function RemixRootDefaultHydrateFallback() {
               console.log(
                 "\u{1F4BF} Hey developer \u{1F44B}. You can provide a way better UX than this " +
                 "when your app is loading JS modules and/or running \`clientLoader\` " +
-                "functions. Check out https://remix.run/route/hydrate-fallback " +
+                "functions. Check out https://reactrouter.com/start/framework/route-module#hydratefallback " +
                 "for more information."
               );
             `
       }
     }
-  ));
+  ) : null);
 }
 
 // lib/dom/ssr/routes.tsx
@@ -7333,8 +7957,8 @@ var nextPaths = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize = 1e3;
 var discoveredPaths = /* @__PURE__ */ new Set();
 var URL_LIMIT = 7680;
-function isFogOfWarEnabled(ssr) {
-  return ssr === true;
+function isFogOfWarEnabled(routeDiscovery, ssr) {
+  return routeDiscovery.mode === "lazy" && ssr === true;
 }
 function getPartialManifest({ sri, ...manifest }, router) {
   let routeIds = new Set(router.state.matches.map((m) => m.route.id));
@@ -7361,8 +7985,8 @@ function getPartialManifest({ sri, ...manifest }, router) {
     sri: sri ? true : void 0
   };
 }
-function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, isSpaMode, basename) {
-  if (!isFogOfWarEnabled(ssr)) {
+function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename) {
+  if (!isFogOfWarEnabled(routeDiscovery, ssr)) {
     return void 0;
   }
   return async ({ path, patch, signal, fetcherKey }) => {
@@ -7377,14 +8001,16 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, isSpaMo
       ssr,
       isSpaMode,
       basename,
+      routeDiscovery.manifestPath,
       patch,
       signal
     );
   };
 }
-function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
+function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React8.useEffect(() => {
-    if (!isFogOfWarEnabled(ssr) || navigator.connection?.saveData === true) {
+    if (!isFogOfWarEnabled(routeDiscovery, ssr) || // @ts-expect-error - TS doesn't know about this yet
+    window.navigator?.connection?.saveData === true) {
       return;
     }
     function registerElement(el) {
@@ -7418,6 +8044,7 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
           ssr,
           isSpaMode,
           router.basename,
+          routeDiscovery.manifestPath,
           router.patchRoutes
         );
       } catch (e) {
@@ -7434,15 +8061,21 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, isSpaMode) {
       attributeFilter: ["data-discover", "href", "action"]
     });
     return () => observer.disconnect();
-  }, [ssr, isSpaMode, manifest, routeModules, router]);
+  }, [ssr, isSpaMode, manifest, routeModules, router, routeDiscovery]);
+}
+function getManifestPath(_manifestPath, basename) {
+  let manifestPath = _manifestPath || "/__manifest";
+  if (basename == null) {
+    return manifestPath;
+  }
+  return `${basename}${manifestPath}`.replace(/\/+/g, "/");
 }
 var MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
-async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, patchRoutes, signal) {
-  let manifestPath = `${basename != null ? basename : "/"}/__manifest`.replace(
-    /\/+/g,
-    "/"
+async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
+  let url = new URL(
+    getManifestPath(manifestPath, basename),
+    window.location.origin
   );
-  let url = new URL(manifestPath, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
   url.searchParams.set("version", manifest.version);
   if (url.toString().length > URL_LIMIT) {
@@ -7469,7 +8102,9 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
       }
       sessionStorage.setItem(MANIFEST_VERSION_STORAGE_KEY, manifest.version);
       window.location.href = errorReloadPath;
-      throw new Error("Detected manifest version mismatch, reloading...");
+      console.warn("Detected manifest version mismatch, reloading...");
+      await new Promise(() => {
+      });
     } else if (res.status >= 400) {
       throw new Error(await res.text());
     }
@@ -7668,7 +8303,7 @@ function PrefetchPageLinksImpl({
   matches: nextMatches,
   ...linkProps
 }) {
-  let location2 = useLocation();
+  let location = useLocation();
   let { manifest, routeModules } = useFrameworkContext();
   let { basename } = useDataRouterContext2();
   let { loaderData, matches } = useDataRouterStateContext();
@@ -7678,10 +8313,10 @@ function PrefetchPageLinksImpl({
       nextMatches,
       matches,
       manifest,
-      location2,
+      location,
       "data"
     ),
-    [page, nextMatches, matches, manifest, location2]
+    [page, nextMatches, matches, manifest, location]
   );
   let newMatchesForAssets = React9.useMemo(
     () => getNewMatchesForLinks(
@@ -7689,13 +8324,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();
@@ -7716,7 +8351,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",
@@ -7727,7 +8362,7 @@ function PrefetchPageLinksImpl({
   }, [
     basename,
     loaderData,
-    location2,
+    location,
     manifest,
     newMatchesForData,
     nextMatches,
@@ -7752,7 +8387,7 @@ function Meta() {
     matches: routerMatches,
     loaderData
   } = useDataRouterStateContext();
-  let location2 = useLocation();
+  let location = useLocation();
   let _matches = getActiveMatches(routerMatches, errors, isSpaMode);
   let error = null;
   if (errors) {
@@ -7782,7 +8417,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;
@@ -7848,10 +8483,17 @@ function isValidMetaTag(tagName) {
 }
 var isHydrated = false;
 function Scripts(props) {
-  let { manifest, serverHandoffString, isSpaMode, ssr, renderMeta } = useFrameworkContext();
+  let {
+    manifest,
+    serverHandoffString,
+    isSpaMode,
+    renderMeta,
+    routeDiscovery,
+    ssr
+  } = useFrameworkContext();
   let { router, static: isStatic, staticContext } = useDataRouterContext2();
   let { matches: routerMatches } = useDataRouterStateContext();
-  let enableFogOfWar = isFogOfWarEnabled(ssr);
+  let enableFogOfWar = isFogOfWarEnabled(routeDiscovery, ssr);
   if (renderMeta) {
     renderMeta.didRenderScripts = true;
   }
@@ -8007,7 +8649,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-e56aa53bc";
+    window.__reactRouterVersion = "0.0.0-experimental-aecfb0db1";
   }
 } catch (e) {
 }
@@ -8265,14 +8907,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: navigator2, basename } = React10.useContext(NavigationContext);
+    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 = navigator2.encodeLocation ? navigator2.encodeLocation(path).pathname : path.pathname;
-    let locationPathname = location2.pathname;
+    let toPathname = navigator.encodeLocation ? navigator.encodeLocation(path).pathname : path.pathname;
+    let locationPathname = location.pathname;
     let nextLocationPathname = routerState && routerState.navigation && routerState.navigation.location ? routerState.navigation.location.pathname : null;
     if (!caseSensitive) {
       locationPathname = locationPathname.toLowerCase();
@@ -8377,19 +9019,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
@@ -8450,13 +9092,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,
@@ -8467,7 +9109,7 @@ function useLinkClickHandler(to, {
       }
     },
     [
-      location2,
+      location,
       navigate,
       path,
       replaceProp,
@@ -8487,18 +9129,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(
@@ -8559,9 +9201,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 === "");
@@ -8653,23 +9295,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;
 }
@@ -8682,7 +9324,7 @@ function useScrollRestoration({
     "useScrollRestoration" /* UseScrollRestoration */
   );
   let { basename } = React10.useContext(NavigationContext);
-  let location2 = useLocation();
+  let location = useLocation();
   let matches = useMatches();
   let navigation = useNavigation();
   React10.useEffect(() => {
@@ -8694,7 +9336,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 {
@@ -8709,7 +9351,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(() => {
@@ -8727,7 +9369,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]);
@@ -8739,9 +9381,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();
@@ -8752,7 +9394,7 @@ function useScrollRestoration({
         return;
       }
       window.scrollTo(0, 0);
-    }, [location2, restoreScrollPosition, preventScrollReset]);
+    }, [location, restoreScrollPosition, preventScrollReset]);
   }
 }
 function useBeforeUnload(callback, options) {
@@ -8825,7 +9467,7 @@ function StaticRouter({
     locationProp = parsePath(locationProp);
   }
   let action = "POP" /* Pop */;
-  let location2 = {
+  let location = {
     pathname: locationProp.pathname || "/",
     search: locationProp.search || "",
     hash: locationProp.hash || "",
@@ -8838,7 +9480,7 @@ function StaticRouter({
     {
       basename,
       children,
-      location: location2,
+      location,
       navigationType: action,
       navigator: staticNavigator,
       static: true
@@ -8848,7 +9490,7 @@ function StaticRouter({
 function StaticRouterProvider({
   context,
   router,
-  hydrate = true,
+  hydrate: hydrate2 = true,
   nonce
 }) {
   invariant(
@@ -8864,7 +9506,7 @@ function StaticRouterProvider({
   };
   let fetchersContext = /* @__PURE__ */ new Map();
   let hydrateScript = "";
-  if (hydrate !== false) {
+  if (hydrate2 !== false) {
     let data2 = {
       loaderData: context.loaderData,
       actionData: context.actionData,
@@ -9057,9 +9699,6 @@ function createStaticRouter(routes, context, opts = {}) {
     _internalFetchControllers: /* @__PURE__ */ new Map(),
     _internalSetRoutes() {
       throw msg("_internalSetRoutes");
-    },
-    _internalSetStateDoNotUseOrYouWillBreakYourApp() {
-      throw msg("_internalSetStateDoNotUseOrYouWillBreakYourApp");
     }
   };
 }
@@ -9134,6 +9773,7 @@ function ServerRouter({
         future: context.future,
         ssr: context.ssr,
         isSpaMode: context.isSpaMode,
+        routeDiscovery: context.routeDiscovery,
         serializeError: context.serializeError,
         renderMeta: context.renderMeta
       }
@@ -9183,7 +9823,8 @@ function createRoutesStub(routes, unstable_getContext) {
         },
         routeModules: {},
         ssr: false,
-        isSpaMode: false
+        isSpaMode: false,
+        routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" }
       };
       let patched = processRoutes(
         // @ts-expect-error `StubRouteObject` is stricter about `loader`/`action`
@@ -9267,7 +9908,7 @@ function processRoutes(routes, manifest, routeModules, parentId) {
 import { parse, serialize } from "cookie";
 
 // lib/server-runtime/crypto.ts
-var encoder = new TextEncoder();
+var encoder = /* @__PURE__ */ new TextEncoder();
 var sign = async (value, secret) => {
   let data2 = encoder.encode(value);
   let key = await createKey2(secret, ["sign"]);
@@ -9587,6 +10228,26 @@ function invariant3(value, message) {
   }
 }
 
+// lib/server-runtime/dev.ts
+var globalDevServerHooksKey = "__reactRouterDevServerHooks";
+function setDevServerHooks(devServerHooks) {
+  globalThis[globalDevServerHooksKey] = devServerHooks;
+}
+function getDevServerHooks() {
+  return globalThis[globalDevServerHooksKey];
+}
+function getBuildTimeHeader(request, headerName) {
+  if (typeof process !== "undefined") {
+    try {
+      if (process.env?.IS_RR_BUILD_REQUEST === "yes") {
+        return request.headers.get(headerName);
+      }
+    } catch (e) {
+    }
+  }
+  return null;
+}
+
 // lib/server-runtime/routes.ts
 function groupRoutesByParentId2(manifest) {
   let routes = {};
@@ -9618,10 +10279,11 @@ function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesBy
       // Need to use RR's version in the param typed here to permit the optional
       // context even though we know it'll always be provided in remix
       loader: route.module.loader ? async (args) => {
-        if (args.request.headers.has("X-React-Router-Prerender-Data")) {
-          const preRenderedData = args.request.headers.get(
-            "X-React-Router-Prerender-Data"
-          );
+        let preRenderedData = getBuildTimeHeader(
+          args.request,
+          "X-React-Router-Prerender-Data"
+        );
+        if (preRenderedData != null) {
           let encoded = preRenderedData ? decodeURI(preRenderedData) : preRenderedData;
           invariant3(encoded, "Missing prerendered data for route");
           let uint8array = new TextEncoder().encode(encoded);
@@ -9696,21 +10358,9 @@ function createServerHandoffString(serverHandoff) {
   return escapeHtml2(JSON.stringify(serverHandoff));
 }
 
-// lib/server-runtime/dev.ts
-var globalDevServerHooksKey = "__reactRouterDevServerHooks";
-function setDevServerHooks(devServerHooks) {
-  globalThis[globalDevServerHooksKey] = devServerHooks;
-}
-function getDevServerHooks() {
-  return globalThis[globalDevServerHooksKey];
-}
-
-// lib/server-runtime/single-fetch.ts
-import { encode } from "turbo-stream";
-
 // lib/server-runtime/headers.ts
 import { splitCookiesString } from "set-cookie-parser";
-function getDocumentHeaders(context, getRouteHeadersFn) {
+function getDocumentHeaders(build, context) {
   let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
   let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
   let errorHeaders;
@@ -9728,12 +10378,14 @@ function getDocumentHeaders(context, getRouteHeadersFn) {
   }
   return matches.reduce((parentHeaders, match, idx) => {
     let { id } = match.route;
+    let route = build.routes[id];
+    invariant3(route, `Route with id "${id}" not found in build`);
+    let routeModule = route.module;
     let loaderHeaders = context.loaderHeaders[id] || new Headers();
     let actionHeaders = context.actionHeaders[id] || new Headers();
     let includeErrorHeaders = errorHeaders != null && idx === matches.length - 1;
     let includeErrorCookies = includeErrorHeaders && errorHeaders !== loaderHeaders && errorHeaders !== actionHeaders;
-    let headersFn = getRouteHeadersFn(match);
-    if (headersFn == null) {
+    if (routeModule.headers == null) {
       let headers2 = new Headers(parentHeaders);
       if (includeErrorCookies) {
         prependCookies(errorHeaders, headers2);
@@ -9743,12 +10395,12 @@ function getDocumentHeaders(context, getRouteHeadersFn) {
       return headers2;
     }
     let headers = new Headers(
-      typeof headersFn === "function" ? headersFn({
+      routeModule.headers ? typeof routeModule.headers === "function" ? routeModule.headers({
         loaderHeaders,
         parentHeaders,
         actionHeaders,
         errorHeaders: includeErrorHeaders ? errorHeaders : void 0
-      }) : headersFn
+      }) : routeModule.headers : void 0
     );
     if (includeErrorCookies) {
       prependCookies(errorHeaders, headers);
@@ -9773,7 +10425,6 @@ function prependCookies(parentHeaders, childHeaders) {
 }
 
 // lib/server-runtime/single-fetch.ts
-var SINGLE_FETCH_REDIRECT_STATUS = 202;
 var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
   ...NO_BODY_STATUS_CODES,
   304
@@ -9781,10 +10432,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,
-        (m) => build.routes[m.route.id]?.module.headers
-      );
+      let headers = getDocumentHeaders(build, context);
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: getSingleFetchRedirect(
@@ -9859,10 +10507,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,
-        (m) => build.routes[m.route.id]?.module.headers
-      );
+      let headers = getDocumentHeaders(build, context);
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: {
@@ -10118,9 +10763,10 @@ Error: ${e instanceof Error ? e.toString() : e}`
     if (stripBasename(normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
       normalizedPath = normalizedPath.slice(0, -1);
     }
+    let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
     if (!_build.ssr) {
       if (_build.prerender.length === 0) {
-        request.headers.set("X-React-Router-SPA-Mode", "yes");
+        isSpaMode = true;
       } else if (!_build.prerender.includes(normalizedPath) && !_build.prerender.includes(normalizedPath + "/")) {
         if (url.pathname.endsWith(".data")) {
           errorHandler(
@@ -10140,11 +10786,14 @@ Error: ${e instanceof Error ? e.toString() : e}`
             statusText: "Not Found"
           });
         } else {
-          request.headers.set("X-React-Router-SPA-Mode", "yes");
+          isSpaMode = true;
         }
       }
     }
-    let manifestUrl = `${normalizedBasename}/__manifest`.replace(/\/+/g, "/");
+    let manifestUrl = getManifestPath(
+      _build.routeDiscovery.manifestPath,
+      normalizedBasename
+    );
     if (url.pathname === manifestUrl) {
       try {
         let res = await handleManifestRequest(_build, routes, url);
@@ -10154,7 +10803,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, url.pathname, _build.basename);
+    let matches = matchServerRoutes(routes, normalizedPath, _build.basename);
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
@@ -10209,7 +10858,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
           );
         }
       }
-    } else if (!request.headers.has("X-React-Router-SPA-Mode") && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
+    } else if (!isSpaMode && matches && matches[matches.length - 1].route.module.default == null && matches[matches.length - 1].route.module.ErrorBoundary == null) {
       response = await handleResourceRequest(
         serverMode,
         _build,
@@ -10234,6 +10883,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
         request,
         loadContext,
         handleError,
+        isSpaMode,
         criticalCss
       );
     }
@@ -10309,8 +10959,7 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
   );
   return response;
 }
-async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, criticalCss) {
-  let isSpaMode = request.headers.has("X-React-Router-SPA-Mode");
+async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, isSpaMode, criticalCss) {
   try {
     let response = await staticHandler.query(request, {
       requestContext: loadContext,
@@ -10325,10 +10974,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     if (isResponse(context)) {
       return context;
     }
-    let headers = getDocumentHeaders(
-      context,
-      (m) => build.routes[m.route.id]?.module.headers
-    );
+    let headers = getDocumentHeaders(build, context);
     if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) {
       return new Response(null, { status: context.statusCode, headers });
     }
@@ -10345,17 +10991,21 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       actionData: context.actionData,
       errors: serializeErrors2(context.errors, serverMode)
     };
+    let baseServerHandoff = {
+      basename: build.basename,
+      future: build.future,
+      routeDiscovery: build.routeDiscovery,
+      ssr: build.ssr,
+      isSpaMode: isSpaMode2
+    };
     let entryContext = {
       manifest: build.assets,
       routeModules: createEntryRouteModules(build.routes),
       staticHandlerContext: context,
       criticalCss,
       serverHandoffString: createServerHandoffString({
-        basename: build.basename,
-        criticalCss,
-        future: build.future,
-        ssr: build.ssr,
-        isSpaMode: isSpaMode2
+        ...baseServerHandoff,
+        criticalCss
       }),
       serverHandoffStream: encodeViaTurboStream(
         state,
@@ -10366,6 +11016,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       renderMeta: {},
       future: build.future,
       ssr: build.ssr,
+      routeDiscovery: build.routeDiscovery,
       isSpaMode: isSpaMode2,
       serializeError: (err) => serializeError(err, serverMode)
     };
@@ -10408,12 +11059,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
       entryContext = {
         ...entryContext,
         staticHandlerContext: context,
-        serverHandoffString: createServerHandoffString({
-          basename: build.basename,
-          future: build.future,
-          ssr: build.ssr,
-          isSpaMode: isSpaMode2
-        }),
+        serverHandoffString: createServerHandoffString(baseServerHandoff),
         serverHandoffStream: encodeViaTurboStream(
           state2,
           request.signal,
@@ -10586,7 +11232,7 @@ function createSessionStorage({
 function warnOnceAboutSigningSessionCookie(cookie) {
   warnOnce(
     cookie.isSigned,
-    `The "${cookie.name}" cookie is not signed, but session cookies should be signed to prevent tampering on the client before they are sent back to the server. See https://remix.run/utils/cookies#signing-cookies for more information.`
+    `The "${cookie.name}" cookie is not signed, but session cookies should be signed to prevent tampering on the client before they are sent back to the server. See https://reactrouter.com/explanation/sessions-and-cookies#signing-cookies for more information.`
   );
 }
 
@@ -10666,680 +11312,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 !== "action") {
-      throw new Error("Unexpected payload type");
-    }
-    if (payload.rerender) {
-      (async () => {
-        const rerender = await payload.rerender;
-        if (!rerender) return;
-        if (landedActionId < actionId && window.__routerActionID <= actionId) {
-          landedActionId = actionId;
-          if (rerender.type === "redirect") {
-            if (rerender.reload) {
-              window.location.href = rerender.location;
-              return;
-            }
-            window.__router.navigate(rerender.location, {
-              replace: rerender.replace
-            });
-            return;
-          }
-          let lastMatch;
-          for (const match of rerender.matches) {
-            window.__router.patchRoutes(
-              lastMatch?.id ?? null,
-              [createRouteFromServerManifest(match)],
-              true
-            );
-            lastMatch = match;
-          }
-          window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({});
-          React14.startTransition(() => {
-            window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
-              loaderData: Object.assign(
-                {},
-                window.__router.state.loaderData,
-                rerender.loaderData
-              ),
-              errors: rerender.errors ? Object.assign(
-                {},
-                window.__router.state.errors,
-                rerender.errors
-              ) : null
-            });
-          });
-        }
-      })();
-    }
-    return payload.actionResult;
-  };
-}
-function createRouterFromPayload({
-  decode: decode2,
-  payload
-}) {
-  if (window.__router) return window.__router;
-  if (payload.type !== "render") throw new Error("Invalid payload type");
-  let patches = /* @__PURE__ */ new Map();
-  payload.patches?.forEach((patch) => {
-    invariant(patch.parentId, "Invalid patch parentId");
-    if (!patches.has(patch.parentId)) {
-      patches.set(patch.parentId, []);
-    }
-    patches.get(patch.parentId)?.push(patch);
-  });
-  let routes = payload.matches.reduceRight((previous, match) => {
-    const route = createRouteFromServerManifest(
-      match,
-      payload
-    );
-    if (previous.length > 0) {
-      route.children = previous;
-      let childrenToPatch = patches.get(match.id);
-      if (childrenToPatch) {
-        route.children.push(
-          ...childrenToPatch.map((r) => createRouteFromServerManifest(r))
-        );
-      }
-    }
-    return [route];
-  }, []);
-  window.__router = createRouter({
-    routes,
-    basename: payload.basename,
-    history: createBrowserHistory(),
-    hydrationData: getHydrationData(
-      {
-        loaderData: payload.loaderData,
-        actionData: payload.actionData,
-        errors: payload.errors
-      },
-      routes,
-      (routeId) => {
-        let match = payload.matches.find((m) => m.id === routeId);
-        invariant(match, "Route not found in payload");
-        return {
-          clientLoader: match.clientLoader,
-          hasLoader: match.hasLoader,
-          hasHydrateFallback: match.hydrateFallbackElement != null
-        };
-      },
-      payload.location,
-      void 0,
-      false
-    ),
-    async patchRoutesOnNavigation({ patch, path, signal }) {
-      let response = await fetch(`${path}.manifest`, { signal });
-      if (!response.body || response.status < 200 || response.status >= 300) {
-        throw new Error("Unable to fetch new route matches from the server");
-      }
-      let payload2 = await decode2(response.body);
-      if (payload2.type !== "manifest") {
-        throw new Error("Failed to patch routes on navigation");
-      }
-      payload2.matches.forEach(
-        (match, i) => patch(payload2.matches[i - 1]?.id ?? null, [
-          createRouteFromServerManifest(match)
-        ])
-      );
-      payload2.patches.forEach((p) => {
-        patch(p.parentId ?? null, [createRouteFromServerManifest(p)]);
-      });
-    },
-    // FIXME: Pass `build.ssr` and `build.basename` into this function
-    dataStrategy: getRSCSingleFetchDataStrategy(
-      () => window.__router,
-      true,
-      void 0,
-      decode2
-    )
-  });
-  if (window.__router.state.initialized) {
-    window.__routerInitialized = true;
-    window.__router.initialize();
-  } else {
-    window.__routerInitialized = false;
-  }
-  let lastLoaderData = void 0;
-  window.__router.subscribe(({ loaderData, actionData }) => {
-    if (lastLoaderData !== loaderData) {
-      window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
-    }
-  });
-  return window.__router;
-}
-var renderedRoutesContext = unstable_createContext();
-function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
-  let dataStrategy = getSingleFetchDataStrategyImpl(
-    getRouter,
-    (match) => {
-      let M = match;
-      return {
-        hasLoader: M.route.hasLoader,
-        hasClientLoader: M.route.hasClientLoader,
-        hasAction: M.route.hasAction,
-        hasClientAction: M.route.hasClientAction,
-        hasShouldRevalidate: M.route.hasShouldRevalidate
-      };
-    },
-    // pass map into fetchAndDecode so it can add payloads
-    getFetchAndDecodeViaRSC(decode2),
-    ssr,
-    basename
-  );
-  return async (args) => args.unstable_runClientMiddleware(async () => {
-    let context = args.context;
-    context.set(renderedRoutesContext, []);
-    let results = await dataStrategy(args);
-    const renderedRouteById = new Map(
-      context.get(renderedRoutesContext).map((r) => [r.id, r])
-    );
-    for (const match of args.matches) {
-      const rendered = renderedRouteById.get(match.route.id);
-      if (rendered) {
-        window.__router.patchRoutes(
-          rendered.parentId ?? null,
-          [createRouteFromServerManifest(rendered)],
-          true
-        );
-      }
-    }
-    return results;
-  });
-}
-function getFetchAndDecodeViaRSC(decode2) {
-  return async (args, basename, targetRoutes) => {
-    let { request, context } = args;
-    let url = singleFetchUrl(request.url, basename, "rsc");
-    if (request.method === "GET") {
-      url = stripIndexParam(url);
-      if (targetRoutes) {
-        url.searchParams.set("_routes", targetRoutes.join(","));
-      }
-    }
-    let res = await fetch(url, await createRequestInit(request));
-    if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
-      throw new ErrorResponseImpl(404, "Not Found", true);
-    }
-    invariant(res.body, "No response body to decode");
-    try {
-      const payload = await decode2(res.body);
-      if (payload.type === "redirect") {
-        return {
-          status: res.status,
-          data: {
-            redirect: {
-              redirect: payload.location,
-              reload: false,
-              replace: payload.replace,
-              revalidate: false,
-              status: payload.status
-            }
-          }
-        };
-      }
-      if (payload.type !== "render") {
-        throw new Error("Unexpected payload type");
-      }
-      context.get(renderedRoutesContext).push(...payload.matches);
-      let results = { routes: {} };
-      const dataKey = isMutationMethod(request.method) ? "actionData" : "loaderData";
-      for (let [routeId, data2] of Object.entries(payload[dataKey] || {})) {
-        results.routes[routeId] = { data: data2 };
-      }
-      if (payload.errors) {
-        for (let [routeId, error] of Object.entries(payload.errors)) {
-          results.routes[routeId] = { error };
-        }
-      }
-      return { status: res.status, data: results };
-    } catch (e) {
-      throw new Error("Unable to decode RSC response");
-    }
-  };
-}
-function RSCHydratedRouter({
-  decode: decode2,
-  payload
-}) {
-  if (payload.type !== "render") throw new Error("Invalid payload type");
-  let router = React14.useMemo(
-    () => createRouterFromPayload({ decode: decode2, payload }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-  React14.useLayoutEffect(() => {
-    if (!window.__routerInitialized) {
-      window.__routerInitialized = true;
-      window.__router.initialize();
-    }
-  }, []);
-  const frameworkContext = {
-    future: {
-      // These flags have no runtime impact so can always be false.  If we add
-      // flags that drive runtime behavior they'll need to be proxied through.
-      unstable_middleware: false,
-      unstable_subResourceIntegrity: false
-    },
-    isSpaMode: true,
-    ssr: true,
-    criticalCss: "",
-    manifest: {
-      routes: {},
-      version: "1",
-      url: "",
-      entry: {
-        module: "",
-        imports: []
-      }
-    },
-    routeModules: {}
-  };
-  return /* @__PURE__ */ React14.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React14.createElement(RouterProvider, { router }));
-}
-function createRouteFromServerManifest(match, payload) {
-  let hasInitialData = payload && match.id in payload.loaderData;
-  let initialData = payload?.loaderData[match.id];
-  let hasInitialError = payload?.errors && match.id in payload.errors;
-  let initialError = payload?.errors?.[match.id];
-  let isHydrationRequest = match.clientLoader?.hydrate === true || !match.hasLoader;
-  let dataRoute = {
-    id: match.id,
-    element: match.element,
-    errorElement: match.errorElement,
-    handle: match.handle,
-    hasErrorBoundary: match.hasErrorBoundary,
-    hydrateFallbackElement: match.hydrateFallbackElement,
-    index: match.index,
-    loader: match.clientLoader ? async (args, singleFetch) => {
-      try {
-        let result = await match.clientLoader({
-          ...args,
-          serverLoader: () => {
-            preventInvalidServerHandlerCall2(
-              "loader",
-              match.id,
-              match.hasLoader
-            );
-            if (isHydrationRequest) {
-              if (hasInitialData) {
-                return initialData;
-              }
-              if (hasInitialError) {
-                throw initialError;
-              }
-            }
-            return callSingleFetch(singleFetch);
-          }
-        });
-        return result;
-      } finally {
-        isHydrationRequest = false;
-      }
-    } : (
-      // We always make the call in this RSC world since even if we don't
-      // have a `loader` we may need to get the `element` implementation
-      (_, singleFetch) => callSingleFetch(singleFetch)
-    ),
-    action: match.clientAction ? (args, singleFetch) => match.clientAction({
-      ...args,
-      serverAction: async () => {
-        preventInvalidServerHandlerCall2(
-          "loader",
-          match.id,
-          match.hasLoader
-        );
-        return await callSingleFetch(singleFetch);
-      }
-    }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : void 0,
-    path: match.path,
-    shouldRevalidate: match.shouldRevalidate,
-    // We always have a "loader" in this RSC world since even if we don't
-    // have a `loader` we may need to get the `element` implementation
-    hasLoader: true,
-    hasClientLoader: match.clientLoader != null,
-    hasAction: match.hasAction,
-    hasClientAction: match.clientAction != null,
-    hasShouldRevalidate: match.shouldRevalidate != null
-  };
-  if (typeof dataRoute.loader === "function") {
-    dataRoute.loader.hydrate = shouldHydrateRouteLoader(
-      match.id,
-      match.clientLoader,
-      match.hasLoader,
-      false
-    );
-  }
-  return dataRoute;
-}
-function callSingleFetch(singleFetch) {
-  invariant(typeof singleFetch === "function", "Invalid singleFetch parameter");
-  return singleFetch();
-}
-function preventInvalidServerHandlerCall2(type, routeId, hasHandler) {
-  if (!hasHandler) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${routeId}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
-}
-
-// lib/rsc/server.ssr.tsx
-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, requestServer, decode2, renderHTML) {
-  const url = new URL(request.url);
-  let serverRequest = request;
-  const isDataRequest = isReactServerRequest(url);
-  const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
-  if (isDataRequest) {
-    const serverURL = new URL(request.url);
-    serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
-    let headers = new Headers(request.headers);
-    headers.set("X-React-Router-Data-Request", "true");
-    serverRequest = new Request(serverURL, {
-      body: request.body,
-      duplex: request.body ? "half" : void 0,
-      headers,
-      method: request.method,
-      signal: request.signal
-    });
-  }
-  const serverResponse = await requestServer(serverRequest);
-  if (respondWithRSCPayload) {
-    return serverResponse;
-  }
-  if (!serverResponse.body) {
-    throw new Error("Missing body in server response");
-  }
-  const serverResponseB = serverResponse.clone();
-  if (!serverResponseB.body) {
-    throw new Error("Failed to clone server response");
-  }
-  const payload = await decode2(serverResponse.body);
-  if (payload.type === "redirect") {
-    return new Response(null, {
-      status: payload.status,
-      headers: {
-        Location: payload.location
-      }
-    });
-  }
-  const html = await renderHTML(payload);
-  try {
-    const body = html.pipeThrough(injectRSCPayload(serverResponseB.body));
-    const headers = new Headers(serverResponse.headers);
-    headers.set("Content-Type", "text/html");
-    return new Response(body, {
-      status: serverResponse.status,
-      headers
-    });
-  } catch (reason) {
-    throw reason;
-  }
-}
-function RSCStaticRouter({ payload }) {
-  if (payload.type !== "render") return null;
-  const context = {
-    actionData: payload.actionData,
-    actionHeaders: {},
-    basename: payload.basename,
-    errors: payload.errors,
-    loaderData: payload.loaderData,
-    loaderHeaders: {},
-    location: payload.location,
-    statusCode: 200,
-    matches: payload.matches.map((match) => ({
-      params: match.params,
-      pathname: match.pathname,
-      pathnameBase: match.pathnameBase,
-      route: {
-        id: match.id,
-        action: match.hasAction || !!match.clientAction,
-        handle: match.handle,
-        hasErrorBoundary: match.hasErrorBoundary,
-        loader: match.hasLoader || !!match.clientLoader,
-        index: match.index,
-        path: match.path,
-        shouldRevalidate: match.shouldRevalidate
-      }
-    }))
-  };
-  const router = createStaticRouter(
-    payload.matches.reduceRight((previous, match) => {
-      const route = {
-        id: match.id,
-        action: match.hasAction || !!match.clientAction,
-        element: match.element,
-        errorElement: match.errorElement,
-        handle: match.handle,
-        hasErrorBoundary: !!match.errorElement,
-        hydrateFallbackElement: match.hydrateFallbackElement,
-        index: match.index,
-        loader: match.hasLoader || !!match.clientLoader,
-        path: match.path,
-        shouldRevalidate: match.shouldRevalidate
-      };
-      if (previous.length > 0) {
-        route.children = previous;
-      }
-      return [route];
-    }, []),
-    context
-  );
-  const frameworkContext = {
-    future: {
-      // These flags have no runtime impact so can always be false.  If we add
-      // flags that drive runtime behavior they'll need to be proxied through.
-      unstable_middleware: false,
-      unstable_subResourceIntegrity: false
-    },
-    isSpaMode: false,
-    ssr: true,
-    criticalCss: "",
-    manifest: {
-      routes: {},
-      version: "1",
-      url: "",
-      entry: {
-        module: "",
-        imports: []
-      }
-    },
-    routeModules: {}
-  };
-  return /* @__PURE__ */ React15.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React15.createElement(
-    StaticRouterProvider,
-    {
-      context,
-      router,
-      hydrate: false,
-      nonce: payload.nonce
-    }
-  ));
-}
-function isReactServerRequest(url) {
-  return url.pathname.endsWith(".rsc");
-}
-function isManifestRequest(url) {
-  return url.pathname.endsWith(".manifest");
-}
-
-// lib/rsc/html-stream/browser.ts
-function getServerStream() {
-  let encoder3 = new TextEncoder();
-  let streamController = null;
-  let rscStream = new ReadableStream({
-    start(controller) {
-      if (typeof window === "undefined") {
-        return;
-      }
-      let handleChunk = (chunk) => {
-        if (typeof chunk === "string") {
-          controller.enqueue(encoder3.encode(chunk));
-        } else {
-          controller.enqueue(chunk);
-        }
-      };
-      window.__FLIGHT_DATA || (window.__FLIGHT_DATA = []);
-      window.__FLIGHT_DATA.forEach(handleChunk);
-      window.__FLIGHT_DATA.push = (chunk) => {
-        handleChunk(chunk);
-        return 0;
-      };
-      streamController = controller;
-    }
-  });
-  if (typeof document !== "undefined" && document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", () => {
-      streamController?.close();
-    });
-  } else {
-    streamController?.close();
-  }
-  return rscStream;
-}
-
 // lib/dom/ssr/errors.ts
 function deserializeErrors2(errors) {
   if (!errors) return null;
@@ -11377,6 +11349,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,
@@ -11438,9 +11436,6 @@ export {
   Router,
   Routes,
   Await,
-  WithRouteComponentProps,
-  WithHydrateFallbackProps,
-  WithErrorBoundaryProps,
   createRoutesFromChildren,
   createRoutesFromElements,
   renderMatches,
@@ -11495,11 +11490,6 @@ export {
   createCookieSessionStorage,
   createMemorySessionStorage,
   href,
-  getHydrationData,
-  createCallServer,
-  RSCHydratedRouter,
-  routeRSCServerRequest,
-  RSCStaticRouter,
-  getServerStream,
-  deserializeErrors2 as deserializeErrors
+  deserializeErrors2 as deserializeErrors,
+  getHydrationData
 };