react-router 7.13.2 → 7.14.0

package/CHANGELOG.md

@@ -1,5 +1,72 @@
 # `react-router`
 
+## 7.14.0
+
+### Patch Changes
+
+- UNSTABLE RSC FRAMEWORK MODE BREAKING CHANGE - Existing route module exports remain unchanged from stable v7 non-RSC mode, but new exports are added for RSC mode. If you want to use RSC features, you will need to update your route modules to export the new annotations. ([#14901](https://github.com/remix-run/react-router/pull/14901))
+
+  If you are using RSC framework mode currently, you will need to update your route modules to the new conventions. The following route module components have their own mutually exclusive server component counterparts:
+
+  | Server Component Export | Client Component  |
+  | ----------------------- | ----------------- |
+  | `ServerComponent`       | `default`         |
+  | `ServerErrorBoundary`   | `ErrorBoundary`   |
+  | `ServerLayout`          | `Layout`          |
+  | `ServerHydrateFallback` | `HydrateFallback` |
+
+  If you were previously exporting a `ServerComponent`, your `ErrorBoundary`, `Layout`, and `HydrateFallback` were also server components. If you want to keep those as server components, you can rename them and prefix them with `Server`. If you were previously importing the implementations of those components from a client module, you can simply inline them.
+
+  Example:
+
+  Before
+
+  ```tsx
+  import { ErrorBoundary as ClientErrorBoundary } from "./client";
+
+  export function ServerComponent() {
+    // ...
+  }
+
+  export function ErrorBoundary() {
+    return <ClientErrorBoundary />;
+  }
+
+  export function Layout() {
+    // ...
+  }
+
+  export function HydrateFallback() {
+    // ...
+  }
+  ```
+
+  After
+
+  ```tsx
+  export function ServerComponent() {
+    // ...
+  }
+
+  export function ErrorBoundary() {
+    // previous implementation of ClientErrorBoundary, this is now a client component
+  }
+
+  export function ServerLayout() {
+    // rename previous Layout export to ServerLayout to make it a server component
+  }
+
+  export function ServerHydrateFallback() {
+    // rename previous HydrateFallback export to ServerHydrateFallback to make it a server component
+  }
+  ```
+
+- rsc Link prefetch ([#14902](https://github.com/remix-run/react-router/pull/14902))
+
+- Remove recursion from turbo-stream v2 allowing for encoding / decoding of massive payloads. ([#14838](https://github.com/remix-run/react-router/pull/14838))
+
+- encodeViaTurboStream leaked memory via unremoved AbortSignal listener ([#14900](https://github.com/remix-run/react-router/pull/14900))
+
 ## 7.13.2
 
 ### Patch Changes

package/dist/development/{browser-Bfn3xw9E.d.ts → browser-C9Ar1yxG.d.ts}

@@ -65,14 +65,15 @@ type RSCRenderPayload = {
     errors: Record<string, any> | null;
     loaderData: Record<string, any>;
     location: Location;
+    routeDiscovery: RouteDiscovery;
     matches: RSCRouteMatch[];
-    patches?: RSCRouteManifest[];
+    patches?: Promise<RSCRouteManifest[]>;
     nonce?: string;
     formState?: unknown;
 };
 type RSCManifestPayload = {
     type: "manifest";
-    patches: RSCRouteManifest[];
+    patches: Promise<RSCRouteManifest[]>;
 };
 type RSCActionPayload = {
     type: "action";
@@ -99,6 +100,12 @@ type DecodeReplyFunction = (reply: FormData | string, options: {
     temporaryReferences: unknown;
 }) => Promise<unknown[]>;
 type LoadServerActionFunction = (id: string) => Promise<Function>;
+type RouteDiscovery = {
+    mode: "lazy";
+    manifestPath?: string | undefined;
+} | {
+    mode: "initial";
+};
 /**
  * Matches the given routes to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  * and returns an [RSC](https://react.dev/reference/rsc/server-components)
@@ -165,12 +172,13 @@ type LoadServerActionFunction = (id: string) => Promise<Function>;
  * @param opts.requestContext An instance of {@link RouterContextProvider}
  * that should be created per request, to be passed to [`action`](../../start/data/route-object#action)s,
  * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
+ * @param opts.routeDiscovery The route discovery configuration, used to determine how the router should discover new routes during navigations.
  * @param opts.routes Your {@link unstable_RSCRouteConfigEntry | route definitions}.
  * @returns A [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)
  * that contains the [RSC](https://react.dev/reference/rsc/server-components)
  * data for hydration.
  */
-declare function matchRSCServerRequest({ allowedActionOrigins, createTemporaryReferenceSet, basename, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, request, routes, generateResponse, }: {
+declare function matchRSCServerRequest({ allowedActionOrigins, createTemporaryReferenceSet, basename, decodeReply, requestContext, routeDiscovery, loadServerAction, decodeAction, decodeFormState, onError, request, routes, generateResponse, }: {
     allowedActionOrigins?: string[];
     createTemporaryReferenceSet: () => unknown;
     basename?: string;
@@ -182,6 +190,7 @@ declare function matchRSCServerRequest({ allowedActionOrigins, createTemporaryRe
     onError?: (error: unknown) => void;
     request: Request;
     routes: RSCRouteConfigEntry[];
+    routeDiscovery?: RouteDiscovery;
     generateResponse: (match: RSCMatch, { onError, temporaryReferences, }: {
         onError(error: unknown): string | undefined;
         temporaryReferences: unknown;
@@ -256,11 +265,6 @@ interface RSCHydratedRouterProps {
      * The decoded {@link unstable_RSCPayload} to hydrate.
      */
     payload: RSCPayload;
-    /**
-     * `"eager"` or `"lazy"` - Determines if links are eagerly discovered, or
-     * delayed until clicked.
-     */
-    routeDiscovery?: "eager" | "lazy";
     /**
      * A function that returns an {@link RouterContextProvider} instance
      * which is provided as the `context` argument to client [`action`](../../start/data/route-object#action)s,
@@ -306,10 +310,9 @@ interface RSCHydratedRouterProps {
  * @param {unstable_RSCHydratedRouterProps.fetch} props.fetch n/a
  * @param {unstable_RSCHydratedRouterProps.getContext} props.getContext n/a
  * @param {unstable_RSCHydratedRouterProps.payload} props.payload n/a
- * @param {unstable_RSCHydratedRouterProps.routeDiscovery} props.routeDiscovery n/a
  * @returns A hydrated {@link DataRouter} that can be used to navigate and
  * render routes.
  */
-declare function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementation, payload, routeDiscovery, getContext, }: RSCHydratedRouterProps): React.JSX.Element;
+declare function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementation, payload, getContext, }: RSCHydratedRouterProps): React.JSX.Element;
 
 export { type BrowserCreateFromReadableStreamFunction as B, type DecodeActionFunction as D, type EncodeReplyFunction as E, type LoadServerActionFunction as L, RSCHydratedRouter as R, type DecodeFormStateFunction as a, type DecodeReplyFunction as b, createCallServer as c, type RSCManifestPayload as d, type RSCPayload as e, type RSCRenderPayload as f, getRequest as g, type RSCHydratedRouterProps as h, type RSCMatch as i, type RSCRouteManifest as j, type RSCRouteMatch as k, type RSCRouteConfigEntry as l, matchRSCServerRequest as m, type RSCRouteConfig as n };

package/dist/development/{browser-Di6-vSl-.d.mts → browser-vtIR1Kpe.d.mts}

@@ -65,14 +65,15 @@ type RSCRenderPayload = {
     errors: Record<string, any> | null;
     loaderData: Record<string, any>;
     location: Location;
+    routeDiscovery: RouteDiscovery;
     matches: RSCRouteMatch[];
-    patches?: RSCRouteManifest[];
+    patches?: Promise<RSCRouteManifest[]>;
     nonce?: string;
     formState?: unknown;
 };
 type RSCManifestPayload = {
     type: "manifest";
-    patches: RSCRouteManifest[];
+    patches: Promise<RSCRouteManifest[]>;
 };
 type RSCActionPayload = {
     type: "action";
@@ -99,6 +100,12 @@ type DecodeReplyFunction = (reply: FormData | string, options: {
     temporaryReferences: unknown;
 }) => Promise<unknown[]>;
 type LoadServerActionFunction = (id: string) => Promise<Function>;
+type RouteDiscovery = {
+    mode: "lazy";
+    manifestPath?: string | undefined;
+} | {
+    mode: "initial";
+};
 /**
  * Matches the given routes to a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request)
  * and returns an [RSC](https://react.dev/reference/rsc/server-components)
@@ -165,12 +172,13 @@ type LoadServerActionFunction = (id: string) => Promise<Function>;
  * @param opts.requestContext An instance of {@link RouterContextProvider}
  * that should be created per request, to be passed to [`action`](../../start/data/route-object#action)s,
  * [`loader`](../../start/data/route-object#loader)s and [middleware](../../how-to/middleware).
+ * @param opts.routeDiscovery The route discovery configuration, used to determine how the router should discover new routes during navigations.
  * @param opts.routes Your {@link unstable_RSCRouteConfigEntry | route definitions}.
  * @returns A [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response)
  * that contains the [RSC](https://react.dev/reference/rsc/server-components)
  * data for hydration.
  */
-declare function matchRSCServerRequest({ allowedActionOrigins, createTemporaryReferenceSet, basename, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, request, routes, generateResponse, }: {
+declare function matchRSCServerRequest({ allowedActionOrigins, createTemporaryReferenceSet, basename, decodeReply, requestContext, routeDiscovery, loadServerAction, decodeAction, decodeFormState, onError, request, routes, generateResponse, }: {
     allowedActionOrigins?: string[];
     createTemporaryReferenceSet: () => unknown;
     basename?: string;
@@ -182,6 +190,7 @@ declare function matchRSCServerRequest({ allowedActionOrigins, createTemporaryRe
     onError?: (error: unknown) => void;
     request: Request;
     routes: RSCRouteConfigEntry[];
+    routeDiscovery?: RouteDiscovery;
     generateResponse: (match: RSCMatch, { onError, temporaryReferences, }: {
         onError(error: unknown): string | undefined;
         temporaryReferences: unknown;
@@ -256,11 +265,6 @@ interface RSCHydratedRouterProps {
      * The decoded {@link unstable_RSCPayload} to hydrate.
      */
     payload: RSCPayload;
-    /**
-     * `"eager"` or `"lazy"` - Determines if links are eagerly discovered, or
-     * delayed until clicked.
-     */
-    routeDiscovery?: "eager" | "lazy";
     /**
      * A function that returns an {@link RouterContextProvider} instance
      * which is provided as the `context` argument to client [`action`](../../start/data/route-object#action)s,
@@ -306,10 +310,9 @@ interface RSCHydratedRouterProps {
  * @param {unstable_RSCHydratedRouterProps.fetch} props.fetch n/a
  * @param {unstable_RSCHydratedRouterProps.getContext} props.getContext n/a
  * @param {unstable_RSCHydratedRouterProps.payload} props.payload n/a
- * @param {unstable_RSCHydratedRouterProps.routeDiscovery} props.routeDiscovery n/a
  * @returns A hydrated {@link DataRouter} that can be used to navigate and
  * render routes.
  */
-declare function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementation, payload, routeDiscovery, getContext, }: RSCHydratedRouterProps): React.JSX.Element;
+declare function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementation, payload, getContext, }: RSCHydratedRouterProps): React.JSX.Element;
 
 export { type BrowserCreateFromReadableStreamFunction as B, type DecodeActionFunction as D, type EncodeReplyFunction as E, type LoadServerActionFunction as L, RSCHydratedRouter as R, type DecodeFormStateFunction as a, type DecodeReplyFunction as b, createCallServer as c, type RSCManifestPayload as d, type RSCPayload as e, type RSCRenderPayload as f, getRequest as g, type RSCHydratedRouterProps as h, type RSCMatch as i, type RSCRouteManifest as j, type RSCRouteMatch as k, type RSCRouteConfigEntry as l, matchRSCServerRequest as m, type RSCRouteConfig as n };

package/dist/development/{chunk-UALY5CBT.mjs → chunk-2UH5WJXA.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.13.2
+ * react-router v7.14.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -51,7 +51,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-UVKPFVEO.mjs";
+} from "./chunk-QFMPRPBF.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -1096,14 +1096,24 @@ function getSingleFetchRedirect(status, headers, basename) {
 function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
   let controller = new AbortController();
   let timeoutId = setTimeout(
-    () => controller.abort(new Error("Server Timeout")),
+    () => {
+      controller.abort(new Error("Server Timeout"));
+      cleanupCallbacks();
+    },
     typeof streamTimeout === "number" ? streamTimeout : 4950
   );
-  let clearStreamTimeout = () => clearTimeout(timeoutId);
-  requestSignal.addEventListener("abort", clearStreamTimeout);
+  let abortControllerOnRequestAbort = () => {
+    controller.abort(requestSignal.reason);
+    cleanupCallbacks();
+  };
+  requestSignal.addEventListener("abort", abortControllerOnRequestAbort);
+  let cleanupCallbacks = () => {
+    clearTimeout(timeoutId);
+    requestSignal.removeEventListener("abort", abortControllerOnRequestAbort);
+  };
   return encode(data2, {
     signal: controller.signal,
-    onComplete: clearStreamTimeout,
+    onComplete: cleanupCallbacks,
     plugins: [
       (value) => {
         if (value instanceof Error) {
@@ -2057,6 +2067,7 @@ function populateRSCRouteModules(routeModules, matches) {
 var noopComponent = () => null;
 
 // lib/rsc/server.ssr.tsx
+var defaultManifestPath = "/__manifest";
 var REACT_USE = "use";
 var useImpl = React4[REACT_USE];
 function useSafe(promise) {
@@ -2437,7 +2448,10 @@ function RSCStaticRouter({ getPayload }) {
         imports: []
       }
     },
-    routeDiscovery: { mode: "lazy", manifestPath: "/__manifest" },
+    routeDiscovery: payload.routeDiscovery.mode === "initial" ? { mode: "initial", manifestPath: defaultManifestPath } : {
+      mode: "lazy",
+      manifestPath: payload.routeDiscovery.manifestPath || defaultManifestPath
+    },
     routeModules: createRSCRouteModules(payload)
   };
   return /* @__PURE__ */ React4.createElement(RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React4.createElement(RSCRouterGlobalErrorBoundary, { location: payload.location }, /* @__PURE__ */ React4.createElement(FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React4.createElement(