react-router 7.9.1 → 7.9.2-pre.1

package/dist/{production/chunk-RCAZODXZ.mjs → development/chunk-ITFVGECV.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.1
+ * react-router v7.9.2-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -22,6 +22,7 @@ import {
   SingleFetchRedirectSymbol,
   StaticRouterProvider,
   StreamTransfer,
+  UNSTABLE_TransitionEnabledRouterProvider,
   convertRoutesToDataRoutes,
   createBrowserHistory,
   createContext,
@@ -59,7 +60,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-P25HWPOZ.mjs";
+} from "./chunk-I4PRIPRX.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -192,6 +193,12 @@ function processRoutes(routes, context, manifest, routeModules, parentId) {
       ErrorBoundary: route.ErrorBoundary ? withErrorBoundaryProps(route.ErrorBoundary) : void 0,
       action: route.action ? (args) => route.action({ ...args, context }) : void 0,
       loader: route.loader ? (args) => route.loader({ ...args, context }) : void 0,
+      middleware: route.middleware ? route.middleware.map(
+        (mw) => (...args) => mw(
+          { ...args[0], context },
+          args[1]
+        )
+      ) : void 0,
       handle: route.handle,
       shouldRevalidate: route.shouldRevalidate
     };
@@ -1234,9 +1241,11 @@ async function handleManifestRequest(build, routes, url) {
     });
   }
   let patches = {};
-  if (url.searchParams.has("p")) {
+  if (url.searchParams.has("paths")) {
     let paths = /* @__PURE__ */ new Set();
-    url.searchParams.getAll("p").forEach((path) => {
+    let pathParam = url.searchParams.get("paths") || "";
+    let requestedPaths = pathParam.split(",").filter(Boolean);
+    requestedPaths.forEach((path) => {
       if (!path.startsWith("/")) {
         path = `/${path}`;
       }
@@ -1848,7 +1857,7 @@ function createCallServer({
   return async (id, args) => {
     let actionId = globalVar.__routerActionID = (globalVar.__routerActionID ?? (globalVar.__routerActionID = 0)) + 1;
     const temporaryReferences = createTemporaryReferenceSet();
-    const response = await fetchImplementation(
+    const payloadPromise = fetchImplementation(
       new Request(location.href, {
         body: await encodeReply(args, { temporaryReferences }),
         method: "POST",
@@ -1857,44 +1866,45 @@ function createCallServer({
           "rsc-action-id": id
         }
       })
-    );
-    if (!response.body) {
-      throw new Error("No response body");
-    }
-    const payload = await createFromReadableStream(response.body, {
-      temporaryReferences
-    });
-    if (payload.type === "redirect") {
-      if (payload.reload) {
-        window.location.href = payload.location;
-        return;
+    ).then((response) => {
+      if (!response.body) {
+        throw new Error("No response body");
       }
-      globalVar.__reactRouterDataRouter.navigate(payload.location, {
-        replace: payload.replace
+      return createFromReadableStream(response.body, {
+        temporaryReferences
       });
-      return payload.actionResult;
-    }
-    if (payload.type !== "action") {
-      throw new Error("Unexpected payload type");
-    }
-    if (payload.rerender) {
-      React4.startTransition(
-        // @ts-expect-error - We have old react types that don't know this can be async
-        async () => {
-          const rerender = await payload.rerender;
-          if (!rerender) return;
-          if (landedActionId < actionId && globalVar.__routerActionID <= actionId) {
-            landedActionId = actionId;
-            if (rerender.type === "redirect") {
-              if (rerender.reload) {
-                window.location.href = rerender.location;
-                return;
-              }
+    });
+    globalVar.__reactRouterDataRouter.__setPendingRerender(
+      Promise.resolve(payloadPromise).then(async (payload) => {
+        if (payload.type === "redirect") {
+          if (payload.reload) {
+            window.location.href = payload.location;
+            return () => {
+            };
+          }
+          return () => {
+            globalVar.__reactRouterDataRouter.navigate(payload.location, {
+              replace: payload.replace
+            });
+          };
+        }
+        if (payload.type !== "action") {
+          throw new Error("Unexpected payload type");
+        }
+        const rerender = await payload.rerender;
+        if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
+          if (rerender.type === "redirect") {
+            if (rerender.reload) {
+              window.location.href = rerender.location;
+              return;
+            }
+            return () => {
               globalVar.__reactRouterDataRouter.navigate(rerender.location, {
                 replace: rerender.replace
               });
-              return;
-            }
+            };
+          }
+          return () => {
             let lastMatch;
             for (const match of rerender.matches) {
               globalVar.__reactRouterDataRouter.patchRoutes(
@@ -1905,29 +1915,32 @@ function createCallServer({
               lastMatch = match;
             }
             window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
-              {}
+              {
+                loaderData: Object.assign(
+                  {},
+                  globalVar.__reactRouterDataRouter.state.loaderData,
+                  rerender.loaderData
+                ),
+                errors: rerender.errors ? Object.assign(
+                  {},
+                  globalVar.__reactRouterDataRouter.state.errors,
+                  rerender.errors
+                ) : null
+              }
             );
-            React4.startTransition(() => {
-              window.__reactRouterDataRouter._internalSetStateDoNotUseOrYouWillBreakYourApp(
-                {
-                  loaderData: Object.assign(
-                    {},
-                    globalVar.__reactRouterDataRouter.state.loaderData,
-                    rerender.loaderData
-                  ),
-                  errors: rerender.errors ? Object.assign(
-                    {},
-                    globalVar.__reactRouterDataRouter.state.errors,
-                    rerender.errors
-                  ) : null
-                }
-              );
-            });
-          }
+          };
         }
-      );
-    }
-    return payload.actionResult;
+        return () => {
+        };
+      }).catch(() => {
+      })
+    );
+    return payloadPromise.then((payload) => {
+      if (payload.type !== "action" && payload.type !== "redirect") {
+        throw new Error("Unexpected payload type");
+      }
+      return payload.actionResult;
+    });
   };
 }
 function createRouterFromPayload({
@@ -2294,7 +2307,7 @@ function RSCHydratedRouter({
     routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
     routeModules
   };
-  return /* @__PURE__ */ React4.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(RouterProvider, { router, flushSync: ReactDOM.flushSync }))));
+  return /* @__PURE__ */ React4.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: location2 }, /* @__PURE__ */ React4.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(UNSTABLE_TransitionEnabledRouterProvider, { router, flushSync: ReactDOM.flushSync }))));
 }
 function createRouteFromServerManifest(match, payload) {
   let hasInitialData = payload && match.id in payload.loaderData;
@@ -2407,7 +2420,7 @@ function getManifestUrl(paths) {
     ""
   );
   let url = new URL(`${basename}/.manifest`, window.location.origin);
-  paths.sort().forEach((path) => url.searchParams.append("p", path));
+  url.searchParams.set("paths", paths.sort().join(","));
   return url;
 }
 async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
@@ -2601,8 +2614,28 @@ async function routeRSCServerRequest({
       }
     });
   };
-  const getPayload = async () => {
-    return createFromReadableStream(createStream());
+  let deepestRenderedBoundaryId = null;
+  const getPayload = () => {
+    const payloadPromise = Promise.resolve(
+      createFromReadableStream(createStream())
+    );
+    return Object.defineProperties(payloadPromise, {
+      _deepestRenderedBoundaryId: {
+        get() {
+          return deepestRenderedBoundaryId;
+        },
+        set(boundaryId) {
+          deepestRenderedBoundaryId = boundaryId;
+        }
+      },
+      formState: {
+        get() {
+          return payloadPromise.then(
+            (payload) => payload.type === "render" ? payload.formState : void 0
+          );
+        }
+      }
+    });
   };
   try {
     if (!detectRedirectResponse.body) {
@@ -2626,7 +2659,7 @@ async function routeRSCServerRequest({
     }
     const html = await renderHTML(getPayload);
     const headers = new Headers(serverResponse.headers);
-    headers.set("Content-Type", "text/html");
+    headers.set("Content-Type", "text/html; charset=utf-8");
     if (!hydrate) {
       return new Response(html, {
         status: serverResponse.status,
@@ -2645,11 +2678,62 @@ async function routeRSCServerRequest({
     if (reason instanceof Response) {
       return reason;
     }
+    try {
+      const status = isRouteErrorResponse(reason) ? reason.status : 500;
+      const html = await renderHTML(() => {
+        const decoded = Promise.resolve(
+          createFromReadableStream(createStream())
+        );
+        const payloadPromise = decoded.then(
+          (payload) => Object.assign(payload, {
+            status,
+            errors: deepestRenderedBoundaryId ? {
+              [deepestRenderedBoundaryId]: reason
+            } : {}
+          })
+        );
+        return Object.defineProperties(payloadPromise, {
+          _deepestRenderedBoundaryId: {
+            get() {
+              return deepestRenderedBoundaryId;
+            },
+            set(boundaryId) {
+              deepestRenderedBoundaryId = boundaryId;
+            }
+          },
+          formState: {
+            get() {
+              return payloadPromise.then(
+                (payload) => payload.type === "render" ? payload.formState : void 0
+              );
+            }
+          }
+        });
+      });
+      const headers = new Headers(serverResponse.headers);
+      headers.set("Content-Type", "text/html");
+      if (!hydrate) {
+        return new Response(html, {
+          status,
+          headers
+        });
+      }
+      if (!serverResponseB?.body) {
+        throw new Error("Failed to clone server response");
+      }
+      const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
+      return new Response(body2, {
+        status,
+        headers
+      });
+    } catch {
+    }
     throw reason;
   }
 }
 function RSCStaticRouter({ getPayload }) {
-  const payload = useSafe(getPayload());
+  const decoded = getPayload();
+  const payload = useSafe(decoded);
   if (payload.type === "redirect") {
     throw new Response(null, {
       status: payload.status,
@@ -2671,6 +2755,12 @@ function RSCStaticRouter({ getPayload }) {
     }
   }
   const context = {
+    get _deepestRenderedBoundaryId() {
+      return decoded._deepestRenderedBoundaryId ?? null;
+    },
+    set _deepestRenderedBoundaryId(boundaryId) {
+      decoded._deepestRenderedBoundaryId = boundaryId;
+    },
     actionData: payload.actionData,
     actionHeaders: {},
     basename: payload.basename,