react-router 7.10.1-pre.0 → 7.11.0-pre.0

package/dist/production/{index-react-server-client-CipGfVBI.d.mts → index-react-server-client-P7VgYu6T.d.mts}

@@ -1,4 +1,4 @@
-import { bE as RouteManifest, q as RouteModules, W as HydrationState, a3 as DataRouteObject, a as ClientLoaderFunction, a7 as StaticHandlerContext, bF as ServerRouteModule, s as MiddlewareEnabled, c as RouterContextProvider, t as AppLoadContext, an as LoaderFunctionArgs, ae as ActionFunctionArgs, aw as unstable_ServerInstrumentation, al as HTMLFormMethod, aj as FormEncType, y as RelativeRoutingType, bh as PageLinkDescriptor, T as To, bG as History, a6 as GetScrollRestorationKeyFunction, e as RouterInit, bH as FutureConfig$1, u as unstable_ClientInstrumentation, r as DataStrategyFunction, a2 as PatchRoutesOnNavigationFunction, v as NavigateOptions, a8 as Fetcher, Q as RouteObject, p as Router, x as SerializeFrom, B as BlockerFunction, L as Location, bI as CreateStaticHandlerOptions$1, a4 as StaticHandler } from './router-CwNp5l9u.mjs';
+import { bE as RouteManifest, q as RouteModules, W as HydrationState, a3 as DataRouteObject, a as ClientLoaderFunction, a7 as StaticHandlerContext, bF as ServerRouteModule, s as MiddlewareEnabled, c as RouterContextProvider, t as AppLoadContext, an as LoaderFunctionArgs, ae as ActionFunctionArgs, aw as unstable_ServerInstrumentation, al as HTMLFormMethod, aj as FormEncType, y as RelativeRoutingType, bh as PageLinkDescriptor, T as To, bG as History, a6 as GetScrollRestorationKeyFunction, e as RouterInit, bH as FutureConfig$1, u as unstable_ClientInstrumentation, r as DataStrategyFunction, a2 as PatchRoutesOnNavigationFunction, v as NavigateOptions, a8 as Fetcher, Q as RouteObject, p as Router, x as SerializeFrom, B as BlockerFunction, L as Location, bI as CreateStaticHandlerOptions$1, a4 as StaticHandler } from './router-5fbeEIMQ.mjs';
 import * as React from 'react';
 
 interface Route {
@@ -215,6 +215,18 @@ interface SharedSubmitOptions {
      * Enable flushSync for this submission's state updates
      */
     flushSync?: boolean;
+    /**
+     * Specify the default revalidation behavior after this submission
+     *
+     * If no `shouldRevalidate` functions are present on the active routes, then this
+     * value will be used directly.  Otherwise it will be passed into `shouldRevalidate`
+     * so the route can make the final determination on revalidation. This can be
+     * useful when updating search params and you don't want to trigger a revalidation.
+     *
+     * By default (when not specified), loaders will revalidate according to the routers
+     * standard revalidation behavior.
+     */
+    unstable_defaultShouldRevalidate?: boolean;
 }
 /**
  * Submit options available to fetchers
@@ -251,7 +263,8 @@ interface SubmitOptions extends FetcherSubmitOptions {
 
 declare const FrameworkContext: React.Context<FrameworkContextObject | undefined>;
 /**
- * Defines the discovery behavior of the link:
+ * Defines the [lazy route discovery](../../explanation/lazy-route-discovery)
+ * behavior of the link/form:
  *
  * - "render" - default, discover the route when the link renders
  * - "none" - don't eagerly discover, only discover if the link is clicked
@@ -1112,16 +1125,16 @@ declare namespace HistoryRouter {
  */
 interface LinkProps extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> {
     /**
-     * Defines the link discovery behavior
+     * Defines the link [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+     *
+     * - **render** — default, discover the route when the link renders
+     * - **none** — don't eagerly discover, only discover if the link is clicked
      *
      * ```tsx
      * <Link /> // default ("render")
      * <Link discover="render" />
      * <Link discover="none" />
      * ```
-     *
-     * - **render** — default, discover the route when the link renders
-     * - **none** — don't eagerly discover, only discover if the link is clicked
      */
     discover?: DiscoverBehavior;
     /**
@@ -1266,6 +1279,22 @@ interface LinkProps extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>,
      * To apply specific styles for the transition, see {@link useViewTransitionState}
      */
     viewTransition?: boolean;
+    /**
+     * Specify the default revalidation behavior for the navigation.
+     *
+     * ```tsx
+     * <Link to="/some/path" unstable_defaultShouldRevalidate={false} />
+     * ```
+     *
+     * If no `shouldRevalidate` functions are present on the active routes, then this
+     * value will be used directly.  Otherwise it will be passed into `shouldRevalidate`
+     * so the route can make the final determination on revalidation. This can be
+     * useful when updating search params and you don't want to trigger a revalidation.
+     *
+     * By default (when not specified), loaders will revalidate according to the routers
+     * standard revalidation behavior.
+     */
+    unstable_defaultShouldRevalidate?: boolean;
 }
 /**
  * A progressively enhanced [`<a href>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a)
@@ -1295,6 +1324,7 @@ interface LinkProps extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>,
  * @param {LinkProps.state} props.state n/a
  * @param {LinkProps.to} props.to n/a
  * @param {LinkProps.viewTransition} props.viewTransition [modes: framework, data] n/a
+ * @param {LinkProps.unstable_defaultShouldRevalidate} props.unstable_defaultShouldRevalidate n/a
  */
 declare const Link: React.ForwardRefExoticComponent<LinkProps & React.RefAttributes<HTMLAnchorElement>>;
 /**
@@ -1524,6 +1554,18 @@ interface SharedFormProps extends React.FormHTMLAttributes<HTMLFormElement> {
      * then this form will not do anything.
      */
     onSubmit?: React.FormEventHandler<HTMLFormElement>;
+    /**
+     * Specify the default revalidation behavior after this submission
+     *
+     * If no `shouldRevalidate` functions are present on the active routes, then this
+     * value will be used directly.  Otherwise it will be passed into `shouldRevalidate`
+     * so the route can make the final determination on revalidation. This can be
+     * useful when updating search params and you don't want to trigger a revalidation.
+     *
+     * By default (when not specified), loaders will revalidate according to the routers
+     * standard revalidation behavior.
+     */
+    unstable_defaultShouldRevalidate?: boolean;
 }
 /**
  * Form props available to fetchers
@@ -1537,16 +1579,16 @@ interface FetcherFormProps extends SharedFormProps {
  */
 interface FormProps extends SharedFormProps {
     /**
-     * Defines the link discovery behavior. See {@link DiscoverBehavior}.
+     * Defines the form [lazy route discovery](../../explanation/lazy-route-discovery) behavior.
+     *
+     * - **render** — default, discover the route when the form renders
+     * - **none** — don't eagerly discover, only discover if the form is submitted
      *
      * ```tsx
-     * <Link /> // default ("render")
-     * <Link discover="render" />
-     * <Link discover="none" />
+     * <Form /> // default ("render")
+     * <Form discover="render" />
+     * <Form discover="none" />
      * ```
-     *
-     * - **render** — default, discover the route when the link renders
-     * - **none** — don't eagerly discover, only discover if the link is clicked
      */
     discover?: DiscoverBehavior;
     /**
@@ -1631,6 +1673,7 @@ interface FormProps extends SharedFormProps {
  * @param {FormProps.replace} replace n/a
  * @param {FormProps.state} state n/a
  * @param {FormProps.viewTransition} viewTransition n/a
+ * @param {FormProps.unstable_defaultShouldRevalidate} unstable_defaultShouldRevalidate n/a
  * @returns A progressively enhanced [`<form>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form) component
  */
 declare const Form: React.ForwardRefExoticComponent<FormProps & React.RefAttributes<HTMLFormElement>>;
@@ -1721,18 +1764,21 @@ declare namespace ScrollRestoration {
  * @param options.viewTransition Enables a [View Transition](https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API)
  * for this navigation. To apply specific styles during the transition, see
  * {@link useViewTransitionState}. Defaults to `false`.
+ * @param options.unstable_defaultShouldRevalidate Specify the default revalidation
+ * behavior for the navigation. Defaults to `true`.
  * @param options.unstable_useTransitions Wraps the navigation in
  * [`React.startTransition`](https://react.dev/reference/react/startTransition)
  * for concurrent rendering. Defaults to `false`.
  * @returns A click handler function that can be used in a custom {@link Link} component.
  */
-declare function useLinkClickHandler<E extends Element = HTMLAnchorElement>(to: To, { target, replace: replaceProp, state, preventScrollReset, relative, viewTransition, unstable_useTransitions, }?: {
+declare function useLinkClickHandler<E extends Element = HTMLAnchorElement>(to: To, { target, replace: replaceProp, state, preventScrollReset, relative, viewTransition, unstable_defaultShouldRevalidate, unstable_useTransitions, }?: {
     target?: React.HTMLAttributeAnchorTarget;
     replace?: boolean;
     state?: any;
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
     viewTransition?: boolean;
+    unstable_defaultShouldRevalidate?: boolean;
     unstable_useTransitions?: boolean;
 }): (event: React.MouseEvent<E, MouseEvent>) => void;
 /**

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

@@ -1,3 +1,3 @@
-export { b2 as MemoryRouter, b3 as Navigate, b4 as Outlet, b5 as Route, b6 as Router, b7 as RouterProvider, b8 as Routes, aR as UNSAFE_AwaitContextProvider, by as UNSAFE_WithComponentProps, bC as UNSAFE_WithErrorBoundaryProps, bA as UNSAFE_WithHydrateFallbackProps } from './router-CwNp5l9u.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-CipGfVBI.mjs';
+export { b2 as MemoryRouter, b3 as Navigate, b4 as Outlet, b5 as Route, b6 as Router, b7 as RouterProvider, b8 as Routes, aR as UNSAFE_AwaitContextProvider, by as UNSAFE_WithComponentProps, bC as UNSAFE_WithErrorBoundaryProps, bA as UNSAFE_WithHydrateFallbackProps } from './router-5fbeEIMQ.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-P7VgYu6T.mjs';
 import 'react';

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

@@ -1,3 +1,3 @@
-export { b2 as MemoryRouter, b3 as Navigate, b4 as Outlet, b5 as Route, b6 as Router, b7 as RouterProvider, b8 as Routes, aP as UNSAFE_AwaitContextProvider, by as UNSAFE_WithComponentProps, bC as UNSAFE_WithErrorBoundaryProps, bA as UNSAFE_WithHydrateFallbackProps } from './instrumentation-BB0wRuqz.js';
-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-CCjKYJTH.js';
+export { b2 as MemoryRouter, b3 as Navigate, b4 as Outlet, b5 as Route, b6 as Router, b7 as RouterProvider, b8 as Routes, aP as UNSAFE_AwaitContextProvider, by as UNSAFE_WithComponentProps, bC as UNSAFE_WithErrorBoundaryProps, bA as UNSAFE_WithHydrateFallbackProps } from './instrumentation-BlrVzjbg.js';
+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-Cv5Q9lf0.js';
 import 'react';

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

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.10.1-pre.0
+ * react-router v7.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,7 +19,7 @@
 
 
 
-var _chunk7NETFFGGjs = require('./chunk-7NETFFGG.js');
+var _chunkM5W3Q3T5js = require('./chunk-M5W3Q3T5.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunk7NETFFGGjs = require('./chunk-7NETFFGG.js');
 
 
 
-var _chunk322RSYEJjs = require('./chunk-322RSYEJ.js');
+var _chunkAO22ZXHIjs = require('./chunk-AO22ZXHI.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunk322RSYEJjs = require('./chunk-322RSYEJ.js');
 
 
 
-exports.BrowserRouter = _chunk7NETFFGGjs.BrowserRouter; exports.Form = _chunk7NETFFGGjs.Form; exports.HashRouter = _chunk7NETFFGGjs.HashRouter; exports.Link = _chunk7NETFFGGjs.Link; exports.Links = _chunk322RSYEJjs.Links; exports.MemoryRouter = _chunk322RSYEJjs.MemoryRouter; exports.Meta = _chunk322RSYEJjs.Meta; exports.NavLink = _chunk7NETFFGGjs.NavLink; exports.Navigate = _chunk322RSYEJjs.Navigate; exports.Outlet = _chunk322RSYEJjs.Outlet; exports.Route = _chunk322RSYEJjs.Route; exports.Router = _chunk322RSYEJjs.Router; exports.RouterProvider = _chunk322RSYEJjs.RouterProvider; exports.Routes = _chunk322RSYEJjs.Routes; exports.ScrollRestoration = _chunk7NETFFGGjs.ScrollRestoration; exports.StaticRouter = _chunk7NETFFGGjs.StaticRouter; exports.StaticRouterProvider = _chunk7NETFFGGjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunk322RSYEJjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunk322RSYEJjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk322RSYEJjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk322RSYEJjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk7NETFFGGjs.HistoryRouter;
+exports.BrowserRouter = _chunkM5W3Q3T5js.BrowserRouter; exports.Form = _chunkM5W3Q3T5js.Form; exports.HashRouter = _chunkM5W3Q3T5js.HashRouter; exports.Link = _chunkM5W3Q3T5js.Link; exports.Links = _chunkAO22ZXHIjs.Links; exports.MemoryRouter = _chunkAO22ZXHIjs.MemoryRouter; exports.Meta = _chunkAO22ZXHIjs.Meta; exports.NavLink = _chunkM5W3Q3T5js.NavLink; exports.Navigate = _chunkAO22ZXHIjs.Navigate; exports.Outlet = _chunkAO22ZXHIjs.Outlet; exports.Route = _chunkAO22ZXHIjs.Route; exports.Router = _chunkAO22ZXHIjs.Router; exports.RouterProvider = _chunkAO22ZXHIjs.RouterProvider; exports.Routes = _chunkAO22ZXHIjs.Routes; exports.ScrollRestoration = _chunkM5W3Q3T5js.ScrollRestoration; exports.StaticRouter = _chunkM5W3Q3T5js.StaticRouter; exports.StaticRouterProvider = _chunkM5W3Q3T5js.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkAO22ZXHIjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkAO22ZXHIjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkAO22ZXHIjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkAO22ZXHIjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkM5W3Q3T5js.HistoryRouter;

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

@@ -1,5 +1,5 @@
 /**
- * react-router v7.10.1-pre.0
+ * react-router v7.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-FI4GMOFC.mjs";
+} from "./chunk-IDHO4Q57.mjs";
 export {
   BrowserRouter,
   Form,

package/dist/production/index-react-server.d.mts

@@ -1369,6 +1369,7 @@ type BaseNavigateOrFetchOptions = {
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
     flushSync?: boolean;
+    unstable_defaultShouldRevalidate?: boolean;
 };
 type BaseNavigateOptions = BaseNavigateOrFetchOptions & {
     replace?: boolean;
@@ -2192,7 +2193,7 @@ type RSCMatch = {
 };
 type DecodeActionFunction = (formData: FormData) => Promise<() => Promise<unknown>>;
 type DecodeFormStateFunction = (result: unknown, formData: FormData) => unknown;
-type DecodeReplyFunction = (reply: FormData | string, { temporaryReferences }: {
+type DecodeReplyFunction = (reply: FormData | string, options: {
     temporaryReferences: unknown;
 }) => Promise<unknown[]>;
 type LoadServerActionFunction = (id: string) => Promise<Function>;
@@ -2277,7 +2278,8 @@ declare function matchRSCServerRequest({ createTemporaryReferenceSet, basename,
     onError?: (error: unknown) => void;
     request: Request;
     routes: RSCRouteConfigEntry[];
-    generateResponse: (match: RSCMatch, { temporaryReferences, }: {
+    generateResponse: (match: RSCMatch, { onError, temporaryReferences, }: {
+        onError(error: unknown): string | undefined;
         temporaryReferences: unknown;
     }) => Response;
 }): Promise<Response>;

package/dist/production/index-react-server.d.ts

@@ -1369,6 +1369,7 @@ type BaseNavigateOrFetchOptions = {
     preventScrollReset?: boolean;
     relative?: RelativeRoutingType;
     flushSync?: boolean;
+    unstable_defaultShouldRevalidate?: boolean;
 };
 type BaseNavigateOptions = BaseNavigateOrFetchOptions & {
     replace?: boolean;
@@ -2192,7 +2193,7 @@ type RSCMatch = {
 };
 type DecodeActionFunction = (formData: FormData) => Promise<() => Promise<unknown>>;
 type DecodeFormStateFunction = (result: unknown, formData: FormData) => unknown;
-type DecodeReplyFunction = (reply: FormData | string, { temporaryReferences }: {
+type DecodeReplyFunction = (reply: FormData | string, options: {
     temporaryReferences: unknown;
 }) => Promise<unknown[]>;
 type LoadServerActionFunction = (id: string) => Promise<Function>;
@@ -2277,7 +2278,8 @@ declare function matchRSCServerRequest({ createTemporaryReferenceSet, basename,
     onError?: (error: unknown) => void;
     request: Request;
     routes: RSCRouteConfigEntry[];
-    generateResponse: (match: RSCMatch, { temporaryReferences, }: {
+    generateResponse: (match: RSCMatch, { onError, temporaryReferences, }: {
+        onError(error: unknown): string | undefined;
         temporaryReferences: unknown;
     }) => Response;
 }): Promise<Response>;

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

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.10.1-pre.0
+ * react-router v7.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1850,7 +1850,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request,
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties,
@@ -2393,6 +2393,43 @@ function prependCookies(parentHeaders, childHeaders) {
   }
 }
 var SINGLE_FETCH_REDIRECT_STATUS = 202;
+
+// lib/errors.ts
+var ERROR_DIGEST_BASE = "REACT_ROUTER_ERROR";
+var ERROR_DIGEST_REDIRECT = "REDIRECT";
+var ERROR_DIGEST_ROUTE_ERROR_RESPONSE = "ROUTE_ERROR_RESPONSE";
+function createRedirectErrorDigest(response) {
+  return `${ERROR_DIGEST_BASE}:${ERROR_DIGEST_REDIRECT}:${JSON.stringify({
+    status: response.status,
+    statusText: response.statusText,
+    location: response.headers.get("Location"),
+    reloadDocument: response.headers.get("X-Remix-Reload-Document") === "true",
+    replace: response.headers.get("X-Remix-Replace") === "true"
+  })}`;
+}
+function createRouteErrorResponseDigest(response) {
+  let status = 500;
+  let statusText = "";
+  let data2;
+  if (isDataWithResponseInit(response)) {
+    status = response.init?.status ?? status;
+    statusText = response.init?.statusText ?? statusText;
+    data2 = response.data;
+  } else {
+    status = response.status;
+    statusText = response.statusText;
+    data2 = void 0;
+  }
+  return `${ERROR_DIGEST_BASE}:${ERROR_DIGEST_ROUTE_ERROR_RESPONSE}:${JSON.stringify(
+    {
+      status,
+      statusText,
+      data: data2
+    }
+  )}`;
+}
+
+// lib/rsc/server.rsc.ts
 var Outlet = reactServerClient.Outlet;
 var WithComponentProps = reactServerClient.UNSAFE_WithComponentProps;
 var WithErrorBoundaryProps = reactServerClient.UNSAFE_WithErrorBoundaryProps;
@@ -2464,8 +2501,28 @@ async function matchRSCServerRequest({
   routes,
   generateResponse
 }) {
-  let requestUrl = new URL(request.url);
+  let url = new URL(request.url);
+  basename = basename || "/";
+  let normalizedPath = url.pathname;
+  if (stripBasename(normalizedPath, basename) === "/_root.rsc") {
+    normalizedPath = basename;
+  } else if (normalizedPath.endsWith(".rsc")) {
+    normalizedPath = normalizedPath.replace(/\.rsc$/, "");
+  }
+  if (stripBasename(normalizedPath, basename) !== "/" && normalizedPath.endsWith("/")) {
+    normalizedPath = normalizedPath.slice(0, -1);
+  }
+  url.pathname = normalizedPath;
+  basename = basename.length > normalizedPath.length ? normalizedPath : basename;
+  let routerRequest = new Request(url.toString(), {
+    method: request.method,
+    headers: request.headers,
+    body: request.body,
+    signal: request.signal,
+    duplex: request.body ? "half" : void 0
+  });
   const temporaryReferences = createTemporaryReferenceSet();
+  const requestUrl = new URL(request.url);
   if (isManifestRequest(requestUrl)) {
     let response2 = await generateManifestResponse(
       routes,
@@ -2477,18 +2534,6 @@ async function matchRSCServerRequest({
     return response2;
   }
   let isDataRequest = isReactServerRequest(requestUrl);
-  const url = new URL(request.url);
-  let routerRequest = request;
-  if (isDataRequest) {
-    url.pathname = url.pathname.replace(/(_root)?\.rsc$/, "");
-    routerRequest = new Request(url.toString(), {
-      method: request.method,
-      headers: request.headers,
-      body: request.body,
-      signal: request.signal,
-      duplex: request.body ? "half" : void 0
-    });
-  }
   let matches = matchRoutes(routes, url.pathname, basename);
   if (matches) {
     await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
@@ -2560,7 +2605,7 @@ async function generateManifestResponse(routes, basename, request, generateRespo
       }),
       payload
     },
-    { temporaryReferences }
+    { temporaryReferences, onError: defaultOnError }
   );
 }
 function prependBasenameToRedirectResponse(response, basename = "/") {
@@ -2838,7 +2883,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
       headers,
       payload
     },
-    { temporaryReferences }
+    { temporaryReferences, onError: defaultOnError }
   );
 }
 async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, sideEffectRedirectHeaders) {
@@ -2868,7 +2913,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
   headers.delete("Content-Length");
   const baseRenderPayload = {
     type: "render",
-    basename,
+    basename: staticContext.basename,
     actionData: staticContext.actionData,
     errors: staticContext.errors,
     loaderData: staticContext.loaderData,
@@ -2905,7 +2950,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
       headers,
       payload
     },
-    { temporaryReferences }
+    { temporaryReferences, onError: defaultOnError }
   );
 }
 async function getRenderPayload(baseRenderPayload, routes, basename, routeIdsToLoad, isDataRequest, staticContext) {
@@ -3116,6 +3161,14 @@ function isReactServerRequest(url) {
 function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }
+function defaultOnError(error) {
+  if (isRedirectResponse(error)) {
+    return createRedirectErrorDigest(error);
+  }
+  if (isResponse(error) || isDataWithResponseInit(error)) {
+    return createRouteErrorResponseDigest(error);
+  }
+}
 function isClientReference(x) {
   try {
     return x.$$typeof === Symbol.for("react.client.reference");

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

@@ -6,7 +6,7 @@ export { BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLi
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.10.1-pre.0
+ * react-router v7.11.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1829,7 +1829,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties, manifest, request,
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties,
@@ -2372,6 +2372,43 @@ function prependCookies(parentHeaders, childHeaders) {
   }
 }
 var SINGLE_FETCH_REDIRECT_STATUS = 202;
+
+// lib/errors.ts
+var ERROR_DIGEST_BASE = "REACT_ROUTER_ERROR";
+var ERROR_DIGEST_REDIRECT = "REDIRECT";
+var ERROR_DIGEST_ROUTE_ERROR_RESPONSE = "ROUTE_ERROR_RESPONSE";
+function createRedirectErrorDigest(response) {
+  return `${ERROR_DIGEST_BASE}:${ERROR_DIGEST_REDIRECT}:${JSON.stringify({
+    status: response.status,
+    statusText: response.statusText,
+    location: response.headers.get("Location"),
+    reloadDocument: response.headers.get("X-Remix-Reload-Document") === "true",
+    replace: response.headers.get("X-Remix-Replace") === "true"
+  })}`;
+}
+function createRouteErrorResponseDigest(response) {
+  let status = 500;
+  let statusText = "";
+  let data2;
+  if (isDataWithResponseInit(response)) {
+    status = response.init?.status ?? status;
+    statusText = response.init?.statusText ?? statusText;
+    data2 = response.data;
+  } else {
+    status = response.status;
+    statusText = response.statusText;
+    data2 = void 0;
+  }
+  return `${ERROR_DIGEST_BASE}:${ERROR_DIGEST_ROUTE_ERROR_RESPONSE}:${JSON.stringify(
+    {
+      status,
+      statusText,
+      data: data2
+    }
+  )}`;
+}
+
+// lib/rsc/server.rsc.ts
 var Outlet = Outlet$1;
 var WithComponentProps = UNSAFE_WithComponentProps;
 var WithErrorBoundaryProps = UNSAFE_WithErrorBoundaryProps;
@@ -2443,8 +2480,28 @@ async function matchRSCServerRequest({
   routes,
   generateResponse
 }) {
-  let requestUrl = new URL(request.url);
+  let url = new URL(request.url);
+  basename = basename || "/";
+  let normalizedPath = url.pathname;
+  if (stripBasename(normalizedPath, basename) === "/_root.rsc") {
+    normalizedPath = basename;
+  } else if (normalizedPath.endsWith(".rsc")) {
+    normalizedPath = normalizedPath.replace(/\.rsc$/, "");
+  }
+  if (stripBasename(normalizedPath, basename) !== "/" && normalizedPath.endsWith("/")) {
+    normalizedPath = normalizedPath.slice(0, -1);
+  }
+  url.pathname = normalizedPath;
+  basename = basename.length > normalizedPath.length ? normalizedPath : basename;
+  let routerRequest = new Request(url.toString(), {
+    method: request.method,
+    headers: request.headers,
+    body: request.body,
+    signal: request.signal,
+    duplex: request.body ? "half" : void 0
+  });
   const temporaryReferences = createTemporaryReferenceSet();
+  const requestUrl = new URL(request.url);
   if (isManifestRequest(requestUrl)) {
     let response2 = await generateManifestResponse(
       routes,
@@ -2456,18 +2513,6 @@ async function matchRSCServerRequest({
     return response2;
   }
   let isDataRequest = isReactServerRequest(requestUrl);
-  const url = new URL(request.url);
-  let routerRequest = request;
-  if (isDataRequest) {
-    url.pathname = url.pathname.replace(/(_root)?\.rsc$/, "");
-    routerRequest = new Request(url.toString(), {
-      method: request.method,
-      headers: request.headers,
-      body: request.body,
-      signal: request.signal,
-      duplex: request.body ? "half" : void 0
-    });
-  }
   let matches = matchRoutes(routes, url.pathname, basename);
   if (matches) {
     await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
@@ -2539,7 +2584,7 @@ async function generateManifestResponse(routes, basename, request, generateRespo
       }),
       payload
     },
-    { temporaryReferences }
+    { temporaryReferences, onError: defaultOnError }
   );
 }
 function prependBasenameToRedirectResponse(response, basename = "/") {
@@ -2817,7 +2862,7 @@ function generateRedirectResponse(response, actionResult, basename, isDataReques
       headers,
       payload
     },
-    { temporaryReferences }
+    { temporaryReferences, onError: defaultOnError }
   );
 }
 async function generateStaticContextResponse(routes, basename, generateResponse, statusCode, routeIdsToLoad, isDataRequest, isSubmission, actionResult, formState, staticContext, temporaryReferences, skipRevalidation, sideEffectRedirectHeaders) {
@@ -2847,7 +2892,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
   headers.delete("Content-Length");
   const baseRenderPayload = {
     type: "render",
-    basename,
+    basename: staticContext.basename,
     actionData: staticContext.actionData,
     errors: staticContext.errors,
     loaderData: staticContext.loaderData,
@@ -2884,7 +2929,7 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
       headers,
       payload
     },
-    { temporaryReferences }
+    { temporaryReferences, onError: defaultOnError }
   );
 }
 async function getRenderPayload(baseRenderPayload, routes, basename, routeIdsToLoad, isDataRequest, staticContext) {
@@ -3095,6 +3140,14 @@ function isReactServerRequest(url) {
 function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }
+function defaultOnError(error) {
+  if (isRedirectResponse(error)) {
+    return createRedirectErrorDigest(error);
+  }
+  if (isResponse(error) || isDataWithResponseInit(error)) {
+    return createRouteErrorResponseDigest(error);
+  }
+}
 function isClientReference(x) {
   try {
     return x.$$typeof === Symbol.for("react.client.reference");