react-router 0.0.0-experimental-d431f1b65 → 0.0.0-experimental-e5dac68cb

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

@@ -1,5 +1,6 @@
 import { aR as RouteManifest, aS as ServerRouteModule, h as MiddlewareEnabled, a9 as unstable_RouterContextProvider, i as AppLoadContext, Y as LoaderFunctionArgs, y as ActionFunctionArgs, b as RouteModules, S as StaticHandlerContext, H as HydrationState, k as DataRouteObject, l as ClientLoaderFunction, T as To, aq as NavigateOptions, s as BlockerFunction, B as Blocker, aT as SerializeFrom, r as RelativeRoutingType, L as Location, _ as ParamParseKey, m as Path, a2 as PathPattern, a0 as PathMatch, a7 as UIMatch, p as Navigation, aa as Action, $ as Params, a as Router$1, c as RouteObject, e as IndexRouteObject, X as LazyRouteFunction, N as NonIndexRouteObject, R as RouterInit, F as FutureConfig$1, I as InitialEntry, D as DataStrategyFunction, P as PatchRoutesOnNavigationFunction, ar as Navigator, at as RouteMatch, W as HTMLFormMethod, U as FormEncType, aB as PageLinkDescriptor, aU as History, n as GetScrollRestorationKeyFunction, o as Fetcher, au as ClientActionFunction, g as LinksFunction, M as MetaFunction, a5 as ShouldRevalidateFunction } from './route-data-C8_wxpLo.mjs';
 import * as React from 'react';
+import { AsyncLocalStorage } from 'node:async_hooks';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route$1 {
@@ -2134,6 +2135,12 @@ declare function useViewTransitionState(to: To, opts?: {
     relative?: RelativeRoutingType;
 }): boolean;
 
+type ServerContext = {
+    redirect?: Response;
+};
+declare global {
+    var ___reactRouterServerStorage___: AsyncLocalStorage<ServerContext> | undefined;
+}
 type RenderedRoute = {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
@@ -2185,6 +2192,7 @@ type ServerRedirectPayload = {
     location: string;
     replace: boolean;
     reload: boolean;
+    actionResult?: Promise<unknown>;
 };
 type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload | ServerRedirectPayload;
 

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-d431f1b65
+ * react-router v0.0.0-experimental-e5dac68cb
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4845,10 +4845,6 @@ var DataRouterContext = React.createContext(null);
 DataRouterContext.displayName = "DataRouter";
 var DataRouterStateContext = React.createContext(null);
 DataRouterStateContext.displayName = "DataRouterState";
-var RSCRouterContext = React.createContext(false);
-function useIsRSCRouterContext() {
-  return React.useContext(RSCRouterContext);
-}
 var ViewTransitionContext = React.createContext({
   isTransitioning: false
 });
@@ -5022,7 +5018,6 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     // router loaded. We can help them understand how to avoid that.
     `useRoutes() may be used only in the context of a <Router> component.`
   );
-  let isRSCRouterContext = useIsRSCRouterContext();
   let { navigator } = React2.useContext(NavigationContext);
   let { matches: parentMatches } = React2.useContext(RouteContext);
   let routeMatch = parentMatches[parentMatches.length - 1];
@@ -5088,8 +5083,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     ),
     parentMatches,
     dataRouterState,
-    future,
-    isRSCRouterContext
+    future
   );
   if (locationArg && renderedMatches) {
     return /* @__PURE__ */ React2.createElement(
@@ -5180,7 +5174,7 @@ function RenderedRoute({ routeContext, match, children }) {
   }
   return /* @__PURE__ */ React2.createElement(RouteContext.Provider, { value: routeContext }, children);
 }
-function _renderMatches(matches, parentMatches = [], dataRouterState = null, future = null, isRSCRouterContext = false) {
+function _renderMatches(matches, parentMatches = [], dataRouterState = null, future = null) {
   if (matches == null) {
     if (!dataRouterState) {
       return null;
@@ -5270,9 +5264,6 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
       } else {
         children = outlet;
       }
-      if (isRSCRouterContext) {
-        children = /* @__PURE__ */ React2.createElement(RedirectBoundary, null, children);
-      }
       return /* @__PURE__ */ React2.createElement(
         RenderedRoute,
         {
@@ -5299,19 +5290,6 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
     ) : getChildren();
   }, null);
 }
-var RedirectBoundary = class extends React2.Component {
-  // If the error is Symbol.for("react-router.redirect"), keep rendering children.
-  // If it's anything else, re-throw to bubble it up.
-  static getDerivedStateFromError(error) {
-    if (error === Symbol.for("react-router.redirect")) {
-      return null;
-    }
-    throw error;
-  }
-  render() {
-    return this.props.children;
-  }
-};
 function getDataRouterConsoleError(hookName) {
   return `${hookName} must be used within a data router.  See https://reactrouter.com/en/main/routers/picking-a-router.`;
 }
@@ -8804,7 +8782,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-d431f1b65";
+    window.__reactRouterVersion = "0.0.0-experimental-e5dac68cb";
   }
 } catch (e) {
 }
@@ -11646,20 +11624,10 @@ function createCallServer({
         window.location.href = payload.location;
         return;
       }
-      let reject;
-      const promise = new Promise((resolve, rejectFn) => {
-        reject = rejectFn;
-      });
-      const unsubscribe = window.__router.subscribe(({ navigation }) => {
-        if (navigation.state === "idle") {
-          unsubscribe();
-          reject(Symbol.for("react-router.redirect"));
-        }
-      });
       window.__router.navigate(payload.location, {
         replace: payload.replace
       });
-      return promise;
+      return payload.actionResult;
     }
     if (payload.type !== "action") {
       throw new Error("Unexpected payload type");
@@ -12000,7 +11968,7 @@ function RSCHydratedRouter({
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
     routeModules: {}
   };
-  return /* @__PURE__ */ React15.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React15.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React15.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React15.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
+  return /* @__PURE__ */ React15.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React15.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React15.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync })));
 }
 function createRouteFromServerManifest(match, payload) {
   let hasInitialData = payload && match.id in payload.loaderData;
@@ -12098,10 +12066,23 @@ var nextPaths2 = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize2 = 1e3;
 var discoveredPaths2 = /* @__PURE__ */ new Set();
 var URL_LIMIT2 = 7680;
-async function fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation, signal) {
+function getManifestUrl(paths) {
+  if (paths.length === 0) {
+    return null;
+  }
+  if (paths.length === 1) {
+    return new URL(`${paths[0]}.manifest`, window.location.origin);
+  }
   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));
+  return url;
+}
+async function fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation, signal) {
+  let url = getManifestUrl(paths);
+  if (url == null) {
+    return;
+  }
   if (url.toString().length > URL_LIMIT2) {
     nextPaths2.clear();
     return;
@@ -12363,7 +12344,7 @@ function RSCStaticRouter({
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
     routeModules: {}
   };
-  return /* @__PURE__ */ React16.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React16.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React16.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React16.createElement(
+  return /* @__PURE__ */ React16.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React16.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React16.createElement(
     StaticRouterProvider,
     {
       context,
@@ -12371,7 +12352,7 @@ function RSCStaticRouter({
       hydrate: false,
       nonce: payload.nonce
     }
-  ))));
+  )));
 }
 function isReactServerRequest(url) {
   return url.pathname.endsWith(".rsc");

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './browser-Dr0PjLWi.mjs';
+import { R as RouterProviderProps$1 } from './browser-Bh26Omrk.mjs';
 import { R as RouterInit } from './route-data-C8_wxpLo.mjs';
+import 'node:async_hooks';
 
 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-d431f1b65
+ * react-router v0.0.0-experimental-e5dac68cb
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/dom-export.mjs

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

package/dist/development/index.d.mts

@@ -1,13 +1,14 @@
 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-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 { 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-Bh26Omrk.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-Bh26Omrk.mjs';
 import * as React from 'react';
 import React__default, { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';
 export { ParseOptions as CookieParseOptions, SerializeOptions as CookieSerializeOptions } from 'cookie';
 import { P as Pages } from './register-DeIo2iHO.mjs';
 export { R as Register } from './register-DeIo2iHO.mjs';
+import 'node:async_hooks';
 
 declare const SingleFetchRedirectSymbol: unique symbol;
 declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, basename: string | undefined): DataStrategyFunction;

package/dist/development/index.d.ts

@@ -4,6 +4,7 @@ import * as React from 'react';
 import React__default, { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';
 export { ParseOptions as CookieParseOptions, SerializeOptions as CookieSerializeOptions } from 'cookie';
+import { AsyncLocalStorage } from 'node:async_hooks';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route$1 {
@@ -2512,6 +2513,12 @@ type ToArgs<Params extends Record<string, string | undefined>> = Equal<Params, {
  */
 declare function href<Path extends keyof Args>(path: Path, ...args: Args[Path]): string;
 
+type ServerContext = {
+    redirect?: Response;
+};
+declare global {
+    var ___reactRouterServerStorage___: AsyncLocalStorage<ServerContext> | undefined;
+}
 type RenderedRoute = {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
@@ -2563,6 +2570,7 @@ type ServerRedirectPayload = {
     location: string;
     replace: boolean;
     reload: boolean;
+    actionResult?: Promise<unknown>;
 };
 type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload | ServerRedirectPayload;
 

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-d431f1b65
+ * react-router v0.0.0-experimental-e5dac68cb
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5005,10 +5005,6 @@ var DataRouterContext = React.createContext(null);
 DataRouterContext.displayName = "DataRouter";
 var DataRouterStateContext = React.createContext(null);
 DataRouterStateContext.displayName = "DataRouterState";
-var RSCRouterContext = React.createContext(false);
-function useIsRSCRouterContext() {
-  return React.useContext(RSCRouterContext);
-}
 var ViewTransitionContext = React.createContext({
   isTransitioning: false
 });
@@ -5182,7 +5178,6 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     // router loaded. We can help them understand how to avoid that.
     `useRoutes() may be used only in the context of a <Router> component.`
   );
-  let isRSCRouterContext = useIsRSCRouterContext();
   let { navigator } = React2.useContext(NavigationContext);
   let { matches: parentMatches } = React2.useContext(RouteContext);
   let routeMatch = parentMatches[parentMatches.length - 1];
@@ -5248,8 +5243,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     ),
     parentMatches,
     dataRouterState,
-    future,
-    isRSCRouterContext
+    future
   );
   if (locationArg && renderedMatches) {
     return /* @__PURE__ */ React2.createElement(
@@ -5340,7 +5334,7 @@ function RenderedRoute({ routeContext, match, children }) {
   }
   return /* @__PURE__ */ React2.createElement(RouteContext.Provider, { value: routeContext }, children);
 }
-function _renderMatches(matches, parentMatches = [], dataRouterState = null, future = null, isRSCRouterContext = false) {
+function _renderMatches(matches, parentMatches = [], dataRouterState = null, future = null) {
   if (matches == null) {
     if (!dataRouterState) {
       return null;
@@ -5430,9 +5424,6 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
       } else {
         children = outlet;
       }
-      if (isRSCRouterContext) {
-        children = /* @__PURE__ */ React2.createElement(RedirectBoundary, null, children);
-      }
       return /* @__PURE__ */ React2.createElement(
         RenderedRoute,
         {
@@ -5459,19 +5450,6 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
     ) : getChildren();
   }, null);
 }
-var RedirectBoundary = class extends React2.Component {
-  // If the error is Symbol.for("react-router.redirect"), keep rendering children.
-  // If it's anything else, re-throw to bubble it up.
-  static getDerivedStateFromError(error) {
-    if (error === Symbol.for("react-router.redirect")) {
-      return null;
-    }
-    throw error;
-  }
-  render() {
-    return this.props.children;
-  }
-};
 function getDataRouterConsoleError(hookName) {
   return `${hookName} must be used within a data router.  See https://reactrouter.com/en/main/routers/picking-a-router.`;
 }
@@ -8964,7 +8942,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-d431f1b65";
+    window.__reactRouterVersion = "0.0.0-experimental-e5dac68cb";
   }
 } catch (e) {
 }
@@ -11806,20 +11784,10 @@ function createCallServer({
         window.location.href = payload.location;
         return;
       }
-      let reject;
-      const promise = new Promise((resolve, rejectFn) => {
-        reject = rejectFn;
-      });
-      const unsubscribe = window.__router.subscribe(({ navigation }) => {
-        if (navigation.state === "idle") {
-          unsubscribe();
-          reject(Symbol.for("react-router.redirect"));
-        }
-      });
       window.__router.navigate(payload.location, {
         replace: payload.replace
       });
-      return promise;
+      return payload.actionResult;
     }
     if (payload.type !== "action") {
       throw new Error("Unexpected payload type");
@@ -12160,7 +12128,7 @@ function RSCHydratedRouter({
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
     routeModules: {}
   };
-  return /* @__PURE__ */ React15.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React15.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React15.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React15.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
+  return /* @__PURE__ */ React15.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React15.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React15.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync })));
 }
 function createRouteFromServerManifest(match, payload) {
   let hasInitialData = payload && match.id in payload.loaderData;
@@ -12258,10 +12226,23 @@ var nextPaths2 = /* @__PURE__ */ new Set();
 var discoveredPathsMaxSize2 = 1e3;
 var discoveredPaths2 = /* @__PURE__ */ new Set();
 var URL_LIMIT2 = 7680;
-async function fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation, signal) {
+function getManifestUrl(paths) {
+  if (paths.length === 0) {
+    return null;
+  }
+  if (paths.length === 1) {
+    return new URL(`${paths[0]}.manifest`, window.location.origin);
+  }
   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));
+  return url;
+}
+async function fetchAndApplyManifestPatches2(paths, decode2, fetchImplementation, signal) {
+  let url = getManifestUrl(paths);
+  if (url == null) {
+    return;
+  }
   if (url.toString().length > URL_LIMIT2) {
     nextPaths2.clear();
     return;
@@ -12523,7 +12504,7 @@ function RSCStaticRouter({
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
     routeModules: {}
   };
-  return /* @__PURE__ */ React16.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React16.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React16.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React16.createElement(
+  return /* @__PURE__ */ React16.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React16.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React16.createElement(
     StaticRouterProvider,
     {
       context,
@@ -12531,7 +12512,7 @@ function RSCStaticRouter({
       hydrate: false,
       nonce: payload.nonce
     }
-  ))));
+  )));
 }
 function isReactServerRequest(url) {
   return url.pathname.endsWith(".rsc");

package/dist/development/index.mjs

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 import { ParseOptions, SerializeOptions } from 'cookie';
 export { ParseOptions as CookieParseOptions, SerializeOptions as CookieSerializeOptions } from 'cookie';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import * as React from 'react';
 
 /**
@@ -579,7 +580,7 @@ type RedirectFunction = (url: string, init?: number | ResponseInit) => Response;
  *
  * @category Utils
  */
-declare const redirect: RedirectFunction;
+declare const redirect$1: RedirectFunction;
 /**
  * A redirect response that will force a document reload to the new location.
  * Sets the status code and the `Location` header.
@@ -587,7 +588,7 @@ declare const redirect: RedirectFunction;
  *
  * @category Utils
  */
-declare const redirectDocument: RedirectFunction;
+declare const redirectDocument$1: RedirectFunction;
 /**
  * A redirect response that will perform a `history.replaceState` instead of a
  * `history.pushState` for client-side navigation redirects.
@@ -596,7 +597,7 @@ declare const redirectDocument: RedirectFunction;
  *
  * @category Utils
  */
-declare const replace: RedirectFunction;
+declare const replace$1: RedirectFunction;
 
 /**
  * A Router instance manages all navigation and data loading/mutations
@@ -1737,6 +1738,15 @@ type LdJsonValue = LdJsonPrimitive | LdJsonObject | LdJsonArray;
  */
 type RouteHandle = unknown;
 
+type ServerContext = {
+    redirect?: Response;
+};
+declare global {
+    var ___reactRouterServerStorage___: AsyncLocalStorage<ServerContext> | undefined;
+}
+declare const redirect: typeof redirect$1;
+declare const redirectDocument: typeof redirectDocument$1;
+declare const replace: typeof replace$1;
 type ServerRouteObjectBase = {
     action?: ActionFunction;
     clientAction?: ClientActionFunction;
@@ -1818,6 +1828,7 @@ type ServerRedirectPayload = {
     location: string;
     replace: boolean;
     reload: boolean;
+    actionResult?: Promise<unknown>;
 };
 type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload | ServerRedirectPayload;
 type ServerMatch = {

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

@@ -1,5 +1,6 @@
 import { ParseOptions, SerializeOptions } from 'cookie';
 export { ParseOptions as CookieParseOptions, SerializeOptions as CookieSerializeOptions } from 'cookie';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import * as React from 'react';
 
 /**
@@ -579,7 +580,7 @@ type RedirectFunction = (url: string, init?: number | ResponseInit) => Response;
  *
  * @category Utils
  */
-declare const redirect: RedirectFunction;
+declare const redirect$1: RedirectFunction;
 /**
  * A redirect response that will force a document reload to the new location.
  * Sets the status code and the `Location` header.
@@ -587,7 +588,7 @@ declare const redirect: RedirectFunction;
  *
  * @category Utils
  */
-declare const redirectDocument: RedirectFunction;
+declare const redirectDocument$1: RedirectFunction;
 /**
  * A redirect response that will perform a `history.replaceState` instead of a
  * `history.pushState` for client-side navigation redirects.
@@ -596,7 +597,7 @@ declare const redirectDocument: RedirectFunction;
  *
  * @category Utils
  */
-declare const replace: RedirectFunction;
+declare const replace$1: RedirectFunction;
 
 /**
  * A Router instance manages all navigation and data loading/mutations
@@ -1737,6 +1738,15 @@ type LdJsonValue = LdJsonPrimitive | LdJsonObject | LdJsonArray;
  */
 type RouteHandle = unknown;
 
+type ServerContext = {
+    redirect?: Response;
+};
+declare global {
+    var ___reactRouterServerStorage___: AsyncLocalStorage<ServerContext> | undefined;
+}
+declare const redirect: typeof redirect$1;
+declare const redirectDocument: typeof redirectDocument$1;
+declare const replace: typeof replace$1;
 type ServerRouteObjectBase = {
     action?: ActionFunction;
     clientAction?: ClientActionFunction;
@@ -1818,6 +1828,7 @@ type ServerRedirectPayload = {
     location: string;
     replace: boolean;
     reload: boolean;
+    actionResult?: Promise<unknown>;
 };
 type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload | ServerRedirectPayload;
 type ServerMatch = {