react-router 8.4.0 → 8.5.1

package/dist/production/lib/components.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,10 +11,12 @@
 import { createMemoryHistory, createPath, invariant, parsePath, warning } from "./router/history.js";
 import { defaultMapRouteProperties, getResolveToMatches, getRoutePattern, resolveTo, stripBasename } from "./router/utils.js";
 import { getNavigatorCurrentUrl, validateNavigationTarget } from "./router/navigation.js";
-import { createRouter } from "./router/router.js";
+import { clientErrors, createRouter } from "./router/router.js";
 import { AwaitContext, DataRouterContext, DataRouterDataContext, DataRouterNavigationContext, DataRouterStateContext, FetchersContext, LocationContext, NavigationContext, RouteContext, ViewTransitionContext, useIsRSCRouterContext } from "./context.js";
+import { getAwaitPromise, getPromiseResult } from "./await.js";
 import { _renderMatches, useActionData, useAsyncValue, useInRouterContext, useLoaderData, useLocation, useMatches, useNavigate, useOutlet, useParams, useRouteError, useRoutes, useRoutesImpl } from "./hooks.js";
 import { warnOnce } from "./server-runtime/warnings.js";
+import { FrameworkContext } from "./dom/ssr/components.js";
 import * as React$1 from "react";
 import { useOptimistic } from "react";
 //#region lib/components.tsx
@@ -84,6 +86,11 @@ var Deferred = class {
 		});
 	}
 };
+function handleSkippedViewTransition(transition, document) {
+	transition.ready.catch((reason) => {
+		if (!(document.visibilityState === "hidden" || typeof reason === "object" && reason !== null && "name" in reason && reason.name === "AbortError")) throw reason;
+	});
+}
 /**
 * Render the UI for the given {@link DataRouter}. This component should
 * typically be at the top of an app's element tree. The router prop should
@@ -122,13 +129,18 @@ function RouterProvider({ router, flushSync: reactDomFlushSyncImpl, onError, use
 	useTransitions = useIsRSCRouterContext() || useTransitions;
 	let [_state, setStateImpl] = React$1.useState(router.state);
 	let [state, setOptimisticState] = useOptimistic(_state);
+	let lastState = React$1.useRef(state);
 	let [pendingState, setPendingState] = React$1.useState();
 	let [vtContext, setVtContext] = React$1.useState({ isTransitioning: false });
 	let [renderDfd, setRenderDfd] = React$1.useState();
 	let [transition, setTransition] = React$1.useState();
 	let [interruption, setInterruption] = React$1.useState();
 	let fetcherData = React$1.useRef(/* @__PURE__ */ new Map());
+	let handledErrors = React$1.useRef(/* @__PURE__ */ new WeakSet());
 	let setState = React$1.useCallback((newState, { deletedFetchers, newErrors, flushSync, viewTransitionOpts }) => {
+		lastState.current = newState;
+		if (newErrors && newState.errors && clientErrors.has(newState.errors)) if (handledErrors.current.has(newState.errors)) newErrors = null;
+		else handledErrors.current.add(newState.errors);
 		if (newErrors && onError) Object.values(newErrors).forEach((error) => onError(error, {
 			location: newState.location,
 			params: newState.matches[0]?.params ?? {},
@@ -166,6 +178,7 @@ function RouterProvider({ router, flushSync: reactDomFlushSyncImpl, onError, use
 			let t = router.window.document.startViewTransition(() => {
 				reactDomFlushSyncImpl(() => setStateImpl(newState));
 			});
+			handleSkippedViewTransition(t, router.window.document);
 			t.finished.finally(() => {
 				reactDomFlushSyncImpl(() => {
 					setRenderDfd(void 0);
@@ -204,6 +217,15 @@ function RouterProvider({ router, flushSync: reactDomFlushSyncImpl, onError, use
 		onError
 	]);
 	React$1.useLayoutEffect(() => router.subscribe(setState), [router, setState]);
+	React$1.useLayoutEffect(() => {
+		let errors = router.state.errors;
+		let newErrors = errors ? clientErrors.get(errors) : null;
+		if (lastState.current !== router.state || errors && newErrors && !handledErrors.current.has(errors)) setState(router.state, {
+			deletedFetchers: [],
+			flushSync: false,
+			newErrors: newErrors ?? null
+		});
+	}, [router, setState]);
 	React$1.useEffect(() => {
 		if (vtContext.isTransitioning && !vtContext.flushSync) setRenderDfd(new Deferred());
 	}, [vtContext]);
@@ -219,6 +241,7 @@ function RouterProvider({ router, flushSync: reactDomFlushSyncImpl, onError, use
 				});
 				await renderPromise;
 			});
+			handleSkippedViewTransition(transition, router.window.document);
 			transition.finished.finally(() => {
 				setRenderDfd(void 0);
 				setTransition(void 0);
@@ -347,6 +370,10 @@ const MemoizedDataRoutes = React$1.memo(DataRoutes);
 function DataRoutes({ routes, manifest, state, isStatic, onError }) {
 	let dataRouterContext = React$1.useContext(DataRouterContext);
 	invariant(dataRouterContext, "You must render this element inside a <DataRouterContext.Provider> element");
+	let discoveryRuntime = React$1.useContext(FrameworkContext)?.routeDiscoveryRuntime;
+	React$1.useEffect(() => {
+		if (state.initialized) discoveryRuntime?.markReady();
+	}, [state.initialized, discoveryRuntime]);
 	return useRoutesImpl(routes, void 0, {
 		router: dataRouterContext.router,
 		manifest,
@@ -624,6 +651,21 @@ function Routes({ children, location }) {
 *
 * **Note:** `<Await>` expects to be rendered inside a [`<React.Suspense>`](https://react.dev/reference/react/Suspense)
 *
+* Pass `unstable_promise` instead of `resolve` to opt into React's
+* [`use()`](https://react.dev/reference/react/use) implementation. With
+* `unstable_promise`, `errorElement` handles promise rejections, while errors
+* thrown by children bubble to the nearest React error boundary.
+*
+* In React Server Components, `resolve` already has this error-handling behavior:
+* `errorElement` handles only input rejections, while child render errors
+* propagate to the surrounding error boundary. Both props accept promise-like
+* values without modifying the source promise. Both props treat a falsy
+* `errorElement` as absent and propagate the rejection. Pass an empty fragment
+* to handle a rejection without rendering any content.
+*
+* <docs-warning>The `unstable_promise` prop is experimental and may change in
+* minor or patch releases.</docs-warning>
+*
 * @example
 * import { Await, useLoaderData } from "react-router";
 *
@@ -664,9 +706,14 @@ function Routes({ children, location }) {
 * @param {AwaitProps.children} props.children n/a
 * @param {AwaitProps.errorElement} props.errorElement n/a
 * @param {AwaitProps.resolve} props.resolve n/a
+* @param props.unstable_promise A promise (or value) to read using React's `use()`
+* API in client components. Accepts promise-like values without modifying the
+* source promise. Pass exactly one of `unstable_promise` or `resolve`.
 * @returns React element for the rendered awaited value
 */
-function Await({ children, errorElement, resolve }) {
+function Await(props) {
+	invariant("resolve" in props !== "unstable_promise" in props, "<Await> requires exactly one of `resolve` or `unstable_promise`");
+	let { children, errorElement } = props;
 	let dataRouterContext = React$1.useContext(DataRouterContext);
 	let dataRouterStateContext = React$1.useContext(DataRouterStateContext);
 	let onError = React$1.useCallback((error, errorInfo) => {
@@ -677,12 +724,25 @@ function Await({ children, errorElement, resolve }) {
 			errorInfo
 		});
 	}, [dataRouterContext, dataRouterStateContext]);
+	if ("unstable_promise" in props) return /* @__PURE__ */ React$1.createElement(AwaitPromise, {
+		value: props.unstable_promise,
+		errorElement,
+		onError
+	}, children);
 	return /* @__PURE__ */ React$1.createElement(AwaitErrorBoundary, {
-		resolve,
+		resolve: props.resolve,
 		errorElement,
 		onError
 	}, /* @__PURE__ */ React$1.createElement(ResolveAwait, null, children));
 }
+function AwaitPromise({ value, children, errorElement, onError }) {
+	let result = value != null && (typeof value === "object" || typeof value === "function") && "then" in value && typeof value.then === "function" ? React$1.use(getAwaitPromise(value, onError)) : {
+		status: "fulfilled",
+		value
+	};
+	if (result.status === "rejected" && !errorElement) throw result.reason;
+	return /* @__PURE__ */ React$1.createElement(AwaitContext.Provider, { value: result }, result.status === "rejected" ? errorElement : /* @__PURE__ */ React$1.createElement(ResolveAwait, null, children));
+}
 var AwaitErrorBoundary = class extends React$1.Component {
 	constructor(props) {
 		super(props);
@@ -716,7 +776,24 @@ var AwaitErrorBoundary = class extends React$1.Component {
 		} else {
 			status = 0;
 			Object.defineProperty(resolve, "_tracked", { get: () => true });
-			promise = resolve.then((data) => Object.defineProperty(resolve, "_data", { get: () => data }), (error) => {
+			let result = getPromiseResult(resolve);
+			if (result) {
+				promise = resolve;
+				if (result.status === "fulfilled") {
+					status = 1;
+					Object.defineProperty(resolve, "_data", { get: () => result.value });
+				} else {
+					status = 2;
+					Object.defineProperty(resolve, "_error", { get: () => result.reason });
+					Promise.resolve(resolve).catch((reason) => {
+						try {
+							this.props.onError?.(reason);
+						} catch (error) {
+							console.error("<Await> caught the following error in onError", error);
+						}
+					});
+				}
+			} else promise = Promise.resolve(resolve).then((data) => Object.defineProperty(resolve, "_data", { get: () => data }), (error) => {
 				this.props.onError?.(error);
 				Object.defineProperty(resolve, "_error", { get: () => error });
 			});

package/dist/production/lib/context.d.ts

@@ -32,8 +32,8 @@ type FetchersContextObject = {
   fetcherData: Map<string, any>;
 };
 declare const FetchersContext: React$1.Context<FetchersContextObject | null>;
-declare const AwaitContext: React$1.Context<TrackedPromise | null>;
-declare const AwaitContextProvider: (props: React$1.ComponentProps<typeof AwaitContext.Provider>) => React$1.FunctionComponentElement<React$1.ProviderProps<TrackedPromise | null>>;
+declare const AwaitContext: React$1.Context<TrackedPromise | PromiseSettledResult<unknown> | null>;
+declare const AwaitContextProvider: (props: React$1.ComponentProps<typeof AwaitContext.Provider>) => React$1.FunctionComponentElement<React$1.ProviderProps<TrackedPromise | PromiseSettledResult<unknown> | null>>;
 interface NavigateOptions {
   /** Replace the current entry in the history stack instead of pushing a new one */
   replace?: boolean;
@@ -47,7 +47,12 @@ interface NavigateOptions {
   relative?: RelativeRoutingType;
   /** Wraps the initial state update for this navigation in a {@link https://react.dev/reference/react-dom/flushSync ReactDOM.flushSync} call instead of the default {@link https://react.dev/reference/react/startTransition React.startTransition} */
   flushSync?: boolean;
-  /** Enables a {@link https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API View Transition} for this navigation by wrapping the final state update in `document.startViewTransition()`. If you need to apply specific styles for this view transition, you will also need to leverage the {@link useViewTransitionState `useViewTransitionState()`} hook.  */
+  /**
+   * Enables a view transition for this navigation.
+   *
+   * @deprecated Use React's `<ViewTransition>` component instead. See the
+   * [migration guide](https://reactrouter.com/how-to/view-transitions).
+   */
   viewTransition?: boolean;
   /** Specifies the default revalidation behavior after this submission */
   defaultShouldRevalidate?: boolean;

package/dist/production/lib/context.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/dom/dom.d.ts

@@ -112,6 +112,9 @@ interface SubmitOptions extends FetcherSubmitOptions {
   navigate?: boolean;
   /**
    * Enable view transitions on this submission navigation
+   *
+   * @deprecated Use React's `<ViewTransition>` component instead. See the
+   * [migration guide](https://reactrouter.com/how-to/view-transitions).
    */
   viewTransition?: boolean;
 }

package/dist/production/lib/dom/dom.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/dom/lib.d.ts

@@ -3,9 +3,9 @@ import { History, To } from "../router/history.js";
 import { DataStrategyFunction, HTMLFormMethod, PatchRoutesOnNavigationFunction, RouteObject } from "../router/utils.js";
 import { BlockerFunction, Fetcher, FutureConfig, GetScrollRestorationKeyFunction, HydrationState, RelativeRoutingType, Router, RouterInit } from "../router/router.js";
 import { NavigateOptions } from "../context.js";
+import { SerializeFrom } from "../types/route-data.js";
 import { FetcherSubmitOptions, SubmitOptions, SubmitTarget, URLSearchParamsInit } from "./dom.js";
 import { DiscoverBehavior, PrefetchBehavior, ScriptsProps } from "./ssr/components.js";
-import { SerializeFrom } from "../types/route-data.js";
 import { ClientInstrumentation } from "../router/instrumentation.js";
 import * as React$1 from "react";
 
@@ -863,6 +863,9 @@ interface LinkProps extends Omit<React$1.AnchorHTMLAttributes<HTMLAnchorElement>
    */
   to: To;
   /**
+   * **Deprecated.** Use React's [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition)
+   * component instead. See the [migration guide](../../how-to/view-transitions).
+   *
    * Enables a [View Transition](https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API)
    * for this navigation.
    *
@@ -873,6 +876,8 @@ interface LinkProps extends Omit<React$1.AnchorHTMLAttributes<HTMLAnchorElement>
    * ```
    *
    * To apply specific styles for the transition, see {@link useViewTransitionState}
+   *
+   * @deprecated Use React's `<ViewTransition>` component instead.
    */
   viewTransition?: boolean;
   /**
@@ -1020,6 +1025,10 @@ type NavLinkRenderProps = {
   /**
    * Indicates if a view transition to the link's URL is in progress.
    * See {@link useViewTransitionState}
+   *
+   * @deprecated Only tracks React Router's deprecated view transitions. Use
+   * React's `<ViewTransition>` component to style transitions instead. See the
+   * [migration guide](https://reactrouter.com/how-to/view-transitions).
    */
   isTransitioning: boolean;
 };
@@ -1059,9 +1068,6 @@ interface NavLinkProps extends Omit<LinkProps, "className" | "style" | "children
    * a.pending {
    *   color: blue;
    * }
-   * a.transitioning {
-   *   view-transition-name: my-transition;
-   * }
    * ```
    *
    * Or you can specify a function that receives {@link NavLinkRenderProps} and
@@ -1074,6 +1080,10 @@ interface NavLinkProps extends Omit<LinkProps, "className" | "style" | "children
    *   ""
    * )} />
    * ```
+   *
+   * The `transitioning` class is deprecated and only tracks React Router's
+   * legacy view transitions. Use React's [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition)
+   * component instead. See the [migration guide](../../how-to/view-transitions).
    */
   className?: string | ((props: NavLinkRenderProps) => string | undefined);
   /**
@@ -1257,9 +1267,14 @@ interface FormProps extends SharedFormProps {
    */
   state?: any;
   /**
+   * **Deprecated.** Use React's [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition)
+   * component instead. See the [migration guide](../../how-to/view-transitions).
+   *
    * 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}.
+   *
+   * @deprecated Use React's `<ViewTransition>` component instead.
    */
   viewTransition?: boolean;
 }
@@ -1405,9 +1420,9 @@ declare namespace ScrollRestoration {
  * @param options.state The state to add to the [`History`](https://developer.mozilla.org/en-US/docs/Web/API/History)
  * entry for this navigation. Defaults to `undefined`.
  * @param options.target The target attribute for the link. Defaults to `undefined`.
- * @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.viewTransition **Deprecated.** Use React's
+ * [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition) component
+ * instead. See the [migration guide](../../how-to/view-transitions).
  * @param options.defaultShouldRevalidate Specify the default revalidation
  * behavior for the navigation. When not specified, loaders revalidate
  * according to the router's standard revalidation behavior.
@@ -1435,10 +1450,9 @@ declare function useLinkClickHandler<E extends Element = HTMLAnchorElement>(to:
   state?: any;
   preventScrollReset?: boolean;
   relative?: RelativeRoutingType;
-  viewTransition?: boolean;
   defaultShouldRevalidate?: boolean;
   useTransitions?: boolean;
-}): (event: React$1.MouseEvent<E, MouseEvent>) => void;
+} & Pick<NavigateOptions, "viewTransition">): (event: React$1.MouseEvent<E, MouseEvent>) => void;
 /**
  * Returns a tuple of the current URL's [`URLSearchParams`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams)
  * and a function to update them. Setting the search params causes a navigation.
@@ -1662,6 +1676,10 @@ interface FetcherSubmitFunction {
  * The imperative version of {@link Form | `<Form>`} that lets you submit a form
  * from code instead of a user interaction.
  *
+ * The `viewTransition` submission option is deprecated. Use React's
+ * [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition) component
+ * instead. See the [migration guide](../../how-to/view-transitions).
+ *
  * @example
  * import { useSubmit } from "react-router";
  *
@@ -2025,6 +2043,11 @@ declare function usePrompt({
   message: string;
 }): void;
 /**
+ * **Deprecated.** Use React's [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition)
+ * component to style transitions instead. This hook only tracks React Router's
+ * legacy view transitions, not transitions started by React. See the
+ * [migration guide](../../how-to/view-transitions).
+ *
  * This hook returns `true` when there is an active [View Transition](https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API)
  * and the specified location matches either side of the navigation (the URL you are
  * navigating **to** or the URL you are navigating **from**). This can be used to apply finer-grained styles to
@@ -2044,6 +2067,8 @@ declare function usePrompt({
  * more details.
  * @returns `true` if there is an active [View Transition](https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API)
  * and the resolved path matches the transition's destination or source pathname, otherwise `false`.
+ *
+ * @deprecated Use React's `<ViewTransition>` component instead.
  */
 declare function useViewTransitionState(to: To, {
   relative

package/dist/production/lib/dom/lib.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,10 +14,10 @@ import { ErrorResponseImpl, SUPPORTED_ERROR_TYPES, defaultMapRouteProperties, jo
 import { IDLE_FETCHER, createRouter } from "../router/router.js";
 import { DataRouterNavigationContext, NavigationContext, RouteContext, ViewTransitionContext } from "../context.js";
 import { useBlocker, useCurrentRouteId, useDataRouterContext, useDataRouterFetchers, useDataRouterState, useHref, useLocation, useMatches, useNavigate, useNavigation, useResolvedPath } from "../hooks.js";
-import { Router, hydrationRouteProperties } from "../components.js";
-import { createSearchParams, getFormSubmissionInfo, getSearchParamsForLocation, shouldProcessLinkClick } from "./dom.js";
 import { escapeHtml } from "./ssr/markup.js";
 import { FrameworkContext, PrefetchPageLinks, mergeRefs, usePrefetchBehavior } from "./ssr/components.js";
+import { Router, hydrationRouteProperties } from "../components.js";
+import { createSearchParams, getFormSubmissionInfo, getSearchParamsForLocation, shouldProcessLinkClick } from "./dom.js";
 import * as React$1 from "react";
 //#region lib/dom/lib.tsx
 const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
@@ -592,9 +592,9 @@ ScrollRestoration.displayName = "ScrollRestoration";
 * @param options.state The state to add to the [`History`](https://developer.mozilla.org/en-US/docs/Web/API/History)
 * entry for this navigation. Defaults to `undefined`.
 * @param options.target The target attribute for the link. Defaults to `undefined`.
-* @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.viewTransition **Deprecated.** Use React's
+* [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition) component
+* instead. See the [migration guide](../../how-to/view-transitions).
 * @param options.defaultShouldRevalidate Specify the default revalidation
 * behavior for the navigation. When not specified, loaders revalidate
 * according to the router's standard revalidation behavior.
@@ -756,6 +756,10 @@ let getUniqueFetcherId = () => `__${String(++fetcherId)}__`;
 * The imperative version of {@link Form | `<Form>`} that lets you submit a form
 * from code instead of a user interaction.
 *
+* The `viewTransition` submission option is deprecated. Use React's
+* [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition) component
+* instead. See the [migration guide](../../how-to/view-transitions).
+*
 * @example
 * import { useSubmit } from "react-router";
 *
@@ -1235,6 +1239,11 @@ function usePrompt({ when, message }) {
 	}, [blocker, when]);
 }
 /**
+* **Deprecated.** Use React's [`<ViewTransition>`](https://react.dev/reference/react/ViewTransition)
+* component to style transitions instead. This hook only tracks React Router's
+* legacy view transitions, not transitions started by React. See the
+* [migration guide](../../how-to/view-transitions).
+*
 * This hook returns `true` when there is an active [View Transition](https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API)
 * and the specified location matches either side of the navigation (the URL you are
 * navigating **to** or the URL you are navigating **from**). This can be used to apply finer-grained styles to
@@ -1254,6 +1263,8 @@ function usePrompt({ when, message }) {
 * more details.
 * @returns `true` if there is an active [View Transition](https://developer.mozilla.org/en-US/docs/Web/API/View_Transitions_API)
 * and the resolved path matches the transition's destination or source pathname, otherwise `false`.
+*
+* @deprecated Use React's `<ViewTransition>` component instead.
 */
 function useViewTransitionState(to, { relative } = {}) {
 	let vtContext = React$1.useContext(ViewTransitionContext);

package/dist/production/lib/dom/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,8 +13,8 @@ import { createPath, invariant, parsePath, warning } from "../router/history.js"
 import { convertRoutesToDataRoutes, isRouteErrorResponse } from "../router/utils.js";
 import { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION } from "../router/router.js";
 import { DataRouterContext, DataRouterDataContext, DataRouterNavigationContext, DataRouterStateContext, FetchersContext, ViewTransitionContext } from "../context.js";
-import { DataRoutes, Router } from "../components.js";
 import { escapeHtml } from "./ssr/markup.js";
+import { DataRoutes, Router } from "../components.js";
 import * as React$1 from "react";
 //#region lib/dom/server.tsx
 /**

package/dist/production/lib/dom/ssr/components.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,11 +10,11 @@
  */
 import { useIsRSCRouterContext } from "../../context.js";
 import { useDataRouterContext, useDataRouterData, useDataRouterState, useLocation } from "../../hooks.js";
-import { warnOnce } from "../../server-runtime/warnings.js";
 import invariant from "./invariant.js";
 import { getKeyedLinksForMatches, getKeyedPrefetchLinks, getModuleLinkHrefs, getNewMatchesForLinks, isPageLinkDescriptor } from "./links.js";
 import { escapeHtml } from "./markup.js";
 import { singleFetchUrl } from "./single-fetch.js";
+import { warnOnce } from "../../server-runtime/warnings.js";
 import { getPartialManifest, isFogOfWarEnabled } from "./fog-of-war.js";
 import * as React$1 from "react";
 //#region lib/dom/ssr/components.tsx
@@ -234,19 +234,21 @@ function useKeyedPrefetchLinks(matches) {
 }
 function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 	let location = useLocation();
+	let { unstable_apiServerOrigin } = useFrameworkContext();
 	let dataHrefs = React$1.useMemo(() => {
 		if (page === location.pathname + location.search + location.hash) return [];
-		let url = singleFetchUrl(page, "rsc");
+		let url = singleFetchUrl(page, "rsc", unstable_apiServerOrigin);
 		let hasSomeRoutesWithShouldRevalidate = false;
 		let targetRoutes = [];
 		for (let match of nextMatches) if (typeof match.route.shouldRevalidate === "function") hasSomeRoutesWithShouldRevalidate = true;
 		else targetRoutes.push(match.route.id);
 		if (hasSomeRoutesWithShouldRevalidate && targetRoutes.length > 0) url.searchParams.set("_routes", targetRoutes.join(","));
-		return [url.pathname + url.search];
+		return [unstable_apiServerOrigin ? url.toString() : url.pathname + url.search];
 	}, [
 		page,
 		location,
-		nextMatches
+		nextMatches,
+		unstable_apiServerOrigin
 	]);
 	return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, dataHrefs.map((href) => /* @__PURE__ */ React$1.createElement("link", {
 		key: href,
@@ -258,7 +260,7 @@ function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps })
 }
 function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 	let location = useLocation();
-	let { manifest, routeModules } = useFrameworkContext();
+	let { manifest, routeModules, unstable_apiServerOrigin } = useFrameworkContext();
 	let { matches } = useDataRouterState("PrefetchPageLinks");
 	let { loaderData } = useDataRouterData("PrefetchPageLinks");
 	let newMatchesForData = React$1.useMemo(() => getNewMatchesForLinks(page, nextMatches, matches, manifest, location, "data"), [
@@ -287,9 +289,9 @@ function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 			else routesParams.add(m.route.id);
 		});
 		if (routesParams.size === 0) return [];
-		let url = singleFetchUrl(page, "data");
+		let url = singleFetchUrl(page, "data", unstable_apiServerOrigin);
 		if (foundOptOutRoute && routesParams.size > 0) url.searchParams.set("_routes", nextMatches.filter((m) => routesParams.has(m.route.id)).map((m) => m.route.id).join(","));
-		return [url.pathname + url.search];
+		return [unstable_apiServerOrigin ? url.toString() : url.pathname + url.search];
 	}, [
 		loaderData,
 		location,
@@ -297,7 +299,8 @@ function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 		newMatchesForData,
 		nextMatches,
 		page,
-		routeModules
+		routeModules,
+		unstable_apiServerOrigin
 	]);
 	let moduleHrefs = React$1.useMemo(() => getModuleLinkHrefs(newMatchesForAssets, manifest), [newMatchesForAssets, manifest]);
 	let keyedPrefetchLinks = useKeyedPrefetchLinks(newMatchesForAssets);

package/dist/production/lib/dom/ssr/data.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/dom/ssr/entry.d.ts

@@ -1,8 +1,9 @@
 
 import { DataRouteObject, RouteBranch, RouteManifest } from "../../router/utils.js";
 import { StaticHandlerContext } from "../../router/router.js";
-import { RouteModules } from "./routeModules.js";
 import { EntryRoute } from "./routes.js";
+import { RouteModules } from "./routeModules.js";
+import { DiscoveryState, RouteDiscoveryRuntime } from "./route-discovery.js";
 import { ServerBuild } from "../../server-runtime/build.js";
 
 //#region lib/dom/ssr/entry.d.ts
@@ -11,6 +12,8 @@ type SerializedError = {
   stack?: string;
 };
 interface FrameworkContextObject {
+  routeDiscoveryRuntime?: RouteDiscoveryRuntime;
+  routeDiscoveryState?: DiscoveryState;
   manifest: AssetsManifest;
   routeModules: RouteModules;
   criticalCss?: CriticalCss;
@@ -18,6 +21,8 @@ interface FrameworkContextObject {
   future: FutureConfig;
   ssr: boolean;
   isSpaMode: boolean;
+  unstable_apiOnly?: boolean;
+  unstable_apiServerOrigin?: string;
   routeDiscovery: ServerBuild["routeDiscovery"];
   nonce?: string;
   serializeError?(error: Error): SerializedError;
@@ -41,7 +46,9 @@ interface EntryContext extends FrameworkContextObject {
   staticHandlerContext: StaticHandlerContext;
   serverHandoffStream?: ReadableStream<Uint8Array>;
 }
-type FutureConfig = Record<string, never>;
+interface FutureConfig {
+  unstable_customRouteDiscovery?: boolean;
+}
 type CriticalCss = string | {
   rel: "stylesheet";
   href: string;

package/dist/production/lib/dom/ssr/errorBoundaries.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/dom/ssr/fallback.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.4.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/dom/ssr/fog-of-war.d.ts

@@ -2,11 +2,12 @@
 import { PatchRoutesOnNavigationFunction } from "../../router/utils.js";
 import { Router } from "../../router/router.js";
 import { RouteModules } from "./routeModules.js";
+import { RouterFetch } from "./single-fetch.js";
 import { AssetsManifest } from "./entry.js";
 import { ServerBuild } from "../../server-runtime/build.js";
 
 //#region lib/dom/ssr/fog-of-war.d.ts
-declare function getPatchRoutesOnNavigationFunction(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, routeDiscovery: ServerBuild["routeDiscovery"], isSpaMode: boolean, basename: string | undefined): PatchRoutesOnNavigationFunction | undefined;
-declare function useFogOFWarDiscovery(router: Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, routeDiscovery: ServerBuild["routeDiscovery"], isSpaMode: boolean): void;
+declare function getPatchRoutesOnNavigationFunction(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, routeDiscovery: ServerBuild["routeDiscovery"], isSpaMode: boolean, basename: string | undefined, fetchImplementation?: RouterFetch, serverOrigin?: string, isApiOnly?: boolean): PatchRoutesOnNavigationFunction | undefined;
+declare function useFogOFWarDiscovery(router: Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, routeDiscovery: ServerBuild["routeDiscovery"], isSpaMode: boolean, fetchImplementation?: RouterFetch, serverOrigin?: string, isApiOnly?: boolean): void;
 //#endregion
 export { getPatchRoutesOnNavigationFunction, useFogOFWarDiscovery };