react-router 8.2.0 → 8.3.1

package/dist/development/lib/router/history.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.2.0
+ * react-router v8.3.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -193,7 +193,7 @@ function warning(cond, message) {
 		if (typeof console !== "undefined") console.warn(message);
 		try {
 			throw new Error(message);
-		} catch (e) {}
+		} catch {}
 	}
 }
 function createKey() {
@@ -231,7 +231,10 @@ function createLocation(current, to, state = null, key, mask) {
 /**
 * Creates a string URL path from the given pathname, search, and hash components.
 *
+* @public
 * @category Utils
+* @param path The pathname, search, and hash components to combine.
+* @returns The combined URL path.
 */
 function createPath({ pathname = "/", search = "", hash = "" }) {
 	if (search && search !== "?") pathname += search.charAt(0) === "?" ? search : "?" + search;
@@ -241,7 +244,10 @@ function createPath({ pathname = "/", search = "", hash = "" }) {
 /**
 * Parses a string URL path into its separate pathname, search, and hash components.
 *
+* @public
 * @category Utils
+* @param path The URL path to parse.
+* @returns The parsed pathname, search, and hash components.
 */
 function parsePath(path) {
 	let parsedPath = {};

package/dist/development/lib/router/instrumentation.js

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

package/dist/development/lib/router/navigation.js

@@ -0,0 +1,45 @@
+/**
+ * react-router v8.3.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/router/navigation.ts
+const DEFAULT_NAVIGATION_URL = new URL("http://localhost");
+function getNavigatorCurrentUrl(navigator) {
+	if (navigator.createURL) return navigator.createURL("/");
+	try {
+		return new URL(navigator.createHref("/"), DEFAULT_NAVIGATION_URL);
+	} catch {
+		return DEFAULT_NAVIGATION_URL;
+	}
+}
+function isSameOrigin(a, b) {
+	return a.origin === b.origin && (a.origin !== "null" || a.protocol === b.protocol && a.host === b.host);
+}
+function isExplicitUrl(destination, target) {
+	if (destination.startsWith("//")) return true;
+	let protocol = target.protocol.toLowerCase();
+	if (!destination.toLowerCase().startsWith(protocol)) return false;
+	return target.host === "" || destination.slice(protocol.length).startsWith("//");
+}
+function validateNavigationTarget(original, resolved, currentUrl, externalPolicy) {
+	let originalUrl = null;
+	try {
+		originalUrl = original == null ? null : new URL(original, currentUrl);
+	} catch {}
+	let resolvedUrl = new URL(resolved, currentUrl);
+	let originalIsExternal = originalUrl != null && !isSameOrigin(originalUrl, currentUrl);
+	let resolvedIsExternal = !isSameOrigin(resolvedUrl, currentUrl);
+	if (externalPolicy === "reject") {
+		if (originalIsExternal || resolvedIsExternal) throw new Error("External navigation is not allowed");
+	} else if (resolvedIsExternal) {
+		if (originalUrl == null || !isExplicitUrl(original, originalUrl) || !isSameOrigin(originalUrl, resolvedUrl)) throw new Error("External navigation is not allowed");
+	}
+}
+//#endregion
+export { getNavigatorCurrentUrl, validateNavigationTarget };

package/dist/development/lib/router/router.d.ts

@@ -128,6 +128,14 @@ interface Router {
    * @param location
    */
   createHref(location: Location | URL): string;
+  /**
+   * @private
+   * PRIVATE - DO NOT USE
+   *
+   * Utility function to create a URL for the given location
+   * @param location
+   */
+  createURL?(to: To): URL;
   /**
    * @private
    * PRIVATE - DO NOT USE

package/dist/development/lib/router/router.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.2.0
+ * react-router v8.3.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,6 +12,7 @@ import { PROTOCOL_RELATIVE_URL_REGEX, normalizeProtocolRelativeUrl } from "./url
 import { createBrowserURLImpl, createLocation, createPath, invariant, parsePath, warning } from "./history.js";
 import { ErrorResponseImpl, RouterContextProvider, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createDataFunctionUrl, flattenAndRankRoutes, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, matchRoutesImpl, prependBasename, removeDoubleSlashes, resolveTo, stripBasename } from "./utils.js";
 import { consumeInstrumentationClientResultMetaReceiver, getRouteInstrumentationUpdates, instrumentClientSideRouter } from "./instrumentation.js";
+import { validateNavigationTarget } from "./navigation.js";
 //#region lib/router/router.ts
 const validMutationMethodsArr = [
 	"POST",
@@ -412,21 +413,27 @@ function createRouter(init) {
 		let instrumentationNavigateMetaReceiver = consumeInstrumentationClientResultMetaReceiver(router);
 		let { path, submission, error } = normalizeNavigateOptions(false, normalizeTo(state.location, state.matches, basename, to, opts?.fromRouteId, opts?.relative), opts);
 		let maskPath;
-		if (opts?.mask) maskPath = {
-			pathname: "",
-			search: "",
-			hash: "",
-			...typeof opts.mask === "string" ? parsePath(opts.mask) : {
+		if (opts?.mask) {
+			let partialPath = typeof opts.mask === "string" ? parsePath(opts.mask) : {
 				...state.location.mask,
 				...opts.mask
-			}
-		};
+			};
+			maskPath = {
+				pathname: partialPath.pathname ?? "",
+				search: partialPath.search ?? "",
+				hash: partialPath.hash ?? ""
+			};
+			if (PROTOCOL_RELATIVE_URL_REGEX.test(maskPath.pathname)) throw new Error("External navigation is not allowed");
+			else if (maskPath.pathname.startsWith("\\")) maskPath.pathname = maskPath.pathname.replace(/^\\+/, "/");
+			validateNavigationTarget(typeof opts.mask === "string" ? opts.mask : createPath(opts.mask), createPath(maskPath), init.history.createURL("/"), "reject");
+		}
 		let currentLocation = state.location;
 		let nextLocation = createLocation(currentLocation, path, opts && opts.state, void 0, maskPath);
 		nextLocation = {
 			...nextLocation,
 			...init.history.encodeLocation(nextLocation)
 		};
+		validateNavigationTarget(to == null ? init.history.createHref(state.location) : typeof to === "string" ? to : createPath(to), init.history.createHref(nextLocation.mask || nextLocation), init.history.createURL("/"), "reject");
 		let userReplace = opts && opts.replace != null ? opts.replace : void 0;
 		let historyAction = "PUSH";
 		if (userReplace === true) historyAction = "REPLACE";
@@ -883,7 +890,10 @@ function createRouter(init) {
 		let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((rf) => abortFetcher(rf.key));
 		abortController.signal.addEventListener("abort", abortPendingFetchRevalidations);
 		let { loaderResults, fetcherResults } = await callLoadersAndMaybeResolveData(dsMatches, revalidatingFetchers, revalidationRequest, nextLocation, scopedContext);
-		if (abortController.signal.aborted) return;
+		if (abortController.signal.aborted) {
+			if (fetchReloadIds.get(key) === loadId) fetchReloadIds.delete(key);
+			return;
+		}
 		abortController.signal.removeEventListener("abort", abortPendingFetchRevalidations);
 		fetchReloadIds.delete(key);
 		fetchControllers.delete(key);
@@ -1005,7 +1015,10 @@ function createRouter(init) {
 		if (redirect.response.headers.has("X-Remix-Revalidate")) isRevalidationRequired = true;
 		let location = redirect.response.headers.get("Location");
 		invariant(location, "Expected a Location header on the redirect Response");
-		location = normalizeRedirectLocation(location, new URL(request.url), basename, init.history);
+		let originalLocation = location;
+		let currentUrl = new URL(request.url);
+		location = normalizeRedirectLocation(location, currentUrl, basename, init.history);
+		validateNavigationTarget(originalLocation, location, currentUrl, "allow-explicit");
 		let redirectLocation = createLocation(state.location, location, { _isRedirect: true });
 		if (isBrowser) {
 			let isDocumentReload = false;
@@ -1357,6 +1370,7 @@ function createRouter(init) {
 		fetch,
 		revalidate,
 		createHref: (to) => init.history.createHref(to),
+		createURL: (to) => init.history.createURL(to),
 		encodeLocation: (to) => init.history.encodeLocation(to),
 		getFetcher,
 		resetFetcher,
@@ -1876,7 +1890,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
 						text: void 0
 					}
 				};
-			} catch (e) {
+			} catch {
 				return getInvalidBodyError();
 			}
 		}
@@ -1899,7 +1913,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
 	} else try {
 		searchParams = new URLSearchParams(opts.body);
 		formData = convertSearchParamsToFormData(searchParams);
-	} catch (e) {
+	} catch {
 		return getInvalidBodyError();
 	}
 	let submission = {
@@ -2415,7 +2429,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fe
 	});
 	try {
 		await Promise.all(matches.flatMap((m) => [m._lazyPromises?.handler, m._lazyPromises?.route]));
-	} catch (e) {}
+	} catch {}
 	return results;
 }
 async function callLoaderOrAction({ request, path, pattern, match, lazyHandlerPromise, lazyRoutePromise, handlerOverride, scopedContext }) {
@@ -2598,7 +2612,7 @@ function normalizeRedirectLocation(location, currentUrl, basename, historyInstan
 	}
 	try {
 		if (hasInvalidProtocol(historyInstance.createURL(location).toString())) throw new Error("Invalid redirect location");
-	} catch (e) {}
+	} catch {}
 	return location;
 }
 function createClientSideRequest(history, location, signal, submission) {
@@ -2948,7 +2962,7 @@ function restoreAppliedTransitions(_window, transitions) {
 			let json = JSON.parse(sessionPositions);
 			for (let [k, v] of Object.entries(json || {})) if (v && Array.isArray(v)) transitions.set(k, new Set(v || []));
 		}
-	} catch (e) {}
+	} catch {}
 }
 function persistAppliedTransitions(_window, transitions) {
 	if (transitions.size > 0) {
@@ -2969,13 +2983,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/development/lib/router/url.js

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

package/dist/development/lib/router/utils.d.ts

@@ -686,10 +686,22 @@ interface RouteBranch<RouteObjectType extends RouteObject = RouteObject> {
 /**
  * Returns a path with params interpolated.
  *
+ * Param values are percent-encoded for use in a path segment: characters that
+ * would change the URL structure (`/`, `?`, `#`, `%`, whitespace, non-ASCII)
+ * are escaped, while characters that RFC 3986 allows literally in a path
+ * segment (`$ & + , ; = : @`) are kept as-is. Note this differs from query-string
+ * encoding (`encodeURIComponent`/`URLSearchParams`), where those characters are
+ * delimiters and must be escaped. Splat (`*`) values are encoded per segment,
+ * preserving `/` separators.
+ *
+ * See [RFC 3986 §3.3](https://datatracker.ietf.org/doc/html/rfc3986#section-3.3)
+ *
  * @example
  * import { generatePath } from "react-router";
  *
  * generatePath("/users/:id", { id: "123" }); // "/users/123"
+ * generatePath("/files/:name", { name: "a b" }); // "/files/a%20b"
+ * generatePath("/releases/:v", { v: "1.0.0+1" }); // "/releases/1.0.0+1"
  *
  * @public
  * @category Utils

package/dist/development/lib/router/utils.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.2.0
+ * react-router v8.3.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -375,12 +375,66 @@ function matchRouteBranch(branch, pathname, allowPartial = false) {
 	return matches;
 }
 /**
+* Characters that `encodeURIComponent` escapes but that are valid literally in
+* a URL path segment. Per RFC 3986 §3.3, a path segment is made of `pchar`:
+*
+* ```
+* pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
+* sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
+* ```
+*
+* `encodeURIComponent` targets query-string values, where `$ & + , ; = : @`
+* are delimiters and must be escaped — but in a path segment they carry no
+* special meaning, and browsers keep them literal in `location.pathname`.
+* (`! ' ( ) *` and the unreserved set are already left alone by
+* `encodeURIComponent`, so they need no restoring.)
+*/
+const PATH_PARAM_OVERESCAPED = {
+	"%24": "$",
+	"%26": "&",
+	"%2B": "+",
+	"%2C": ",",
+	"%3A": ":",
+	"%3B": ";",
+	"%3D": "=",
+	"%40": "@"
+};
+/**
+* Encodes a param value for interpolation into a single URL path segment.
+*
+* Escapes characters that would break the path (`/ ? # %`, whitespace,
+* non-ASCII, …) while leaving characters that RFC 3986 permits literally in a
+* path segment untouched. Escaping those would needlessly rewrite URLs — e.g.
+*  a semver build param `1.0.0+1` would become `1.0.0%2B1` even though browsers
+* display and match the `+` literally in `location.pathname`.
+*
+* See [RFC 3986 §3.3](https://datatracker.ietf.org/doc/html/rfc3986#section-3.3))
+*
+* @param value The param value to encode.
+* @returns The encoded value, safe for use as a single path segment.
+*/
+function encodePathParam(value) {
+	return encodeURIComponent(value).replace(/%(?:24|26|2B|2C|3A|3B|3D|40)/g, (match) => PATH_PARAM_OVERESCAPED[match]);
+}
+/**
 * Returns a path with params interpolated.
 *
+* Param values are percent-encoded for use in a path segment: characters that
+* would change the URL structure (`/`, `?`, `#`, `%`, whitespace, non-ASCII)
+* are escaped, while characters that RFC 3986 allows literally in a path
+* segment (`$ & + , ; = : @`) are kept as-is. Note this differs from query-string
+* encoding (`encodeURIComponent`/`URLSearchParams`), where those characters are
+* delimiters and must be escaped. Splat (`*`) values are encoded per segment,
+* preserving `/` separators.
+*
+* See [RFC 3986 §3.3](https://datatracker.ietf.org/doc/html/rfc3986#section-3.3)
+*
 * @example
 * import { generatePath } from "react-router";
 *
 * generatePath("/users/:id", { id: "123" }); // "/users/123"
+* generatePath("/files/:name", { name: "a b" }); // "/files/a%20b"
+* generatePath("/releases/:v", { v: "1.0.0+1" }); // "/releases/1.0.0+1"
 *
 * @public
 * @category Utils
@@ -403,7 +457,7 @@ function generatePath(originalPath, params = {}) {
 			const [, key, optional, suffix] = keyMatch;
 			let param = params[key];
 			invariant(optional === "?" || param != null, `Missing ":${key}" param`);
-			return encodeURIComponent(stringify(param)) + suffix;
+			return encodePathParam(stringify(param)) + suffix;
 		}
 		return segment.replace(/\?$/g, "");
 	}).filter((segment) => !!segment).join("/");
@@ -435,13 +489,13 @@ function matchPathImpl(pattern, pathname, matcher, compiledParams) {
 	let match = pathname.match(matcher);
 	if (!match) return null;
 	let matchedPathname = match[0];
-	let pathnameBase = matchedPathname.replace(/(.)\/+$/, "$1");
+	let pathnameBase = removeTrailingSlash(matchedPathname, 1);
 	let captureGroups = match.slice(1);
 	return {
 		params: compiledParams.reduce((memo, { paramName, isOptional }, index) => {
 			if (paramName === "*") {
 				let splatValue = captureGroups[index] || "";
-				pathnameBase = matchedPathname.slice(0, matchedPathname.length - splatValue.length).replace(/(.)\/+$/, "$1");
+				pathnameBase = removeTrailingSlash(matchedPathname.slice(0, matchedPathname.length - splatValue.length), 1);
 			}
 			const value = captureGroups[index];
 			if (isOptional && !value) memo[paramName] = void 0;
@@ -510,7 +564,7 @@ function resolvePath(to, fromPathname = "/") {
 	let pathname;
 	if (toPathname) {
 		toPathname = removeDoubleSlashes(toPathname);
-		if (toPathname.startsWith("/")) pathname = resolvePathname(toPathname.substring(1), "/");
+		if (toPathname.startsWith("/") || toPathname.startsWith("\\")) pathname = resolvePathname(toPathname.substring(1), "/");
 		else pathname = resolvePathname(toPathname, fromPathname);
 	} else pathname = fromPathname;
 	return {
@@ -571,7 +625,11 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
 }
 const removeDoubleSlashes = (path) => path.replace(/[\\/]{2,}/g, "/");
 const joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
-const removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+function removeTrailingSlash(path, minLength = 0) {
+	let end = path.length;
+	while (end > minLength && path.charCodeAt(end - 1) === 47) end--;
+	return end === path.length ? path : path.slice(0, end);
+}
 const normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
 const normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 const normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
@@ -814,7 +872,7 @@ function parseToInfo(_to, basename) {
 		let path = stripBasename(targetUrl.pathname, basename);
 		if (targetUrl.origin === currentUrl.origin && path != null) to = path + targetUrl.search + targetUrl.hash;
 		else isExternal = true;
-	} catch (e) {
+	} catch {
 		warning(false, `<Link to="${to}"> contains an invalid URL which will probably break when clicked - please update to a valid URL path.`);
 	}
 	return {
@@ -824,4 +882,4 @@ function parseToInfo(_to, basename) {
 	};
 }
 //#endregion
-export { ErrorResponseImpl, RouterContextProvider, SUPPORTED_ERROR_TYPES, compilePath, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createContext, createDataFunctionUrl, data, decodePath, defaultMapRouteProperties, flattenAndRankRoutes, generatePath, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isBrowser, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, joinPaths, matchPath, matchRoutes, matchRoutesImpl, parseToInfo, prependBasename, redirect, redirectDocument, removeDoubleSlashes, removeTrailingSlash, replace, resolvePath, resolveTo, stripBasename };
+export { ErrorResponseImpl, RouterContextProvider, SUPPORTED_ERROR_TYPES, compilePath, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createContext, createDataFunctionUrl, data, decodePath, defaultMapRouteProperties, encodePathParam, flattenAndRankRoutes, generatePath, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isBrowser, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, joinPaths, matchPath, matchRoutes, matchRoutesImpl, parseToInfo, prependBasename, redirect, redirectDocument, removeDoubleSlashes, removeTrailingSlash, replace, resolvePath, resolveTo, stripBasename };

package/dist/development/lib/rsc/browser.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.2.0
+ * react-router v8.3.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,15 +9,16 @@
  * @license MIT
  */
 import { PROTOCOL_RELATIVE_URL_REGEX } from "../router/url.js";
-import { createBrowserHistory, invariant } from "../router/history.js";
+import { createBrowserHistory, createPath, invariant } from "../router/history.js";
 import { ErrorResponseImpl, createContext, resolvePath } from "../router/utils.js";
+import { validateNavigationTarget } from "../router/navigation.js";
 import { createRouter, hasInvalidProtocol, isMutationMethod } from "../router/router.js";
 import { RSCRouterContext } from "../context.js";
 import { RouterProvider } from "../components.js";
 import { createRequestInit } from "../dom/ssr/data.js";
 import { getSingleFetchDataStrategyImpl, singleFetchUrl, stripIndexParam } from "../dom/ssr/single-fetch.js";
 import { noActionDefinedError, shouldHydrateRouteLoader } from "../dom/ssr/routes.js";
-import { getPathsWithAncestors } from "../dom/ssr/fog-of-war.js";
+import { getPathsWithAncestors, handleClientVersionMismatch } from "../dom/ssr/fog-of-war.js";
 import { FrameworkContext, setIsHydrated } from "../dom/ssr/components.js";
 import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries.js";
 import { populateRSCRouteModules } from "./route-modules.js";
@@ -82,6 +83,7 @@ function createCallServer({ createFromReadableStream, createTemporaryReferenceSe
 		React$1.startTransition(() => Promise.resolve(payloadPromise).then(async (payload) => {
 			if (payload.type === "redirect") {
 				let location = normalizeRedirectLocation(payload.location);
+				validateNavigationTarget(payload.location, location, new URL(window.location.href), "allow-explicit");
 				if (payload.reload || isExternalLocation(location)) {
 					if (hasInvalidProtocol(location)) throw new Error("Invalid redirect location");
 					window.location.href = location;
@@ -97,6 +99,7 @@ function createCallServer({ createFromReadableStream, createTemporaryReferenceSe
 			if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
 				if (rerender.type === "redirect") {
 					let location = normalizeRedirectLocation(rerender.location);
+					validateNavigationTarget(rerender.location, location, new URL(window.location.href), "allow-explicit");
 					if (rerender.reload || isExternalLocation(location)) {
 						if (hasInvalidProtocol(location)) throw new Error("Invalid redirect location");
 						window.location.href = location;
@@ -133,6 +136,7 @@ function createRouterFromPayload({ fetchImplementation, createFromReadableStream
 		routeModules: globalVar.__reactRouterRouteModules
 	};
 	if (payload.type !== "render") throw new Error("Invalid payload type");
+	let { clientVersion } = payload;
 	globalVar.__reactRouterRouteModules = globalVar.__reactRouterRouteModules ?? {};
 	populateRSCRouteModules(globalVar.__reactRouterRouteModules, payload.matches);
 	let routes = payload.matches.reduceRight((previous, match) => {
@@ -167,7 +171,7 @@ function createRouterFromPayload({ fetchImplementation, createFromReadableStream
 			basename: payload.basename,
 			isSpaMode: false
 		}),
-		async patchRoutesOnNavigation({ path, signal }) {
+		async patchRoutesOnNavigation({ path, signal, fetcherKey }) {
 			if (payload.routeDiscovery.mode === "initial") {
 				if (!applyPatchesPromise) applyPatchesPromise = (async () => {
 					if (!payload.patches) return;
@@ -182,9 +186,10 @@ function createRouterFromPayload({ fetchImplementation, createFromReadableStream
 				return;
 			}
 			if (discoveredPaths.has(path)) return;
-			await fetchAndApplyManifestPatches([path], createFromReadableStream, fetchImplementation, signal);
+			let { state } = globalVar.__reactRouterDataRouter;
+			await fetchAndApplyManifestPatches([path], createFromReadableStream, fetchImplementation, clientVersion, fetcherKey ? window.location.href : createPath(state.navigation.location || state.location), signal);
 		},
-		dataStrategy: getRSCSingleFetchDataStrategy(() => globalVar.__reactRouterDataRouter, true, createFromReadableStream, fetchImplementation)
+		dataStrategy: getRSCSingleFetchDataStrategy(() => globalVar.__reactRouterDataRouter, true, createFromReadableStream, fetchImplementation, clientVersion)
 	});
 	if (globalVar.__reactRouterDataRouter.state.initialized) {
 		globalVar.__routerInitialized = true;
@@ -237,19 +242,16 @@ function createRouterFromPayload({ fetchImplementation, createFromReadableStream
 	};
 }
 const renderedRoutesContext = createContext();
-function getRSCSingleFetchDataStrategy(getRouter, ssr, createFromReadableStream, fetchImplementation) {
+function getRSCSingleFetchDataStrategy(getRouter, ssr, createFromReadableStream, fetchImplementation, clientVersion) {
 	let dataStrategy = getSingleFetchDataStrategyImpl(getRouter, (match) => {
 		let M = match;
 		return {
 			hasLoader: M.route.hasLoader,
-			hasClientLoader: M.route.hasClientLoader,
-			hasComponent: M.route.hasComponent,
-			hasAction: M.route.hasAction,
-			hasClientAction: M.route.hasClientAction
+			hasClientLoader: M.route.hasClientLoader
 		};
-	}, getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation), ssr, (match) => {
+	}, getFetchAndDecodeViaRSC(getRouter, createFromReadableStream, fetchImplementation, clientVersion), ssr, (match) => {
 		let M = match;
-		return M.route.hasComponent && !M.route.element;
+		return !M.route.hasComponent || M.route.element != null;
 	});
 	return async (args) => args.runClientMiddleware(async () => {
 		args.context.set(renderedRoutesContext, []);
@@ -268,7 +270,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, createFromReadableStream,
 		return results;
 	});
 }
-function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
+function getFetchAndDecodeViaRSC(getRouter, createFromReadableStream, fetchImplementation, clientVersion) {
 	return async (args, targetRoutes) => {
 		let { request, context } = args;
 		let url = singleFetchUrl(request.url, "rsc");
@@ -292,6 +294,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
 				} }
 			};
 			if (payload.type !== "render") throw new Error("Unexpected payload type");
+			if (clientVersion !== void 0 && await handleClientVersionMismatch(payload.clientVersion !== clientVersion, clientVersion, createPath(getRouter().state.navigation.location || getRouter().state.location))) return new Promise(() => {});
 			context.get(renderedRoutesContext).push(...payload.matches);
 			let results = { routes: {} };
 			const dataKey = isMutationMethod(request.method) ? "actionData" : "loaderData";
@@ -347,7 +350,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
 */
 function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementation = fetch, payload, getContext }) {
 	if (payload.type !== "render") throw new Error("Invalid payload type");
-	let { routeDiscovery } = payload;
+	let { routeDiscovery, clientVersion } = payload;
 	let { router, routeModules } = React$1.useMemo(() => createRouterFromPayload({
 		payload,
 		fetchImplementation,
@@ -413,7 +416,7 @@ function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementatio
 			});
 			if (paths.length === 0) return;
 			try {
-				await fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation);
+				await fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, clientVersion, null);
 			} catch (e) {
 				console.error("Failed to fetch manifest patches", e);
 			}
@@ -433,7 +436,8 @@ function RSCHydratedRouter({ createFromReadableStream, fetch: fetchImplementatio
 	}, [
 		routeDiscovery,
 		createFromReadableStream,
-		fetchImplementation
+		fetchImplementation,
+		clientVersion
 	]);
 	const frameworkContext = {
 		future: {},
@@ -506,6 +510,7 @@ function createRouteFromServerManifest(match, payload) {
 		shouldRevalidate: match.shouldRevalidate,
 		hasLoader: true,
 		hasClientLoader: match.clientLoader != null,
+		hasComponent: match.hasComponent,
 		hasAction: match.hasAction,
 		hasClientAction: match.clientAction != null
 	};
@@ -526,23 +531,31 @@ function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
 const nextPaths = /* @__PURE__ */ new Set();
 const discoveredPathsMaxSize = 1e3;
 const discoveredPaths = /* @__PURE__ */ new Set();
-function getManifestUrl(paths) {
+function getManifestUrl(paths, clientVersion) {
 	if (paths.length === 0) return null;
-	if (paths.length === 1) return new URL(`${paths[0]}.manifest`, window.location.origin);
-	let basename = (window.__reactRouterDataRouter.basename ?? "").replace(/^\/|\/$/g, "");
-	let url = new URL(`${basename}/.manifest`, window.location.origin);
-	url.searchParams.set("paths", paths.sort().join(","));
+	let url;
+	if (paths.length === 1) url = new URL(`${paths[0]}.manifest`, window.location.origin);
+	else {
+		let basename = (window.__reactRouterDataRouter.basename ?? "").replace(/^\/|\/$/g, "");
+		url = new URL(`${basename}/.manifest`, window.location.origin);
+		url.searchParams.set("paths", paths.sort().join(","));
+	}
+	if (clientVersion !== void 0) url.searchParams.set("version", clientVersion);
 	return url;
 }
-async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
+async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, clientVersion, errorReloadPath, signal) {
 	paths = getPathsWithAncestors(paths);
-	let url = getManifestUrl(paths);
+	let url = getManifestUrl(paths, clientVersion);
 	if (url == null) return;
 	if (url.toString().length > 7680) {
 		nextPaths.clear();
 		return;
 	}
 	let response = await fetchImplementation(new Request(url, { signal }));
+	if (clientVersion !== void 0 && response.status === 204 && response.headers.has("X-Remix-Reload-Document")) {
+		await handleClientVersionMismatch(true, clientVersion, errorReloadPath);
+		return;
+	}
 	if (!response.body || response.status < 200 || response.status >= 300) throw new Error("Unable to fetch new route matches from the server");
 	let payload = await createFromReadableStream(response.body, { temporaryReferences: void 0 });
 	if (payload.type !== "manifest") throw new Error("Failed to patch routes");

package/dist/development/lib/rsc/errorBoundaries.js

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

package/dist/development/lib/rsc/html-stream/browser.js

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