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

package/dist/development/{chunk-XFFANEXU.mjs → chunk-WSV33ENW.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8941,7 +8941,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.8.0-pre.1";
+    "7.8.0-pre.2";
   }
 } catch (e) {
 }

package/dist/development/dom-export.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 _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.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 "use client";
 
 
-var _chunkNGF2R4G7js = require('./chunk-NGF2R4G7.js');
+var _chunk74TFO7SNjs = require('./chunk-74TFO7SN.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react);
@@ -180,7 +180,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkNGF2R4G7js.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunk74TFO7SNjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location, setLocation] = React2.useState(router.state.location);

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 import {
   deserializeErrors,
   getHydrationData
-} from "./chunk-I22FVTOY.mjs";
+} from "./chunk-3D24XHV2.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   FrameworkContext,
@@ -29,7 +29,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-XFFANEXU.mjs";
+} from "./chunk-WSV33ENW.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/{production/index-react-server-client-BzBbJLAD.d.ts → development/index-react-server-client-CMphySRb.d.ts}

@@ -1239,6 +1239,23 @@ interface DOMRouterOpts {
      * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
      * This function is called to generate a fresh `context` instance on each
      * navigation or fetcher call.
+     *
+     * ```tsx
+     * import {
+     *   unstable_createContext,
+     *   unstable_RouterContextProvider,
+     * } from "react-router";
+     *
+     * const apiClientContext = unstable_createContext<APIClient>();
+     *
+     * function createBrowserRouter(routes, {
+     *   unstable_getContext() {
+     *     let context = new unstable_RouterContextProvider();
+     *     context.set(apiClientContext, getApiClient());
+     *     return context;
+     *   }
+     * })
+     * ```
      */
     unstable_getContext?: RouterInit["unstable_getContext"];
     /**
@@ -1249,7 +1266,7 @@ interface DOMRouterOpts {
      * When Server-Rendering and opting-out of automatic hydration, the
      * `hydrationData` option allows you to pass in hydration data from your
      * server-render. This will almost always be a subset of data from the
-     * {@link StaticHandlerContext} value you get back from {@link StaticHandler}'s
+     * {@link StaticHandlerContext} value you get back from the {@link StaticHandler}'s
      * `query` method:
      *
      * ```tsx

package/dist/{production/index-react-server-client-CuajY2vy.d.mts → development/index-react-server-client-DXb0OgpJ.d.mts}

@@ -431,6 +431,23 @@ interface DOMRouterOpts {
      * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
      * This function is called to generate a fresh `context` instance on each
      * navigation or fetcher call.
+     *
+     * ```tsx
+     * import {
+     *   unstable_createContext,
+     *   unstable_RouterContextProvider,
+     * } from "react-router";
+     *
+     * const apiClientContext = unstable_createContext<APIClient>();
+     *
+     * function createBrowserRouter(routes, {
+     *   unstable_getContext() {
+     *     let context = new unstable_RouterContextProvider();
+     *     context.set(apiClientContext, getApiClient());
+     *     return context;
+     *   }
+     * })
+     * ```
      */
     unstable_getContext?: RouterInit["unstable_getContext"];
     /**
@@ -441,7 +458,7 @@ interface DOMRouterOpts {
      * When Server-Rendering and opting-out of automatic hydration, the
      * `hydrationData` option allows you to pass in hydration data from your
      * server-render. This will almost always be a subset of data from the
-     * {@link StaticHandlerContext} value you get back from {@link StaticHandler}'s
+     * {@link StaticHandlerContext} value you get back from the {@link StaticHandler}'s
      * `query` method:
      *
      * ```tsx

package/dist/development/index-react-server-client.d.mts

@@ -1,5 +1,5 @@
 export { f as Await, g as MemoryRouter, h as Navigate, i as Outlet, j as Route, k as Router, l as RouterProvider, m as Routes, W as UNSAFE_WithComponentProps, v as UNSAFE_WithErrorBoundaryProps, t as UNSAFE_WithHydrateFallbackProps } from './components-CuPfnyiZ.mjs';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-CuajY2vy.mjs';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-DXb0OgpJ.mjs';
 import './context-DohQKLID.mjs';
 import 'react';
 import './route-data-CpB5xtMm.mjs';

package/dist/development/index-react-server-client.d.ts

@@ -1,3 +1,3 @@
-export { h as Await, V as BrowserRouter, _ as Form, W as HashRouter, X as Link, am as Links, i as MemoryRouter, al as Meta, Z as NavLink, j as Navigate, k as Outlet, l as Route, m as Router, n as RouterProvider, o as Routes, $ as ScrollRestoration, aj as StaticRouter, ak as StaticRouterProvider, az as UNSAFE_WithComponentProps, aD as UNSAFE_WithErrorBoundaryProps, aB as UNSAFE_WithHydrateFallbackProps, Y as unstable_HistoryRouter } from './index-react-server-client-BzBbJLAD.js';
+export { h as Await, V as BrowserRouter, _ as Form, W as HashRouter, X as Link, am as Links, i as MemoryRouter, al as Meta, Z as NavLink, j as Navigate, k as Outlet, l as Route, m as Router, n as RouterProvider, o as Routes, $ as ScrollRestoration, aj as StaticRouter, ak as StaticRouterProvider, az as UNSAFE_WithComponentProps, aD as UNSAFE_WithErrorBoundaryProps, aB as UNSAFE_WithHydrateFallbackProps, Y as unstable_HistoryRouter } from './index-react-server-client-CMphySRb.js';
 import './routeModules-qBivMBjd.js';
 import 'react';

package/dist/development/index-react-server-client.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.8.0-pre.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -30,11 +30,11 @@
 
 
 
-var _chunk4EVDZJGMjs = require('./chunk-4EVDZJGM.js');
+var _chunkHQ37R3FKjs = require('./chunk-HQ37R3FK.js');
 
 
 
-var _chunkNGF2R4G7js = require('./chunk-NGF2R4G7.js');
+var _chunk74TFO7SNjs = require('./chunk-74TFO7SN.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkNGF2R4G7js = require('./chunk-NGF2R4G7.js');
 
 
 
-exports.Await = _chunk4EVDZJGMjs.Await; exports.BrowserRouter = _chunk4EVDZJGMjs.BrowserRouter; exports.Form = _chunk4EVDZJGMjs.Form; exports.HashRouter = _chunk4EVDZJGMjs.HashRouter; exports.Link = _chunk4EVDZJGMjs.Link; exports.Links = _chunkNGF2R4G7js.Links; exports.MemoryRouter = _chunk4EVDZJGMjs.MemoryRouter; exports.Meta = _chunkNGF2R4G7js.Meta; exports.NavLink = _chunk4EVDZJGMjs.NavLink; exports.Navigate = _chunk4EVDZJGMjs.Navigate; exports.Outlet = _chunk4EVDZJGMjs.Outlet; exports.Route = _chunk4EVDZJGMjs.Route; exports.Router = _chunk4EVDZJGMjs.Router; exports.RouterProvider = _chunk4EVDZJGMjs.RouterProvider; exports.Routes = _chunk4EVDZJGMjs.Routes; exports.ScrollRestoration = _chunk4EVDZJGMjs.ScrollRestoration; exports.StaticRouter = _chunk4EVDZJGMjs.StaticRouter; exports.StaticRouterProvider = _chunk4EVDZJGMjs.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunk4EVDZJGMjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk4EVDZJGMjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk4EVDZJGMjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk4EVDZJGMjs.HistoryRouter;
+exports.Await = _chunkHQ37R3FKjs.Await; exports.BrowserRouter = _chunkHQ37R3FKjs.BrowserRouter; exports.Form = _chunkHQ37R3FKjs.Form; exports.HashRouter = _chunkHQ37R3FKjs.HashRouter; exports.Link = _chunkHQ37R3FKjs.Link; exports.Links = _chunk74TFO7SNjs.Links; exports.MemoryRouter = _chunkHQ37R3FKjs.MemoryRouter; exports.Meta = _chunk74TFO7SNjs.Meta; exports.NavLink = _chunkHQ37R3FKjs.NavLink; exports.Navigate = _chunkHQ37R3FKjs.Navigate; exports.Outlet = _chunkHQ37R3FKjs.Outlet; exports.Route = _chunkHQ37R3FKjs.Route; exports.Router = _chunkHQ37R3FKjs.Router; exports.RouterProvider = _chunkHQ37R3FKjs.RouterProvider; exports.Routes = _chunkHQ37R3FKjs.Routes; exports.ScrollRestoration = _chunkHQ37R3FKjs.ScrollRestoration; exports.StaticRouter = _chunkHQ37R3FKjs.StaticRouter; exports.StaticRouterProvider = _chunkHQ37R3FKjs.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkHQ37R3FKjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkHQ37R3FKjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkHQ37R3FKjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkHQ37R3FKjs.HistoryRouter;

package/dist/development/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-XFFANEXU.mjs";
+} from "./chunk-WSV33ENW.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/index-react-server.js

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.8.0-pre.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2086,7 +2086,7 @@ function invariant2(value, message) {
 }
 
 // lib/server-runtime/headers.ts
-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;
@@ -2102,6 +2102,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();
@@ -2133,7 +2134,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");
@@ -2157,7 +2158,7 @@ var ServerStorage = globalVar.___reactRouterServerStorage___ ?? (globalVar.___re
 var redirect2 = (...args) => {
   const response = redirect(...args);
   const ctx = ServerStorage.getStore();
-  if (ctx) {
+  if (ctx && ctx.runningAction) {
     ctx.redirect = response;
   }
   return response;
@@ -2165,7 +2166,7 @@ var redirect2 = (...args) => {
 var redirectDocument2 = (...args) => {
   const response = redirectDocument(...args);
   const ctx = ServerStorage.getStore();
-  if (ctx) {
+  if (ctx && ctx.runningAction) {
     ctx.redirect = response;
   }
   return response;
@@ -2173,7 +2174,7 @@ var redirectDocument2 = (...args) => {
 var replace2 = (...args) => {
   const response = replace(...args);
   const ctx = ServerStorage.getStore();
-  if (ctx) {
+  if (ctx && ctx.runningAction) {
     ctx.redirect = response;
   }
   return response;
@@ -2429,7 +2430,9 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
     })
   });
   let actionResult;
-  const ctx = {};
+  const ctx = {
+    runningAction: false
+  };
   const result = await ServerStorage.run(
     ctx,
     () => staticHandler.query(request, {
@@ -2440,6 +2443,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       async unstable_generateMiddlewareResponse(query) {
         let formState;
         if (request.method === "POST") {
+          ctx.runningAction = true;
           let result2 = await processServerAction(
             request,
             basename,
@@ -2450,6 +2454,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
             onError,
             temporaryReferences
           );
+          ctx.runningAction = false;
           if (isResponse(result2)) {
             return generateRedirectResponse(
               result2,
@@ -2457,22 +2462,24 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
               basename,
               isDataRequest,
               generateResponse,
-              temporaryReferences
+              temporaryReferences,
+              ctx.redirect?.headers
             );
           }
           actionResult = result2?.actionResult;
           formState = result2?.formState;
           request = result2?.revalidationRequest ?? request;
-        }
-        if (ctx.redirect) {
-          return generateRedirectResponse(
-            ctx.redirect,
-            actionResult,
-            basename,
-            isDataRequest,
-            generateResponse,
-            temporaryReferences
-          );
+          if (ctx.redirect) {
+            return generateRedirectResponse(
+              ctx.redirect,
+              actionResult,
+              basename,
+              isDataRequest,
+              generateResponse,
+              temporaryReferences,
+              void 0
+            );
+          }
         }
         let staticContext = await query(request);
         if (isResponse(staticContext)) {
@@ -2482,7 +2489,8 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
             basename,
             isDataRequest,
             generateResponse,
-            temporaryReferences
+            temporaryReferences,
+            ctx.redirect?.headers
           );
         }
         return generateStaticContextResponse(
@@ -2496,7 +2504,8 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
           actionResult,
           formState,
           staticContext,
-          temporaryReferences
+          temporaryReferences,
+          ctx.redirect?.headers
         );
       }
     })
@@ -2508,13 +2517,14 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       basename,
       isDataRequest,
       generateResponse,
-      temporaryReferences
+      temporaryReferences,
+      ctx.redirect?.headers
     );
   }
   invariant2(isResponse(result), "Expected a response from query");
   return result;
 }
-function generateRedirectResponse(response, actionResult, basename, isDataRequest, generateResponse, temporaryReferences) {
+function generateRedirectResponse(response, actionResult, basename, isDataRequest, generateResponse, temporaryReferences, sideEffectRedirectHeaders) {
   let redirect3 = response.headers.get("Location");
   if (isDataRequest && basename) {
     redirect3 = stripBasename(redirect3, basename) || redirect3;
@@ -2527,7 +2537,10 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
     status: response.status,
     actionResult
   };
-  let headers = new Headers(response.headers);
+  let headers = new Headers(sideEffectRedirectHeaders);
+  for (const [key, value] of response.headers.entries()) {
+    headers.append(key, value);
+  }
   headers.delete("Location");
   headers.delete("X-Remix-Reload-Document");
   headers.delete("X-Remix-Replace");
@@ -2543,7 +2556,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
     { temporaryReferences }
   );
 }
-async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences) {
+async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, sideEffectRedirectHeaders) {
   statusCode = staticContext.statusCode ?? statusCode;
   if (staticContext.errors) {
     staticContext.errors = Object.fromEntries(
@@ -2564,7 +2577,8 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
   });
   let headers = getDocumentHeadersImpl(
     staticContext,
-    (match) => match.route.headers
+    (match) => match.route.headers,
+    sideEffectRedirectHeaders
   );
   headers.delete("Content-Length");
   const baseRenderPayload = {

package/dist/development/index-react-server.mjs

@@ -6,7 +6,7 @@ export { Await, BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.8.0-pre.1
+ * react-router v7.8.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2065,7 +2065,7 @@ function invariant2(value, message) {
 }
 
 // lib/server-runtime/headers.ts
-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;
@@ -2081,6 +2081,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();
@@ -2112,7 +2113,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");
@@ -2136,7 +2137,7 @@ var ServerStorage = globalVar.___reactRouterServerStorage___ ?? (globalVar.___re
 var redirect2 = (...args) => {
   const response = redirect(...args);
   const ctx = ServerStorage.getStore();
-  if (ctx) {
+  if (ctx && ctx.runningAction) {
     ctx.redirect = response;
   }
   return response;
@@ -2144,7 +2145,7 @@ var redirect2 = (...args) => {
 var redirectDocument2 = (...args) => {
   const response = redirectDocument(...args);
   const ctx = ServerStorage.getStore();
-  if (ctx) {
+  if (ctx && ctx.runningAction) {
     ctx.redirect = response;
   }
   return response;
@@ -2152,7 +2153,7 @@ var redirectDocument2 = (...args) => {
 var replace2 = (...args) => {
   const response = replace(...args);
   const ctx = ServerStorage.getStore();
-  if (ctx) {
+  if (ctx && ctx.runningAction) {
     ctx.redirect = response;
   }
   return response;
@@ -2408,7 +2409,9 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
     })
   });
   let actionResult;
-  const ctx = {};
+  const ctx = {
+    runningAction: false
+  };
   const result = await ServerStorage.run(
     ctx,
     () => staticHandler.query(request, {
@@ -2419,6 +2422,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       async unstable_generateMiddlewareResponse(query) {
         let formState;
         if (request.method === "POST") {
+          ctx.runningAction = true;
           let result2 = await processServerAction(
             request,
             basename,
@@ -2429,6 +2433,7 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
             onError,
             temporaryReferences
           );
+          ctx.runningAction = false;
           if (isResponse(result2)) {
             return generateRedirectResponse(
               result2,
@@ -2436,22 +2441,24 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
               basename,
               isDataRequest,
               generateResponse,
-              temporaryReferences
+              temporaryReferences,
+              ctx.redirect?.headers
             );
           }
           actionResult = result2?.actionResult;
           formState = result2?.formState;
           request = result2?.revalidationRequest ?? request;
-        }
-        if (ctx.redirect) {
-          return generateRedirectResponse(
-            ctx.redirect,
-            actionResult,
-            basename,
-            isDataRequest,
-            generateResponse,
-            temporaryReferences
-          );
+          if (ctx.redirect) {
+            return generateRedirectResponse(
+              ctx.redirect,
+              actionResult,
+              basename,
+              isDataRequest,
+              generateResponse,
+              temporaryReferences,
+              void 0
+            );
+          }
         }
         let staticContext = await query(request);
         if (isResponse(staticContext)) {
@@ -2461,7 +2468,8 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
             basename,
             isDataRequest,
             generateResponse,
-            temporaryReferences
+            temporaryReferences,
+            ctx.redirect?.headers
           );
         }
         return generateStaticContextResponse(
@@ -2475,7 +2483,8 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
           actionResult,
           formState,
           staticContext,
-          temporaryReferences
+          temporaryReferences,
+          ctx.redirect?.headers
         );
       }
     })
@@ -2487,13 +2496,14 @@ async function generateRenderResponse(request, routes, basename, isDataRequest,
       basename,
       isDataRequest,
       generateResponse,
-      temporaryReferences
+      temporaryReferences,
+      ctx.redirect?.headers
     );
   }
   invariant2(isResponse(result), "Expected a response from query");
   return result;
 }
-function generateRedirectResponse(response, actionResult, basename, isDataRequest, generateResponse, temporaryReferences) {
+function generateRedirectResponse(response, actionResult, basename, isDataRequest, generateResponse, temporaryReferences, sideEffectRedirectHeaders) {
   let redirect3 = response.headers.get("Location");
   if (isDataRequest && basename) {
     redirect3 = stripBasename(redirect3, basename) || redirect3;
@@ -2506,7 +2516,10 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
     status: response.status,
     actionResult
   };
-  let headers = new Headers(response.headers);
+  let headers = new Headers(sideEffectRedirectHeaders);
+  for (const [key, value] of response.headers.entries()) {
+    headers.append(key, value);
+  }
   headers.delete("Location");
   headers.delete("X-Remix-Reload-Document");
   headers.delete("X-Remix-Replace");
@@ -2522,7 +2535,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
     { temporaryReferences }
   );
 }
-async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences) {
+async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, sideEffectRedirectHeaders) {
   statusCode = staticContext.statusCode ?? statusCode;
   if (staticContext.errors) {
     staticContext.errors = Object.fromEntries(
@@ -2543,7 +2556,8 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
   });
   let headers = getDocumentHeadersImpl(
     staticContext,
-    (match) => match.route.headers
+    (match) => match.route.headers,
+    sideEffectRedirectHeaders
   );
   headers.delete("Content-Length");
   const baseRenderPayload = {

package/dist/development/index.d.mts

@@ -6,8 +6,8 @@ import * as React from 'react';
 import React__default, { ReactElement } from 'react';
 import { c as RouteModules, d as SerializeFrom, e as MetaFunction, f as LinksFunction, A as AppLoadContext, E as Equal, g as ClientActionFunction, h as ClientLoaderFunction, H as HeadersFunction } from './route-data-CpB5xtMm.mjs';
 export { i as ClientActionFunctionArgs, j as ClientLoaderFunctionArgs, k as HeadersArgs, n as HtmlLinkDescriptor, L as LinkDescriptor, l as MetaArgs, M as MetaDescriptor, m as PageLinkDescriptor, u as unstable_SerializesTo } from './route-data-CpB5xtMm.mjs';
-import { A as AssetsManifest, E as EntryContext, F as FutureConfig, S as ServerBuild } from './index-react-server-client-CuajY2vy.mjs';
-export { l as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, a1 as DiscoverBehavior, c as FetcherFormProps, h as FetcherSubmitFunction, G as FetcherSubmitOptions, i as FetcherWithComponents, q as Form, d as FormProps, a2 as HandleDataRequestFunction, a3 as HandleDocumentRequestFunction, a4 as HandleErrorFunction, m as HashRouter, H as HashRouterProps, a as HistoryRouterProps, n as Link, L as LinkProps, X as Links, _ as LinksProps, W as Meta, p as NavLink, N as NavLinkProps, b as NavLinkRenderProps, P as ParamKeyValuePair, a0 as PrefetchBehavior, Z as PrefetchPageLinks, Y as Scripts, $ as ScriptsProps, r as ScrollRestoration, e as ScrollRestorationProps, a5 as ServerEntryModule, f as SetURLSearchParams, T as StaticRouter, M as StaticRouterProps, V as StaticRouterProvider, O as StaticRouterProviderProps, g as SubmitFunction, I as SubmitOptions, J as SubmitTarget, a6 as UNSAFE_FrameworkContext, a7 as UNSAFE_createClientRoutes, a8 as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, a9 as UNSAFE_shouldHydrateRouteLoader, aa as UNSAFE_useScrollRestoration, U as URLSearchParamsInit, j as createBrowserRouter, k as createHashRouter, K as createSearchParams, Q as createStaticHandler, R as createStaticRouter, o as unstable_HistoryRouter, z as unstable_usePrompt, y as useBeforeUnload, w as useFetcher, x as useFetchers, v as useFormAction, u as useLinkClickHandler, s as useSearchParams, t as useSubmit, C as useViewTransitionState } from './index-react-server-client-CuajY2vy.mjs';
+import { A as AssetsManifest, E as EntryContext, F as FutureConfig, S as ServerBuild } from './index-react-server-client-DXb0OgpJ.mjs';
+export { l as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, a1 as DiscoverBehavior, c as FetcherFormProps, h as FetcherSubmitFunction, G as FetcherSubmitOptions, i as FetcherWithComponents, q as Form, d as FormProps, a2 as HandleDataRequestFunction, a3 as HandleDocumentRequestFunction, a4 as HandleErrorFunction, m as HashRouter, H as HashRouterProps, a as HistoryRouterProps, n as Link, L as LinkProps, X as Links, _ as LinksProps, W as Meta, p as NavLink, N as NavLinkProps, b as NavLinkRenderProps, P as ParamKeyValuePair, a0 as PrefetchBehavior, Z as PrefetchPageLinks, Y as Scripts, $ as ScriptsProps, r as ScrollRestoration, e as ScrollRestorationProps, a5 as ServerEntryModule, f as SetURLSearchParams, T as StaticRouter, M as StaticRouterProps, V as StaticRouterProvider, O as StaticRouterProviderProps, g as SubmitFunction, I as SubmitOptions, J as SubmitTarget, a6 as UNSAFE_FrameworkContext, a7 as UNSAFE_createClientRoutes, a8 as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, a9 as UNSAFE_shouldHydrateRouteLoader, aa as UNSAFE_useScrollRestoration, U as URLSearchParamsInit, j as createBrowserRouter, k as createHashRouter, K as createSearchParams, Q as createStaticHandler, R as createStaticRouter, o as unstable_HistoryRouter, z as unstable_usePrompt, y as useBeforeUnload, w as useFetcher, x as useFetchers, v as useFormAction, u as useLinkClickHandler, s as useSearchParams, t as useSubmit, C as useViewTransitionState } from './index-react-server-client-DXb0OgpJ.mjs';
 import { ParseOptions, SerializeOptions } from 'cookie';
 export { ParseOptions as CookieParseOptions, SerializeOptions as CookieSerializeOptions } from 'cookie';
 import { P as Pages } from './register-DiOIlEq5.mjs';

package/dist/development/index.d.ts

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