react-router 8.5.0 → 8.5.1

package/dist/production/lib/actions.js

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

package/dist/production/lib/await.js

@@ -0,0 +1,58 @@
+/**
+ * react-router v8.5.1
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+//#region lib/await.ts
+function getPromiseResult(promise) {
+	if (promise.status === "fulfilled") return {
+		status: "fulfilled",
+		value: promise.value
+	};
+	if (promise.status === "rejected") return {
+		status: "rejected",
+		reason: promise.reason
+	};
+}
+let awaitPromises = /* @__PURE__ */ new WeakMap();
+function getAwaitPromise(source, onError) {
+	let cached = awaitPromises.get(source);
+	if (!cached) {
+		cached = {
+			promise: Promise.resolve(source).then((value) => settle({
+				status: "fulfilled",
+				value
+			}), (reason) => {
+				let result = settle({
+					status: "rejected",
+					reason
+				});
+				try {
+					cached.onError(reason);
+				} catch (error) {
+					console.error("<Await> caught the following error in onError", error);
+				}
+				return result;
+			}),
+			onError
+		};
+		awaitPromises.set(source, cached);
+	} else cached.onError = onError;
+	function settle(result) {
+		Object.assign(cached.promise, {
+			status: "fulfilled",
+			value: result
+		});
+		return result;
+	}
+	let result = getPromiseResult(source);
+	if (result) settle(result);
+	return cached.promise;
+}
+//#endregion
+export { getAwaitPromise, getPromiseResult };

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

@@ -768,6 +768,8 @@ interface AwaitResolveRenderFunction<Resolve = any> {
  * @category Types
  */
 interface AwaitProps<Resolve> {
+  /** Use either `resolve` or `unstable_promise`, never both. */
+  unstable_promise?: never;
   /**
    * When using a function, the resolved value is provided as the parameter.
    *
@@ -869,11 +871,46 @@ interface AwaitProps<Resolve> {
    */
   resolve: Resolve;
 }
+interface AwaitPromiseProps<Resolve> extends Omit<AwaitProps<Resolve>, "resolve" | "unstable_promise"> {
+  resolve?: never;
+  /**
+   * A promise (or value) to read using React's `use()` API in client components.
+   * Unlike `resolve` in client components, this accepts promise-like values
+   * without modifying the source promise.
+   *
+   * `errorElement` handles promise rejections. Errors thrown while rendering
+   * children bubble to the nearest React error boundary.
+   *
+   * ```tsx
+   * <Await unstable_promise={reviewsPromise} errorElement={<ReviewsError />}>
+   *   {(reviews) => <Reviews items={reviews} />}
+   * </Await>
+   * ```
+   *
+   * Pass exactly one of `unstable_promise` or `resolve`.
+   */
+  unstable_promise: Resolve;
+}
 /**
  * Used to render promise values with automatic error handling.
  *
  * **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";
  *
@@ -914,13 +951,12 @@ interface AwaitProps<Resolve> {
  * @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
  */
-declare function Await<Resolve>({
-  children,
-  errorElement,
-  resolve
-}: AwaitProps<Resolve>): React$1.JSX.Element;
+declare function Await<Resolve>(props: AwaitProps<Resolve> | AwaitPromiseProps<Resolve>): React$1.JSX.Element;
 /**
  * Creates a route config from a React "children" object, which is usually
  * either a `<Route>` element or an array of them. Used internally by

package/dist/production/lib/components.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,6 +13,7 @@ import { defaultMapRouteProperties, getResolveToMatches, getRoutePattern, resolv
 import { getNavigatorCurrentUrl, validateNavigationTarget } from "./router/navigation.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";
@@ -85,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
@@ -172,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);
@@ -234,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);
@@ -643,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";
 *
@@ -683,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) => {
@@ -696,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);
@@ -735,7 +776,24 @@ var AwaitErrorBoundary = class extends React$1.Component {
 		} else {
 			status = 0;
 			Object.defineProperty(resolve, "_tracked", { get: () => true });
-			promise = Promise.resolve(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;

package/dist/production/lib/context.js

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.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.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -29,6 +29,12 @@ function getPathsWithAncestors(paths) {
 function isFogOfWarEnabled(routeDiscovery, ssr) {
 	return routeDiscovery.mode === "lazy" && ssr;
 }
+const MANIFEST_MATCH_COST_LIMIT = 5e4;
+const MANIFEST_MATCH_COST_SEGMENT_THRESHOLD = 10;
+function shouldUseInitialRouteDiscovery(pathname, matchCost = 0) {
+	let segmentCount = pathname.split("/").length - 1;
+	return Math.max(segmentCount - 1, 0) * pathname.length + 1 > 7680 || segmentCount > MANIFEST_MATCH_COST_SEGMENT_THRESHOLD && segmentCount * matchCost > MANIFEST_MATCH_COST_LIMIT;
+}
 function getPartialManifest({ sri, ...manifest }, router) {
 	let routeIds = new Set(router.state.matches.map((m) => m.route.id));
 	let segments = router.state.location.pathname.split("/").filter(Boolean);
@@ -108,6 +114,9 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
 		isApiOnly
 	]);
 }
+function getManifestPathsParam(paths) {
+	return paths.slice().sort().map((path) => path.replace(/,/g, "%2C")).join(",");
+}
 function getManifestPath(_manifestPath, basename) {
 	let manifestPath = _manifestPath || "/__manifest";
 	return basename == null ? manifestPath : joinPaths([basename, manifestPath]);
@@ -160,7 +169,7 @@ async function handleClientVersionMismatch(needsReload, version, errorReloadPath
 async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal, fetchImplementation = (request) => fetch(request), serverOrigin, isApiOnly = false) {
 	paths = getPathsWithAncestors(paths);
 	const searchParams = new URLSearchParams();
-	searchParams.set("paths", paths.sort().join(","));
+	searchParams.set("paths", getManifestPathsParam(paths));
 	searchParams.set("version", manifest.version);
 	let url = new URL(getManifestPath(manifestPath, basename), serverOrigin ?? window.location.origin);
 	url.search = searchParams.toString();
@@ -207,4 +216,4 @@ function debounce(callback, wait) {
 	};
 }
 //#endregion
-export { URL_LIMIT, getManifestPath, getPartialManifest, getPatchRoutesOnNavigationFunction, getPathsWithAncestors, handleClientVersionMismatch, isFogOfWarEnabled, useFogOFWarDiscovery };
+export { URL_LIMIT, getManifestPath, getManifestPathsParam, getPartialManifest, getPatchRoutesOnNavigationFunction, getPathsWithAncestors, handleClientVersionMismatch, isFogOfWarEnabled, shouldUseInitialRouteDiscovery, useFogOFWarDiscovery };

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

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

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

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

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

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

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

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

package/dist/production/lib/dom/ssr/route-discovery.d.ts

@@ -4,7 +4,7 @@ import { Router } from "../../router/router.js";
 import { ClientOnErrorFunction } from "../../components.js";
 import { RouteModules } from "./routeModules.js";
 import { RouterFetch } from "./single-fetch.js";
-import { WindowReactRouterContext } from "../global.js";
+import { ServerHandoff } from "../../server-runtime/serverHandoff.js";
 import { AssetsManifest } from "./entry.js";
 
 //#region lib/dom/ssr/route-discovery.d.ts
@@ -37,7 +37,7 @@ type RouteDiscoverySsrInfo = {
   manifest: AssetsManifest;
   routeModules: RouteModules;
   router: Router | undefined;
-  context: Pick<WindowReactRouterContext, "ssr" | "routeDiscovery" | "isSpaMode" | "basename" | "unstable_apiServerOrigin" | "unstable_apiOnly">;
+  context: Pick<ServerHandoff, "ssr" | "routeDiscovery" | "isSpaMode" | "basename" | "unstable_apiServerOrigin" | "unstable_apiOnly">;
 };
 declare class RouteDiscoveryRuntime {
   private ssrInfo;

package/dist/production/lib/dom/ssr/route-discovery.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 import { createPath, invariant } from "../../router/history.js";
 import { DiscoveryCancelledError, getRoutePattern, prependBasename } from "../../router/utils.js";
 import { createClientRoutes } from "./routes.js";
-import { getManifestPath, getPathsWithAncestors, handleClientVersionMismatch, isFogOfWarEnabled } from "./fog-of-war.js";
+import { getManifestPath, getManifestPathsParam, getPathsWithAncestors, handleClientVersionMismatch, isFogOfWarEnabled } from "./fog-of-war.js";
 import { useFrameworkContext } from "./components.js";
 import * as React$1 from "react";
 //#region lib/dom/ssr/route-discovery.ts
@@ -158,7 +158,7 @@ var RouteDiscoveryRuntime = class {
 	requestUrl(paths) {
 		let { manifest, context } = this.ssrInfo;
 		let params = new URLSearchParams();
-		params.set("paths", paths.slice().sort().join(","));
+		params.set("paths", getManifestPathsParam(paths));
 		params.set("version", manifest.version);
 		let url = new URL(getManifestPath(context.routeDiscovery.manifestPath, context.basename), context.unstable_apiServerOrigin ?? window.location.origin);
 		url.search = params.toString();

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

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

package/dist/production/lib/dom/ssr/routes-test-stub.js

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

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

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

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

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

package/dist/production/lib/dom/ssr/single-fetch.d.ts

@@ -31,7 +31,7 @@ type RouterFetchContext = {
   navigationType: null;
 };
 type RouterFetch = (request: Request, context: RouterFetchContext) => Promise<Response>;
-declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, fetchImplementation?: RouterFetch, isApiOnly?: boolean, serverOrigin?: string): DataStrategyFunction;
+declare function getTurboStreamSingleFetchDataStrategy(getRouter: () => Router, manifest: AssetsManifest, routeModules: RouteModules, ssr: boolean, fetchImplementation?: RouterFetch, isApiOnly?: boolean, serverOrigin?: string, isSpaMode?: boolean): DataStrategyFunction;
 declare function decodeViaTurboStream(body: ReadableStream<Uint8Array>, global: Window | typeof globalThis): Promise<{
   done: Promise<void>;
   value: unknown;

package/dist/production/lib/dom/ssr/single-fetch.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -56,7 +56,7 @@ function StreamTransfer({ context, identifier, reader, textDecoder, nonce }) {
 		nonce
 	})));
 }
-function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules, ssr, fetchImplementation = (request) => fetch(request), isApiOnly = false, serverOrigin) {
+function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules, ssr, fetchImplementation = (request) => fetch(request), isApiOnly = false, serverOrigin, isSpaMode = false) {
 	let dataStrategy = getSingleFetchDataStrategyImpl(getRouter, (match) => {
 		let manifestRoute = manifest.routes[match.route.id];
 		invariant(manifestRoute, "Route not found in manifest");
@@ -64,10 +64,10 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
 			hasLoader: manifestRoute.hasLoader,
 			hasClientLoader: manifestRoute.hasClientLoader
 		};
-	}, fetchAndDecodeViaTurboStream(fetchImplementation, serverOrigin), ssr, void 0, isApiOnly);
+	}, fetchAndDecodeViaTurboStream(fetchImplementation, serverOrigin), ssr, void 0, isApiOnly, isSpaMode);
 	return async (args) => args.runClientMiddleware(dataStrategy);
 }
-function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut = () => true, isApiOnly = false) {
+function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut = () => true, isApiOnly = false, isSpaMode = false) {
 	return async (args) => {
 		let { request, matches, fetcherKey } = args;
 		let router = getRouter();
@@ -78,7 +78,7 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
 		});
 		if (!ssr && !foundRevalidatingServerLoader) return nonSsrStrategy(args, getRouteInfo, fetchAndDecode);
 		if (fetcherKey) return singleFetchLoaderFetcherStrategy(args, fetchAndDecode);
-		return singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut, isApiOnly);
+		return singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut, isApiOnly, isSpaMode);
 	};
 }
 async function singleFetchActionStrategy(args, fetchAndDecode) {
@@ -113,7 +113,7 @@ async function nonSsrStrategy(args, getRouteInfo, fetchAndDecode) {
 	}));
 	return results;
 }
-async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut = () => true, isApiOnly = false) {
+async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut = () => true, isApiOnly = false, isSpaMode = false) {
 	let routesParams = /* @__PURE__ */ new Set();
 	let foundOptOutRoute = false;
 	let routeDfds = args.matches.map(() => createDeferred());
@@ -162,7 +162,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
 		}
 	})));
 	await Promise.all(routeDfds.map((d) => d.promise));
-	if ((!router.state.initialized && router.state.navigation.state === "idle" && !isApiOnly || routesParams.size === 0) && !window.__reactRouterHdrActive) singleFetchDfd.resolve({ routes: {} });
+	if ((!router.state.initialized && router.state.navigation.state === "idle" && !isApiOnly && !isSpaMode || routesParams.size === 0) && !window.__reactRouterHdrActive) singleFetchDfd.resolve({ routes: {} });
 	else {
 		let targetRoutes = ssr && foundOptOutRoute && routesParams.size > 0 ? [...routesParams.keys()] : void 0;
 		try {

package/dist/production/lib/dom-export/dom-router-provider.js

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

package/dist/production/lib/dom-export/hydrated-router.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -89,7 +89,7 @@ function createHydratedRouter({ getContext, instrumentations, fetch: fetchImplem
 		mapRouteProperties: UNSAFE_defaultMapRouteProperties,
 		hydrationRouteProperties: UNSAFE_hydrationRouteProperties,
 		instrumentations,
-		dataStrategy: UNSAFE_getTurboStreamSingleFetchDataStrategy(() => router, ssrInfo.manifest, ssrInfo.routeModules, ssr, fetchImplementation, ssrInfo.context.unstable_apiOnly === true, ssrInfo.context.unstable_apiServerOrigin),
+		dataStrategy: UNSAFE_getTurboStreamSingleFetchDataStrategy(() => router, ssrInfo.manifest, ssrInfo.routeModules, ssr, fetchImplementation, ssrInfo.context.unstable_apiOnly === true, ssrInfo.context.unstable_apiServerOrigin, ssrInfo.context.isSpaMode),
 		patchRoutesOnNavigation: discoveryRuntime ? UNSAFE_getCustomPatchRoutesOnNavigationFunction(() => router, discoveryRuntime) : UNSAFE_getPatchRoutesOnNavigationFunction(() => router, ssrInfo.manifest, ssrInfo.routeModules, ssr, ssrInfo.context.routeDiscovery, ssrInfo.context.isSpaMode, ssrInfo.context.basename, fetchImplementation, ssrInfo.context.unstable_apiServerOrigin, isApiOnly)
 	});
 	ssrInfo.router = router;

package/dist/production/lib/errors.js

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

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

@@ -192,9 +192,6 @@ interface NavigateFunction {
  *
  * [MODES: framework, data]
  *
- * <br/>
- * <br/>
- *
  * To prevent {@link ScrollRestoration | `<ScrollRestoration>`} from resetting
  * the scroll position, use the `preventScrollReset` option.
  *

package/dist/production/lib/hooks.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.5.0
+ * react-router v8.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -212,9 +212,6 @@ const navigateEffectWarning = "You should call navigate() in a React.useEffect()
 *
 * [MODES: framework, data]
 *
-* <br/>
-* <br/>
-*
 * To prevent {@link ScrollRestoration | `<ScrollRestoration>`} from resetting
 * the scroll position, use the `preventScrollReset` option.
 *
@@ -1095,7 +1092,8 @@ function useRouteError() {
 * @returns The resolved value from the nearest {@link Await} component
 */
 function useAsyncValue() {
-	return React$1.useContext(AwaitContext)?._data;
+	let value = React$1.useContext(AwaitContext);
+	return value && "status" in value && !("_tracked" in value) ? value.status === "fulfilled" ? value.value : void 0 : value?._data;
 }
 /**
 * Returns the rejection value from the closest {@link Await | `<Await>`}.
@@ -1123,7 +1121,8 @@ function useAsyncValue() {
 * @returns The error that was thrown in the nearest {@link Await} component
 */
 function useAsyncError() {
-	return React$1.useContext(AwaitContext)?._error;
+	let value = React$1.useContext(AwaitContext);
+	return value && "status" in value && !("_tracked" in value) ? value.status === "rejected" ? value.reason : void 0 : value?._error;
 }
 let blockerId = 0;
 /**