react-router 0.0.0-experimental-4303fcb98 → 0.0.0-experimental-d431f1b65

package/dist/development/{browser-DQVA_cmy.d.mts → browser-Dr0PjLWi.d.mts}

@@ -2168,6 +2168,7 @@ type ServerRenderPayload = {
     matches: ServerRouteMatch[];
     patches?: RenderedRoute[];
     nonce?: string;
+    formState?: unknown;
 };
 type ServerManifestPayload = {
     type: "manifest";
@@ -2196,12 +2197,14 @@ declare global {
         __routerActionID: number;
     }
 }
-declare function createCallServer({ decode, encodeAction, }: {
+declare function createCallServer({ decode, encodeAction, fetch: fetchImplementation, }: {
     decode: DecodeServerResponseFunction;
     encodeAction: EncodeActionFunction;
+    fetch?: (request: Request) => Promise<Response>;
 }): (id: string, args: unknown[]) => Promise<unknown>;
-declare function RSCHydratedRouter({ decode, payload, routeDiscovery, }: {
+declare function RSCHydratedRouter({ decode, fetch: fetchImplementation, payload, routeDiscovery, }: {
     decode: DecodeServerResponseFunction;
+    fetch?: (request: Request) => Promise<Response>;
     payload: ServerPayload;
     routeDiscovery?: "eager" | "lazy";
 }): React.JSX.Element;

package/dist/development/{chunk-3HEPIEBR.mjs → chunk-F37344ZN.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8804,7 +8804,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-4303fcb98";
+    window.__reactRouterVersion = "0.0.0-experimental-d431f1b65";
   }
 } catch (e) {
 }
@@ -11621,19 +11621,22 @@ function RSCDefaultRootErrorBoundary({
 // lib/rsc/browser.tsx
 function createCallServer({
   decode: decode2,
-  encodeAction
+  encodeAction,
+  fetch: fetchImplementation = fetch
 }) {
   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
-      }
-    });
+    const response = await fetchImplementation(
+      new Request(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");
     }
@@ -11708,6 +11711,7 @@ function createCallServer({
   };
 }
 function createRouterFromPayload({
+  fetchImplementation,
   decode: decode2,
   payload
 }) {
@@ -11765,14 +11769,20 @@ function createRouterFromPayload({
       if (discoveredPaths2.has(path)) {
         return;
       }
-      await fetchAndApplyManifestPatches2([path], decode2, signal);
+      await fetchAndApplyManifestPatches2(
+        [path],
+        decode2,
+        fetchImplementation,
+        signal
+      );
     },
     // FIXME: Pass `build.ssr` and `build.basename` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
       () => window.__router,
       true,
       void 0,
-      decode2
+      decode2,
+      fetchImplementation
     )
   });
   if (window.__router.state.initialized) {
@@ -11790,7 +11800,7 @@ function createRouterFromPayload({
   return window.__router;
 }
 var renderedRoutesContext = unstable_createContext();
-function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
+function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2, fetchImplementation) {
   let dataStrategy = getSingleFetchDataStrategyImpl(
     getRouter,
     (match) => {
@@ -11805,7 +11815,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
       };
     },
     // pass map into fetchAndDecode so it can add payloads
-    getFetchAndDecodeViaRSC(decode2),
+    getFetchAndDecodeViaRSC(decode2, fetchImplementation),
     ssr,
     basename,
     // If the route has a component but we don't have an element, we need to hit
@@ -11842,7 +11852,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
     return results;
   });
 }
-function getFetchAndDecodeViaRSC(decode2) {
+function getFetchAndDecodeViaRSC(decode2, fetchImplementation) {
   return async (args, basename, targetRoutes) => {
     let { request, context } = args;
     let url = singleFetchUrl(request.url, basename, "rsc");
@@ -11852,7 +11862,9 @@ function getFetchAndDecodeViaRSC(decode2) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
-    let res = await fetch(url, await createRequestInit(request));
+    let res = await fetchImplementation(
+      new Request(url, await createRequestInit(request))
+    );
     if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
       throw new ErrorResponseImpl(404, "Not Found", true);
     }
@@ -11895,14 +11907,18 @@ function getFetchAndDecodeViaRSC(decode2) {
 }
 function RSCHydratedRouter({
   decode: decode2,
+  fetch: fetchImplementation = fetch,
   payload,
   routeDiscovery = "eager"
 }) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
   let router = React15.useMemo(
-    () => createRouterFromPayload({ decode: decode2, payload }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
+    () => createRouterFromPayload({
+      decode: decode2,
+      payload,
+      fetchImplementation
+    }),
+    [decode2, payload, fetchImplementation]
   );
   React15.useLayoutEffect(() => {
     if (!window.__routerInitialized) {
@@ -11947,7 +11963,7 @@ function RSCHydratedRouter({
         return;
       }
       try {
-        await fetchAndApplyManifestPatches2(paths, decode2);
+        await fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation);
       } catch (e) {
         console.error("Failed to fetch manifest patches", e);
       }
@@ -11961,7 +11977,7 @@ function RSCHydratedRouter({
       attributes: true,
       attributeFilter: ["data-discover", "href", "action"]
     });
-  }, [routeDiscovery, decode2]);
+  }, [routeDiscovery, decode2, fetchImplementation]);
   const frameworkContext = {
     future: {
       // These flags have no runtime impact so can always be false.  If we add
@@ -12082,7 +12098,7 @@ var nextPaths2 = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize2 = 1e3;
 var discoveredPaths2 = /* @__PURE__ */ new Set();
 var URL_LIMIT2 = 7680;
-async function fetchAndApplyManifestPatches2(paths, decode2, signal) {
+async function fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation, signal) {
   let basename = (window.__router.basename ?? "").replace(/^\/|\/$/g, "");
   let url = new URL(`${basename}/.manifest`, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
@@ -12090,7 +12106,7 @@ async function fetchAndApplyManifestPatches2(paths, decode2, signal) {
     nextPaths2.clear();
     return;
   }
-  let response = await fetch(url, { signal });
+  let response = await fetchImplementation(new Request(url, { signal }));
   if (!response.body || response.status < 200 || response.status >= 300) {
     throw new Error("Unable to fetch new route matches from the server");
   }

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './browser-DQVA_cmy.mjs';
+import { R as RouterProviderProps$1 } from './browser-Dr0PjLWi.mjs';
 import { R as RouterInit } from './route-data-C8_wxpLo.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -26,7 +26,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-3HEPIEBR.mjs";
+} from "./chunk-F37344ZN.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/index.d.mts

@@ -1,7 +1,7 @@
 import { a as Router, b as RouteModules, D as DataStrategyFunction, L as Location, S as StaticHandlerContext, c as RouteObject, C as CreateStaticHandlerOptions$1, d as StaticHandler, F as FutureConfig, I as InitialEntry, H as HydrationState, e as IndexRouteObject, f as LoaderFunction, A as ActionFunction, M as MetaFunction, g as LinksFunction, N as NonIndexRouteObject, u as unstable_InitialContext, h as MiddlewareEnabled, i as AppLoadContext, E as Equal, j as RouterState, P as PatchRoutesOnNavigationFunction, k as DataRouteObject, l as ClientLoaderFunction, m as Path } from './route-data-C8_wxpLo.mjs';
 export { y as ActionFunctionArgs, B as Blocker, s as BlockerFunction, au as ClientActionFunction, av as ClientActionFunctionArgs, aw as ClientLoaderFunctionArgs, ap as DataRouteMatch, z as DataStrategyFunctionArgs, J as DataStrategyMatch, K as DataStrategyResult, Q as ErrorResponse, o as Fetcher, U as FormEncType, V as FormMethod, aE as Future, G as GetScrollPositionFunction, n as GetScrollRestorationKeyFunction, W as HTMLFormMethod, ax as HeadersArgs, ay as HeadersFunction, aC as HtmlLinkDescriptor, af as IDLE_BLOCKER, ae as IDLE_FETCHER, ad as IDLE_NAVIGATION, X as LazyRouteFunction, aD as LinkDescriptor, Y as LoaderFunctionArgs, az as MetaArgs, aA as MetaDescriptor, aq as NavigateOptions, p as Navigation, q as NavigationStates, aa as NavigationType, ar as Navigator, aB as PageLinkDescriptor, _ as ParamParseKey, $ as Params, as as PatchRoutesOnNavigationFunctionArgs, a0 as PathMatch, a1 as PathParam, a2 as PathPattern, a3 as RedirectFunction, r as RelativeRoutingType, x as RevalidationState, at as RouteMatch, w as RouterFetchOptions, R as RouterInit, v as RouterNavigateOptions, t as RouterSubscriber, a5 as ShouldRevalidateFunction, a6 as ShouldRevalidateFunctionArgs, T as To, a7 as UIMatch, aK as UNSAFE_DataRouterContext, aL as UNSAFE_DataRouterStateContext, O as UNSAFE_DataWithResponseInit, aJ as UNSAFE_ErrorResponseImpl, aM as UNSAFE_FetchersContext, aN as UNSAFE_LocationContext, aO as UNSAFE_NavigationContext, aP as UNSAFE_RouteContext, aQ as UNSAFE_ViewTransitionContext, aG as UNSAFE_createBrowserHistory, aI as UNSAFE_createRouter, aH as UNSAFE_invariant, ab as createPath, ag as data, ah as generatePath, ai as isRouteErrorResponse, aj as matchPath, ak as matchRoutes, ac as parsePath, al as redirect, am as redirectDocument, an as replace, ao as resolvePath, Z as unstable_MiddlewareFunction, a4 as unstable_RouterContext, a9 as unstable_RouterContextProvider, aF as unstable_SerializesTo, a8 as unstable_createContext } from './route-data-C8_wxpLo.mjs';
-import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, a as RouteComponentType, H as HydrateFallbackType, b as ErrorBoundaryType, S as ServerBuild, c as ServerPayload } from './browser-DQVA_cmy.mjs';
-export { i as Await, d as AwaitProps, ag as BrowserRouter, a0 as BrowserRouterProps, a1 as DOMRouterOpts, a7 as FetcherFormProps, ac as FetcherSubmitFunction, aw as FetcherSubmitOptions, ad as FetcherWithComponents, al as Form, a8 as FormProps, aH as HandleDataRequestFunction, aI as HandleDocumentRequestFunction, aJ as HandleErrorFunction, ah as HashRouter, a2 as HashRouterProps, a3 as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, ai as Link, a4 as LinkProps, aD as Links, j as MemoryRouter, M as MemoryRouterOpts, e as MemoryRouterProps, aC as Meta, ak as NavLink, a5 as NavLinkProps, a6 as NavLinkRenderProps, k as Navigate, u as NavigateFunction, N as NavigateProps, l as Outlet, O as OutletProps, ax as ParamKeyValuePair, P as PathRouteProps, aF as PrefetchPageLinks, m as Route, f as RouteProps, n as Router, g as RouterProps, o as RouterProvider, R as RouterProviderProps, p as Routes, h as RoutesProps, aE as Scripts, aG as ScriptsProps, am as ScrollRestoration, a9 as ScrollRestorationProps, aK as ServerEntryModule, aa as SetURLSearchParams, ab as SubmitFunction, ay as SubmitOptions, aA as SubmitTarget, aV as UNSAFE_FrameworkContext, aW as UNSAFE_createClientRoutes, aX as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aQ as UNSAFE_hydrationRouteProperties, aR as UNSAFE_mapRouteProperties, aY as UNSAFE_shouldHydrateRouteLoader, aZ as UNSAFE_useScrollRestoration, aS as UNSAFE_withComponentProps, aU as UNSAFE_withErrorBoundaryProps, aT as UNSAFE_withHydrateFallbackProps, az as URLSearchParamsInit, ae as createBrowserRouter, af as createHashRouter, q as createMemoryRouter, r as createRoutesFromChildren, s as createRoutesFromElements, aB as createSearchParams, t as renderMatches, aL as unstable_DecodeServerResponseFunction, aM as unstable_EncodeActionFunction, aj as unstable_HistoryRouter, aO as unstable_RSCHydratedRouter, aN as unstable_createCallServer, aP as unstable_getServerStream, au as unstable_usePrompt, w as useActionData, x as useAsyncError, y as useAsyncValue, at as useBeforeUnload, v as useBlocker, ar as useFetcher, as as useFetchers, aq as useFormAction, z as useHref, B as useInRouterContext, an as useLinkClickHandler, C as useLoaderData, D as useLocation, G as useMatch, J as useMatches, K as useNavigate, Q as useNavigation, T as useNavigationType, U as useOutlet, V as useOutletContext, W as useParams, X as useResolvedPath, Y as useRevalidator, Z as useRouteError, _ as useRouteLoaderData, $ as useRoutes, ao as useSearchParams, ap as useSubmit, av as useViewTransitionState } from './browser-DQVA_cmy.mjs';
+import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, a as RouteComponentType, H as HydrateFallbackType, b as ErrorBoundaryType, S as ServerBuild, c as ServerPayload } from './browser-Dr0PjLWi.mjs';
+export { i as Await, d as AwaitProps, ag as BrowserRouter, a0 as BrowserRouterProps, a1 as DOMRouterOpts, a7 as FetcherFormProps, ac as FetcherSubmitFunction, aw as FetcherSubmitOptions, ad as FetcherWithComponents, al as Form, a8 as FormProps, aH as HandleDataRequestFunction, aI as HandleDocumentRequestFunction, aJ as HandleErrorFunction, ah as HashRouter, a2 as HashRouterProps, a3 as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, ai as Link, a4 as LinkProps, aD as Links, j as MemoryRouter, M as MemoryRouterOpts, e as MemoryRouterProps, aC as Meta, ak as NavLink, a5 as NavLinkProps, a6 as NavLinkRenderProps, k as Navigate, u as NavigateFunction, N as NavigateProps, l as Outlet, O as OutletProps, ax as ParamKeyValuePair, P as PathRouteProps, aF as PrefetchPageLinks, m as Route, f as RouteProps, n as Router, g as RouterProps, o as RouterProvider, R as RouterProviderProps, p as Routes, h as RoutesProps, aE as Scripts, aG as ScriptsProps, am as ScrollRestoration, a9 as ScrollRestorationProps, aK as ServerEntryModule, aa as SetURLSearchParams, ab as SubmitFunction, ay as SubmitOptions, aA as SubmitTarget, aV as UNSAFE_FrameworkContext, aW as UNSAFE_createClientRoutes, aX as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aQ as UNSAFE_hydrationRouteProperties, aR as UNSAFE_mapRouteProperties, aY as UNSAFE_shouldHydrateRouteLoader, aZ as UNSAFE_useScrollRestoration, aS as UNSAFE_withComponentProps, aU as UNSAFE_withErrorBoundaryProps, aT as UNSAFE_withHydrateFallbackProps, az as URLSearchParamsInit, ae as createBrowserRouter, af as createHashRouter, q as createMemoryRouter, r as createRoutesFromChildren, s as createRoutesFromElements, aB as createSearchParams, t as renderMatches, aL as unstable_DecodeServerResponseFunction, aM as unstable_EncodeActionFunction, aj as unstable_HistoryRouter, aO as unstable_RSCHydratedRouter, aN as unstable_createCallServer, aP as unstable_getServerStream, au as unstable_usePrompt, w as useActionData, x as useAsyncError, y as useAsyncValue, at as useBeforeUnload, v as useBlocker, ar as useFetcher, as as useFetchers, aq as useFormAction, z as useHref, B as useInRouterContext, an as useLinkClickHandler, C as useLoaderData, D as useLocation, G as useMatch, J as useMatches, K as useNavigate, Q as useNavigation, T as useNavigationType, U as useOutlet, V as useOutletContext, W as useParams, X as useResolvedPath, Y as useRevalidator, Z as useRouteError, _ as useRouteLoaderData, $ as useRoutes, ao as useSearchParams, ap as useSubmit, av as useViewTransitionState } from './browser-Dr0PjLWi.mjs';
 import * as React from 'react';
 import React__default, { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';

package/dist/development/index.d.ts

@@ -2546,6 +2546,7 @@ type ServerRenderPayload = {
     matches: ServerRouteMatch[];
     patches?: RenderedRoute[];
     nonce?: string;
+    formState?: unknown;
 };
 type ServerManifestPayload = {
     type: "manifest";
@@ -2574,12 +2575,14 @@ declare global {
         __routerActionID: number;
     }
 }
-declare function createCallServer({ decode, encodeAction, }: {
+declare function createCallServer({ decode, encodeAction, fetch: fetchImplementation, }: {
     decode: DecodeServerResponseFunction;
     encodeAction: EncodeActionFunction;
+    fetch?: (request: Request) => Promise<Response>;
 }): (id: string, args: unknown[]) => Promise<unknown>;
-declare function RSCHydratedRouter({ decode, payload, routeDiscovery, }: {
+declare function RSCHydratedRouter({ decode, fetch: fetchImplementation, payload, routeDiscovery, }: {
     decode: DecodeServerResponseFunction;
+    fetch?: (request: Request) => Promise<Response>;
     payload: ServerPayload;
     routeDiscovery?: "eager" | "lazy";
 }): React.JSX.Element;

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8964,7 +8964,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-4303fcb98";
+    window.__reactRouterVersion = "0.0.0-experimental-d431f1b65";
   }
 } catch (e) {
 }
@@ -11781,19 +11781,22 @@ function RSCDefaultRootErrorBoundary({
 // lib/rsc/browser.tsx
 function createCallServer({
   decode: decode2,
-  encodeAction
+  encodeAction,
+  fetch: fetchImplementation = fetch
 }) {
   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
-      }
-    });
+    const response = await fetchImplementation(
+      new Request(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");
     }
@@ -11868,6 +11871,7 @@ function createCallServer({
   };
 }
 function createRouterFromPayload({
+  fetchImplementation,
   decode: decode2,
   payload
 }) {
@@ -11925,14 +11929,20 @@ function createRouterFromPayload({
       if (discoveredPaths2.has(path)) {
         return;
       }
-      await fetchAndApplyManifestPatches2([path], decode2, signal);
+      await fetchAndApplyManifestPatches2(
+        [path],
+        decode2,
+        fetchImplementation,
+        signal
+      );
     },
     // FIXME: Pass `build.ssr` and `build.basename` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
       () => window.__router,
       true,
       void 0,
-      decode2
+      decode2,
+      fetchImplementation
     )
   });
   if (window.__router.state.initialized) {
@@ -11950,7 +11960,7 @@ function createRouterFromPayload({
   return window.__router;
 }
 var renderedRoutesContext = unstable_createContext();
-function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
+function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2, fetchImplementation) {
   let dataStrategy = getSingleFetchDataStrategyImpl(
     getRouter,
     (match) => {
@@ -11965,7 +11975,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
       };
     },
     // pass map into fetchAndDecode so it can add payloads
-    getFetchAndDecodeViaRSC(decode2),
+    getFetchAndDecodeViaRSC(decode2, fetchImplementation),
     ssr,
     basename,
     // If the route has a component but we don't have an element, we need to hit
@@ -12002,7 +12012,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
     return results;
   });
 }
-function getFetchAndDecodeViaRSC(decode2) {
+function getFetchAndDecodeViaRSC(decode2, fetchImplementation) {
   return async (args, basename, targetRoutes) => {
     let { request, context } = args;
     let url = singleFetchUrl(request.url, basename, "rsc");
@@ -12012,7 +12022,9 @@ function getFetchAndDecodeViaRSC(decode2) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
-    let res = await fetch(url, await createRequestInit(request));
+    let res = await fetchImplementation(
+      new Request(url, await createRequestInit(request))
+    );
     if (res.status === 404 && !res.headers.has("X-Remix-Response")) {
       throw new ErrorResponseImpl(404, "Not Found", true);
     }
@@ -12055,14 +12067,18 @@ function getFetchAndDecodeViaRSC(decode2) {
 }
 function RSCHydratedRouter({
   decode: decode2,
+  fetch: fetchImplementation = fetch,
   payload,
   routeDiscovery = "eager"
 }) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
   let router = React15.useMemo(
-    () => createRouterFromPayload({ decode: decode2, payload }),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
+    () => createRouterFromPayload({
+      decode: decode2,
+      payload,
+      fetchImplementation
+    }),
+    [decode2, payload, fetchImplementation]
   );
   React15.useLayoutEffect(() => {
     if (!window.__routerInitialized) {
@@ -12107,7 +12123,7 @@ function RSCHydratedRouter({
         return;
       }
       try {
-        await fetchAndApplyManifestPatches2(paths, decode2);
+        await fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation);
       } catch (e) {
         console.error("Failed to fetch manifest patches", e);
       }
@@ -12121,7 +12137,7 @@ function RSCHydratedRouter({
       attributes: true,
       attributeFilter: ["data-discover", "href", "action"]
     });
-  }, [routeDiscovery, decode2]);
+  }, [routeDiscovery, decode2, fetchImplementation]);
   const frameworkContext = {
     future: {
       // These flags have no runtime impact so can always be false.  If we add
@@ -12242,7 +12258,7 @@ var nextPaths2 = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize2 = 1e3;
 var discoveredPaths2 = /* @__PURE__ */ new Set();
 var URL_LIMIT2 = 7680;
-async function fetchAndApplyManifestPatches2(paths, decode2, signal) {
+async function fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation, signal) {
   let basename = (window.__router.basename ?? "").replace(/^\/|\/$/g, "");
   let url = new URL(`${basename}/.manifest`, window.location.origin);
   paths.sort().forEach((path) => url.searchParams.append("p", path));
@@ -12250,7 +12266,7 @@ async function fetchAndApplyManifestPatches2(paths, decode2, signal) {
     nextPaths2.clear();
     return;
   }
-  let response = await fetch(url, { signal });
+  let response = await fetchImplementation(new Request(url, { signal }));
   if (!response.body || response.status < 200 || response.status >= 300) {
     throw new Error("Unable to fetch new route matches from the server");
   }

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -135,7 +135,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-3HEPIEBR.mjs";
+} from "./chunk-F37344ZN.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/internal.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/internal.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1801,6 +1801,7 @@ type ServerRenderPayload = {
     matches: ServerRouteMatch[];
     patches?: RenderedRoute[];
     nonce?: string;
+    formState?: unknown;
 };
 type ServerManifestPayload = {
     type: "manifest";
@@ -1826,9 +1827,11 @@ type ServerMatch = {
 };
 type DecodeCallServerFunction = (id: string, reply: FormData | string) => Promise<() => Promise<unknown>>;
 type DecodeFormActionFunction = (formData: FormData) => Promise<() => Promise<void>>;
-declare function matchRSCServerRequest({ decodeCallServer, decodeFormAction, onError, request, routes, generateResponse, }: {
+type DecodeFormStateFunction = (result: unknown, formData: FormData) => unknown;
+declare function matchRSCServerRequest({ decodeCallServer, decodeFormAction, decodeFormState, onError, request, routes, generateResponse, }: {
     decodeCallServer?: DecodeCallServerFunction;
     decodeFormAction?: DecodeFormActionFunction;
+    decodeFormState?: DecodeFormStateFunction;
     onError?: (error: unknown) => void;
     request: Request;
     routes: ServerRouteObject[];

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

@@ -1801,6 +1801,7 @@ type ServerRenderPayload = {
     matches: ServerRouteMatch[];
     patches?: RenderedRoute[];
     nonce?: string;
+    formState?: unknown;
 };
 type ServerManifestPayload = {
     type: "manifest";
@@ -1826,9 +1827,11 @@ type ServerMatch = {
 };
 type DecodeCallServerFunction = (id: string, reply: FormData | string) => Promise<() => Promise<unknown>>;
 type DecodeFormActionFunction = (formData: FormData) => Promise<() => Promise<void>>;
-declare function matchRSCServerRequest({ decodeCallServer, decodeFormAction, onError, request, routes, generateResponse, }: {
+type DecodeFormStateFunction = (result: unknown, formData: FormData) => unknown;
+declare function matchRSCServerRequest({ decodeCallServer, decodeFormAction, decodeFormState, onError, request, routes, generateResponse, }: {
     decodeCallServer?: DecodeCallServerFunction;
     decodeFormAction?: DecodeFormActionFunction;
+    decodeFormState?: DecodeFormStateFunction;
     onError?: (error: unknown) => void;
     request: Request;
     routes: ServerRouteObject[];

package/dist/development/rsc-export.js

@@ -25,7 +25,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 /**
- * react-router v0.0.0-experimental-4303fcb98
+ * react-router v0.0.0-experimental-d431f1b65
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2448,6 +2448,7 @@ function prependCookies(parentHeaders, childHeaders) {
 async function matchRSCServerRequest({
   decodeCallServer,
   decodeFormAction,
+  decodeFormState,
   onError,
   request,
   routes,
@@ -2494,6 +2495,7 @@ async function matchRSCServerRequest({
     isDataRequest,
     decodeCallServer,
     decodeFormAction,
+    decodeFormState,
     onError,
     generateResponse
   );
@@ -2534,7 +2536,7 @@ async function generateManifestResponse(routes, request, generateResponse) {
     payload
   });
 }
-async function processServerAction(request, decodeCallServer, decodeFormAction, onError) {
+async function processServerAction(request, decodeCallServer, decodeFormAction, decodeFormState, onError) {
   const getRevalidationRequest = () => new Request(request.url, {
     method: "GET",
     headers: request.headers,
@@ -2574,8 +2576,10 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         );
       }
       const action = await decodeFormAction(formData);
+      let formState = void 0;
       try {
-        await action();
+        const result = await action();
+        formState = decodeFormState?.(result, formData);
       } catch (error) {
         if (isResponse(error)) {
           return error;
@@ -2583,6 +2587,7 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         onError?.(error);
       }
       return {
+        formState,
         revalidationRequest: getRevalidationRequest()
       };
     }
@@ -2628,7 +2633,7 @@ async function generateResourceResponse(request, routes, routeId, onError) {
     headers
   });
 }
-async function generateRenderResponse(request, routes, isDataRequest, decodeCallServer, decodeFormAction, onError, generateResponse) {
+async function generateRenderResponse(request, routes, isDataRequest, decodeCallServer, decodeFormAction, decodeFormState, onError, generateResponse) {
   let statusCode = 200;
   let url = new URL(request.url);
   let isSubmission = isMutationMethod(request.method);
@@ -2644,17 +2649,20 @@ async function generateRenderResponse(request, routes, isDataRequest, decodeCall
     ...routeIdsToLoad ? { filterMatchesToLoad: (m) => routeIdsToLoad.includes(m.route.id) } : null,
     async unstable_stream(_, query) {
       let actionResult;
+      let formState;
       if (request.method === "POST") {
         let result2 = await processServerAction(
           request,
           decodeCallServer,
           decodeFormAction,
+          decodeFormState,
           onError
         );
         if (isResponse(result2)) {
           return generateRedirectResponse(statusCode, result2, generateResponse);
         }
         actionResult = result2?.actionResult;
+        formState = result2?.formState;
         request = result2?.revalidationRequest ?? request;
       }
       let staticContext = await query(request);
@@ -2673,6 +2681,7 @@ async function generateRenderResponse(request, routes, isDataRequest, decodeCall
         isDataRequest,
         isSubmission,
         actionResult,
+        formState,
         staticContext
       );
     }
@@ -2700,7 +2709,7 @@ function generateRedirectResponse(statusCode, response, generateResponse) {
     payload
   });
 }
-async function generateStaticContextResponse(routes, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, staticContext) {
+async function generateStaticContextResponse(routes, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext) {
   statusCode = staticContext.statusCode ?? statusCode;
   if (staticContext.errors) {
     staticContext.errors = Object.fromEntries(
@@ -2724,7 +2733,8 @@ async function generateStaticContextResponse(routes, generateResponse, statusCod
     actionData: staticContext.actionData,
     errors: staticContext.errors,
     loaderData: staticContext.loaderData,
-    location: staticContext.location
+    location: staticContext.location,
+    formState
   };
   const renderPayloadPromise = () => getRenderPayload(
     baseRenderPayload,