react-router 7.5.1 → 7.5.2

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.5.1
+ * react-router v7.5.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -71,8 +71,9 @@ import {
   decodeViaTurboStream,
   deserializeErrors,
   generatePath,
+  getHydrationData,
   getPatchRoutesOnNavigationFunction,
-  getSingleFetchDataStrategy,
+  getTurboStreamSingleFetchDataStrategy,
   href,
   hydrationRouteProperties,
   invariant,
@@ -124,7 +125,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-LSOULM7L.mjs";
+} from "./chunk-BAXFHI7N.mjs";
 export {
   Await,
   BrowserRouter,
@@ -169,8 +170,9 @@ export {
   createRouter as UNSAFE_createRouter,
   decodeViaTurboStream as UNSAFE_decodeViaTurboStream,
   deserializeErrors as UNSAFE_deserializeErrors,
+  getHydrationData as UNSAFE_getHydrationData,
   getPatchRoutesOnNavigationFunction as UNSAFE_getPatchRoutesOnNavigationFunction,
-  getSingleFetchDataStrategy as UNSAFE_getSingleFetchDataStrategy,
+  getTurboStreamSingleFetchDataStrategy as UNSAFE_getTurboStreamSingleFetchDataStrategy,
   hydrationRouteProperties as UNSAFE_hydrationRouteProperties,
   invariant as UNSAFE_invariant,
   mapRouteProperties as UNSAFE_mapRouteProperties,

package/dist/development/lib/types/route-module.d.mts

@@ -1,4 +1,4 @@
-import { aE as LinkDescriptor, aB as MetaDescriptor, aV as ServerDataFrom, aW as ClientDataFrom, aX as Func, aY as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, M as MiddlewareEnabled, aZ as Pretty } from '../../route-data-OcOrqK13.mjs';
+import { aF as LinkDescriptor, aC as MetaDescriptor, aU as ServerDataFrom, aV as ClientDataFrom, aW as Func, aX as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, M as MiddlewareEnabled, aY as Pretty } from '../../route-data-C12CLHiN.mjs';
 import { A as AppLoadContext } from '../../data-CQbyyGzl.mjs';
 import 'react';
 

package/dist/development/lib/types/route-module.d.ts

@@ -1,4 +1,4 @@
-import { aE as LinkDescriptor, aB as MetaDescriptor, aV as ServerDataFrom, aW as ClientDataFrom, aX as Func, aY as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, M as MiddlewareEnabled, aZ as Pretty } from '../../route-data-OcOrqK13.js';
+import { aF as LinkDescriptor, aC as MetaDescriptor, aU as ServerDataFrom, aV as ClientDataFrom, aW as Func, aX as unstable_MiddlewareNextFunction, E as Equal, u as unstable_RouterContextProvider, M as MiddlewareEnabled, aY as Pretty } from '../../route-data-C12CLHiN.js';
 import { A as AppLoadContext } from '../../data-CQbyyGzl.js';
 import 'react';
 

package/dist/development/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.5.1
+ * react-router v7.5.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.5.1
+ * react-router v7.5.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/{route-data-OcOrqK13.d.ts → route-data-C12CLHiN.d.mts}

@@ -1736,4 +1736,4 @@ type ServerDataFrom<T> = ServerData<DataFrom<T>>;
 type ClientDataFrom<T> = ClientData<DataFrom<T>>;
 type SerializeFrom<T> = T extends (...args: infer Args) => unknown ? Args extends [ClientLoaderFunctionArgs | ClientActionFunctionArgs] ? ClientDataFrom<T> : ServerDataFrom<T> : T;
 
-export { type FormEncType as $, type ActionFunctionArgs as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type Equal as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type Fetcher as J, type NavigationStates as K, type LoaderFunctionArgs as L, type MiddlewareEnabled as M, type NavigateOptions as N, type RouterSubscriber as O, type ParamParseKey as P, type RouterNavigateOptions as Q, type RouterInit as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type RouterFetchOptions as V, type DataStrategyFunctionArgs as W, type DataStrategyMatch as X, type DataStrategyResult as Y, DataWithResponseInit as Z, type ErrorResponse as _, type Router as a, type FormMethod as a0, type HTMLFormMethod as a1, type LazyRouteFunction as a2, type unstable_MiddlewareFunction as a3, type PathParam as a4, type RedirectFunction as a5, type unstable_RouterContext as a6, type ShouldRevalidateFunction as a7, type ShouldRevalidateFunctionArgs as a8, unstable_createContext as a9, type MetaArgs as aA, type MetaDescriptor as aB, type PageLinkDescriptor as aC, type HtmlLinkDescriptor as aD, type LinkDescriptor as aE, type Future as aF, type unstable_SerializesTo as aG, createBrowserHistory as aH, invariant as aI, createRouter as aJ, ErrorResponseImpl as aK, DataRouterContext as aL, DataRouterStateContext as aM, FetchersContext as aN, LocationContext as aO, NavigationContext as aP, RouteContext as aQ, ViewTransitionContext as aR, type RouteModules as aS, type RouteModule as aT, type History as aU, type ServerDataFrom as aV, type ClientDataFrom as aW, type Func as aX, type unstable_MiddlewareNextFunction as aY, type Pretty as aZ, createPath as aa, parsePath as ab, IDLE_NAVIGATION as ac, IDLE_FETCHER as ad, IDLE_BLOCKER as ae, data as af, generatePath as ag, isRouteErrorResponse as ah, matchPath as ai, matchRoutes as aj, redirect as ak, redirectDocument as al, replace as am, resolvePath as an, type DataRouteMatch as ao, type DataRouteObject as ap, type Navigator as aq, type PatchRoutesOnNavigationFunction as ar, type PatchRoutesOnNavigationFunctionArgs as as, type RouteMatch as at, type ClientActionFunction as au, type ClientActionFunctionArgs as av, type ClientLoaderFunction as aw, type ClientLoaderFunctionArgs as ax, type HeadersArgs as ay, type HeadersFunction as az, type RouteManifest as b, type RelativeRoutingType as c, type Location as d, Action as e, type Path as f, type PathPattern as g, type PathMatch as h, type Params as i, type RouteObject as j, type Navigation as k, type RevalidationState as l, type SerializeFrom as m, type Blocker as n, type StaticHandlerContext as o, type StaticHandler as p, type unstable_InitialContext as q, type IndexRouteObject as r, type LoaderFunction as s, type ActionFunction as t, unstable_RouterContextProvider as u, type MetaFunction as v, type LinksFunction as w, type NonIndexRouteObject as x, type RouterState as y, type GetScrollRestorationKeyFunction as z };
+export { type DataStrategyResult as $, type ActionFunctionArgs as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type Equal as E, type FutureConfig as F, type DataRouteObject as G, type HydrationState as H, type InitialEntry as I, type ClientLoaderFunction as J, type GetScrollPositionFunction as K, type LoaderFunctionArgs as L, type MiddlewareEnabled as M, type NavigateOptions as N, type GetScrollRestorationKeyFunction as O, type ParamParseKey as P, type Fetcher as Q, type RouterInit as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type NavigationStates as V, type RouterSubscriber as W, type RouterNavigateOptions as X, type RouterFetchOptions as Y, type DataStrategyFunctionArgs as Z, type DataStrategyMatch as _, type Router as a, DataWithResponseInit as a0, type ErrorResponse as a1, type FormEncType as a2, type FormMethod as a3, type HTMLFormMethod as a4, type LazyRouteFunction as a5, type unstable_MiddlewareFunction as a6, type PathParam as a7, type RedirectFunction as a8, type unstable_RouterContext as a9, type HeadersFunction as aA, type MetaArgs as aB, type MetaDescriptor as aC, type PageLinkDescriptor as aD, type HtmlLinkDescriptor as aE, type LinkDescriptor as aF, type Future as aG, type unstable_SerializesTo as aH, createBrowserHistory as aI, invariant as aJ, createRouter as aK, ErrorResponseImpl as aL, DataRouterContext as aM, DataRouterStateContext as aN, FetchersContext as aO, LocationContext as aP, NavigationContext as aQ, RouteContext as aR, ViewTransitionContext as aS, type History as aT, type ServerDataFrom as aU, type ClientDataFrom as aV, type Func as aW, type unstable_MiddlewareNextFunction as aX, type Pretty as aY, type ShouldRevalidateFunction as aa, type ShouldRevalidateFunctionArgs as ab, unstable_createContext as ac, createPath as ad, parsePath as ae, IDLE_NAVIGATION as af, IDLE_FETCHER as ag, IDLE_BLOCKER as ah, data as ai, generatePath as aj, isRouteErrorResponse as ak, matchPath as al, matchRoutes as am, redirect as an, redirectDocument as ao, replace as ap, resolvePath as aq, type DataRouteMatch as ar, type Navigator as as, type PatchRoutesOnNavigationFunction as at, type PatchRoutesOnNavigationFunctionArgs as au, type RouteMatch as av, type ClientActionFunction as aw, type ClientActionFunctionArgs as ax, type ClientLoaderFunctionArgs as ay, type HeadersArgs as az, type RouteModules as b, type RouteManifest as c, type RelativeRoutingType as d, type Location as e, Action as f, type Path as g, type PathPattern as h, type PathMatch as i, type Params as j, type RouteObject as k, type Navigation as l, type RevalidationState as m, type SerializeFrom as n, type Blocker as o, type StaticHandlerContext as p, type StaticHandler as q, type unstable_InitialContext as r, type IndexRouteObject as s, type LoaderFunction as t, unstable_RouterContextProvider as u, type ActionFunction as v, type MetaFunction as w, type LinksFunction as x, type NonIndexRouteObject as y, type RouterState as z };

package/dist/{production/route-data-OcOrqK13.d.mts → development/route-data-C12CLHiN.d.ts}

@@ -1736,4 +1736,4 @@ type ServerDataFrom<T> = ServerData<DataFrom<T>>;
 type ClientDataFrom<T> = ClientData<DataFrom<T>>;
 type SerializeFrom<T> = T extends (...args: infer Args) => unknown ? Args extends [ClientLoaderFunctionArgs | ClientActionFunctionArgs] ? ClientDataFrom<T> : ServerDataFrom<T> : T;
 
-export { type FormEncType as $, type ActionFunctionArgs as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type Equal as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type Fetcher as J, type NavigationStates as K, type LoaderFunctionArgs as L, type MiddlewareEnabled as M, type NavigateOptions as N, type RouterSubscriber as O, type ParamParseKey as P, type RouterNavigateOptions as Q, type RouterInit as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type RouterFetchOptions as V, type DataStrategyFunctionArgs as W, type DataStrategyMatch as X, type DataStrategyResult as Y, DataWithResponseInit as Z, type ErrorResponse as _, type Router as a, type FormMethod as a0, type HTMLFormMethod as a1, type LazyRouteFunction as a2, type unstable_MiddlewareFunction as a3, type PathParam as a4, type RedirectFunction as a5, type unstable_RouterContext as a6, type ShouldRevalidateFunction as a7, type ShouldRevalidateFunctionArgs as a8, unstable_createContext as a9, type MetaArgs as aA, type MetaDescriptor as aB, type PageLinkDescriptor as aC, type HtmlLinkDescriptor as aD, type LinkDescriptor as aE, type Future as aF, type unstable_SerializesTo as aG, createBrowserHistory as aH, invariant as aI, createRouter as aJ, ErrorResponseImpl as aK, DataRouterContext as aL, DataRouterStateContext as aM, FetchersContext as aN, LocationContext as aO, NavigationContext as aP, RouteContext as aQ, ViewTransitionContext as aR, type RouteModules as aS, type RouteModule as aT, type History as aU, type ServerDataFrom as aV, type ClientDataFrom as aW, type Func as aX, type unstable_MiddlewareNextFunction as aY, type Pretty as aZ, createPath as aa, parsePath as ab, IDLE_NAVIGATION as ac, IDLE_FETCHER as ad, IDLE_BLOCKER as ae, data as af, generatePath as ag, isRouteErrorResponse as ah, matchPath as ai, matchRoutes as aj, redirect as ak, redirectDocument as al, replace as am, resolvePath as an, type DataRouteMatch as ao, type DataRouteObject as ap, type Navigator as aq, type PatchRoutesOnNavigationFunction as ar, type PatchRoutesOnNavigationFunctionArgs as as, type RouteMatch as at, type ClientActionFunction as au, type ClientActionFunctionArgs as av, type ClientLoaderFunction as aw, type ClientLoaderFunctionArgs as ax, type HeadersArgs as ay, type HeadersFunction as az, type RouteManifest as b, type RelativeRoutingType as c, type Location as d, Action as e, type Path as f, type PathPattern as g, type PathMatch as h, type Params as i, type RouteObject as j, type Navigation as k, type RevalidationState as l, type SerializeFrom as m, type Blocker as n, type StaticHandlerContext as o, type StaticHandler as p, type unstable_InitialContext as q, type IndexRouteObject as r, type LoaderFunction as s, type ActionFunction as t, unstable_RouterContextProvider as u, type MetaFunction as v, type LinksFunction as w, type NonIndexRouteObject as x, type RouterState as y, type GetScrollRestorationKeyFunction as z };
+export { type DataStrategyResult as $, type ActionFunctionArgs as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type Equal as E, type FutureConfig as F, type DataRouteObject as G, type HydrationState as H, type InitialEntry as I, type ClientLoaderFunction as J, type GetScrollPositionFunction as K, type LoaderFunctionArgs as L, type MiddlewareEnabled as M, type NavigateOptions as N, type GetScrollRestorationKeyFunction as O, type ParamParseKey as P, type Fetcher as Q, type RouterInit as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type NavigationStates as V, type RouterSubscriber as W, type RouterNavigateOptions as X, type RouterFetchOptions as Y, type DataStrategyFunctionArgs as Z, type DataStrategyMatch as _, type Router as a, DataWithResponseInit as a0, type ErrorResponse as a1, type FormEncType as a2, type FormMethod as a3, type HTMLFormMethod as a4, type LazyRouteFunction as a5, type unstable_MiddlewareFunction as a6, type PathParam as a7, type RedirectFunction as a8, type unstable_RouterContext as a9, type HeadersFunction as aA, type MetaArgs as aB, type MetaDescriptor as aC, type PageLinkDescriptor as aD, type HtmlLinkDescriptor as aE, type LinkDescriptor as aF, type Future as aG, type unstable_SerializesTo as aH, createBrowserHistory as aI, invariant as aJ, createRouter as aK, ErrorResponseImpl as aL, DataRouterContext as aM, DataRouterStateContext as aN, FetchersContext as aO, LocationContext as aP, NavigationContext as aQ, RouteContext as aR, ViewTransitionContext as aS, type History as aT, type ServerDataFrom as aU, type ClientDataFrom as aV, type Func as aW, type unstable_MiddlewareNextFunction as aX, type Pretty as aY, type ShouldRevalidateFunction as aa, type ShouldRevalidateFunctionArgs as ab, unstable_createContext as ac, createPath as ad, parsePath as ae, IDLE_NAVIGATION as af, IDLE_FETCHER as ag, IDLE_BLOCKER as ah, data as ai, generatePath as aj, isRouteErrorResponse as ak, matchPath as al, matchRoutes as am, redirect as an, redirectDocument as ao, replace as ap, resolvePath as aq, type DataRouteMatch as ar, type Navigator as as, type PatchRoutesOnNavigationFunction as at, type PatchRoutesOnNavigationFunctionArgs as au, type RouteMatch as av, type ClientActionFunction as aw, type ClientActionFunctionArgs as ax, type ClientLoaderFunctionArgs as ay, type HeadersArgs as az, type RouteModules as b, type RouteManifest as c, type RelativeRoutingType as d, type Location as e, Action as f, type Path as g, type PathPattern as h, type PathMatch as i, type Params as j, type RouteObject as k, type Navigation as l, type RevalidationState as m, type SerializeFrom as n, type Blocker as o, type StaticHandlerContext as p, type StaticHandler as q, type unstable_InitialContext as r, type IndexRouteObject as s, type LoaderFunction as t, unstable_RouterContextProvider as u, type ActionFunction as v, type MetaFunction as w, type LinksFunction as x, type NonIndexRouteObject as y, type RouterState as z };

package/dist/production/{chunk-SAWFLE7G.mjs → chunk-XAHXRTXS.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.5.1
+ * react-router v7.5.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -6312,6 +6312,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,
@@ -6379,10 +6380,19 @@ function StreamTransfer({
     )));
   }
 }
-function getSingleFetchDataStrategy(getRouter, getRouteInfo, ssr, basename) {
+function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules, ssr, basename) {
   let dataStrategy = getSingleFetchDataStrategyImpl(
     getRouter,
-    getRouteInfo,
+    (match) => {
+      let manifestRoute = manifest.routes[match.route.id];
+      invariant2(manifestRoute, "Route not found in manifest");
+      let routeModule = routeModules[match.route.id];
+      return {
+        hasLoader: manifestRoute.hasLoader,
+        hasClientLoader: manifestRoute.hasClientLoader,
+        hasShouldRevalidate: Boolean(routeModule?.shouldRevalidate)
+      };
+    },
     fetchAndDecodeViaTurboStream,
     ssr,
     basename
@@ -6397,7 +6407,7 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
       return singleFetchActionStrategy(args, fetchAndDecode, basename);
     }
     let foundRevalidatingServerLoader = matches.some((m) => {
-      let { hasLoader, hasClientLoader } = getRouteInfo(m.route.id);
+      let { hasLoader, hasClientLoader } = getRouteInfo(m);
       return m.unstable_shouldCallHandler() && hasLoader && !hasClientLoader;
     });
     if (!ssr && !foundRevalidatingServerLoader) {
@@ -6449,7 +6459,7 @@ async function nonSsrStrategy(args, getRouteInfo, fetchAndDecode, basename) {
     matchesToLoad.map(
       (m) => m.resolve(async (handler) => {
         try {
-          let { hasClientLoader } = getRouteInfo(m.route.id);
+          let { hasClientLoader } = getRouteInfo(m);
           let routeId = m.route.id;
           let result = hasClientLoader ? await handler(async () => {
             let { data: data2 } = await fetchAndDecode(args, basename, [routeId]);
@@ -6475,7 +6485,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
       async (m, i) => m.resolve(async (handler) => {
         routeDfds[i].resolve();
         let routeId = m.route.id;
-        let { hasLoader, hasClientLoader, hasShouldRevalidate } = getRouteInfo(routeId);
+        let { hasLoader, hasClientLoader, hasShouldRevalidate } = getRouteInfo(m);
         let defaultShouldRevalidate = !m.unstable_shouldRevalidateArgs || m.unstable_shouldRevalidateArgs.actionStatus == null || m.unstable_shouldRevalidateArgs.actionStatus < 400;
         let shouldCall = m.unstable_shouldCallHandler(defaultShouldRevalidate);
         if (!shouldCall) {
@@ -6516,7 +6526,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
   );
   await Promise.all(routeDfds.map((d) => d.promise));
   if ((!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
-    singleFetchDfd.resolve({});
+    singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
     try {
@@ -6584,6 +6594,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") {
@@ -7034,8 +7058,9 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         }
       };
       dataRoute.loader.hydrate = shouldHydrateRouteLoader(
-        route,
-        routeModule,
+        route.id,
+        routeModule.clientLoader,
+        route.hasLoader,
         isSpaMode
       );
       dataRoute.action = ({ request, params, context }, singleFetch) => {
@@ -7233,8 +7258,8 @@ function getRouteModuleComponent(routeModule) {
     return routeModule.default;
   }
 }
-function shouldHydrateRouteLoader(route, routeModule, isSpaMode) {
-  return isSpaMode && route.id !== "root" || routeModule.clientLoader != null && (routeModule.clientLoader.hydrate === true || route.hasLoader !== true);
+function shouldHydrateRouteLoader(routeId, clientLoader, hasLoader, isSpaMode) {
+  return isSpaMode && routeId !== "root" || clientLoader != null && (clientLoader.hydrate === true || hasLoader !== true);
 }
 
 // lib/dom/ssr/fog-of-war.ts
@@ -7916,7 +7941,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.5.1";
+    window.__reactRouterVersion = "7.5.2";
   }
 } catch (e) {
 }
@@ -9019,7 +9044,12 @@ function ServerRouter({
     let routeId = match.route.id;
     let route = routeModules[routeId];
     let manifestRoute = context.manifest.routes[routeId];
-    if (route && manifestRoute && shouldHydrateRouteLoader(manifestRoute, route, context.isSpaMode) && (route.HydrateFallback || !manifestRoute.hasLoader)) {
+    if (route && manifestRoute && shouldHydrateRouteLoader(
+      routeId,
+      route.clientLoader,
+      manifestRoute.hasLoader,
+      context.isSpaMode
+    ) && (route.HydrateFallback || !manifestRoute.hasLoader)) {
       delete context.staticHandlerContext.loaderData[routeId];
     }
   }
@@ -9488,6 +9518,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 = {};
@@ -9519,10 +9569,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);
@@ -9597,15 +9648,6 @@ 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";
 
@@ -9676,7 +9718,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
@@ -10015,9 +10056,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(
@@ -10037,7 +10079,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
             statusText: "Not Found"
           });
         } else {
-          request.headers.set("X-React-Router-SPA-Mode", "yes");
+          isSpaMode = true;
         }
       }
     }
@@ -10106,7 +10148,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,
@@ -10131,6 +10173,7 @@ Error: ${e instanceof Error ? e.toString() : e}`
         request,
         loadContext,
         handleError,
+        isSpaMode,
         criticalCss
       );
     }
@@ -10206,8 +10249,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,
@@ -10480,7 +10522,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.`
   );
 }
 
@@ -10597,6 +10639,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,
@@ -10663,7 +10731,7 @@ export {
   renderMatches,
   createSearchParams,
   SingleFetchRedirectSymbol,
-  getSingleFetchDataStrategy,
+  getTurboStreamSingleFetchDataStrategy,
   decodeViaTurboStream,
   RemixErrorBoundary,
   createClientRoutesWithHMRRevalidationOptOut,
@@ -10712,5 +10780,6 @@ export {
   createCookieSessionStorage,
   createMemorySessionStorage,
   href,
-  deserializeErrors2 as deserializeErrors
+  deserializeErrors2 as deserializeErrors,
+  getHydrationData
 };

package/dist/production/dom-export.d.mts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-CyHis97d.mjs';
-import { R as RouterInit } from './route-data-OcOrqK13.mjs';
+import { R as RouterProviderProps$1 } from './fog-of-war-D2zsXvum.mjs';
+import { R as RouterInit } from './route-data-C12CLHiN.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/production/dom-export.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-D4x86-Xc.js';
-import { R as RouterInit } from './route-data-OcOrqK13.js';
+import { R as RouterProviderProps$1 } from './fog-of-war-BLArG-qZ.js';
+import { R as RouterInit } from './route-data-C12CLHiN.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;