react-router 8.0.0-pre.0 → 8.0.0-pre.1

package/dist/production/lib/router/router.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,6 +8,7 @@
  *
  * @license MIT
  */
+import { PROTOCOL_RELATIVE_URL_REGEX, normalizeProtocolRelativeUrl } from "./url.js";
 import { createBrowserURLImpl, createLocation, createPath, invariant, parsePath, warning } from "./history.js";
 import { ErrorResponseImpl, RouterContextProvider, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, flattenAndRankRoutes, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, matchRoutesImpl, prependBasename, removeDoubleSlashes, resolveTo, stripBasename } from "./utils.js";
 import { getRouteInstrumentationUpdates, instrumentClientSideRouter } from "./instrumentation.js";
@@ -2572,17 +2573,23 @@ const invalidProtocols = [
 	"filesystem:",
 	"javascript:"
 ];
+function hasInvalidProtocol(location) {
+	try {
+		return invalidProtocols.includes(new URL(location).protocol);
+	} catch {
+		return false;
+	}
+}
 function normalizeRedirectLocation(location, currentUrl, basename, historyInstance) {
 	if (isAbsoluteUrl(location)) {
 		let normalizedLocation = location;
-		let url = normalizedLocation.startsWith("//") ? new URL(currentUrl.protocol + normalizedLocation) : new URL(normalizedLocation);
-		if (invalidProtocols.includes(url.protocol)) throw new Error("Invalid redirect location");
+		let url = PROTOCOL_RELATIVE_URL_REGEX.test(normalizedLocation) ? new URL(normalizeProtocolRelativeUrl(normalizedLocation, currentUrl.protocol)) : new URL(normalizedLocation);
+		if (hasInvalidProtocol(url.toString())) throw new Error("Invalid redirect location");
 		let isSameBasename = stripBasename(url.pathname, basename) != null;
 		if (url.origin === currentUrl.origin && isSameBasename) return removeDoubleSlashes(url.pathname) + url.search + url.hash;
 	}
 	try {
-		let url = historyInstance.createURL(location);
-		if (invalidProtocols.includes(url.protocol)) throw new Error("Invalid redirect location");
+		if (hasInvalidProtocol(historyInstance.createURL(location).toString())) throw new Error("Invalid redirect location");
 	} catch (e) {}
 	return location;
 }
@@ -2978,4 +2985,4 @@ function createDeferred() {
 	};
 }
 //#endregion
-export { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, createRouter, createStaticHandler, getStaticContextFromError, invalidProtocols, isDataWithResponseInit, isMutationMethod, isRedirectResponse, isRedirectStatusCode, isResponse };
+export { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION, createRouter, createStaticHandler, getStaticContextFromError, hasInvalidProtocol, isDataWithResponseInit, isMutationMethod, isRedirectResponse, isRedirectStatusCode, isResponse };

package/dist/production/lib/router/url.js

@@ -0,0 +1,18 @@
+/**
+ * react-router v8.0.0-pre.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/url.ts
+const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|[\\/]{2})/i;
+const PROTOCOL_RELATIVE_URL_REGEX = /^[\\/]{2}/;
+function normalizeProtocolRelativeUrl(url, protocol) {
+	return protocol + url.replace(/\\/g, "/");
+}
+//#endregion
+export { ABSOLUTE_URL_REGEX, PROTOCOL_RELATIVE_URL_REGEX, normalizeProtocolRelativeUrl };

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

@@ -668,6 +668,8 @@ interface RouteMeta<RouteObjectType extends RouteObject = RouteObject> {
   caseSensitive: boolean;
   childrenIndex: number;
   route: RouteObjectType;
+  matcher?: RegExp;
+  compiledParams?: CompiledPathParam[];
 }
 /**
  * @private
@@ -752,6 +754,10 @@ interface PathMatch<ParamKey extends string = string> {
  * or `null` if it does not match.
  */
 declare function matchPath<Path extends string>(pattern: PathPattern<Path> | Path, pathname: string): PathMatch<ParamParseKey<Path>> | null;
+type CompiledPathParam = {
+  paramName: string;
+  isOptional?: boolean;
+};
 /**
  * Returns a resolved {@link Path} object relative to the given pathname.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,6 +8,7 @@
  *
  * @license MIT
  */
+import { ABSOLUTE_URL_REGEX, PROTOCOL_RELATIVE_URL_REGEX, normalizeProtocolRelativeUrl } from "./url.js";
 import { invariant, parsePath, warning } from "./history.js";
 import * as React$1 from "react";
 //#region lib/router/utils.ts
@@ -280,7 +281,14 @@ function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "",
 		branches.push({
 			path,
 			score: computeScore(path, route.index),
-			routesMeta
+			routesMeta: routesMeta.map((meta, i) => {
+				let [matcher, params] = compilePath(meta.relativePath, meta.caseSensitive, i === routesMeta.length - 1);
+				return {
+					...meta,
+					matcher,
+					compiledParams: params
+				};
+			})
 		});
 	};
 	routes.forEach((route, index) => {
@@ -331,11 +339,12 @@ function matchRouteBranch(branch, pathname, allowPartial = false) {
 		let meta = routesMeta[i];
 		let end = i === routesMeta.length - 1;
 		let remainingPathname = matchedPathname === "/" ? pathname : pathname.slice(matchedPathname.length) || "/";
-		let match = matchPath({
+		let pattern = {
 			path: meta.relativePath,
 			caseSensitive: meta.caseSensitive,
 			end
-		}, remainingPathname);
+		};
+		let match = meta.matcher && meta.compiledParams ? matchPathImpl(pattern, remainingPathname, meta.matcher, meta.compiledParams) : matchPath(pattern, remainingPathname);
 		let route = meta.route;
 		if (!match && end && allowPartial && !routesMeta[routesMeta.length - 1].route.index) match = matchPath({
 			path: meta.relativePath,
@@ -409,6 +418,9 @@ function matchPath(pattern, pathname) {
 		end: true
 	};
 	let [matcher, compiledParams] = compilePath(pattern.path, pattern.caseSensitive, pattern.end);
+	return matchPathImpl(pattern, pathname, matcher, compiledParams);
+}
+function matchPathImpl(pattern, pathname, matcher, compiledParams) {
 	let match = pathname.match(matcher);
 	if (!match) return null;
 	let matchedPathname = match[0];
@@ -471,7 +483,6 @@ function stripBasename(pathname, basename) {
 function prependBasename({ basename, pathname }) {
 	return pathname === "/" ? basename : joinPaths([basename, pathname]);
 }
-const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
 const isAbsoluteUrl = (url) => ABSOLUTE_URL_REGEX.test(url);
 /**
 * Returns a resolved {@link Path} object relative to the given pathname.
@@ -547,7 +558,7 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
 	if (!path.pathname.endsWith("/") && (hasExplicitTrailingSlash || hasCurrentTrailingSlash)) path.pathname += "/";
 	return path;
 }
-const removeDoubleSlashes = (path) => path.replace(/\/\/+/g, "/");
+const removeDoubleSlashes = (path) => path.replace(/[\\/]{2,}/g, "/");
 const joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
 const removeTrailingSlash = (path) => path.replace(/\/+$/, "");
 const normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
@@ -700,6 +711,14 @@ const replace = (url, init) => {
 	response.headers.set("X-Remix-Replace", "true");
 	return response;
 };
+const SUPPORTED_ERROR_TYPES = [
+	"EvalError",
+	"RangeError",
+	"ReferenceError",
+	"SyntaxError",
+	"TypeError",
+	"URIError"
+];
 var ErrorResponseImpl = class {
 	status;
 	statusText;
@@ -765,7 +784,7 @@ function parseToInfo(_to, basename) {
 	let isExternal = false;
 	if (isBrowser) try {
 		let currentUrl = new URL(window.location.href);
-		let targetUrl = to.startsWith("//") ? new URL(currentUrl.protocol + to) : new URL(to);
+		let targetUrl = PROTOCOL_RELATIVE_URL_REGEX.test(to) ? new URL(normalizeProtocolRelativeUrl(to, currentUrl.protocol)) : new URL(to);
 		let path = stripBasename(targetUrl.pathname, basename);
 		if (targetUrl.origin === currentUrl.origin && path != null) to = path + targetUrl.search + targetUrl.hash;
 		else isExternal = true;
@@ -779,4 +798,4 @@ function parseToInfo(_to, basename) {
 	};
 }
 //#endregion
-export { ErrorResponseImpl, RouterContextProvider, compilePath, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createContext, data, decodePath, defaultMapRouteProperties, flattenAndRankRoutes, generatePath, getPathContributingMatches, getResolveToMatches, getRoutePattern, isAbsoluteUrl, isBrowser, isRouteErrorResponse, isUnsupportedLazyRouteFunctionKey, isUnsupportedLazyRouteObjectKey, joinPaths, matchPath, matchRoutes, matchRoutesImpl, parseToInfo, prependBasename, redirect, redirectDocument, removeDoubleSlashes, replace, resolvePath, resolveTo, stripBasename };
+export { ErrorResponseImpl, RouterContextProvider, SUPPORTED_ERROR_TYPES, compilePath, convertRouteMatchToUiMatch, convertRoutesToDataRoutes, createContext, 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 };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,15 +8,16 @@
  *
  * @license MIT
  */
+import { PROTOCOL_RELATIVE_URL_REGEX } from "../router/url.js";
 import { createBrowserHistory, invariant } from "../router/history.js";
-import { ErrorResponseImpl, createContext } from "../router/utils.js";
-import { createRouter, invalidProtocols, isMutationMethod } from "../router/router.js";
+import { ErrorResponseImpl, createContext, resolvePath } from "../router/utils.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 "../dom/ssr/fog-of-war.js";
+import { getPathsWithAncestors } 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";
@@ -80,13 +81,14 @@ function createCallServer({ createFromReadableStream, createTemporaryReferenceSe
 		});
 		React$1.startTransition(() => Promise.resolve(payloadPromise).then(async (payload) => {
 			if (payload.type === "redirect") {
-				if (payload.reload || isExternalLocation(payload.location)) {
-					if (hasInvalidProtocol(payload.location)) throw new Error("Invalid redirect location");
-					window.location.href = payload.location;
+				let location = normalizeRedirectLocation(payload.location);
+				if (payload.reload || isExternalLocation(location)) {
+					if (hasInvalidProtocol(location)) throw new Error("Invalid redirect location");
+					window.location.href = location;
 					return;
 				}
 				React$1.startTransition(() => {
-					globalVar.__reactRouterDataRouter.navigate(payload.location, { replace: payload.replace });
+					globalVar.__reactRouterDataRouter.navigate(location, { replace: payload.replace });
 				});
 				return;
 			}
@@ -94,13 +96,14 @@ function createCallServer({ createFromReadableStream, createTemporaryReferenceSe
 			const rerender = await payload.rerender;
 			if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
 				if (rerender.type === "redirect") {
-					if (rerender.reload || isExternalLocation(rerender.location)) {
-						if (hasInvalidProtocol(rerender.location)) throw new Error("Invalid redirect location");
-						window.location.href = rerender.location;
+					let location = normalizeRedirectLocation(rerender.location);
+					if (rerender.reload || isExternalLocation(location)) {
+						if (hasInvalidProtocol(location)) throw new Error("Invalid redirect location");
+						window.location.href = location;
 						return;
 					}
 					React$1.startTransition(() => {
-						globalVar.__reactRouterDataRouter.navigate(rerender.location, { replace: rerender.replace });
+						globalVar.__reactRouterDataRouter.navigate(location, { replace: rerender.replace });
 					});
 					return;
 				}
@@ -533,6 +536,7 @@ function getManifestUrl(paths) {
 	return url;
 }
 async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
+	paths = getPathsWithAncestors(paths);
 	let url = getManifestUrl(paths);
 	if (url == null) return;
 	if (url.toString().length > 7680) {
@@ -568,12 +572,12 @@ function debounce(callback, wait) {
 function isExternalLocation(location) {
 	return new URL(location, window.location.href).origin !== window.location.origin;
 }
-function hasInvalidProtocol(location) {
-	try {
-		return invalidProtocols.includes(new URL(location).protocol);
-	} catch {
-		return false;
+function normalizeRedirectLocation(location) {
+	if (PROTOCOL_RELATIVE_URL_REGEX.test(location)) {
+		let path = resolvePath(location);
+		return path.pathname + path.search + path.hash;
 	}
+	return location;
 }
 function cloneRoutes(routes) {
 	if (!routes) return void 0;

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/html-stream/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/rsc/route-modules.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,6 +9,7 @@
  * @license MIT
  */
 import { isRouteErrorResponse } from "../router/utils.js";
+import { hasInvalidProtocol } from "../router/router.js";
 import { RSCRouterContext } from "../context.js";
 import { decodeRedirectErrorDigest, decodeRouteErrorResponseDigest } from "../errors.js";
 import { escapeHtml } from "../dom/ssr/markup.js";
@@ -122,6 +123,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 		if (!detectRedirectResponse.body) throw new Error("Failed to clone server response");
 		const payload = await createFromReadableStream(detectRedirectResponse.body);
 		if (serverResponse.status === 202 && payload.type === "redirect") {
+			if (hasInvalidProtocol(payload.location)) throw new Error("Invalid redirect location");
 			const headers = new Headers(serverResponse.headers);
 			headers.delete("Content-Encoding");
 			headers.delete("Content-Length");
@@ -159,6 +161,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 		for (const [key, value] of serverResponse.headers) headers.append(key, value);
 		headers.set("Content-Type", "text/html; charset=utf-8");
 		if (renderRedirect) {
+			if (hasInvalidProtocol(renderRedirect.location)) throw new Error("Invalid redirect location");
 			headers.set("Location", renderRedirect.location);
 			return new Response(html, {
 				status: renderRedirect.status,
@@ -166,7 +169,10 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 			});
 		}
 		const redirectTransform = new TransformStream({ flush(controller) {
-			if (renderRedirect) controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(renderRedirect.location)}"/>`));
+			if (renderRedirect) {
+				if (hasInvalidProtocol(renderRedirect.location)) return;
+				controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(renderRedirect.location)}"/>`));
+			}
 		} });
 		if (!hydrate) return new Response(html.pipeThrough(redirectTransform), {
 			status,
@@ -182,10 +188,13 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 		});
 	} catch (error) {
 		if (error instanceof Response) return error;
-		if (renderRedirect) return new Response(`Redirect: ${renderRedirect.location}`, {
-			status: renderRedirect.status,
-			headers: { Location: renderRedirect.location }
-		});
+		if (renderRedirect) {
+			if (hasInvalidProtocol(renderRedirect.location)) throw new Error("Invalid redirect location");
+			return new Response(`Redirect: ${renderRedirect.location}`, {
+				status: renderRedirect.status,
+				headers: { Location: renderRedirect.location }
+			});
+		}
 		try {
 			let normalizedError = renderError ?? error;
 			let [status, statusText] = isRouteErrorResponse(normalizedError) ? [normalizedError.status, normalizedError.statusText] : [500, ""];
@@ -230,6 +239,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 			for (const [key, value] of serverResponse.headers) headers.append(key, value);
 			headers.set("Content-Type", "text/html; charset=utf-8");
 			if (retryRedirect) {
+				if (hasInvalidProtocol(retryRedirect.location)) throw new Error("Invalid redirect location");
 				headers.set("Location", retryRedirect.location);
 				return new Response(html, {
 					status: retryRedirect.status,
@@ -237,7 +247,10 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 				});
 			}
 			const retryRedirectTransform = new TransformStream({ flush(controller) {
-				if (retryRedirect) controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(retryRedirect.location)}"/>`));
+				if (retryRedirect) {
+					if (hasInvalidProtocol(retryRedirect.location)) return;
+					controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(retryRedirect.location)}"/>`));
+				}
 			} });
 			if (!hydrate) return new Response(html.pipeThrough(retryRedirectTransform), {
 				status,
@@ -295,10 +308,13 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 function RSCStaticRouter({ getPayload }) {
 	const decoded = getPayload();
 	const payload = React$1.use(decoded);
-	if (payload.type === "redirect") throw new Response(null, {
-		status: payload.status,
-		headers: { Location: payload.location }
-	});
+	if (payload.type === "redirect") {
+		if (hasInvalidProtocol(payload.location)) throw new Error("Invalid redirect location");
+		throw new Response(null, {
+			status: payload.status,
+			headers: { Location: payload.location }
+		});
+	}
 	if (payload.type !== "render") return null;
 	let patchedLoaderData = { ...payload.loaderData };
 	for (const match of payload.matches) if (shouldHydrateRouteLoader(match.id, match.clientLoader, match.hasLoader, false) && (match.hydrateFallbackElement || !match.hasLoader)) delete patchedLoaderData[match.id];

package/dist/production/lib/server-runtime/cookies.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/crypto.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/data.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/dev.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/entry.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/errors.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,7 +8,6 @@
  *
  * @license MIT
  */
-import { isRouteErrorResponse } from "../router/utils.js";
 import "./mode.js";
 //#region lib/server-runtime/errors.ts
 /**
@@ -72,24 +71,5 @@ function serializeError(error, serverMode) {
 		stack: sanitized.stack
 	};
 }
-function serializeErrors(errors, serverMode) {
-	if (!errors) return null;
-	let entries = Object.entries(errors);
-	let serialized = {};
-	for (let [key, val] of entries) if (isRouteErrorResponse(val)) serialized[key] = {
-		...val,
-		__type: "RouteErrorResponse"
-	};
-	else if (val instanceof Error) {
-		let sanitized = sanitizeError(val, serverMode);
-		serialized[key] = {
-			message: sanitized.message,
-			stack: sanitized.stack,
-			__type: "Error",
-			...sanitized.name !== "Error" ? { __subType: sanitized.name } : {}
-		};
-	} else serialized[key] = val;
-	return serialized;
-}
 //#endregion
-export { sanitizeError, sanitizeErrors, serializeError, serializeErrors };
+export { sanitizeError, sanitizeErrors, serializeError };

package/dist/production/lib/server-runtime/headers.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/invariant.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/mode.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/routeMatching.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/routes.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/server-runtime/server.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,13 +8,13 @@
  *
  * @license MIT
  */
-import { ErrorResponseImpl, RouterContextProvider, defaultMapRouteProperties, isRouteErrorResponse, stripBasename } from "../router/utils.js";
+import { ErrorResponseImpl, RouterContextProvider, defaultMapRouteProperties, isRouteErrorResponse, removeTrailingSlash, stripBasename } from "../router/utils.js";
 import { instrumentHandler } from "../router/instrumentation.js";
 import { createStaticHandler, getStaticContextFromError, isMutationMethod, isRedirectResponse, isResponse } from "../router/router.js";
 import { getManifestPath } from "../dom/ssr/fog-of-war.js";
 import { createEntryRouteModules } from "./entry.js";
 import { isServerMode } from "./mode.js";
-import { sanitizeErrors, serializeError, serializeErrors } from "./errors.js";
+import { sanitizeErrors, serializeError } from "./errors.js";
 import { matchServerRoutes } from "./routeMatching.js";
 import { getBuildTimeHeader, getDevServerHooks } from "./dev.js";
 import { createStaticHandlerDataRoutes } from "./routes.js";
@@ -54,7 +54,7 @@ function derive(build, mode) {
 		}
 		loadContext = initialContext || new RouterContextProvider();
 		let requestUrl = new URL(request.url);
-		let normalizedPathname = getNormalizedPath(request, build.basename).pathname;
+		let normalizedPathname = getNormalizedPath(request).pathname;
 		let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
 		if (!build.ssr) {
 			let decodedPath = decodeURI(normalizedPathname);
@@ -74,7 +74,7 @@ function derive(build, mode) {
 				decodedPath = strippedPath;
 			}
 			if (build.prerender.length === 0) isSpaMode = true;
-			else if (!build.prerender.includes(decodedPath) && !build.prerender.includes(decodedPath + "/")) if (requestUrl.pathname.endsWith(".data")) {
+			else if (!build.prerender.some((p) => removeTrailingSlash(p) === removeTrailingSlash(decodedPath))) if (requestUrl.pathname.endsWith(".data")) {
 				errorHandler(new ErrorResponseImpl(404, "Not Found", `Refusing to SSR the path \`${decodedPath}\` because \`ssr:false\` is set and the path is not included in the \`prerender\` config, so in production the path will be a 404.`), {
 					context: loadContext,
 					params,
@@ -155,26 +155,20 @@ const createRequestHandler = (build, mode) => {
 	};
 };
 async function handleManifestRequest(build, dataRoutes, branches, url) {
-	if (build.assets.version !== url.searchParams.get("version")) return new Response(null, {
-		status: 204,
-		headers: { "X-Remix-Reload-Document": "true" }
-	});
 	if (url.toString().length > 7680) return new Response(null, {
 		statusText: "Bad Request",
 		status: 400
 	});
+	if (build.assets.version !== url.searchParams.get("version")) return new Response(null, {
+		status: 204,
+		headers: { "X-Remix-Reload-Document": "true" }
+	});
 	let patches = {};
 	if (url.searchParams.has("paths")) {
-		let paths = /* @__PURE__ */ new Set();
-		(url.searchParams.get("paths") || "").split(",").filter(Boolean).forEach((path) => {
-			if (!path.startsWith("/")) path = `/${path}`;
-			let segments = path.split("/").slice(1);
-			segments.forEach((_, i) => {
-				let partialPath = segments.slice(0, i + 1).join("/");
-				paths.add(`/${partialPath}`);
-			});
-		});
+		let pathParam = url.searchParams.get("paths") || "";
+		let paths = new Set(pathParam.split(",").filter(Boolean));
 		for (let path of paths) {
+			if (!path.startsWith("/")) path = `/${path}`;
 			let matches = matchServerRoutes(build.routes, dataRoutes, branches, path, build.basename);
 			if (matches) for (let match of matches) {
 				let routeId = match.route.id;
@@ -192,7 +186,7 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
 async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, isSpaMode, criticalCss) {
 	try {
 		if (isMutationMethod(request.method)) try {
-			throwIfPotentialCSRFAttack(request.headers, Array.isArray(build.allowedActionOrigins) ? build.allowedActionOrigins : []);
+			throwIfPotentialCSRFAttack(request, Array.isArray(build.allowedActionOrigins) ? build.allowedActionOrigins : []);
 		} catch (e) {
 			handleError(e);
 			return new Response("Bad Request", { status: 400 });
@@ -209,7 +203,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 					return new Response(null, { status: 500 });
 				}
 			},
-			normalizePath: (r) => getNormalizedPath(r, build.basename)
+			normalizePath: (r) => getNormalizedPath(r)
 		});
 		if (!isResponse(result)) result = await renderHtml(result, isSpaMode);
 		return result;
@@ -232,7 +226,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 		let state = {
 			loaderData: context.loaderData,
 			actionData: context.actionData,
-			errors: serializeErrors(context.errors, serverMode)
+			errors: context.errors
 		};
 		let baseServerHandoff = {
 			basename: build.basename,
@@ -274,7 +268,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			let state = {
 				loaderData: context.loaderData,
 				actionData: context.actionData,
-				errors: serializeErrors(context.errors, serverMode)
+				errors: context.errors
 			};
 			entryContext = {
 				...entryContext,
@@ -304,7 +298,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
 					return handleQueryRouteError(error);
 				}
 			},
-			normalizePath: (r) => getNormalizedPath(r, build.basename)
+			normalizePath: (r) => getNormalizedPath(r)
 		}));
 	} catch (error) {
 		return handleQueryRouteError(error);

package/dist/production/lib/server-runtime/serverHandoff.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *