react-router 7.10.1 → 7.11.0-pre.0

package/dist/{production/chunk-YO5R3LGQ.js → development/chunk-OVG6YSZ5.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }/**
- * react-router v7.10.1
+ * react-router v7.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,7 @@
 
 
 
-var _chunkUQPBOMFPjs = require('./chunk-UQPBOMFP.js');
+var _chunkUO7KGW2Ujs = require('./chunk-UO7KGW2U.js');
 
 // lib/dom/ssr/hydration.tsx
 function getHydrationData({
@@ -29,12 +29,12 @@ function getHydrationData({
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = _chunkUQPBOMFPjs.matchRoutes.call(void 0, routes, location, basename);
+  let initialMatches = _chunkUO7KGW2Ujs.matchRoutes.call(void 0, routes, location, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
       let routeInfo = getRouteInfo(routeId);
-      if (_chunkUQPBOMFPjs.shouldHydrateRouteLoader.call(void 0, 
+      if (_chunkUO7KGW2Ujs.shouldHydrateRouteLoader.call(void 0, 
         routeId,
         routeInfo.clientLoader,
         routeInfo.hasLoader,
@@ -112,7 +112,7 @@ function RSCDefaultRootErrorBoundaryImpl({
       }
     }
   );
-  if (_chunkUQPBOMFPjs.isRouteErrorResponse.call(void 0, error)) {
+  if (_chunkUO7KGW2Ujs.isRouteErrorResponse.call(void 0, error)) {
     return /* @__PURE__ */ _react2.default.createElement(
       ErrorWrapper,
       {
@@ -120,7 +120,7 @@ function RSCDefaultRootErrorBoundaryImpl({
         title: "Unhandled Thrown Response!"
       },
       /* @__PURE__ */ _react2.default.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText),
-      _chunkUQPBOMFPjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
+      _chunkUO7KGW2Ujs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
     );
   }
   let errorInstance;
@@ -146,7 +146,7 @@ function RSCDefaultRootErrorBoundaryImpl({
 function RSCDefaultRootErrorBoundary({
   hasRootLayout
 }) {
-  let error = _chunkUQPBOMFPjs.useRouteError.call(void 0, );
+  let error = _chunkUO7KGW2Ujs.useRouteError.call(void 0, );
   if (hasRootLayout === void 0) {
     throw new Error("Missing 'hasRootLayout' prop");
   }

package/dist/development/{chunk-PMGK554W.mjs → chunk-QMKP6CC3.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.10.1
+ * react-router v7.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -27,6 +27,8 @@ import {
   createServerRoutes,
   createStaticHandler,
   createStaticRouter,
+  decodeRedirectErrorDigest,
+  decodeRouteErrorResponseDigest,
   decodeViaTurboStream,
   encode,
   escapeHtml,
@@ -49,7 +51,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-WWGJGFF6.mjs";
+} from "./chunk-KRMLYMWA.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -1920,7 +1922,7 @@ function useSafe(promise) {
 }
 async function routeRSCServerRequest({
   request,
-  fetchServer,
+  serverResponse,
   createFromReadableStream,
   renderHTML,
   hydrate = true
@@ -1928,7 +1930,6 @@ async function routeRSCServerRequest({
   const url = new URL(request.url);
   const isDataRequest = isReactServerRequest(url);
   const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
-  const serverResponse = await fetchServer(request);
   if (respondWithRSCPayload || serverResponse.headers.get("React-Router-Resource") === "true") {
     return serverResponse;
   }
@@ -1990,6 +1991,8 @@ async function routeRSCServerRequest({
       }
     });
   };
+  let renderRedirect;
+  let renderError;
   try {
     if (!detectRedirectResponse.body) {
       throw new Error("Failed to clone server response");
@@ -2010,73 +2013,179 @@ async function routeRSCServerRequest({
         statusText: serverResponse.statusText
       });
     }
-    const html = await renderHTML(getPayload);
-    const headers = new Headers(serverResponse.headers);
+    let reactHeaders = new Headers();
+    let status = serverResponse.status;
+    let statusText = serverResponse.statusText;
+    let html = await renderHTML(getPayload, {
+      onError(error) {
+        if (typeof error === "object" && error && "digest" in error && typeof error.digest === "string") {
+          renderRedirect = decodeRedirectErrorDigest(error.digest);
+          if (renderRedirect) {
+            return error.digest;
+          }
+          let routeErrorResponse = decodeRouteErrorResponseDigest(error.digest);
+          if (routeErrorResponse) {
+            renderError = routeErrorResponse;
+            status = routeErrorResponse.status;
+            statusText = routeErrorResponse.statusText;
+            return error.digest;
+          }
+        }
+      },
+      onHeaders(headers2) {
+        for (const [key, value] of headers2) {
+          reactHeaders.append(key, value);
+        }
+      }
+    });
+    const headers = new Headers(reactHeaders);
+    for (const [key, value] of serverResponse.headers) {
+      headers.append(key, value);
+    }
     headers.set("Content-Type", "text/html; charset=utf-8");
-    if (!hydrate) {
+    if (renderRedirect) {
+      headers.set("Location", renderRedirect.location);
       return new Response(html, {
-        status: serverResponse.status,
+        status: renderRedirect.status,
+        headers
+      });
+    }
+    const redirectTransform = new TransformStream({
+      flush(controller) {
+        if (renderRedirect) {
+          controller.enqueue(
+            new TextEncoder().encode(
+              `<meta http-equiv="refresh" content="0;url=${escapeHtml(renderRedirect.location)}"/>`
+            )
+          );
+        }
+      }
+    });
+    if (!hydrate) {
+      return new Response(html.pipeThrough(redirectTransform), {
+        status,
+        statusText,
         headers
       });
     }
     if (!serverResponseB?.body) {
       throw new Error("Failed to clone server response");
     }
-    const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
+    const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body)).pipeThrough(redirectTransform);
     return new Response(body2, {
-      status: serverResponse.status,
+      status,
+      statusText,
       headers
     });
   } catch (reason) {
     if (reason instanceof Response) {
       return reason;
     }
+    if (renderRedirect) {
+      return new Response(`Redirect: ${renderRedirect.location}`, {
+        status: renderRedirect.status,
+        headers: {
+          Location: renderRedirect.location
+        }
+      });
+    }
     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;
+      reason = renderError ?? reason;
+      let [status, statusText] = isRouteErrorResponse(reason) ? [reason.status, reason.statusText] : [500, ""];
+      let retryRedirect;
+      let reactHeaders = new Headers();
+      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;
+              }
             },
-            set(boundaryId) {
-              deepestRenderedBoundaryId = boundaryId;
+            formState: {
+              get() {
+                return payloadPromise.then(
+                  (payload) => payload.type === "render" ? payload.formState : void 0
+                );
+              }
             }
-          },
-          formState: {
-            get() {
-              return payloadPromise.then(
-                (payload) => payload.type === "render" ? payload.formState : void 0
+          });
+        },
+        {
+          onError(error) {
+            if (typeof error === "object" && error && "digest" in error && typeof error.digest === "string") {
+              retryRedirect = decodeRedirectErrorDigest(error.digest);
+              if (retryRedirect) {
+                return error.digest;
+              }
+              let routeErrorResponse = decodeRouteErrorResponseDigest(
+                error.digest
               );
+              if (routeErrorResponse) {
+                status = routeErrorResponse.status;
+                statusText = routeErrorResponse.statusText;
+                return error.digest;
+              }
+            }
+          },
+          onHeaders(headers2) {
+            for (const [key, value] of headers2) {
+              reactHeaders.append(key, value);
             }
           }
+        }
+      );
+      const headers = new Headers(reactHeaders);
+      for (const [key, value] of serverResponse.headers) {
+        headers.append(key, value);
+      }
+      headers.set("Content-Type", "text/html; charset=utf-8");
+      if (retryRedirect) {
+        headers.set("Location", retryRedirect.location);
+        return new Response(html, {
+          status: retryRedirect.status,
+          headers
         });
+      }
+      const retryRedirectTransform = new TransformStream({
+        flush(controller) {
+          if (retryRedirect) {
+            controller.enqueue(
+              new TextEncoder().encode(
+                `<meta http-equiv="refresh" content="0;url=${escapeHtml(retryRedirect.location)}"/>`
+              )
+            );
+          }
+        }
       });
-      const headers = new Headers(serverResponse.headers);
-      headers.set("Content-Type", "text/html");
       if (!hydrate) {
-        return new Response(html, {
+        return new Response(html.pipeThrough(retryRedirectTransform), {
           status,
+          statusText,
           headers
         });
       }
       if (!serverResponseB?.body) {
         throw new Error("Failed to clone server response");
       }
-      const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
+      const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body)).pipeThrough(retryRedirectTransform);
       return new Response(body2, {
         status,
+        statusText,
         headers
       });
     } catch {