react-router 8.3.1 → 8.5.0

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,12 +9,12 @@
  * @license MIT
  */
 import { ABSOLUTE_URL_REGEX } from "../router/url.js";
-import { createPath, invariant, parsePath } from "../router/history.js";
+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, DataRouterStateContext, FetchersContext, ViewTransitionContext } from "../context.js";
-import { DataRoutes, Router } from "../components.js";
+import { DataRouterContext, DataRouterDataContext, DataRouterNavigationContext, DataRouterStateContext, FetchersContext, ViewTransitionContext } from "../context.js";
 import { escapeHtml } from "./ssr/markup.js";
+import { DataRoutes, Router } from "../components.js";
 import * as React$1 from "react";
 //#region lib/dom/server.tsx
 /**
@@ -91,7 +91,6 @@ function StaticRouterProvider({ context, router, hydrate = true, nonce }) {
 		staticContext: context,
 		basename: context.basename || "/"
 	};
-	let fetchersContext = /* @__PURE__ */ new Map();
 	let hydrateScript = "";
 	if (hydrate !== false) {
 		let data = {
@@ -102,7 +101,30 @@ function StaticRouterProvider({ context, router, hydrate = true, nonce }) {
 		hydrateScript = `window.__staticRouterHydrationData = JSON.parse(${escapeHtml(JSON.stringify(JSON.stringify(data)))});`;
 	}
 	let { state } = dataRouterContext.router;
-	return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React$1.createElement(DataRouterStateContext.Provider, { value: state }, /* @__PURE__ */ React$1.createElement(FetchersContext.Provider, { value: fetchersContext }, /* @__PURE__ */ React$1.createElement(ViewTransitionContext.Provider, { value: { isTransitioning: false } }, /* @__PURE__ */ React$1.createElement(Router, {
+	let dataRouterState = {
+		historyAction: state.historyAction,
+		location: state.location,
+		matches: state.matches,
+		initialized: state.initialized,
+		renderFallback: state.renderFallback,
+		restoreScrollPosition: state.restoreScrollPosition,
+		preventScrollReset: state.preventScrollReset,
+		blockers: state.blockers
+	};
+	let dataRouterNavigation = {
+		navigation: state.navigation,
+		revalidation: state.revalidation
+	};
+	let dataRouterData = {
+		loaderData: state.loaderData,
+		actionData: state.actionData,
+		errors: state.errors
+	};
+	let fetchersContext = {
+		fetchers: state.fetchers,
+		fetcherData: /* @__PURE__ */ new Map()
+	};
+	return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React$1.createElement(DataRouterStateContext.Provider, { value: dataRouterState }, /* @__PURE__ */ React$1.createElement(DataRouterNavigationContext.Provider, { value: dataRouterNavigation }, /* @__PURE__ */ React$1.createElement(DataRouterDataContext.Provider, { value: dataRouterData }, /* @__PURE__ */ React$1.createElement(FetchersContext.Provider, { value: fetchersContext }, /* @__PURE__ */ React$1.createElement(ViewTransitionContext.Provider, { value: { isTransitioning: false } }, /* @__PURE__ */ React$1.createElement(Router, {
 		basename: dataRouterContext.basename,
 		location: state.location,
 		navigationType: state.historyAction,
@@ -112,10 +134,9 @@ function StaticRouterProvider({ context, router, hydrate = true, nonce }) {
 	}, /* @__PURE__ */ React$1.createElement(DataRoutes, {
 		manifest: router.manifest,
 		routes: router.routes,
-		future: router.future,
 		state,
 		isStatic: true
-	})))))), hydrateScript ? /* @__PURE__ */ React$1.createElement("script", {
+	})))))))), hydrateScript ? /* @__PURE__ */ React$1.createElement("script", {
 		suppressHydrationWarning: true,
 		nonce,
 		dangerouslySetInnerHTML: { __html: hydrateScript }
@@ -185,26 +206,31 @@ function getStatelessNavigator() {
 * `query`
 * @param opts Options
 * @param opts.future Future flags for the static {@link DataRouter}
-* @param opts.branches Optional pre-computed route branches
+* @param opts.branches Deprecated optional pre-computed route branches. This option
+* is no longer used because branch caching is done automatically inside the static router.
 * @returns A static {@link DataRouter} that can be used to render the provided routes
 */
 function createStaticRouter(routes, context, opts = {}) {
+	warning(opts.branches == null, "`createStaticRouter({ branches })` is deprecated and no longer used. Branch caching is done automatically inside the static router.");
 	let manifest = {};
 	let dataRoutes = convertRoutesToDataRoutes(routes, void 0, void 0, manifest);
-	let matches = context.matches.map((match) => {
+	let future = { ...opts?.future };
+	let matchRoutes = context._match;
+	let mapRouteMatch = (match) => {
 		let route = manifest[match.route.id] || match.route;
 		return {
 			...match,
 			route
 		};
-	});
+	};
+	let matches = context.matches.map(mapRouteMatch);
 	let msg = (method) => `You cannot use router.${method}() on the server because it is a stateless environment`;
 	return {
 		get basename() {
 			return context.basename;
 		},
 		get future() {
-			return { ...opts?.future };
+			return future;
 		},
 		get state() {
 			return {
@@ -227,13 +253,13 @@ function createStaticRouter(routes, context, opts = {}) {
 		get routes() {
 			return dataRoutes;
 		},
-		get branches() {
-			return opts.branches;
-		},
 		get manifest() {
 			return manifest;
 		},
 		get window() {},
+		match(locationArg) {
+			return matchRoutes(locationArg)?.map(mapRouteMatch) ?? null;
+		},
 		initialize() {
 			throw msg("initialize");
 		},

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,27 +8,16 @@
  *
  * @license MIT
  */
-import { matchRoutes } from "../../router/utils.js";
-import { DataRouterContext, DataRouterStateContext, useIsRSCRouterContext } from "../../context.js";
-import { useLocation } from "../../hooks.js";
-import { warnOnce } from "../../server-runtime/warnings.js";
+import { useIsRSCRouterContext } from "../../context.js";
+import { useDataRouterContext, useDataRouterData, useDataRouterState, useLocation } from "../../hooks.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
-function useDataRouterContext() {
-	let context = React$1.useContext(DataRouterContext);
-	invariant(context, "You must render this element inside a <DataRouterContext.Provider> element");
-	return context;
-}
-function useDataRouterStateContext() {
-	let context = React$1.useContext(DataRouterStateContext);
-	invariant(context, "You must render this element inside a <DataRouterStateContext.Provider> element");
-	return context;
-}
 const FrameworkContext = React$1.createContext(void 0);
 FrameworkContext.displayName = "FrameworkContext";
 function useFrameworkContext() {
@@ -142,7 +131,8 @@ const CRITICAL_CSS_DATA_ATTRIBUTE = "data-react-router-critical-css";
 */
 function Links({ nonce, crossOrigin }) {
 	let { isSpaMode, manifest, routeModules, criticalCss, nonce: contextNonce } = useFrameworkContext();
-	let { errors, matches: routerMatches } = useDataRouterStateContext();
+	let { matches: routerMatches } = useDataRouterState("Links");
+	let { errors } = useDataRouterData("Links");
 	let matches = getActiveMatches(routerMatches, errors, isSpaMode);
 	let keyedLinks = React$1.useMemo(() => getKeyedLinksForMatches(matches, routeModules, manifest), [
 		matches,
@@ -202,11 +192,11 @@ function Links({ nonce, crossOrigin }) {
 function PrefetchPageLinks({ page, ...linkProps }) {
 	let rsc = useIsRSCRouterContext();
 	let { nonce: contextNonce } = useFrameworkContext();
-	let { router } = useDataRouterContext();
-	let matches = React$1.useMemo(() => matchRoutes(router.routes, page, router.basename), [
+	let { router } = useDataRouterContext("PrefetchPageLinks");
+	let matches = React$1.useMemo(() => router.match(page), [
+		router,
 		router.routes,
-		page,
-		router.basename
+		page
 	]);
 	if (!matches) return null;
 	if (linkProps.nonce == null && contextNonce) linkProps = {
@@ -244,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,
@@ -268,8 +260,9 @@ function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps })
 }
 function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 	let location = useLocation();
-	let { manifest, routeModules } = useFrameworkContext();
-	let { loaderData, matches } = useDataRouterStateContext();
+	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"), [
 		page,
 		nextMatches,
@@ -296,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,
@@ -306,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);
@@ -355,7 +349,8 @@ function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 */
 function Meta() {
 	let { isSpaMode, routeModules } = useFrameworkContext();
-	let { errors, matches: routerMatches, loaderData } = useDataRouterStateContext();
+	let { matches: routerMatches } = useDataRouterState("Meta");
+	let { errors, loaderData } = useDataRouterData("Meta");
 	let location = useLocation();
 	let _matches = getActiveMatches(routerMatches, errors, isSpaMode);
 	let error = null;
@@ -480,8 +475,8 @@ function setIsHydrated() {
 */
 function Scripts(scriptProps) {
 	let { manifest, serverHandoffString, isSpaMode, renderMeta, routeDiscovery, ssr, nonce: contextNonce } = useFrameworkContext();
-	let { router, static: isStatic, staticContext } = useDataRouterContext();
-	let { matches: routerMatches } = useDataRouterStateContext();
+	let { router, static: isStatic, staticContext } = useDataRouterContext("Scripts");
+	let { matches: routerMatches } = useDataRouterState("Scripts");
 	let isRSCRouterContext = useIsRSCRouterContext();
 	let enableFogOfWar = isFogOfWarEnabled(routeDiscovery, ssr);
 	if (scriptProps.nonce == null && contextNonce) scriptProps = {

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

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

package/dist/development/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;
@@ -33,11 +38,17 @@ interface FrameworkContextObject {
   };
 }
 interface EntryContext extends FrameworkContextObject {
+  /**
+   * @deprecated This property was an internal implementation detail and was
+   * never intended for use in `entry.server.tsx`. It is always an empty array.
+   */
   branches: RouteBranch<DataRouteObject>[];
   staticHandlerContext: StaticHandlerContext;
   serverHandoffStream?: ReadableStream<Uint8Array>;
 }
-type FutureConfig = Record<string, never>;
+interface FutureConfig {
+  unstable_customRouteDiscovery?: boolean;
+}
 type CriticalCss = string | {
   rel: "stylesheet";
   href: string;

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

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

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

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

package/dist/development/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 };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,7 +9,7 @@
  * @license MIT
  */
 import { createPath } from "../../router/history.js";
-import { joinPaths, matchRoutesImpl } from "../../router/utils.js";
+import { joinPaths } from "../../router/utils.js";
 import { createClientRoutes } from "./routes.js";
 import * as React$1 from "react";
 //#region lib/dom/ssr/fog-of-war.ts
@@ -27,7 +27,7 @@ function getPathsWithAncestors(paths) {
 	return Array.from(result);
 }
 function isFogOfWarEnabled(routeDiscovery, ssr) {
-	return routeDiscovery.mode === "lazy" && ssr === true;
+	return routeDiscovery.mode === "lazy" && ssr;
 }
 function getPartialManifest({ sri, ...manifest }, router) {
 	let routeIds = new Set(router.state.matches.map((m) => m.route.id));
@@ -39,7 +39,7 @@ function getPartialManifest({ sri, ...manifest }, router) {
 		segments.pop();
 	}
 	paths.forEach((path) => {
-		let matches = matchRoutesImpl(router.routes, path, router.basename || "/", false, router.branches);
+		let matches = router.match(path);
 		if (matches) matches.forEach((m) => routeIds.add(m.route.id));
 	});
 	let initialRoutes = [...routeIds].reduce((acc, id) => Object.assign(acc, { [id]: manifest.routes[id] }), {});
@@ -49,15 +49,15 @@ function getPartialManifest({ sri, ...manifest }, router) {
 		sri: sri ? true : void 0
 	};
 }
-function getPatchRoutesOnNavigationFunction(getRouter, manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename) {
+function getPatchRoutesOnNavigationFunction(getRouter, manifest, routeModules, ssr, routeDiscovery, isSpaMode, basename, fetchImplementation = (request) => fetch(request), serverOrigin, isApiOnly = false) {
 	if (!isFogOfWarEnabled(routeDiscovery, ssr)) return;
 	return async ({ path, patch, signal, fetcherKey }) => {
 		if (discoveredPaths.has(path)) return;
 		let { state } = getRouter();
-		await fetchAndApplyManifestPatches([path], fetcherKey ? window.location.href : createPath(state.navigation.location || state.location), manifest, routeModules, ssr, isSpaMode, basename, routeDiscovery.manifestPath, patch, signal);
+		await fetchAndApplyManifestPatches([path], fetcherKey ? window.location.href : createPath(state.navigation.location || state.location), manifest, routeModules, ssr, isSpaMode, basename, routeDiscovery.manifestPath, patch, signal, fetchImplementation, serverOrigin, isApiOnly);
 	};
 }
-function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
+function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode, fetchImplementation = (request) => fetch(request), serverOrigin, isApiOnly = false) {
 	React$1.useEffect(() => {
 		if (!isFogOfWarEnabled(routeDiscovery, ssr) || window.navigator?.connection?.saveData === true) return;
 		function registerElement(el) {
@@ -77,7 +77,7 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
 			});
 			if (lazyPaths.length === 0) return;
 			try {
-				await fetchAndApplyManifestPatches(lazyPaths, null, manifest, routeModules, ssr, isSpaMode, router.basename, routeDiscovery.manifestPath, router.patchRoutes);
+				await fetchAndApplyManifestPatches(lazyPaths, null, manifest, routeModules, ssr, isSpaMode, router.basename, routeDiscovery.manifestPath, router.patchRoutes, void 0, fetchImplementation, serverOrigin, isApiOnly);
 			} catch (e) {
 				console.error("Failed to fetch manifest patches", e);
 			}
@@ -102,7 +102,10 @@ function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscover
 		manifest,
 		routeModules,
 		router,
-		routeDiscovery
+		routeDiscovery,
+		fetchImplementation,
+		serverOrigin,
+		isApiOnly
 	]);
 }
 function getManifestPath(_manifestPath, basename) {
@@ -110,7 +113,10 @@ function getManifestPath(_manifestPath, basename) {
 	return basename == null ? manifestPath : joinPaths([basename, manifestPath]);
 }
 const MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
+const MANIFEST_RELOAD_TIMEOUT = 5e3;
+let pendingManifestReload;
 async function handleClientVersionMismatch(needsReload, version, errorReloadPath) {
+	if (pendingManifestReload) return pendingManifestReload;
 	if (!needsReload) {
 		try {
 			sessionStorage.removeItem(MANIFEST_VERSION_STORAGE_KEY);
@@ -121,24 +127,42 @@ async function handleClientVersionMismatch(needsReload, version, errorReloadPath
 		console.warn("Detected a manifest version mismatch during eager route discovery. The next navigation/fetch to an undiscovered route will result in a new document navigation to sync up with the latest manifest.");
 		return true;
 	}
+	let alreadyReloaded = false;
 	try {
-		if (sessionStorage.getItem(MANIFEST_VERSION_STORAGE_KEY) === version) {
-			console.error("Unable to discover routes due to manifest version mismatch.");
-			return true;
-		}
-		sessionStorage.setItem(MANIFEST_VERSION_STORAGE_KEY, version);
+		alreadyReloaded = sessionStorage.getItem(MANIFEST_VERSION_STORAGE_KEY) === version;
+		if (!alreadyReloaded) sessionStorage.setItem(MANIFEST_VERSION_STORAGE_KEY, version);
 	} catch {}
-	window.location.href = errorReloadPath;
-	console.warn("Detected manifest version mismatch, reloading...");
-	await new Promise(() => {});
-	return true;
+	if (alreadyReloaded) throw new Error("Unable to discover routes due to manifest version mismatch.");
+	let rejectReload;
+	let reloadPromise = new Promise((_, reject) => {
+		rejectReload = reject;
+	});
+	pendingManifestReload = reloadPromise;
+	let failReload = () => {
+		clearTimeout(timeout);
+		window.removeEventListener("pageshow", onPageShow);
+		pendingManifestReload = void 0;
+		rejectReload(/* @__PURE__ */ new Error("Unable to discover routes due to manifest version mismatch."));
+	};
+	let timeout = setTimeout(failReload, MANIFEST_RELOAD_TIMEOUT);
+	let onPageShow = (event) => {
+		if (event.persisted) failReload();
+	};
+	window.addEventListener("pageshow", onPageShow);
+	try {
+		window.location.href = errorReloadPath;
+		console.warn("Detected manifest version mismatch, reloading...");
+	} catch {
+		failReload();
+	}
+	return reloadPromise;
 }
-async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
+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("version", manifest.version);
-	let url = new URL(getManifestPath(manifestPath, basename), window.location.origin);
+	let url = new URL(getManifestPath(manifestPath, basename), serverOrigin ?? window.location.origin);
 	url.search = searchParams.toString();
 	if (url.toString().length > 7680) {
 		nextPaths.clear();
@@ -146,7 +170,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
 	}
 	let serverPatches;
 	try {
-		let res = await fetch(url, { signal });
+		let res = await fetchImplementation(new Request(url, { signal }), { type: "manifest" });
 		if (!res.ok) throw new Error(`${res.status} ${res.statusText}`);
 		if (await handleClientVersionMismatch(res.status === 204 && res.headers.has("X-Remix-Reload-Document"), manifest.version, errorReloadPath)) return;
 		serverPatches = await res.json();
@@ -166,7 +190,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
 	Object.values(patches).forEach((patch) => {
 		if (patch && (!patch.parentId || !patches[patch.parentId])) parentIds.add(patch.parentId);
 	});
-	parentIds.forEach((parentId) => patchRoutes(parentId || null, createClientRoutes(patches, routeModules, null, ssr, isSpaMode, parentId)));
+	parentIds.forEach((parentId) => patchRoutes(parentId || null, createClientRoutes(patches, routeModules, null, ssr, isSpaMode, parentId, void 0, void 0, isApiOnly)));
 }
 function addToFifoQueue(path, queue) {
 	if (queue.size >= discoveredPathsMaxSize) {

package/dist/development/lib/dom/ssr/hydration.d.ts

@@ -1,7 +1,7 @@
 
 import { Path } from "../../router/history.js";
 import { DataRouteObject } from "../../router/utils.js";
-import { HydrationState, Router } from "../../router/router.js";
+import { FutureConfig, HydrationState, Router } from "../../router/router.js";
 import { ClientLoaderFunction } from "./routeModules.js";
 
 //#region lib/dom/ssr/hydration.d.ts
@@ -11,6 +11,7 @@ declare function getHydrationData({
   getRouteInfo,
   location,
   basename,
+  future,
   isSpaMode
 }: {
   state: {
@@ -26,6 +27,7 @@ declare function getHydrationData({
   };
   location: Path;
   basename: string | undefined;
+  future: FutureConfig;
   isSpaMode: boolean;
 }): HydrationState;
 //#endregion

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,15 +8,17 @@
  *
  * @license MIT
  */
-import { matchRoutes } from "../../router/utils.js";
+import { createDataRouteMatcher } from "../../router/router.js";
 import { shouldHydrateRouteLoader } from "./routes.js";
 //#region lib/dom/ssr/hydration.tsx
-function getHydrationData({ state, routes, getRouteInfo, location, basename, isSpaMode }) {
+function getHydrationData({ state, routes, getRouteInfo, location, basename, future, isSpaMode }) {
 	let hydrationData = {
 		...state,
 		loaderData: { ...state.loaderData }
 	};
-	let initialMatches = matchRoutes(routes, location, basename);
+	let dataRouteMatcher = createDataRouteMatcher(future, basename || "/");
+	dataRouteMatcher.update(routes);
+	let initialMatches = dataRouteMatcher.match(location);
 	if (initialMatches) for (let match of initialMatches) {
 		let routeId = match.route.id;
 		let routeInfo = getRouteInfo(routeId);

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.5.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -20,5 +20,8 @@ const ESCAPE_REGEX = /[&><\u2028\u2029]/g;
 function escapeHtml(html) {
 	return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
+function escapeAttribute(value) {
+	return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 //#endregion
-export { escapeHtml };
+export { escapeAttribute, escapeHtml };