react-router 0.0.0-experimental-0fd8a0272 → 0.0.0-experimental-573acd4d4

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 # `react-router`
 
+## 7.5.1
+
+### Patch Changes
+
+- Fix single fetch bug where no revalidation request would be made when navigating upwards to a reused parent route ([#13253](https://github.com/remix-run/react-router/pull/13253))
+
+- When using the object-based `route.lazy` API, the `HydrateFallback` and `hydrateFallbackElement` properties are now skipped when lazy loading routes after hydration. ([#13376](https://github.com/remix-run/react-router/pull/13376))
+
+  If you move the code for these properties into a separate file, you can use this optimization to avoid downloading unused hydration code. For example:
+
+  ```ts
+  createBrowserRouter([
+    {
+      path: "/show/:showId",
+      lazy: {
+        loader: async () => (await import("./show.loader.js")).loader,
+        Component: async () => (await import("./show.component.js")).Component,
+        HydrateFallback: async () =>
+          (await import("./show.hydrate-fallback.js")).HydrateFallback,
+      },
+    },
+  ]);
+  ```
+
+- Properly revalidate prerendered paths when param values change ([#13380](https://github.com/remix-run/react-router/pull/13380))
+
+- UNSTABLE: Add a new `unstable_runClientMiddleware` argument to `dataStrategy` to enable middleware execution in custom `dataStrategy` implementations ([#13395](https://github.com/remix-run/react-router/pull/13395))
+
+- UNSTABLE: Add better error messaging when `getLoadContext` is not updated to return a `Map`" ([#13242](https://github.com/remix-run/react-router/pull/13242))
+
+- Do not automatically add `null` to `staticHandler.query()` `context.loaderData` if routes do not have loaders ([#13223](https://github.com/remix-run/react-router/pull/13223))
+
+  - This was a Remix v2 implementation detail inadvertently left in for React Router v7
+  - Now that we allow returning `undefined` from loaders, our prior check of `loaderData[routeId] !== undefined` was no longer sufficient and was changed to a `routeId in loaderData` check - these `null` values can cause issues for this new check
+  - ⚠️ This could be a "breaking bug fix" for you if you are doing manual SSR with `createStaticHandler()`/`<StaticRouterProvider>`, and using `context.loaderData` to control `<RouterProvider>` hydration behavior on the client
+
+- Fix prerendering when a loader returns a redirect ([#13365](https://github.com/remix-run/react-router/pull/13365))
+
+- UNSTABLE: Update context type for `LoaderFunctionArgs`/`ActionFunctionArgs` when middleware is enabled ([#13381](https://github.com/remix-run/react-router/pull/13381))
+
+- Add support for the new `unstable_shouldCallHandler`/`unstable_shouldRevalidateArgs` APIs in `dataStrategy` ([#13253](https://github.com/remix-run/react-router/pull/13253))
+
 ## 7.5.0
 
 ### Minor Changes

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -7982,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-0fd8a0272";
+    window.__reactRouterVersion = "0.0.0-experimental-573acd4d4";
   }
 } catch (e) {
 }
@@ -10672,16 +10672,12 @@ function deserializeErrors2(errors) {
 }
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, isSpaMode) {
+function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = matchRoutes(
-    routes,
-    window.location,
-    window.__reactRouterContext?.basename
-  );
+  let initialMatches = matchRoutes(routes, location2, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
@@ -10821,6 +10817,8 @@ function createRouterFromPayload({
           hasHydrateFallback: match.hydrateFallbackElement != null
         };
       },
+      payload.location,
+      void 0,
       false
     ),
     async patchRoutesOnNavigation({ patch, path, signal }) {
@@ -10855,9 +10853,9 @@ function createRouterFromPayload({
   } else {
     window.__routerInitialized = false;
   }
-  let lastLocationKey = window.__router.state.location.key;
-  window.__router.subscribe(({ location: location2 }) => {
-    if (location2.key !== lastLocationKey) {
+  let lastLoaderData = void 0;
+  window.__router.subscribe(({ loaderData, actionData }) => {
+    if (lastLoaderData !== loaderData) {
       window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
     }
   });
@@ -11100,7 +11098,7 @@ function injectRSCPayload(rscStream) {
   let timeout = null;
   function flushBufferedChunks(controller) {
     for (let chunk of buffered) {
-      let buf = decoder.decode(chunk);
+      let buf = decoder.decode(chunk, { stream: true });
       if (buf.endsWith(trailer)) {
         buf = buf.slice(0, -trailer.length);
       }

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -6129,16 +6129,12 @@ function deserializeErrors(errors) {
 }
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, isSpaMode) {
+function getHydrationData(state, routes, getRouteInfo, location, basename, isSpaMode) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = matchRoutes(
-    routes,
-    window.location,
-    window.__reactRouterContext?.basename
-  );
+  let initialMatches = matchRoutes(routes, location, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
@@ -6244,6 +6240,8 @@ function createHydratedRouter({
         hasLoader: ssrInfo.manifest.routes[routeId]?.hasLoader === true,
         hasHydrateFallback: ssrInfo.routeModules[routeId]?.HydrateFallback != null
       }),
+      window.location,
+      window.__reactRouterContext?.basename,
       ssrInfo.context.isSpaMode
     );
     if (hydrationData && hydrationData.errors) {

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-E7S3F3DO.mjs";
+} from "./chunk-6DVU7PCU.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
@@ -115,6 +115,8 @@ function createHydratedRouter({
         hasLoader: ssrInfo.manifest.routes[routeId]?.hasLoader === true,
         hasHydrateFallback: ssrInfo.routeModules[routeId]?.HydrateFallback != null
       }),
+      window.location,
+      window.__reactRouterContext?.basename,
       ssrInfo.context.isSpaMode
     );
     if (hydrationData && hydrationData.errors) {

package/dist/development/index.d.mts

@@ -845,7 +845,7 @@ declare function getHydrationData(state: {
     clientLoader: ClientLoaderFunction | undefined;
     hasLoader: boolean;
     hasHydrateFallback: boolean;
-}, isSpaMode: boolean): HydrationState;
+}, location: Path, basename: string | undefined, isSpaMode: boolean): HydrationState;
 
 declare function routeServerRequest(request: Request, requestServer: (request: Request) => Promise<Response>, decode: (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>, renderHTML: (payload: ServerPayload) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>): Promise<Response>;
 declare function ServerStaticRouter({ payload }: {

package/dist/development/index.d.ts

@@ -845,7 +845,7 @@ declare function getHydrationData(state: {
     clientLoader: ClientLoaderFunction | undefined;
     hasLoader: boolean;
     hasHydrateFallback: boolean;
-}, isSpaMode: boolean): HydrationState;
+}, location: Path, basename: string | undefined, isSpaMode: boolean): HydrationState;
 
 declare function routeServerRequest(request: Request, requestServer: (request: Request) => Promise<Response>, decode: (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>, renderHTML: (payload: ServerPayload) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>): Promise<Response>;
 declare function ServerStaticRouter({ payload }: {

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8139,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-0fd8a0272";
+    window.__reactRouterVersion = "0.0.0-experimental-573acd4d4";
   }
 } catch (e) {
 }
@@ -10829,16 +10829,12 @@ function deserializeErrors2(errors) {
 }
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, isSpaMode) {
+function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = matchRoutes(
-    routes,
-    window.location,
-    window.__reactRouterContext?.basename
-  );
+  let initialMatches = matchRoutes(routes, location2, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
@@ -10978,6 +10974,8 @@ function createRouterFromPayload({
           hasHydrateFallback: match.hydrateFallbackElement != null
         };
       },
+      payload.location,
+      void 0,
       false
     ),
     async patchRoutesOnNavigation({ patch, path, signal }) {
@@ -11012,9 +11010,9 @@ function createRouterFromPayload({
   } else {
     window.__routerInitialized = false;
   }
-  let lastLocationKey = window.__router.state.location.key;
-  window.__router.subscribe(({ location: location2 }) => {
-    if (location2.key !== lastLocationKey) {
+  let lastLoaderData = void 0;
+  window.__router.subscribe(({ loaderData, actionData }) => {
+    if (lastLoaderData !== loaderData) {
       window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
     }
   });
@@ -11257,7 +11255,7 @@ function injectRSCPayload(rscStream) {
   let timeout = null;
   function flushBufferedChunks(controller) {
     for (let chunk of buffered) {
-      let buf = decoder.decode(chunk);
+      let buf = decoder.decode(chunk, { stream: true });
       if (buf.endsWith(trailer)) {
         buf = buf.slice(0, -trailer.length);
       }

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -132,7 +132,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-E7S3F3DO.mjs";
+} from "./chunk-6DVU7PCU.mjs";
 export {
   Await,
   BrowserRouter,

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/server.d.mts

@@ -1526,12 +1526,14 @@ type ServerMatch = {
     payload: ServerPayload;
 };
 type DecodeCallServerFunction = (id: string, reply: FormData | string) => Promise<() => Promise<unknown>>;
-declare function matchServerRequest({ decodeCallServer, onError, request, routes, }: {
+type DecodeFormActionFunction = (formData: FormData) => Promise<() => Promise<void>>;
+declare function matchServerRequest({ decodeCallServer, decodeFormAction, onError, request, routes, }: {
     decodeCallServer?: DecodeCallServerFunction;
+    decodeFormAction?: DecodeFormActionFunction;
     onError?: (error: unknown) => void;
     request: Request;
     routes: ServerRouteObject[];
-}): Promise<ServerMatch | Response>;
+}): Promise<ServerMatch>;
 declare function isReactServerRequest(url: URL): boolean;
 
-export { type DecodeCallServerFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };
+export { type DecodeCallServerFunction, type DecodeFormActionFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };

package/dist/development/server.d.ts

@@ -1526,12 +1526,14 @@ type ServerMatch = {
     payload: ServerPayload;
 };
 type DecodeCallServerFunction = (id: string, reply: FormData | string) => Promise<() => Promise<unknown>>;
-declare function matchServerRequest({ decodeCallServer, onError, request, routes, }: {
+type DecodeFormActionFunction = (formData: FormData) => Promise<() => Promise<void>>;
+declare function matchServerRequest({ decodeCallServer, decodeFormAction, onError, request, routes, }: {
     decodeCallServer?: DecodeCallServerFunction;
+    decodeFormAction?: DecodeFormActionFunction;
     onError?: (error: unknown) => void;
     request: Request;
     routes: ServerRouteObject[];
-}): Promise<ServerMatch | Response>;
+}): Promise<ServerMatch>;
 declare function isReactServerRequest(url: URL): boolean;
 
-export { type DecodeCallServerFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };
+export { type DecodeCallServerFunction, type DecodeFormActionFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };

package/dist/development/server.js

@@ -23,7 +23,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2001,6 +2001,7 @@ function getTargetMatch(matches, location) {
 }
 async function matchServerRequest({
   decodeCallServer,
+  decodeFormAction,
   onError,
   request,
   routes
@@ -2011,9 +2012,6 @@ async function matchServerRequest({
       routes,
       url.pathname.replace(/\.manifest$/, "")
     );
-    if (!matches?.length) {
-      return new Response("Not found", { status: 404 });
-    }
     return {
       statusCode: 200,
       headers: new Headers({
@@ -2023,12 +2021,12 @@ async function matchServerRequest({
       payload: {
         type: "manifest",
         matches: await Promise.all(
-          matches.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id))
+          matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? []
         ),
         patches: await getAdditionalRoutePatches(
           url.pathname,
           routes,
-          matches.map((m) => m.route.id)
+          matches?.map((m) => m.route.id) ?? []
         )
       }
     };
@@ -2056,6 +2054,27 @@ async function matchServerRequest({
       signal: request.signal
     });
   }
+  if (request.method === "POST") {
+    const formData = await request.formData();
+    if (Array.from(formData.keys()).some((key) => key.startsWith("$ACTION_ID_"))) {
+      if (!decodeFormAction) {
+        throw new Error(
+          "Cannot handle form actions without a decodeFormAction function"
+        );
+      }
+      const action = await decodeFormAction(formData);
+      try {
+        await action();
+      } catch (error) {
+        onError?.(error);
+      }
+      request = new Request(request.url, {
+        method: "GET",
+        headers: request.headers,
+        signal: request.signal
+      });
+    }
+  }
   const getRenderPayload = async () => {
     const handler = createStaticHandler(routes);
     let isSubmission = isMutationMethod(request.method);
@@ -2188,9 +2207,6 @@ async function matchServerRequest({
       } : await getRenderPayload()
     };
   } catch (error) {
-    if (typeof error === "object" && error instanceof Response) {
-      return error;
-    }
     throw error;
   }
 }

package/dist/development/server.mjs

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1979,6 +1979,7 @@ function getTargetMatch(matches, location) {
 }
 async function matchServerRequest({
   decodeCallServer,
+  decodeFormAction,
   onError,
   request,
   routes
@@ -1989,9 +1990,6 @@ async function matchServerRequest({
       routes,
       url.pathname.replace(/\.manifest$/, "")
     );
-    if (!matches?.length) {
-      return new Response("Not found", { status: 404 });
-    }
     return {
       statusCode: 200,
       headers: new Headers({
@@ -2001,12 +1999,12 @@ async function matchServerRequest({
       payload: {
         type: "manifest",
         matches: await Promise.all(
-          matches.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id))
+          matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? []
         ),
         patches: await getAdditionalRoutePatches(
           url.pathname,
           routes,
-          matches.map((m) => m.route.id)
+          matches?.map((m) => m.route.id) ?? []
         )
       }
     };
@@ -2034,6 +2032,27 @@ async function matchServerRequest({
       signal: request.signal
     });
   }
+  if (request.method === "POST") {
+    const formData = await request.formData();
+    if (Array.from(formData.keys()).some((key) => key.startsWith("$ACTION_ID_"))) {
+      if (!decodeFormAction) {
+        throw new Error(
+          "Cannot handle form actions without a decodeFormAction function"
+        );
+      }
+      const action = await decodeFormAction(formData);
+      try {
+        await action();
+      } catch (error) {
+        onError?.(error);
+      }
+      request = new Request(request.url, {
+        method: "GET",
+        headers: request.headers,
+        signal: request.signal
+      });
+    }
+  }
   const getRenderPayload = async () => {
     const handler = createStaticHandler(routes);
     let isSubmission = isMutationMethod(request.method);
@@ -2166,9 +2185,6 @@ async function matchServerRequest({
       } : await getRenderPayload()
     };
   } catch (error) {
-    if (typeof error === "object" && error instanceof Response) {
-      return error;
-    }
     throw error;
   }
 }

package/dist/production/{chunk-OBBSTJVM.mjs → chunk-ZHQUHC3T.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -7982,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-0fd8a0272";
+    window.__reactRouterVersion = "0.0.0-experimental-573acd4d4";
   }
 } catch (e) {
 }
@@ -10672,16 +10672,12 @@ function deserializeErrors2(errors) {
 }
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, isSpaMode) {
+function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = matchRoutes(
-    routes,
-    window.location,
-    window.__reactRouterContext?.basename
-  );
+  let initialMatches = matchRoutes(routes, location2, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
@@ -10821,6 +10817,8 @@ function createRouterFromPayload({
           hasHydrateFallback: match.hydrateFallbackElement != null
         };
       },
+      payload.location,
+      void 0,
       false
     ),
     async patchRoutesOnNavigation({ patch, path, signal }) {
@@ -10855,9 +10853,9 @@ function createRouterFromPayload({
   } else {
     window.__routerInitialized = false;
   }
-  let lastLocationKey = window.__router.state.location.key;
-  window.__router.subscribe(({ location: location2 }) => {
-    if (location2.key !== lastLocationKey) {
+  let lastLoaderData = void 0;
+  window.__router.subscribe(({ loaderData, actionData }) => {
+    if (lastLoaderData !== loaderData) {
       window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
     }
   });
@@ -11100,7 +11098,7 @@ function injectRSCPayload(rscStream) {
   let timeout = null;
   function flushBufferedChunks(controller) {
     for (let chunk of buffered) {
-      let buf = decoder.decode(chunk);
+      let buf = decoder.decode(chunk, { stream: true });
       if (buf.endsWith(trailer)) {
         buf = buf.slice(0, -trailer.length);
       }

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -6129,16 +6129,12 @@ function deserializeErrors(errors) {
 }
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, isSpaMode) {
+function getHydrationData(state, routes, getRouteInfo, location, basename, isSpaMode) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = matchRoutes(
-    routes,
-    window.location,
-    window.__reactRouterContext?.basename
-  );
+  let initialMatches = matchRoutes(routes, location, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
@@ -6244,6 +6240,8 @@ function createHydratedRouter({
         hasLoader: ssrInfo.manifest.routes[routeId]?.hasLoader === true,
         hasHydrateFallback: ssrInfo.routeModules[routeId]?.HydrateFallback != null
       }),
+      window.location,
+      window.__reactRouterContext?.basename,
       ssrInfo.context.isSpaMode
     );
     if (hydrationData && hydrationData.errors) {

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-OBBSTJVM.mjs";
+} from "./chunk-ZHQUHC3T.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
@@ -115,6 +115,8 @@ function createHydratedRouter({
         hasLoader: ssrInfo.manifest.routes[routeId]?.hasLoader === true,
         hasHydrateFallback: ssrInfo.routeModules[routeId]?.HydrateFallback != null
       }),
+      window.location,
+      window.__reactRouterContext?.basename,
       ssrInfo.context.isSpaMode
     );
     if (hydrationData && hydrationData.errors) {

package/dist/production/index.d.mts

@@ -845,7 +845,7 @@ declare function getHydrationData(state: {
     clientLoader: ClientLoaderFunction | undefined;
     hasLoader: boolean;
     hasHydrateFallback: boolean;
-}, isSpaMode: boolean): HydrationState;
+}, location: Path, basename: string | undefined, isSpaMode: boolean): HydrationState;
 
 declare function routeServerRequest(request: Request, requestServer: (request: Request) => Promise<Response>, decode: (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>, renderHTML: (payload: ServerPayload) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>): Promise<Response>;
 declare function ServerStaticRouter({ payload }: {

package/dist/production/index.d.ts

@@ -845,7 +845,7 @@ declare function getHydrationData(state: {
     clientLoader: ClientLoaderFunction | undefined;
     hasLoader: boolean;
     hasHydrateFallback: boolean;
-}, isSpaMode: boolean): HydrationState;
+}, location: Path, basename: string | undefined, isSpaMode: boolean): HydrationState;
 
 declare function routeServerRequest(request: Request, requestServer: (request: Request) => Promise<Response>, decode: (body: ReadableStream<Uint8Array>) => Promise<ServerPayload>, renderHTML: (payload: ServerPayload) => ReadableStream<Uint8Array> | Promise<ReadableStream<Uint8Array>>): Promise<Response>;
 declare function ServerStaticRouter({ payload }: {

package/dist/production/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8139,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-0fd8a0272";
+    window.__reactRouterVersion = "0.0.0-experimental-573acd4d4";
   }
 } catch (e) {
 }
@@ -10829,16 +10829,12 @@ function deserializeErrors2(errors) {
 }
 
 // lib/dom/ssr/hydration.tsx
-function getHydrationData(state, routes, getRouteInfo, isSpaMode) {
+function getHydrationData(state, routes, getRouteInfo, location2, basename, isSpaMode) {
   let hydrationData = {
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = matchRoutes(
-    routes,
-    window.location,
-    window.__reactRouterContext?.basename
-  );
+  let initialMatches = matchRoutes(routes, location2, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
@@ -10978,6 +10974,8 @@ function createRouterFromPayload({
           hasHydrateFallback: match.hydrateFallbackElement != null
         };
       },
+      payload.location,
+      void 0,
       false
     ),
     async patchRoutesOnNavigation({ patch, path, signal }) {
@@ -11012,9 +11010,9 @@ function createRouterFromPayload({
   } else {
     window.__routerInitialized = false;
   }
-  let lastLocationKey = window.__router.state.location.key;
-  window.__router.subscribe(({ location: location2 }) => {
-    if (location2.key !== lastLocationKey) {
+  let lastLoaderData = void 0;
+  window.__router.subscribe(({ loaderData, actionData }) => {
+    if (lastLoaderData !== loaderData) {
       window.__routerActionID = (window.__routerActionID ?? (window.__routerActionID = 0)) + 1;
     }
   });
@@ -11257,7 +11255,7 @@ function injectRSCPayload(rscStream) {
   let timeout = null;
   function flushBufferedChunks(controller) {
     for (let chunk of buffered) {
-      let buf = decoder.decode(chunk);
+      let buf = decoder.decode(chunk, { stream: true });
       if (buf.endsWith(trailer)) {
         buf = buf.slice(0, -trailer.length);
       }

package/dist/production/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -132,7 +132,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-OBBSTJVM.mjs";
+} from "./chunk-ZHQUHC3T.mjs";
 export {
   Await,
   BrowserRouter,

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/server.d.mts

@@ -1526,12 +1526,14 @@ type ServerMatch = {
     payload: ServerPayload;
 };
 type DecodeCallServerFunction = (id: string, reply: FormData | string) => Promise<() => Promise<unknown>>;
-declare function matchServerRequest({ decodeCallServer, onError, request, routes, }: {
+type DecodeFormActionFunction = (formData: FormData) => Promise<() => Promise<void>>;
+declare function matchServerRequest({ decodeCallServer, decodeFormAction, onError, request, routes, }: {
     decodeCallServer?: DecodeCallServerFunction;
+    decodeFormAction?: DecodeFormActionFunction;
     onError?: (error: unknown) => void;
     request: Request;
     routes: ServerRouteObject[];
-}): Promise<ServerMatch | Response>;
+}): Promise<ServerMatch>;
 declare function isReactServerRequest(url: URL): boolean;
 
-export { type DecodeCallServerFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };
+export { type DecodeCallServerFunction, type DecodeFormActionFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };

package/dist/production/server.d.ts

@@ -1526,12 +1526,14 @@ type ServerMatch = {
     payload: ServerPayload;
 };
 type DecodeCallServerFunction = (id: string, reply: FormData | string) => Promise<() => Promise<unknown>>;
-declare function matchServerRequest({ decodeCallServer, onError, request, routes, }: {
+type DecodeFormActionFunction = (formData: FormData) => Promise<() => Promise<void>>;
+declare function matchServerRequest({ decodeCallServer, decodeFormAction, onError, request, routes, }: {
     decodeCallServer?: DecodeCallServerFunction;
+    decodeFormAction?: DecodeFormActionFunction;
     onError?: (error: unknown) => void;
     request: Request;
     routes: ServerRouteObject[];
-}): Promise<ServerMatch | Response>;
+}): Promise<ServerMatch>;
 declare function isReactServerRequest(url: URL): boolean;
 
-export { type DecodeCallServerFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };
+export { type DecodeCallServerFunction, type DecodeFormActionFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, createStaticHandler, data, isReactServerRequest, matchRoutes, matchServerRequest, redirect, redirectDocument, replace };

package/dist/production/server.js

@@ -23,7 +23,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2001,6 +2001,7 @@ function getTargetMatch(matches, location) {
 }
 async function matchServerRequest({
   decodeCallServer,
+  decodeFormAction,
   onError,
   request,
   routes
@@ -2011,9 +2012,6 @@ async function matchServerRequest({
       routes,
       url.pathname.replace(/\.manifest$/, "")
     );
-    if (!matches?.length) {
-      return new Response("Not found", { status: 404 });
-    }
     return {
       statusCode: 200,
       headers: new Headers({
@@ -2023,12 +2021,12 @@ async function matchServerRequest({
       payload: {
         type: "manifest",
         matches: await Promise.all(
-          matches.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id))
+          matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? []
         ),
         patches: await getAdditionalRoutePatches(
           url.pathname,
           routes,
-          matches.map((m) => m.route.id)
+          matches?.map((m) => m.route.id) ?? []
         )
       }
     };
@@ -2056,6 +2054,27 @@ async function matchServerRequest({
       signal: request.signal
     });
   }
+  if (request.method === "POST") {
+    const formData = await request.formData();
+    if (Array.from(formData.keys()).some((key) => key.startsWith("$ACTION_ID_"))) {
+      if (!decodeFormAction) {
+        throw new Error(
+          "Cannot handle form actions without a decodeFormAction function"
+        );
+      }
+      const action = await decodeFormAction(formData);
+      try {
+        await action();
+      } catch (error) {
+        onError?.(error);
+      }
+      request = new Request(request.url, {
+        method: "GET",
+        headers: request.headers,
+        signal: request.signal
+      });
+    }
+  }
   const getRenderPayload = async () => {
     const handler = createStaticHandler(routes);
     let isSubmission = isMutationMethod(request.method);
@@ -2188,9 +2207,6 @@ async function matchServerRequest({
       } : await getRenderPayload()
     };
   } catch (error) {
-    if (typeof error === "object" && error instanceof Response) {
-      return error;
-    }
     throw error;
   }
 }

package/dist/production/server.mjs

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
 /**
- * react-router v0.0.0-experimental-0fd8a0272
+ * react-router v0.0.0-experimental-573acd4d4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1979,6 +1979,7 @@ function getTargetMatch(matches, location) {
 }
 async function matchServerRequest({
   decodeCallServer,
+  decodeFormAction,
   onError,
   request,
   routes
@@ -1989,9 +1990,6 @@ async function matchServerRequest({
       routes,
       url.pathname.replace(/\.manifest$/, "")
     );
-    if (!matches?.length) {
-      return new Response("Not found", { status: 404 });
-    }
     return {
       statusCode: 200,
       headers: new Headers({
@@ -2001,12 +1999,12 @@ async function matchServerRequest({
       payload: {
         type: "manifest",
         matches: await Promise.all(
-          matches.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id))
+          matches?.map((m, i) => getRoute(m.route, matches[i - 1]?.route.id)) ?? []
         ),
         patches: await getAdditionalRoutePatches(
           url.pathname,
           routes,
-          matches.map((m) => m.route.id)
+          matches?.map((m) => m.route.id) ?? []
         )
       }
     };
@@ -2034,6 +2032,27 @@ async function matchServerRequest({
       signal: request.signal
     });
   }
+  if (request.method === "POST") {
+    const formData = await request.formData();
+    if (Array.from(formData.keys()).some((key) => key.startsWith("$ACTION_ID_"))) {
+      if (!decodeFormAction) {
+        throw new Error(
+          "Cannot handle form actions without a decodeFormAction function"
+        );
+      }
+      const action = await decodeFormAction(formData);
+      try {
+        await action();
+      } catch (error) {
+        onError?.(error);
+      }
+      request = new Request(request.url, {
+        method: "GET",
+        headers: request.headers,
+        signal: request.signal
+      });
+    }
+  }
   const getRenderPayload = async () => {
     const handler = createStaticHandler(routes);
     let isSubmission = isMutationMethod(request.method);
@@ -2166,9 +2185,6 @@ async function matchServerRequest({
       } : await getRenderPayload()
     };
   } catch (error) {
-    if (typeof error === "object" && error instanceof Response) {
-      return error;
-    }
     throw error;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "0.0.0-experimental-0fd8a0272",
+  "version": "0.0.0-experimental-573acd4d4",
   "description": "Declarative routing for React",
   "keywords": [
     "react",