react-router 7.8.0-pre.0 → 7.8.0-pre.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # `react-router`
 
+## 7.8.0-pre.2
+
+### Patch Changes
+
+- proxy server action side-effect redirects from actions for document and callServer requests ([#14131](https://github.com/remix-run/react-router/pull/14131))
+
+## 7.8.0-pre.1
+
+### Patch Changes
+
+- [REMOVE] Few additional fixes for returning/throwing data from middleware - attach to #14093 ([#14128](https://github.com/remix-run/react-router/pull/14128))
+
 ## 7.8.0-pre.0
 
 ### Minor Changes

package/dist/development/{chunk-HSC5IU24.mjs → chunk-3D24XHV2.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.0
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -57,7 +57,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-SC4OUYO4.mjs";
+} from "./chunk-WSV33ENW.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -703,7 +703,7 @@ function getDocumentHeaders(context, build) {
     return route.module.headers;
   });
 }
-function getDocumentHeadersImpl(context, getRouteHeadersFn) {
+function getDocumentHeadersImpl(context, getRouteHeadersFn, _defaultHeaders) {
   let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
   let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
   let errorHeaders;
@@ -719,6 +719,7 @@ function getDocumentHeadersImpl(context, getRouteHeadersFn) {
       return errorHeaders != null;
     });
   }
+  const defaultHeaders = new Headers(_defaultHeaders);
   return matches.reduce((parentHeaders, match, idx) => {
     let { id } = match.route;
     let loaderHeaders = context.loaderHeaders[id] || new Headers();
@@ -750,7 +751,7 @@ function getDocumentHeadersImpl(context, getRouteHeadersFn) {
     prependCookies(loaderHeaders, headers);
     prependCookies(parentHeaders, headers);
     return headers;
-  }, new Headers());
+  }, new Headers(defaultHeaders));
 }
 function prependCookies(parentHeaders, childHeaders) {
   let parentSetCookieString = parentHeaders.get("Set-Cookie");
@@ -2512,6 +2513,20 @@ async function routeRSCServerRequest({
     return payloadPromise;
   };
   try {
+    const payload = await getPayload();
+    if (serverResponse.status === SINGLE_FETCH_REDIRECT_STATUS && payload.type === "redirect") {
+      const headers2 = new Headers(serverResponse.headers);
+      headers2.delete("Content-Encoding");
+      headers2.delete("Content-Length");
+      headers2.delete("Content-Type");
+      headers2.delete("x-remix-response");
+      headers2.set("Location", payload.location);
+      return new Response(serverResponseB?.body || "", {
+        headers: headers2,
+        status: payload.status,
+        statusText: serverResponse.statusText
+      });
+    }
     const html = await renderHTML(getPayload);
     const headers = new Headers(serverResponse.headers);
     headers.set("Content-Type", "text/html");

package/dist/development/{chunk-IW6UADHO.js → chunk-74TFO7SN.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.8.0-pre.0
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2942,6 +2942,9 @@ function createStaticHandler(routes, opts) {
           return res;
         },
         (error) => {
+          if (isRouteErrorResponse(error)) {
+            return Promise.resolve(errorResponseToResponse(error));
+          }
           if (isResponse(error)) {
             return Promise.resolve(error);
           }
@@ -3934,12 +3937,6 @@ async function runServerMiddlewarePipeline(args, handler, errorHandler) {
     handler,
     errorHandler
   );
-  if (isDataWithResponseInit(result)) {
-    return new Response(
-      typeof result.data === "string" ? result.data : JSON.stringify(result.data),
-      { ...result.init }
-    );
-  }
   if (isResponse(result)) {
     return result;
   }
@@ -3976,10 +3973,17 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
         errorHandler,
         idx + 1
       );
+      if (isDataWithResponseInit(result)) {
+        result = dataWithResponseInitToResponse(result);
+      }
       nextResult = result;
       return nextResult;
     } catch (e) {
-      nextResult = await errorHandler(e, routeId);
+      nextResult = await errorHandler(
+        // Convert thrown data() values to ErrorResponses
+        isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
+        routeId
+      );
       return nextResult;
     }
   };
@@ -3992,16 +3996,23 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       },
       next
     );
+    if (isDataWithResponseInit(result)) {
+      result = dataWithResponseInitToResponse(result);
+    }
     if (nextCalled) {
       return typeof result === "undefined" ? nextResult : result;
-    } else if (isResponse(result) || isDataWithResponseInit(result)) {
+    } else if (isResponse(result)) {
       return result;
     } else {
       nextResult = await next();
       return nextResult;
     }
-  } catch (error) {
-    let response = await errorHandler(error, routeId);
+  } catch (e) {
+    let response = await errorHandler(
+      // Convert thrown data() values to ErrorResponses
+      isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
+      routeId
+    );
     return response;
   }
 }
@@ -4663,6 +4674,28 @@ function isHashChangeOnly(a, b) {
   }
   return false;
 }
+function dataWithResponseInitToResponse(data2) {
+  return new Response(
+    typeof data2.data === "string" ? data2.data : JSON.stringify(data2.data),
+    data2.init || void 0
+  );
+}
+function dataWithResponseInitToErrorResponse(data2) {
+  return new ErrorResponseImpl(
+    _nullishCoalesce(_optionalChain([data2, 'access', _61 => _61.init, 'optionalAccess', _62 => _62.status]), () => ( 500)),
+    _nullishCoalesce(_optionalChain([data2, 'access', _63 => _63.init, 'optionalAccess', _64 => _64.statusText]), () => ( "Internal Server Error")),
+    data2.data
+  );
+}
+function errorResponseToResponse(error) {
+  return new Response(
+    typeof error.data === "string" ? error.data : JSON.stringify(error.data),
+    {
+      status: error.status,
+      statusText: error.statusText
+    }
+  );
+}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }
@@ -5689,7 +5722,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
       return {
         hasLoader: manifestRoute.hasLoader,
         hasClientLoader: manifestRoute.hasClientLoader,
-        hasShouldRevalidate: Boolean(_optionalChain([routeModule, 'optionalAccess', _61 => _61.shouldRevalidate]))
+        hasShouldRevalidate: Boolean(_optionalChain([routeModule, 'optionalAccess', _65 => _65.shouldRevalidate]))
       };
     },
     fetchAndDecodeViaTurboStream,
@@ -5856,7 +5889,7 @@ async function bubbleMiddlewareErrors(singleFetchPromise, matches, routesParams,
           let routeResult = fetchedData.routes[match.route.id];
           if ("error" in routeResult) {
             middlewareError = routeResult.error;
-            if (_optionalChain([results, 'access', _62 => _62[match.route.id], 'optionalAccess', _63 => _63.result]) == null) {
+            if (_optionalChain([results, 'access', _66 => _66[match.route.id], 'optionalAccess', _67 => _67.result]) == null) {
               results[match.route.id] = {
                 type: "error",
                 result: middlewareError
@@ -5969,7 +6002,7 @@ async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
       }
     } else {
       let typed = decoded.value;
-      let routeId = _optionalChain([targetRoutes, 'optionalAccess', _64 => _64[0]]);
+      let routeId = _optionalChain([targetRoutes, 'optionalAccess', _68 => _68[0]]);
       invariant2(routeId, "No routeId found for single fetch call decoding");
       if ("redirect" in typed) {
         data2 = { redirect: typed };
@@ -6280,7 +6313,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
   if (locationArg) {
     let parsedLocationArg = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
     invariant(
-      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _65 => _65.pathname, 'optionalAccess', _66 => _66.startsWith, 'call', _67 => _67(parentPathnameBase)]),
+      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _69 => _69.pathname, 'optionalAccess', _70 => _70.startsWith, 'call', _71 => _71(parentPathnameBase)]),
       `When overriding the location using \`<Routes location>\` or \`useRoutes(routes, location)\`, the location pathname must begin with the portion of the URL pathname that was matched by all parent routes. The current pathname base is "${parentPathnameBase}" but pathname "${parsedLocationArg.pathname}" was given in the \`location\` prop.`
     );
     location = parsedLocationArg;
@@ -6428,10 +6461,10 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, fut
     }
   }
   let renderedMatches = matches;
-  let errors = _optionalChain([dataRouterState, 'optionalAccess', _68 => _68.errors]);
+  let errors = _optionalChain([dataRouterState, 'optionalAccess', _72 => _72.errors]);
   if (errors != null) {
     let errorIndex = renderedMatches.findIndex(
-      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _69 => _69[m.route.id]]) !== void 0
+      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _73 => _73[m.route.id]]) !== void 0
     );
     invariant(
       errorIndex >= 0,
@@ -6608,15 +6641,15 @@ function useRouteError() {
   if (error !== void 0) {
     return error;
   }
-  return _optionalChain([state, 'access', _70 => _70.errors, 'optionalAccess', _71 => _71[routeId]]);
+  return _optionalChain([state, 'access', _74 => _74.errors, 'optionalAccess', _75 => _75[routeId]]);
 }
 function useAsyncValue() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _72 => _72._data]);
+  return _optionalChain([value, 'optionalAccess', _76 => _76._data]);
 }
 function useAsyncError() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _73 => _73._error]);
+  return _optionalChain([value, 'optionalAccess', _77 => _77._error]);
 }
 var blockerId = 0;
 function useBlocker(shouldBlock) {
@@ -6728,7 +6761,7 @@ function getKeyedLinksForMatches(matches, routeModules, manifest) {
     let route = manifest.routes[match.route.id];
     return [
       route && route.css ? route.css.map((href) => ({ rel: "stylesheet", href })) : [],
-      _optionalChain([module, 'optionalAccess', _74 => _74.links, 'optionalCall', _75 => _75()]) || []
+      _optionalChain([module, 'optionalAccess', _78 => _78.links, 'optionalCall', _79 => _79()]) || []
     ];
   }).flat(2);
   let preloads = getModuleLinkHrefs(matches, manifest);
@@ -6829,7 +6862,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
       // param change, /users/123 -> /users/456
       currentMatches[index].pathname !== match.pathname || // splat param changed, which is not present in match.path
       // e.g. /files/images/avatar.jpg -> files/finances.xls
-      _optionalChain([currentMatches, 'access', _76 => _76[index], 'access', _77 => _77.route, 'access', _78 => _78.path, 'optionalAccess', _79 => _79.endsWith, 'call', _80 => _80("*")]) && currentMatches[index].params["*"] !== match.params["*"]
+      _optionalChain([currentMatches, 'access', _80 => _80[index], 'access', _81 => _81.route, 'access', _82 => _82.path, 'optionalAccess', _83 => _83.endsWith, 'call', _84 => _84("*")]) && currentMatches[index].params["*"] !== match.params["*"]
     );
   };
   if (mode === "assets") {
@@ -6852,7 +6885,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
             location.pathname + location.search + location.hash,
             window.origin
           ),
-          currentParams: _optionalChain([currentMatches, 'access', _81 => _81[0], 'optionalAccess', _82 => _82.params]) || {},
+          currentParams: _optionalChain([currentMatches, 'access', _85 => _85[0], 'optionalAccess', _86 => _86.params]) || {},
           nextUrl: new URL(page, window.origin),
           nextParams: match.params,
           defaultShouldRevalidate: true
@@ -7124,10 +7157,10 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         )
       });
       let hasInitialData = initialState && initialState.loaderData && route.id in initialState.loaderData;
-      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _83 => _83.loaderData, 'optionalAccess', _84 => _84[route.id]]) : void 0;
+      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _87 => _87.loaderData, 'optionalAccess', _88 => _88[route.id]]) : void 0;
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
-      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _85 => _85.errors, 'optionalAccess', _86 => _86[route.id]]) : void 0;
-      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _87 => _87.clientLoader, 'optionalAccess', _88 => _88.hydrate]) === true || !route.hasLoader);
+      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _89 => _89.errors, 'optionalAccess', _90 => _90[route.id]]) : void 0;
+      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _91 => _91.clientLoader, 'optionalAccess', _92 => _92.hydrate]) === true || !route.hasLoader);
       dataRoute.loader = async ({ request, params, context }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
@@ -7424,7 +7457,7 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDi
 function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React6.useEffect(() => {
     if (!isFogOfWarEnabled(routeDiscovery, ssr) || // @ts-expect-error - TS doesn't know about this yet
-    _optionalChain([window, 'access', _89 => _89.navigator, 'optionalAccess', _90 => _90.connection, 'optionalAccess', _91 => _91.saveData]) === true) {
+    _optionalChain([window, 'access', _93 => _93.navigator, 'optionalAccess', _94 => _94.connection, 'optionalAccess', _95 => _95.saveData]) === true) {
       return;
     }
     function registerElement(el) {
@@ -7527,7 +7560,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
     sessionStorage.removeItem(MANIFEST_VERSION_STORAGE_KEY);
     serverPatches = await res.json();
   } catch (e) {
-    if (_optionalChain([signal, 'optionalAccess', _92 => _92.aborted])) return;
+    if (_optionalChain([signal, 'optionalAccess', _96 => _96.aborted])) return;
     throw e;
   }
   let knownRoutes = new Set(Object.keys(manifest.routes));
@@ -7768,7 +7801,7 @@ function PrefetchPageLinksImpl({
       if (!manifestRoute || !manifestRoute.hasLoader) {
         return;
       }
-      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _93 => _93[m.route.id], 'optionalAccess', _94 => _94.shouldRevalidate])) {
+      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _97 => _97[m.route.id], 'optionalAccess', _98 => _98.shouldRevalidate])) {
         foundOptOutRoute = true;
       } else if (manifestRoute.hasClientLoader) {
         foundOptOutRoute = true;
@@ -7842,7 +7875,7 @@ function Meta() {
       error
     };
     matches[i] = match;
-    if (_optionalChain([routeModule, 'optionalAccess', _95 => _95.meta])) {
+    if (_optionalChain([routeModule, 'optionalAccess', _99 => _99.meta])) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         loaderData: data2,
@@ -7938,7 +7971,7 @@ function Scripts(scriptProps) {
     }
     let streamScript = "window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());";
     let contextScript = staticContext ? `window.__reactRouterContext = ${serverHandoffString};${streamScript}` : " ";
-    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _96 => _96.hmr, 'optionalAccess', _97 => _97.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
+    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _100 => _100.hmr, 'optionalAccess', _101 => _101.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
 ${matches.map((match, routeIndex) => {
       let routeVarName = `route${routeIndex}`;
       let manifestEntry = manifest.routes[match.route.id];
@@ -8168,7 +8201,7 @@ function BoundaryShell({
   children
 }) {
   let { routeModules } = useFrameworkContext();
-  if (_optionalChain([routeModules, 'access', _98 => _98.root, 'optionalAccess', _99 => _99.Layout]) && !isOutsideRemixApp) {
+  if (_optionalChain([routeModules, 'access', _102 => _102.root, 'optionalAccess', _103 => _103.Layout]) && !isOutsideRemixApp) {
     return children;
   }
   return /* @__PURE__ */ React8.createElement("html", { lang: "en" }, /* @__PURE__ */ React8.createElement("head", null, /* @__PURE__ */ React8.createElement("meta", { charSet: "utf-8" }), /* @__PURE__ */ React8.createElement(