react-router 8.3.0 → 8.4.0

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,10 +9,10 @@
  * @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 { DataRouterContext, DataRouterDataContext, DataRouterNavigationContext, DataRouterStateContext, FetchersContext, ViewTransitionContext } from "../context.js";
 import { DataRoutes, Router } from "../components.js";
 import { escapeHtml } from "./ssr/markup.js";
 import * as React$1 from "react";
@@ -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/production/lib/dom/ssr/components.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,9 +8,8 @@
  *
  * @license MIT
  */
-import { matchRoutes } from "../../router/utils.js";
-import { DataRouterContext, DataRouterStateContext, useIsRSCRouterContext } from "../../context.js";
-import { useLocation } from "../../hooks.js";
+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";
@@ -19,16 +18,6 @@ import { singleFetchUrl } from "./single-fetch.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 = {
@@ -269,7 +259,8 @@ function RSCPrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps })
 function PrefetchPageLinksImpl({ page, matches: nextMatches, ...linkProps }) {
 	let location = useLocation();
 	let { manifest, routeModules } = useFrameworkContext();
-	let { loaderData, matches } = useDataRouterStateContext();
+	let { matches } = useDataRouterState("PrefetchPageLinks");
+	let { loaderData } = useDataRouterData("PrefetchPageLinks");
 	let newMatchesForData = React$1.useMemo(() => getNewMatchesForLinks(page, nextMatches, matches, manifest, location, "data"), [
 		page,
 		nextMatches,
@@ -355,7 +346,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;
@@ -425,7 +417,7 @@ function Meta() {
 				type: "application/ld+json",
 				dangerouslySetInnerHTML: { __html: escapeHtml(json) }
 			});
-		} catch (e) {
+		} catch {
 			return null;
 		}
 		return /* @__PURE__ */ React$1.createElement("meta", {
@@ -480,8 +472,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/production/lib/dom/ssr/data.js

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

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

@@ -33,6 +33,10 @@ 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>;

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.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
@@ -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] }), {});
@@ -110,7 +110,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,17 +124,35 @@ 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) {
 	paths = getPathsWithAncestors(paths);
@@ -154,6 +175,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
 		if (signal?.aborted) return;
 		throw e;
 	}
+	if (signal?.aborted) return;
 	let knownRoutes = new Set(Object.keys(manifest.routes));
 	let patches = Object.values(serverPatches).reduce((acc, route) => {
 		if (route && !knownRoutes.has(route.id)) acc[route.id] = route;

package/dist/production/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/production/lib/dom/ssr/hydration.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.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/production/lib/dom/ssr/invariant.js

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.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 };

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -40,7 +40,7 @@ function ServerRouter({ context, url, nonce }) {
 		let manifestRoute = context.manifest.routes[routeId];
 		if (route && manifestRoute && shouldHydrateRouteLoader(routeId, route.clientLoader, manifestRoute.hasLoader, context.isSpaMode) && (route.HydrateFallback || !manifestRoute.hasLoader)) delete context.staticHandlerContext.loaderData[routeId];
 	}
-	let router = createStaticRouter(routes, context.staticHandlerContext, { branches: context.branches });
+	let router = createStaticRouter(routes, context.staticHandlerContext, { future: context.future });
 	return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, /* @__PURE__ */ React$1.createElement(FrameworkContext.Provider, { value: {
 		manifest,
 		routeModules,

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -101,25 +101,16 @@ async function singleFetchActionStrategy(args, fetchAndDecode) {
 async function nonSsrStrategy(args, getRouteInfo, fetchAndDecode) {
 	let matchesToLoad = args.matches.filter((m) => m.shouldCallHandler());
 	let results = {};
-	await Promise.all(matchesToLoad.map((m) => m.resolve(async (handler) => {
-		try {
+	await Promise.all(matchesToLoad.map(async (m) => {
+		let routeId = m.route.id;
+		results[routeId] = await m.resolve(async (handler) => {
 			let { hasClientLoader } = getRouteInfo(m);
-			let routeId = m.route.id;
-			let result = hasClientLoader ? await handler(async () => {
+			return hasClientLoader ? handler(async () => {
 				let { data } = await fetchAndDecode(args, [routeId]);
 				return unwrapSingleFetchResult(data, routeId);
-			}) : await handler();
-			results[m.route.id] = {
-				type: "data",
-				result
-			};
-		} catch (e) {
-			results[m.route.id] = {
-				type: "error",
-				result: e
-			};
-		}
-	})));
+			}) : handler();
+		});
+	}));
 	return results;
 }
 async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, shouldAllowOptOut = () => true) {
@@ -205,7 +196,7 @@ async function bubbleMiddlewareErrors(singleFetchPromise, matches, routesParams,
 		if (middlewareError !== void 0) Array.from(routesParams.values()).forEach((routeId) => {
 			if (results[routeId].result instanceof SingleFetchNoResultError) results[routeId].result = middlewareError;
 		});
-	} catch (e) {}
+	} catch {}
 }
 async function singleFetchLoaderFetcherStrategy(args, fetchAndDecode) {
 	let fetcherMatch = args.matches.find((m) => m.shouldCallHandler());
@@ -277,8 +268,8 @@ async function fetchAndDecodeViaTurboStream(args, targetRoutes) {
 			status: res.status,
 			data
 		};
-	} catch (e) {
-		throw new Error("Unable to decode turbo-stream response");
+	} catch (cause) {
+		throw new Error("Unable to decode turbo-stream response", { cause });
 	}
 }
 function decodeViaTurboStream(body, global) {
@@ -326,13 +317,13 @@ function createDeferred() {
 			res(val);
 			try {
 				await promise;
-			} catch (e) {}
+			} catch {}
 		};
 		reject = async (error) => {
 			rej(error);
 			try {
 				await promise;
-			} catch (e) {}
+			} catch {}
 		};
 	});
 	return {

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.0
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -67,6 +67,7 @@ function createHydratedRouter({ getContext, instrumentations }) {
 		}),
 		location: window.location,
 		basename: window.__reactRouterContext?.basename,
+		future: ssrInfo.context.future,
 		isSpaMode: ssrInfo.context.isSpaMode
 	});
 	if (window.history.state && window.history.state.masked) window.history.replaceState({

package/dist/production/lib/errors.js

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