react-router 0.0.0-experimental-573acd4d4 → 0.0.0-experimental-856ae8c29

package/dist/development/{chunk-6DVU7PCU.mjs → chunk-SFY5YCQ7.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-573acd4d4
+ * react-router v0.0.0-experimental-856ae8c29
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1139,7 +1139,14 @@ function createRouter(init) {
     if (newState.matches) {
       newState.matches = newState.matches.map((m) => {
         let route = manifest[m.route.id];
-        return { ...m, route };
+        let matchRoute = m.route;
+        if (matchRoute.element !== route.element || matchRoute.errorElement !== route.errorElement || matchRoute.hydrateFallbackElement !== route.hydrateFallbackElement) {
+          return {
+            ...m,
+            route
+          };
+        }
+        return m;
       });
     }
     state = {
@@ -3623,7 +3630,7 @@ function shouldRevalidateLoader(loaderMatch, arg) {
 function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2, allowElementMutations) {
   let childrenToPatch;
   if (routeId) {
-    let route = findRouteRecursively(routeId, routesToUse);
+    let route = manifest[routeId];
     invariant(
       route,
       `No route found to patch children into: routeId = ${routeId}`
@@ -3659,19 +3666,20 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
   if (allowElementMutations && existingChildren.length > 0) {
     for (let i = 0; i < existingChildren.length; i++) {
       let { existingRoute, newRoute } = existingChildren[i];
-      let existingRouteAny = existingRoute;
-      let [newRouteAny] = convertRoutesToDataRoutes(
+      let existingRouteTyped = existingRoute;
+      let [newRouteTyped] = convertRoutesToDataRoutes(
         [newRoute],
         mapRouteProperties2,
         [],
         // Doesn't matter for mutated routes since they already have an id
-        manifest,
+        {},
+        // Don't touch the manifest here since we're updating in place
         true
       );
-      Object.assign(existingRouteAny, {
-        element: newRouteAny.element ? newRouteAny.element : existingRouteAny.element,
-        errorElement: newRouteAny.errorElement ? newRouteAny.errorElement : existingRouteAny.errorElement,
-        hydrateFallbackElement: newRouteAny.hydrateFallbackElement ? newRouteAny.hydrateFallbackElement : existingRouteAny.hydrateFallbackElement
+      Object.assign(existingRouteTyped, {
+        element: newRouteTyped.element ? newRouteTyped.element : existingRouteTyped.element,
+        errorElement: newRouteTyped.errorElement ? newRouteTyped.errorElement : existingRouteTyped.errorElement,
+        hydrateFallbackElement: newRouteTyped.hydrateFallbackElement ? newRouteTyped.hydrateFallbackElement : existingRouteTyped.hydrateFallbackElement
       });
     }
   }
@@ -3690,20 +3698,6 @@ function isSameRoute(newRoute, existingRoute) {
     (aChild, i) => existingRoute.children?.some((bChild) => isSameRoute(aChild, bChild))
   );
 }
-function findRouteRecursively(id, routes) {
-  for (const route of routes) {
-    if (route.id === id) {
-      return route;
-    }
-    if (route.children) {
-      const found = findRouteRecursively(id, route.children);
-      if (found) {
-        return found;
-      }
-    }
-  }
-  return null;
-}
 var lazyRoutePropertyCache = /* @__PURE__ */ new WeakMap();
 var loadLazyRouteProperty = ({
   key,
@@ -6736,9 +6730,8 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
-  if (!routeResult) {
-    return void 0;
-  } else if ("error" in routeResult) {
+  invariant2(routeResult, `No response found for routeId "${routeId}"`);
+  if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
@@ -7982,7 +7975,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-573acd4d4";
+    window.__reactRouterVersion = "0.0.0-experimental-856ae8c29";
   }
 } catch (e) {
 }
@@ -9685,7 +9678,7 @@ import { encode } from "turbo-stream";
 
 // lib/server-runtime/headers.ts
 import { splitCookiesString } from "set-cookie-parser";
-function getDocumentHeaders(build, context) {
+function getDocumentHeaders(context, getRouteHeadersFn) {
   let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
   let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
   let errorHeaders;
@@ -9703,14 +9696,12 @@ function getDocumentHeaders(build, context) {
   }
   return matches.reduce((parentHeaders, match, idx) => {
     let { id } = match.route;
-    let route = build.routes[id];
-    invariant3(route, `Route with id "${id}" not found in build`);
-    let routeModule = route.module;
     let loaderHeaders = context.loaderHeaders[id] || new Headers();
     let actionHeaders = context.actionHeaders[id] || new Headers();
     let includeErrorHeaders = errorHeaders != null && idx === matches.length - 1;
     let includeErrorCookies = includeErrorHeaders && errorHeaders !== loaderHeaders && errorHeaders !== actionHeaders;
-    if (routeModule.headers == null) {
+    let headersFn = getRouteHeadersFn(match);
+    if (headersFn == null) {
       let headers2 = new Headers(parentHeaders);
       if (includeErrorCookies) {
         prependCookies(errorHeaders, headers2);
@@ -9720,12 +9711,12 @@ function getDocumentHeaders(build, context) {
       return headers2;
     }
     let headers = new Headers(
-      routeModule.headers ? typeof routeModule.headers === "function" ? routeModule.headers({
+      typeof headersFn === "function" ? headersFn({
         loaderHeaders,
         parentHeaders,
         actionHeaders,
         errorHeaders: includeErrorHeaders ? errorHeaders : void 0
-      }) : routeModule.headers : void 0
+      }) : headersFn
     );
     if (includeErrorCookies) {
       prependCookies(errorHeaders, headers);
@@ -9758,7 +9749,10 @@ var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
 async function singleFetchAction(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
   try {
     let respond2 = function(context) {
-      let headers = getDocumentHeaders(build, context);
+      let headers = getDocumentHeaders(
+        context,
+        (m) => build.routes[m.route.id]?.module.headers
+      );
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: getSingleFetchRedirect(
@@ -9833,7 +9827,10 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
 async function singleFetchLoaders(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
   try {
     let respond2 = function(context) {
-      let headers = getDocumentHeaders(build, context);
+      let headers = getDocumentHeaders(
+        context,
+        (m) => build.routes[m.route.id]?.module.headers
+      );
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: {
@@ -10296,7 +10293,10 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     if (isResponse(context)) {
       return context;
     }
-    let headers = getDocumentHeaders(build, context);
+    let headers = getDocumentHeaders(
+      context,
+      (m) => build.routes[m.route.id]?.module.headers
+    );
     if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) {
       return new Response(null, { status: context.statusCode, headers });
     }
@@ -10634,42 +10634,8 @@ function href(path, ...args) {
   }).filter((segment) => segment !== void 0).join("/");
 }
 
-// lib/dom/ssr/errors.ts
-function deserializeErrors2(errors) {
-  if (!errors) return null;
-  let entries = Object.entries(errors);
-  let serialized = {};
-  for (let [key, val] of entries) {
-    if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new ErrorResponseImpl(
-        val.status,
-        val.statusText,
-        val.data,
-        val.internal === true
-      );
-    } else if (val && val.__type === "Error") {
-      if (val.__subType) {
-        let ErrorConstructor = window[val.__subType];
-        if (typeof ErrorConstructor === "function") {
-          try {
-            let error = new ErrorConstructor(val.message);
-            error.stack = val.stack;
-            serialized[key] = error;
-          } catch (e) {
-          }
-        }
-      }
-      if (serialized[key] == null) {
-        let error = new Error(val.message);
-        error.stack = val.stack;
-        serialized[key] = error;
-      }
-    } else {
-      serialized[key] = val;
-    }
-  }
-  return serialized;
-}
+// lib/rsc/browser.tsx
+import * as React14 from "react";
 
 // lib/dom/ssr/hydration.tsx
 function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
@@ -10697,8 +10663,7 @@ function getHydrationData(state, routes, getRouteInfo, location2, basename, isSp
   return hydrationData;
 }
 
-// lib/server.browser.tsx
-import * as React14 from "react";
+// lib/rsc/browser.tsx
 function createCallServer({
   decode: decode2,
   encodeAction
@@ -10774,7 +10739,7 @@ function createRouterFromPayload({
   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) => {
+  payload.patches?.forEach((patch) => {
     invariant(patch.parentId, "Invalid patch parentId");
     if (!patches.has(patch.parentId)) {
       patches.set(patch.parentId, []);
@@ -10951,7 +10916,7 @@ function getFetchAndDecodeViaRSC(decode2) {
     }
   };
 }
-function ServerBrowserRouter({
+function RSCHydratedRouter({
   decode: decode2,
   payload
 }) {
@@ -10969,7 +10934,8 @@ function ServerBrowserRouter({
   }, []);
   const frameworkContext = {
     future: {
-      // TODO: Update these
+      // 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
     },
@@ -10977,11 +10943,7 @@ function ServerBrowserRouter({
     ssr: true,
     criticalCss: "",
     manifest: {
-      routes: {
-        // root: {
-        //   css: []
-        // },
-      },
+      routes: {},
       version: "1",
       url: "",
       entry: {
@@ -11081,10 +11043,10 @@ function preventInvalidServerHandlerCall2(type, routeId, hasHandler) {
   }
 }
 
-// lib/server.static.tsx
+// lib/rsc/server.ssr.tsx
 import * as React15 from "react";
 
-// lib/html-stream/server.ts
+// lib/rsc/html-stream/server.ts
 var encoder2 = new TextEncoder();
 var trailer = "</body></html>";
 function injectRSCPayload(rscStream) {
@@ -11172,8 +11134,8 @@ function escapeScript(script) {
   return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
 }
 
-// lib/server.static.tsx
-async function routeServerRequest(request, requestServer, decode2, renderHTML) {
+// 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);
@@ -11181,13 +11143,12 @@ async function routeServerRequest(request, requestServer, decode2, renderHTML) {
   if (isDataRequest) {
     const serverURL = new URL(request.url);
     serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
-    if (!isDataRequest) {
-      serverURL.searchParams.delete("_routes");
-    }
+    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: request.headers,
+      headers,
       method: request.method,
       signal: request.signal
     });
@@ -11225,7 +11186,7 @@ async function routeServerRequest(request, requestServer, decode2, renderHTML) {
     throw reason;
   }
 }
-function ServerStaticRouter({ payload }) {
+function RSCStaticRouter({ payload }) {
   if (payload.type !== "render") return null;
   const context = {
     actionData: payload.actionData,
@@ -11276,7 +11237,8 @@ function ServerStaticRouter({ payload }) {
   );
   const frameworkContext = {
     future: {
-      // TODO: Update these
+      // 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
     },
@@ -11284,11 +11246,7 @@ function ServerStaticRouter({ payload }) {
     ssr: true,
     criticalCss: "",
     manifest: {
-      routes: {
-        // root: {
-        //   css: []
-        // },
-      },
+      routes: {},
       version: "1",
       url: "",
       entry: {
@@ -11315,7 +11273,7 @@ function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }
 
-// lib/html-stream/browser.ts
+// lib/rsc/html-stream/browser.ts
 function getServerStream() {
   let encoder3 = new TextEncoder();
   let streamController = null;
@@ -11350,6 +11308,43 @@ function getServerStream() {
   return rscStream;
 }
 
+// lib/dom/ssr/errors.ts
+function deserializeErrors2(errors) {
+  if (!errors) return null;
+  let entries = Object.entries(errors);
+  let serialized = {};
+  for (let [key, val] of entries) {
+    if (val && val.__type === "RouteErrorResponse") {
+      serialized[key] = new ErrorResponseImpl(
+        val.status,
+        val.statusText,
+        val.data,
+        val.internal === true
+      );
+    } else if (val && val.__type === "Error") {
+      if (val.__subType) {
+        let ErrorConstructor = window[val.__subType];
+        if (typeof ErrorConstructor === "function") {
+          try {
+            let error = new ErrorConstructor(val.message);
+            error.stack = val.stack;
+            serialized[key] = error;
+          } catch (e) {
+          }
+        }
+      }
+      if (serialized[key] == null) {
+        let error = new Error(val.message);
+        error.stack = val.stack;
+        serialized[key] = error;
+      }
+    } else {
+      serialized[key] = val;
+    }
+  }
+  return serialized;
+}
+
 export {
   Action,
   createBrowserHistory,
@@ -11465,12 +11460,11 @@ export {
   createCookieSessionStorage,
   createMemorySessionStorage,
   href,
-  deserializeErrors2 as deserializeErrors,
   getHydrationData,
   createCallServer,
-  ServerBrowserRouter,
-  routeServerRequest,
-  ServerStaticRouter,
-  isReactServerRequest,
-  getServerStream
+  RSCHydratedRouter,
+  routeRSCServerRequest,
+  RSCStaticRouter,
+  getServerStream,
+  deserializeErrors2 as deserializeErrors
 };

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

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

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

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

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-573acd4d4
+ * react-router v0.0.0-experimental-856ae8c29
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -993,7 +993,14 @@ function createRouter(init) {
     if (newState.matches) {
       newState.matches = newState.matches.map((m) => {
         let route = manifest[m.route.id];
-        return { ...m, route };
+        let matchRoute = m.route;
+        if (matchRoute.element !== route.element || matchRoute.errorElement !== route.errorElement || matchRoute.hydrateFallbackElement !== route.hydrateFallbackElement) {
+          return {
+            ...m,
+            route
+          };
+        }
+        return m;
       });
     }
     state = {
@@ -2886,7 +2893,7 @@ function shouldRevalidateLoader(loaderMatch, arg) {
 function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2, allowElementMutations) {
   let childrenToPatch;
   if (routeId) {
-    let route = findRouteRecursively(routeId, routesToUse);
+    let route = manifest[routeId];
     invariant(
       route,
       `No route found to patch children into: routeId = ${routeId}`
@@ -2922,19 +2929,20 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
   if (allowElementMutations && existingChildren.length > 0) {
     for (let i = 0; i < existingChildren.length; i++) {
       let { existingRoute, newRoute } = existingChildren[i];
-      let existingRouteAny = existingRoute;
-      let [newRouteAny] = convertRoutesToDataRoutes(
+      let existingRouteTyped = existingRoute;
+      let [newRouteTyped] = convertRoutesToDataRoutes(
         [newRoute],
         mapRouteProperties2,
         [],
         // Doesn't matter for mutated routes since they already have an id
-        manifest,
+        {},
+        // Don't touch the manifest here since we're updating in place
         true
       );
-      Object.assign(existingRouteAny, {
-        element: newRouteAny.element ? newRouteAny.element : existingRouteAny.element,
-        errorElement: newRouteAny.errorElement ? newRouteAny.errorElement : existingRouteAny.errorElement,
-        hydrateFallbackElement: newRouteAny.hydrateFallbackElement ? newRouteAny.hydrateFallbackElement : existingRouteAny.hydrateFallbackElement
+      Object.assign(existingRouteTyped, {
+        element: newRouteTyped.element ? newRouteTyped.element : existingRouteTyped.element,
+        errorElement: newRouteTyped.errorElement ? newRouteTyped.errorElement : existingRouteTyped.errorElement,
+        hydrateFallbackElement: newRouteTyped.hydrateFallbackElement ? newRouteTyped.hydrateFallbackElement : existingRouteTyped.hydrateFallbackElement
       });
     }
   }
@@ -2953,20 +2961,6 @@ function isSameRoute(newRoute, existingRoute) {
     (aChild, i) => existingRoute.children?.some((bChild) => isSameRoute(aChild, bChild))
   );
 }
-function findRouteRecursively(id, routes) {
-  for (const route of routes) {
-    if (route.id === id) {
-      return route;
-    }
-    if (route.children) {
-      const found = findRouteRecursively(id, route.children);
-      if (found) {
-        return found;
-      }
-    }
-  }
-  return null;
-}
 var lazyRoutePropertyCache = /* @__PURE__ */ new WeakMap();
 var loadLazyRouteProperty = ({
   key,
@@ -5193,9 +5187,8 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
-  if (!routeResult) {
-    return void 0;
-  } else if ("error" in routeResult) {
+  invariant2(routeResult, `No response found for routeId "${routeId}"`);
+  if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
@@ -6091,6 +6084,32 @@ function dedupe(array) {
   return [...new Set(array)];
 }
 
+// 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;
+}
+
 // lib/dom/ssr/errors.ts
 function deserializeErrors(errors) {
   if (!errors) return null;
@@ -6128,32 +6147,6 @@ function deserializeErrors(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;
-}
-
 // lib/dom-export/dom-router-provider.tsx
 function RouterProvider2(props) {
   return /* @__PURE__ */ React10.createElement(RouterProvider, { flushSync: ReactDOM.flushSync, ...props });

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-573acd4d4
+ * react-router v0.0.0-experimental-856ae8c29
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-6DVU7PCU.mjs";
+} from "./chunk-SFY5YCQ7.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/{browser-Dpxu0wdb.d.ts → fog-of-war-BHTxbJsu.d.ts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { k as RouteObject, R as RouterInit, F as FutureConfig$1, H as HydrationState, I as InitialEntry, D as DataStrategyFunction, at as PatchRoutesOnNavigationFunction, a as Router$1, T as To, d as RelativeRoutingType, y as NonIndexRouteObject, a5 as LazyRouteFunction, s as IndexRouteObject, e as Location, f as Action, as as Navigator, av as RouteMatch, p as StaticHandlerContext, c as RouteManifest, b as RouteModules, G as DataRouteObject, J as ClientLoaderFunction, a4 as HTMLFormMethod, a2 as FormEncType, aD as PageLinkDescriptor, aT as History, O as GetScrollRestorationKeyFunction, N as NavigateOptions, Q as Fetcher, n as SerializeFrom, B as BlockerFunction, aw as ClientActionFunction, x as LinksFunction, w as MetaFunction, aa as ShouldRevalidateFunction, j as Params } from './route-data-DX3MskAN.js';
+import { k as RouteObject, R as RouterInit, F as FutureConfig$1, H as HydrationState, I as InitialEntry, D as DataStrategyFunction, at as PatchRoutesOnNavigationFunction, a as Router$1, T as To, d as RelativeRoutingType, y as NonIndexRouteObject, a5 as LazyRouteFunction, s as IndexRouteObject, e as Location, f as Action, as as Navigator, av as RouteMatch, p as StaticHandlerContext, c as RouteManifest, b as RouteModules, G as DataRouteObject, J as ClientLoaderFunction, a4 as HTMLFormMethod, a2 as FormEncType, aD as PageLinkDescriptor, aT as History, O as GetScrollRestorationKeyFunction, N as NavigateOptions, Q as Fetcher, n as SerializeFrom, B as BlockerFunction, aw as ClientActionFunction, x as LinksFunction, w as MetaFunction, aa as ShouldRevalidateFunction, j as Params } from './route-data-BIYebJr3.js';
 
 /**
  * @private
@@ -1678,16 +1678,6 @@ declare function useViewTransitionState(to: To, opts?: {
     relative?: RelativeRoutingType;
 }): boolean;
 
-declare global {
-    interface Navigator {
-        connection?: {
-            saveData: boolean;
-        };
-    }
-}
-declare function getPatchRoutesOnNavigationFunction(manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, isSpaMode: boolean, basename: string | undefined): PatchRoutesOnNavigationFunction | undefined;
-declare function useFogOFWarDiscovery(router: Router$1, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, isSpaMode: boolean): void;
-
 type RenderedRoute = {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
@@ -1719,7 +1709,7 @@ type ServerRenderPayload = {
     loaderData: Record<string, any>;
     location: Location;
     matches: ServerRouteMatch[];
-    patches: RenderedRoute[];
+    patches?: RenderedRoute[];
     nonce?: string;
 };
 type ServerManifestPayload = {
@@ -1754,7 +1744,7 @@ declare function createCallServer({ decode, encodeAction, }: {
     decode: DecodeServerResponseFunction;
     encodeAction: EncodeActionFunction;
 }): (id: string, args: unknown[]) => Promise<unknown>;
-declare function ServerBrowserRouter({ decode, payload, }: {
+declare function RSCHydratedRouter({ decode, payload, }: {
     decode: DecodeServerResponseFunction;
     payload: ServerPayload;
 }): React.JSX.Element;
@@ -1766,4 +1756,14 @@ declare global {
 }
 declare function getServerStream(): ReadableStream<any>;
 
-export { useLinkClickHandler as $, type AssetsManifest as A, type BrowserRouterProps as B, type CriticalCss as C, type DOMRouterOpts as D, type EntryContext as E, type FutureConfig as F, type SubmitFunction as G, type HashRouterProps as H, type IndexRouteProps as I, type FetcherSubmitFunction as J, type FetcherWithComponents as K, type LayoutRouteProps as L, type MemoryRouterOpts as M, type NavigateProps as N, type OutletProps as O, type PathRouteProps as P, createBrowserRouter as Q, type RouterProviderProps as R, type ServerPayload as S, createHashRouter as T, BrowserRouter as U, HashRouter as V, Link as W, HistoryRouter as X, NavLink as Y, Form as Z, ScrollRestoration as _, type Route as a, useSearchParams as a0, useSubmit as a1, useFormAction as a2, useFetcher as a3, useFetchers as a4, useBeforeUnload as a5, usePrompt as a6, useViewTransitionState as a7, type FetcherSubmitOptions as a8, type ParamKeyValuePair as a9, type SubmitOptions as aa, type URLSearchParamsInit as ab, type SubmitTarget as ac, createSearchParams as ad, Meta as ae, Links as af, Scripts as ag, PrefetchPageLinks as ah, type ScriptsProps as ai, hydrationRouteProperties as aj, mapRouteProperties as ak, FrameworkContext as al, getPatchRoutesOnNavigationFunction as am, useFogOFWarDiscovery as an, createClientRoutes as ao, createClientRoutesWithHMRRevalidationOptOut as ap, shouldHydrateRouteLoader as aq, useScrollRestoration as ar, type DecodeServerResponseFunction as as, type EncodeActionFunction as at, createCallServer as au, ServerBrowserRouter as av, getServerStream as aw, type AwaitProps as b, type MemoryRouterProps as c, type RouteProps as d, type RouterProps as e, type RoutesProps as f, Await as g, MemoryRouter as h, Navigate as i, Outlet as j, Route$1 as k, Router as l, RouterProvider as m, Routes as n, createMemoryRouter as o, createRoutesFromChildren as p, createRoutesFromElements as q, renderMatches as r, type HistoryRouterProps as s, type LinkProps as t, type NavLinkProps as u, type NavLinkRenderProps as v, type FetcherFormProps as w, type FormProps as x, type ScrollRestorationProps as y, type SetURLSearchParams as z };
+declare global {
+    interface Navigator {
+        connection?: {
+            saveData: boolean;
+        };
+    }
+}
+declare function getPatchRoutesOnNavigationFunction(manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, isSpaMode: boolean, basename: string | undefined): PatchRoutesOnNavigationFunction | undefined;
+declare function useFogOFWarDiscovery(router: Router$1, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, isSpaMode: boolean): void;
+
+export { useLinkClickHandler as $, type AssetsManifest as A, type BrowserRouterProps as B, type CriticalCss as C, type DOMRouterOpts as D, type EntryContext as E, type FutureConfig as F, type SubmitFunction as G, type HashRouterProps as H, type IndexRouteProps as I, type FetcherSubmitFunction as J, type FetcherWithComponents as K, type LayoutRouteProps as L, type MemoryRouterOpts as M, type NavigateProps as N, type OutletProps as O, type PathRouteProps as P, createBrowserRouter as Q, type RouterProviderProps as R, type ServerPayload as S, createHashRouter as T, BrowserRouter as U, HashRouter as V, Link as W, HistoryRouter as X, NavLink as Y, Form as Z, ScrollRestoration as _, type Route as a, useSearchParams as a0, useSubmit as a1, useFormAction as a2, useFetcher as a3, useFetchers as a4, useBeforeUnload as a5, usePrompt as a6, useViewTransitionState as a7, type FetcherSubmitOptions as a8, type ParamKeyValuePair as a9, type SubmitOptions as aa, type URLSearchParamsInit as ab, type SubmitTarget as ac, createSearchParams as ad, Meta as ae, Links as af, Scripts as ag, PrefetchPageLinks as ah, type ScriptsProps as ai, type DecodeServerResponseFunction as aj, type EncodeActionFunction as ak, createCallServer as al, RSCHydratedRouter as am, getServerStream as an, hydrationRouteProperties as ao, mapRouteProperties as ap, FrameworkContext as aq, getPatchRoutesOnNavigationFunction as ar, useFogOFWarDiscovery as as, createClientRoutes as at, createClientRoutesWithHMRRevalidationOptOut as au, shouldHydrateRouteLoader as av, useScrollRestoration as aw, type AwaitProps as b, type MemoryRouterProps as c, type RouteProps as d, type RouterProps as e, type RoutesProps as f, Await as g, MemoryRouter as h, Navigate as i, Outlet as j, Route$1 as k, Router as l, RouterProvider as m, Routes as n, createMemoryRouter as o, createRoutesFromChildren as p, createRoutesFromElements as q, renderMatches as r, type HistoryRouterProps as s, type LinkProps as t, type NavLinkProps as u, type NavLinkRenderProps as v, type FetcherFormProps as w, type FormProps as x, type ScrollRestorationProps as y, type SetURLSearchParams as z };