react-router 0.0.0-experimental-e0e92e3b1 → 0.0.0-experimental-0fd8a0272

package/dist/development/{browser-Cd-LzL5m.d.mts → browser-B_fyLsf9.d.mts}

@@ -1719,18 +1719,27 @@ type ServerRenderPayload = {
     loaderData: Record<string, any>;
     location: Location;
     matches: ServerRouteMatch[];
+    patches: RenderedRoute[];
     nonce?: string;
 };
 type ServerManifestPayload = {
     type: "manifest";
     matches: RenderedRoute[];
+    patches: RenderedRoute[];
 };
 type ServerActionPayload = {
     type: "action";
     actionResult: Promise<unknown>;
-    rerender?: Promise<ServerRenderPayload>;
+    rerender?: Promise<ServerRenderPayload | ServerRedirectPayload>;
 };
-type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload;
+type ServerRedirectPayload = {
+    type: "redirect";
+    status: number;
+    location: string;
+    replace: boolean;
+    reload: boolean;
+};
+type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload | ServerRedirectPayload;
 
 type DecodeServerResponseFunction = (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>;
 type EncodeActionFunction = (args: unknown[]) => Promise<BodyInit>;
@@ -1738,6 +1747,7 @@ declare global {
     interface Window {
         __router: Router$1;
         __routerInitialized: boolean;
+        __routerActionID: number;
     }
 }
 declare function createCallServer({ decode, encodeAction, }: {

package/dist/development/{browser-C3X761mx.d.ts → browser-Dpxu0wdb.d.ts}

@@ -1719,18 +1719,27 @@ type ServerRenderPayload = {
     loaderData: Record<string, any>;
     location: Location;
     matches: ServerRouteMatch[];
+    patches: RenderedRoute[];
     nonce?: string;
 };
 type ServerManifestPayload = {
     type: "manifest";
     matches: RenderedRoute[];
+    patches: RenderedRoute[];
 };
 type ServerActionPayload = {
     type: "action";
     actionResult: Promise<unknown>;
-    rerender?: Promise<ServerRenderPayload>;
+    rerender?: Promise<ServerRenderPayload | ServerRedirectPayload>;
 };
-type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload;
+type ServerRedirectPayload = {
+    type: "redirect";
+    status: number;
+    location: string;
+    replace: boolean;
+    reload: boolean;
+};
+type ServerPayload = ServerRenderPayload | ServerManifestPayload | ServerActionPayload | ServerRedirectPayload;
 
 type DecodeServerResponseFunction = (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>;
 type EncodeActionFunction = (args: unknown[]) => Promise<BodyInit>;
@@ -1738,6 +1747,7 @@ declare global {
     interface Window {
         __router: Router$1;
         __routerInitialized: boolean;
+        __routerActionID: number;
     }
 }
 declare function createCallServer({ decode, encodeAction, }: {

package/dist/development/{chunk-ZUOEVBB4.mjs → chunk-E7S3F3DO.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e0e92e3b1
+ * react-router v0.0.0-experimental-0fd8a0272
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2538,8 +2538,7 @@ function createRouter(init) {
         );
         return { active: true, matches: fogMatches || [] };
       } else {
-        let lastRoute = matches.slice(-1)[0];
-        if (Object.keys(matches[0].params).length > 0 || !lastRoute?.route.index && lastRoute?.route.path === "") {
+        if (Object.keys(matches[0].params).length > 0) {
           let partialMatches = matchRoutesImpl(
             routesToUse,
             pathname,
@@ -4038,7 +4037,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, match, laz
       return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
-      if (isUsingNewApi || shouldLoad || handlerOverride && request.method === "GET" && (match.route.lazy || match.route.loader)) {
+      if (isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) {
         return callLoaderOrAction({
           request,
           match,
@@ -6580,7 +6579,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
   );
   await Promise.all(routeDfds.map((d) => d.promise));
   if ((!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
-    singleFetchDfd.resolve({});
+    singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
     try {
@@ -6737,12 +6736,14 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
-  if ("error" in routeResult) {
+  if (!routeResult) {
+    return void 0;
+  } else if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
   } else {
-    throw new Error(`No response found for routeId "${routeId}"`);
+    throw new Error(`Invalid response found for routeId "${routeId}"`);
   }
 }
 function createDeferred2() {
@@ -7981,7 +7982,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-e0e92e3b1";
+    window.__reactRouterVersion = "0.0.0-experimental-0fd8a0272";
   }
 } catch (e) {
 }
@@ -10706,11 +10707,9 @@ function createCallServer({
   decode: decode2,
   encodeAction
 }) {
-  let actionCounter = 0;
   let landedActionId = 0;
   return async (id, args) => {
-    let actionId = ++actionCounter;
-    const locationKey = window.__router.state.loaderData;
+    let actionId = window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
     const response = await fetch(location.href, {
       body: await encodeAction(args),
       method: "POST",
@@ -10728,12 +10727,22 @@ function createCallServer({
     }
     if (payload.rerender) {
       (async () => {
-        const rendered = await payload.rerender;
-        if (!rendered) return;
-        if (actionId > landedActionId && locationKey === window.__router.state.loaderData) {
+        const rerender = await payload.rerender;
+        if (!rerender) return;
+        if (landedActionId < actionId && window.__routerActionID <= actionId) {
           landedActionId = actionId;
+          if (rerender.type === "redirect") {
+            if (rerender.reload) {
+              window.location.href = rerender.location;
+              return;
+            }
+            window.__router.navigate(rerender.location, {
+              replace: rerender.replace
+            });
+            return;
+          }
           let lastMatch;
-          for (const match of rendered.matches) {
+          for (const match of rerender.matches) {
             window.__router.patchRoutes(
               lastMatch?.id ?? null,
               [createRouteFromServerManifest(match)],
@@ -10741,17 +10750,18 @@ function createCallServer({
             );
             lastMatch = match;
           }
+          window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({});
           React14.startTransition(() => {
             window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
               loaderData: Object.assign(
                 {},
                 window.__router.state.loaderData,
-                rendered.loaderData
+                rerender.loaderData
               ),
-              errors: rendered.errors ? Object.assign(
+              errors: rerender.errors ? Object.assign(
                 {},
                 window.__router.state.errors,
-                rendered.errors
+                rerender.errors
               ) : null
             });
           });
@@ -10767,6 +10777,14 @@ 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) => {
+    invariant(patch.parentId, "Invalid patch parentId");
+    if (!patches.has(patch.parentId)) {
+      patches.set(patch.parentId, []);
+    }
+    patches.get(patch.parentId)?.push(patch);
+  });
   let routes = payload.matches.reduceRight((previous, match) => {
     const route = createRouteFromServerManifest(
       match,
@@ -10774,6 +10792,12 @@ function createRouterFromPayload({
     );
     if (previous.length > 0) {
       route.children = previous;
+      let childrenToPatch = patches.get(match.id);
+      if (childrenToPatch) {
+        route.children.push(
+          ...childrenToPatch.map((r) => createRouteFromServerManifest(r))
+        );
+      }
     }
     return [route];
   }, []);
@@ -10813,6 +10837,9 @@ function createRouterFromPayload({
           createRouteFromServerManifest(match)
         ])
       );
+      payload2.patches.forEach((p) => {
+        patch(p.parentId ?? null, [createRouteFromServerManifest(p)]);
+      });
     },
     // FIXME: Pass `build.ssr` and `build.basename` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
@@ -10828,6 +10855,12 @@ function createRouterFromPayload({
   } else {
     window.__routerInitialized = false;
   }
+  let lastLocationKey = window.__router.state.location.key;
+  window.__router.subscribe(({ location: location2 }) => {
+    if (location2.key !== lastLocationKey) {
+      window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
+    }
+  });
   return window.__router;
 }
 var renderedRoutesContext = unstable_createContext();
@@ -10886,6 +10919,20 @@ function getFetchAndDecodeViaRSC(decode2) {
     invariant(res.body, "No response body to decode");
     try {
       const payload = await decode2(res.body);
+      if (payload.type === "redirect") {
+        return {
+          status: res.status,
+          data: {
+            redirect: {
+              redirect: payload.location,
+              reload: false,
+              replace: payload.replace,
+              revalidate: false,
+              status: payload.status
+            }
+          }
+        };
+      }
       if (payload.type !== "render") {
         throw new Error("Unexpected payload type");
       }
@@ -10987,7 +11034,11 @@ function createRouteFromServerManifest(match, payload) {
       } finally {
         isHydrationRequest = false;
       }
-    } : match.hasLoader ? (_, singleFetch) => callSingleFetch(singleFetch) : void 0,
+    } : (
+      // We always make the call in this RSC world since even if we don't
+      // have a `loader` we may need to get the `element` implementation
+      (_, singleFetch) => callSingleFetch(singleFetch)
+    ),
     action: match.clientAction ? (args, singleFetch) => match.clientAction({
       ...args,
       serverAction: async () => {
@@ -11001,7 +11052,9 @@ function createRouteFromServerManifest(match, payload) {
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : void 0,
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
-    hasLoader: match.hasLoader,
+    // We always have a "loader" in this RSC world since even if we don't
+    // have a `loader` we may need to get the `element` implementation
+    hasLoader: true,
     hasClientLoader: match.clientLoader != null,
     hasAction: match.hasAction,
     hasClientAction: match.clientAction != null,
@@ -11153,6 +11206,14 @@ async function routeServerRequest(request, requestServer, decode2, renderHTML) {
     throw new Error("Failed to clone server response");
   }
   const payload = await decode2(serverResponse.body);
+  if (payload.type === "redirect") {
+    return new Response(null, {
+      status: payload.status,
+      headers: {
+        Location: payload.location
+      }
+    });
+  }
   const html = await renderHTML(payload);
   try {
     const body = html.pipeThrough(injectRSCPayload(serverResponseB.body));

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

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

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

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

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e0e92e3b1
+ * react-router v0.0.0-experimental-0fd8a0272
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2392,8 +2392,7 @@ function createRouter(init) {
         );
         return { active: true, matches: fogMatches || [] };
       } else {
-        let lastRoute = matches.slice(-1)[0];
-        if (Object.keys(matches[0].params).length > 0 || !lastRoute?.route.index && lastRoute?.route.path === "") {
+        if (Object.keys(matches[0].params).length > 0) {
           let partialMatches = matchRoutesImpl(
             routesToUse,
             pathname,
@@ -3284,7 +3283,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, match, laz
       return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
-      if (isUsingNewApi || shouldLoad || handlerOverride && request.method === "GET" && (match.route.lazy || match.route.loader)) {
+      if (isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) {
         return callLoaderOrAction({
           request,
           match,
@@ -5037,7 +5036,7 @@ async function singleFetchLoaderNavigationStrategy(args, router2, getRouteInfo,
   );
   await Promise.all(routeDfds.map((d) => d.promise));
   if ((!router2.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
-    singleFetchDfd.resolve({});
+    singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
     try {
@@ -5194,12 +5193,14 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
-  if ("error" in routeResult) {
+  if (!routeResult) {
+    return void 0;
+  } else if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
   } else {
-    throw new Error(`No response found for routeId "${routeId}"`);
+    throw new Error(`Invalid response found for routeId "${routeId}"`);
   }
 }
 function createDeferred2() {

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e0e92e3b1
+ * react-router v0.0.0-experimental-0fd8a0272
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-ZUOEVBB4.mjs";
+} from "./chunk-E7S3F3DO.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, c as RouteManifest, S as ServerRouteModule, M as MiddlewareEnabled, u as unstable_RouterContextProvider, L as LoaderFunctionArgs, A as ActionFunctionArgs, T as To, d as RelativeRoutingType, e as Location, f as Action, P as ParamParseKey, g as Path, h as PathPattern, i as PathMatch, N as NavigateOptions, j as Params$1, k as RouteObject, l as Navigation, m as RevalidationState, U as UIMatch, n as SerializeFrom, B as BlockerFunction, o as Blocker, p as StaticHandlerContext, q as StaticHandler, F as FutureConfig$1, C as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, r as unstable_InitialContext, s as IndexRouteObject, t as LoaderFunction, v as ActionFunction, w as MetaFunction, x as LinksFunction, y as NonIndexRouteObject, E as Equal, z as RouterState, G as DataRouteObject, J as ClientLoaderFunction } from './route-data-DX3MskAN.mjs';
 export { aw as ClientActionFunction, ax as ClientActionFunctionArgs, ay as ClientLoaderFunctionArgs, ar as DataRouteMatch, Z as DataStrategyFunctionArgs, _ as DataStrategyMatch, $ as DataStrategyResult, a1 as ErrorResponse, Q as Fetcher, a2 as FormEncType, a3 as FormMethod, aG as Future, K as GetScrollPositionFunction, O as GetScrollRestorationKeyFunction, a4 as HTMLFormMethod, az as HeadersArgs, aA as HeadersFunction, aE as HtmlLinkDescriptor, ah as IDLE_BLOCKER, ag as IDLE_FETCHER, af as IDLE_NAVIGATION, a5 as LazyRouteFunction, aF as LinkDescriptor, aB as MetaArgs, aC as MetaDescriptor, V as NavigationStates, as as Navigator, aD as PageLinkDescriptor, at as PatchRoutesOnNavigationFunction, au as PatchRoutesOnNavigationFunctionArgs, a7 as PathParam, a8 as RedirectFunction, av as RouteMatch, Y as RouterFetchOptions, R as RouterInit, X as RouterNavigateOptions, W as RouterSubscriber, aa as ShouldRevalidateFunction, ab as ShouldRevalidateFunctionArgs, aM as UNSAFE_DataRouterContext, aN as UNSAFE_DataRouterStateContext, a0 as UNSAFE_DataWithResponseInit, aL as UNSAFE_ErrorResponseImpl, aO as UNSAFE_FetchersContext, aP as UNSAFE_LocationContext, aQ as UNSAFE_NavigationContext, aR as UNSAFE_RouteContext, aS as UNSAFE_ViewTransitionContext, aI as UNSAFE_createBrowserHistory, aK as UNSAFE_createRouter, aJ as UNSAFE_invariant, ad as createPath, ai as data, aj as generatePath, ak as isRouteErrorResponse, al as matchPath, am as matchRoutes, ae as parsePath, an as redirect, ao as redirectDocument, ap as replace, aq as resolvePath, a6 as unstable_MiddlewareFunction, a9 as unstable_RouterContext, aH as unstable_SerializesTo, ac as unstable_createContext } from './route-data-DX3MskAN.mjs';
-import { A as AssetsManifest, a as Route, F as FutureConfig, E as EntryContext, C as CriticalCss, S as ServerPayload } from './browser-Cd-LzL5m.mjs';
-export { g as Await, b as AwaitProps, U as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, as as DecodeServerResponseFunction, at as EncodeActionFunction, w as FetcherFormProps, J as FetcherSubmitFunction, a8 as FetcherSubmitOptions, K as FetcherWithComponents, Z as Form, x as FormProps, V as HashRouter, H as HashRouterProps, s as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, W as Link, t as LinkProps, af as Links, h as MemoryRouter, M as MemoryRouterOpts, c as MemoryRouterProps, ae as Meta, Y as NavLink, u as NavLinkProps, v as NavLinkRenderProps, i as Navigate, N as NavigateProps, j as Outlet, O as OutletProps, a9 as ParamKeyValuePair, P as PathRouteProps, ah as PrefetchPageLinks, k as Route, d as RouteProps, l as Router, e as RouterProps, m as RouterProvider, R as RouterProviderProps, n as Routes, f as RoutesProps, ag as Scripts, ai as ScriptsProps, _ as ScrollRestoration, y as ScrollRestorationProps, av as ServerBrowserRouter, z as SetURLSearchParams, G as SubmitFunction, aa as SubmitOptions, ac as SubmitTarget, al as UNSAFE_FrameworkContext, ao as UNSAFE_createClientRoutes, ap as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, am as UNSAFE_getPatchRoutesOnNavigationFunction, aj as UNSAFE_hydrationRouteProperties, ak as UNSAFE_mapRouteProperties, aq as UNSAFE_shouldHydrateRouteLoader, an as UNSAFE_useFogOFWarDiscovery, ar as UNSAFE_useScrollRestoration, ab as URLSearchParamsInit, Q as createBrowserRouter, au as createCallServer, T as createHashRouter, o as createMemoryRouter, p as createRoutesFromChildren, q as createRoutesFromElements, ad as createSearchParams, aw as getServerStream, r as renderMatches, X as unstable_HistoryRouter, a6 as unstable_usePrompt, a5 as useBeforeUnload, a3 as useFetcher, a4 as useFetchers, a2 as useFormAction, $ as useLinkClickHandler, a0 as useSearchParams, a1 as useSubmit, a7 as useViewTransitionState } from './browser-Cd-LzL5m.mjs';
+import { A as AssetsManifest, a as Route, F as FutureConfig, E as EntryContext, C as CriticalCss, S as ServerPayload } from './browser-B_fyLsf9.mjs';
+export { g as Await, b as AwaitProps, U as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, as as DecodeServerResponseFunction, at as EncodeActionFunction, w as FetcherFormProps, J as FetcherSubmitFunction, a8 as FetcherSubmitOptions, K as FetcherWithComponents, Z as Form, x as FormProps, V as HashRouter, H as HashRouterProps, s as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, W as Link, t as LinkProps, af as Links, h as MemoryRouter, M as MemoryRouterOpts, c as MemoryRouterProps, ae as Meta, Y as NavLink, u as NavLinkProps, v as NavLinkRenderProps, i as Navigate, N as NavigateProps, j as Outlet, O as OutletProps, a9 as ParamKeyValuePair, P as PathRouteProps, ah as PrefetchPageLinks, k as Route, d as RouteProps, l as Router, e as RouterProps, m as RouterProvider, R as RouterProviderProps, n as Routes, f as RoutesProps, ag as Scripts, ai as ScriptsProps, _ as ScrollRestoration, y as ScrollRestorationProps, av as ServerBrowserRouter, z as SetURLSearchParams, G as SubmitFunction, aa as SubmitOptions, ac as SubmitTarget, al as UNSAFE_FrameworkContext, ao as UNSAFE_createClientRoutes, ap as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, am as UNSAFE_getPatchRoutesOnNavigationFunction, aj as UNSAFE_hydrationRouteProperties, ak as UNSAFE_mapRouteProperties, aq as UNSAFE_shouldHydrateRouteLoader, an as UNSAFE_useFogOFWarDiscovery, ar as UNSAFE_useScrollRestoration, ab as URLSearchParamsInit, Q as createBrowserRouter, au as createCallServer, T as createHashRouter, o as createMemoryRouter, p as createRoutesFromChildren, q as createRoutesFromElements, ad as createSearchParams, aw as getServerStream, r as renderMatches, X as unstable_HistoryRouter, a6 as unstable_usePrompt, a5 as useBeforeUnload, a3 as useFetcher, a4 as useFetchers, a2 as useFormAction, $ as useLinkClickHandler, a0 as useSearchParams, a1 as useSubmit, a7 as useViewTransitionState } from './browser-B_fyLsf9.mjs';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';

package/dist/development/index.d.ts

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

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e0e92e3b1
+ * react-router v0.0.0-experimental-0fd8a0272
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2695,8 +2695,7 @@ function createRouter(init) {
         );
         return { active: true, matches: fogMatches || [] };
       } else {
-        let lastRoute = matches.slice(-1)[0];
-        if (Object.keys(matches[0].params).length > 0 || !lastRoute?.route.index && lastRoute?.route.path === "") {
+        if (Object.keys(matches[0].params).length > 0) {
           let partialMatches = matchRoutesImpl(
             routesToUse,
             pathname,
@@ -4195,7 +4194,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, match, laz
       return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
-      if (isUsingNewApi || shouldLoad || handlerOverride && request.method === "GET" && (match.route.lazy || match.route.loader)) {
+      if (isUsingNewApi || shouldLoad || handlerOverride && !isMutationMethod(request.method) && (match.route.lazy || match.route.loader)) {
         return callLoaderOrAction({
           request,
           match,
@@ -6737,7 +6736,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
   );
   await Promise.all(routeDfds.map((d) => d.promise));
   if ((!router.state.initialized || routesParams.size === 0) && !window.__reactRouterHdrActive) {
-    singleFetchDfd.resolve({});
+    singleFetchDfd.resolve({ routes: {} });
   } else {
     let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
     try {
@@ -6894,12 +6893,14 @@ function unwrapSingleFetchResult(result, routeId) {
     });
   }
   let routeResult = result.routes[routeId];
-  if ("error" in routeResult) {
+  if (!routeResult) {
+    return void 0;
+  } else if ("error" in routeResult) {
     throw routeResult.error;
   } else if ("data" in routeResult) {
     return routeResult.data;
   } else {
-    throw new Error(`No response found for routeId "${routeId}"`);
+    throw new Error(`Invalid response found for routeId "${routeId}"`);
   }
 }
 function createDeferred2() {
@@ -8138,7 +8139,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-e0e92e3b1";
+    window.__reactRouterVersion = "0.0.0-experimental-0fd8a0272";
   }
 } catch (e) {
 }
@@ -10863,11 +10864,9 @@ function createCallServer({
   decode: decode2,
   encodeAction
 }) {
-  let actionCounter = 0;
   let landedActionId = 0;
   return async (id, args) => {
-    let actionId = ++actionCounter;
-    const locationKey = window.__router.state.loaderData;
+    let actionId = window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
     const response = await fetch(location.href, {
       body: await encodeAction(args),
       method: "POST",
@@ -10885,12 +10884,22 @@ function createCallServer({
     }
     if (payload.rerender) {
       (async () => {
-        const rendered = await payload.rerender;
-        if (!rendered) return;
-        if (actionId > landedActionId && locationKey === window.__router.state.loaderData) {
+        const rerender = await payload.rerender;
+        if (!rerender) return;
+        if (landedActionId < actionId && window.__routerActionID <= actionId) {
           landedActionId = actionId;
+          if (rerender.type === "redirect") {
+            if (rerender.reload) {
+              window.location.href = rerender.location;
+              return;
+            }
+            window.__router.navigate(rerender.location, {
+              replace: rerender.replace
+            });
+            return;
+          }
           let lastMatch;
-          for (const match of rendered.matches) {
+          for (const match of rerender.matches) {
             window.__router.patchRoutes(
               lastMatch?.id ?? null,
               [createRouteFromServerManifest(match)],
@@ -10898,17 +10907,18 @@ function createCallServer({
             );
             lastMatch = match;
           }
+          window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({});
           React14.startTransition(() => {
             window.__router._internalSetStateDoNotUseOrYouWillBreakYourApp({
               loaderData: Object.assign(
                 {},
                 window.__router.state.loaderData,
-                rendered.loaderData
+                rerender.loaderData
               ),
-              errors: rendered.errors ? Object.assign(
+              errors: rerender.errors ? Object.assign(
                 {},
                 window.__router.state.errors,
-                rendered.errors
+                rerender.errors
               ) : null
             });
           });
@@ -10924,6 +10934,14 @@ 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) => {
+    invariant(patch.parentId, "Invalid patch parentId");
+    if (!patches.has(patch.parentId)) {
+      patches.set(patch.parentId, []);
+    }
+    patches.get(patch.parentId)?.push(patch);
+  });
   let routes = payload.matches.reduceRight((previous, match) => {
     const route = createRouteFromServerManifest(
       match,
@@ -10931,6 +10949,12 @@ function createRouterFromPayload({
     );
     if (previous.length > 0) {
       route.children = previous;
+      let childrenToPatch = patches.get(match.id);
+      if (childrenToPatch) {
+        route.children.push(
+          ...childrenToPatch.map((r) => createRouteFromServerManifest(r))
+        );
+      }
     }
     return [route];
   }, []);
@@ -10970,6 +10994,9 @@ function createRouterFromPayload({
           createRouteFromServerManifest(match)
         ])
       );
+      payload2.patches.forEach((p) => {
+        patch(p.parentId ?? null, [createRouteFromServerManifest(p)]);
+      });
     },
     // FIXME: Pass `build.ssr` and `build.basename` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
@@ -10985,6 +11012,12 @@ function createRouterFromPayload({
   } else {
     window.__routerInitialized = false;
   }
+  let lastLocationKey = window.__router.state.location.key;
+  window.__router.subscribe(({ location: location2 }) => {
+    if (location2.key !== lastLocationKey) {
+      window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
+    }
+  });
   return window.__router;
 }
 var renderedRoutesContext = unstable_createContext();
@@ -11043,6 +11076,20 @@ function getFetchAndDecodeViaRSC(decode2) {
     invariant(res.body, "No response body to decode");
     try {
       const payload = await decode2(res.body);
+      if (payload.type === "redirect") {
+        return {
+          status: res.status,
+          data: {
+            redirect: {
+              redirect: payload.location,
+              reload: false,
+              replace: payload.replace,
+              revalidate: false,
+              status: payload.status
+            }
+          }
+        };
+      }
       if (payload.type !== "render") {
         throw new Error("Unexpected payload type");
       }
@@ -11144,7 +11191,11 @@ function createRouteFromServerManifest(match, payload) {
       } finally {
         isHydrationRequest = false;
       }
-    } : match.hasLoader ? (_, singleFetch) => callSingleFetch(singleFetch) : void 0,
+    } : (
+      // We always make the call in this RSC world since even if we don't
+      // have a `loader` we may need to get the `element` implementation
+      (_, singleFetch) => callSingleFetch(singleFetch)
+    ),
     action: match.clientAction ? (args, singleFetch) => match.clientAction({
       ...args,
       serverAction: async () => {
@@ -11158,7 +11209,9 @@ function createRouteFromServerManifest(match, payload) {
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : void 0,
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
-    hasLoader: match.hasLoader,
+    // We always have a "loader" in this RSC world since even if we don't
+    // have a `loader` we may need to get the `element` implementation
+    hasLoader: true,
     hasClientLoader: match.clientLoader != null,
     hasAction: match.hasAction,
     hasClientAction: match.clientAction != null,
@@ -11310,6 +11363,14 @@ async function routeServerRequest(request, requestServer, decode2, renderHTML) {
     throw new Error("Failed to clone server response");
   }
   const payload = await decode2(serverResponse.body);
+  if (payload.type === "redirect") {
+    return new Response(null, {
+      status: payload.status,
+      headers: {
+        Location: payload.location
+      }
+    });
+  }
   const html = await renderHTML(payload);
   try {
     const body = html.pipeThrough(injectRSCPayload(serverResponseB.body));