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

package/dist/development/lib/dom/lib.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,8 +8,9 @@
  *
  * @license MIT
  */
+import { ABSOLUTE_URL_REGEX } from "../router/url.js";
 import { createBrowserHistory, createHashHistory, createPath, invariant, warning } from "../router/history.js";
-import { ErrorResponseImpl, defaultMapRouteProperties, joinPaths, matchPath, parseToInfo, resolveTo, stripBasename } from "../router/utils.js";
+import { ErrorResponseImpl, SUPPORTED_ERROR_TYPES, defaultMapRouteProperties, joinPaths, matchPath, parseToInfo, resolveTo, stripBasename } from "../router/utils.js";
 import { IDLE_FETCHER, createRouter } from "../router/router.js";
 import { DataRouterContext, DataRouterStateContext, FetchersContext, NavigationContext, RouteContext, ViewTransitionContext } from "../context.js";
 import { useBlocker, useHref, useLocation, useMatches, useNavigate, useNavigation, useResolvedPath, useRouteId } from "../hooks.js";
@@ -21,13 +22,17 @@ import * as React$1 from "react";
 //#region lib/dom/lib.tsx
 const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
-	if (isBrowser) window.__reactRouterVersion = "8.0.0-pre.0";
+	if (isBrowser) window.__reactRouterVersion = "8.0.0-pre.1";
 } catch (e) {}
 /**
 * Create a new {@link DataRouter| data router} that manages the application
 * path via [`history.pushState`](https://developer.mozilla.org/en-US/docs/Web/API/History/pushState)
 * and [`history.replaceState`](https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState).
 *
+* Data Routers should not be held in React state. You should create your router
+* once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+* You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+*
 * @public
 * @category Data Routers
 * @mode data
@@ -63,6 +68,10 @@ function createBrowserRouter(routes, opts) {
 * Create a new {@link DataRouter| data router} that manages the application
 * path via the URL [`hash`](https://developer.mozilla.org/en-US/docs/Web/API/URL/hash).
 *
+* Data Routers should not be held in React state. You should create your router
+* once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+* You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+*
 * @public
 * @category Data Routers
 * @mode data
@@ -108,7 +117,7 @@ function deserializeErrors(errors) {
 	let serialized = {};
 	for (let [key, val] of entries) if (val && val.__type === "RouteErrorResponse") serialized[key] = new ErrorResponseImpl(val.status, val.statusText, val.data, val.internal === true);
 	else if (val && val.__type === "Error") {
-		if (val.__subType) {
+		if (typeof val.__subType === "string" && SUPPORTED_ERROR_TYPES.includes(val.__subType)) {
 			let ErrorConstructor = window[val.__subType];
 			if (typeof ErrorConstructor === "function") try {
 				let error = new ErrorConstructor(val.message);
@@ -244,7 +253,6 @@ function HistoryRouter({ basename, children, history, useTransitions }) {
 	});
 }
 HistoryRouter.displayName = "unstable_HistoryRouter";
-const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
 /**
 * A progressively enhanced [`<a href>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a)
 * wrapper to enable navigation with client-side routing.
@@ -509,7 +517,10 @@ Form.displayName = "Form";
 * }
 * ```
 *
-* This component renders an inline `<script>` to prevent scroll flashing. The `nonce` prop will be passed down to the script tag to allow CSP nonce usage.
+* This component renders an inline `<script>` to prevent scroll flashing. The
+* `nonce` prop will be passed down to the script tag to allow CSP nonce usage.
+* If not provided in Framework Mode, it will default to any
+* {@link ServerRouter | `<ServerRouter nonce>`} prop.
 *
 * ```tsx
 * <ScrollRestoration nonce={cspNonce} />
@@ -554,6 +565,7 @@ function ScrollRestoration({ getKey, storageKey, ...props }) {
 			sessionStorage.removeItem(storageKey);
 		}
 	}).toString();
+	if (props.nonce == null && remixContext?.nonce) props.nonce = remixContext.nonce;
 	return /* @__PURE__ */ React$1.createElement("script", {
 		...props,
 		suppressHydrationWarning: true,

package/dist/development/lib/dom/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,6 +8,7 @@
  *
  * @license MIT
  */
+import { ABSOLUTE_URL_REGEX } from "../router/url.js";
 import { createPath, invariant, parsePath } from "../router/history.js";
 import { convertRoutesToDataRoutes, isRouteErrorResponse } from "../router/utils.js";
 import { IDLE_BLOCKER, IDLE_FETCHER, IDLE_NAVIGATION } from "../router/router.js";
@@ -296,6 +297,5 @@ function encodeLocation(to) {
 		hash: encoded.hash
 	};
 }
-const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
 //#endregion
 export { StaticRouter, StaticRouterProvider, createStaticRouter };

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

@@ -31,7 +31,8 @@ interface LinksProps {
   /**
    * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
    * attribute to render on the [`<link>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link)
-   * element
+   * element. If not provided in Framework Mode, it will default to any
+   * {@link ServerRouter | `<ServerRouter nonce>`} prop.
    */
   nonce?: string | undefined;
   /**
@@ -154,7 +155,8 @@ type ScriptsProps = Omit<React$1.HTMLProps<HTMLScriptElement>, "async" | "childr
   /**
    * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
    * attribute to render on the [`<script>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script)
-   * element
+   * element. If not provided in Framework Mode, it will default to any
+   * {@link ServerRouter | `<ServerRouter nonce>`} prop.
    */
   nonce?: string | undefined;
 };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -141,7 +141,7 @@ const CRITICAL_CSS_DATA_ATTRIBUTE = "data-react-router-critical-css";
 * tags
 */
 function Links({ nonce, crossOrigin }) {
-	let { isSpaMode, manifest, routeModules, criticalCss } = useFrameworkContext();
+	let { isSpaMode, manifest, routeModules, criticalCss, nonce: contextNonce } = useFrameworkContext();
 	let { errors, matches: routerMatches } = useDataRouterStateContext();
 	let matches = getActiveMatches(routerMatches, errors, isSpaMode);
 	let keyedLinks = React$1.useMemo(() => getKeyedLinksForMatches(matches, routeModules, manifest), [
@@ -149,6 +149,7 @@ function Links({ nonce, crossOrigin }) {
 		routeModules,
 		manifest
 	]);
+	if (nonce == null && contextNonce) nonce = contextNonce;
 	return /* @__PURE__ */ React$1.createElement(React$1.Fragment, null, typeof criticalCss === "string" ? /* @__PURE__ */ React$1.createElement("style", {
 		[CRITICAL_CSS_DATA_ATTRIBUTE]: "",
 		nonce,
@@ -200,6 +201,7 @@ 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), [
 		router.routes,
@@ -207,6 +209,10 @@ function PrefetchPageLinks({ page, ...linkProps }) {
 		router.basename
 	]);
 	if (!matches) return null;
+	if (linkProps.nonce == null && contextNonce) linkProps = {
+		...linkProps,
+		nonce: contextNonce
+	};
 	if (rsc) return /* @__PURE__ */ React$1.createElement(RSCPrefetchPageLinksImpl, {
 		page,
 		matches,
@@ -473,11 +479,15 @@ function setIsHydrated() {
 * tags
 */
 function Scripts(scriptProps) {
-	let { manifest, serverHandoffString, isSpaMode, renderMeta, routeDiscovery, ssr } = useFrameworkContext();
+	let { manifest, serverHandoffString, isSpaMode, renderMeta, routeDiscovery, ssr, nonce: contextNonce } = useFrameworkContext();
 	let { router, static: isStatic, staticContext } = useDataRouterContext();
 	let { matches: routerMatches } = useDataRouterStateContext();
 	let isRSCRouterContext = useIsRSCRouterContext();
 	let enableFogOfWar = isFogOfWarEnabled(routeDiscovery, ssr);
+	if (scriptProps.nonce == null && contextNonce) scriptProps = {
+		...scriptProps,
+		nonce: contextNonce
+	};
 	if (renderMeta) renderMeta.didRenderScripts = true;
 	let matches = getActiveMatches(routerMatches, null, isSpaMode);
 	React$1.useEffect(() => {

package/dist/development/lib/dom/ssr/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/development/lib/dom/ssr/entry.d.ts

@@ -19,6 +19,7 @@ interface FrameworkContextObject {
   ssr: boolean;
   isSpaMode: boolean;
   routeDiscovery: ServerBuild["routeDiscovery"];
+  nonce?: string;
   serializeError?(error: Error): SerializedError;
   renderMeta?: {
     didRenderScripts?: boolean;

package/dist/development/lib/dom/ssr/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.
  *
@@ -45,12 +45,16 @@ var RemixErrorBoundary = class extends React$1.Component {
 * When app's don't provide a root level ErrorBoundary, we default to this.
 */
 function RemixRootDefaultErrorBoundary({ error, isOutsideRemixApp }) {
+	let { nonce } = useFrameworkContext();
 	console.error(error);
-	let heyDeveloper = /* @__PURE__ */ React$1.createElement("script", { dangerouslySetInnerHTML: { __html: `
+	let heyDeveloper = /* @__PURE__ */ React$1.createElement("script", {
+		nonce,
+		dangerouslySetInnerHTML: { __html: `
         console.log(
           "💿 Hey developer 👋. You can provide a way better UX than this when your app throws errors. Check out https://reactrouter.com/how-to/error-boundary for more information."
         );
-      ` } });
+      ` }
+	});
 	if (isRouteErrorResponse(error)) return /* @__PURE__ */ React$1.createElement(BoundaryShell, { title: "Unhandled Thrown Response!" }, /* @__PURE__ */ React$1.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText), heyDeveloper);
 	let errorInstance;
 	if (error instanceof Error) errorInstance = error;

package/dist/development/lib/dom/ssr/fallback.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,20 +9,25 @@
  * @license MIT
  */
 import { BoundaryShell } from "./errorBoundaries.js";
+import { useFrameworkContext } from "./components.js";
 import * as React$1 from "react";
 //#region lib/dom/ssr/fallback.tsx
 function RemixRootDefaultHydrateFallback() {
+	let { nonce } = useFrameworkContext();
 	return /* @__PURE__ */ React$1.createElement(BoundaryShell, {
 		title: "Loading...",
 		renderScripts: true
-	}, /* @__PURE__ */ React$1.createElement("script", { dangerouslySetInnerHTML: { __html: `
+	}, /* @__PURE__ */ React$1.createElement("script", {
+		nonce,
+		dangerouslySetInnerHTML: { __html: `
               console.log(
                 "💿 Hey developer 👋. You can provide a way better UX than this " +
                 "when your app is loading JS modules and/or running \`clientLoader\` " +
                 "functions. Check out https://reactrouter.com/start/framework/route-module#hydratefallback " +
                 "for more information."
               );
-            ` } }));
+            ` }
+	}));
 }
 //#endregion
 export { RemixRootDefaultHydrateFallback };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -17,6 +17,15 @@ const nextPaths = /* @__PURE__ */ new Set();
 const discoveredPathsMaxSize = 1e3;
 const discoveredPaths = /* @__PURE__ */ new Set();
 const URL_LIMIT = 7680;
+function getPathsWithAncestors(paths) {
+	let result = /* @__PURE__ */ new Set();
+	paths.forEach((path) => {
+		if (!path.startsWith("/")) path = `/${path}`;
+		for (let i = 1; i < path.length; i++) if (path[i] === "/") result.add(path.slice(0, i));
+		result.add(path);
+	});
+	return Array.from(result);
+}
 function isFogOfWarEnabled(routeDiscovery, ssr) {
 	return routeDiscovery.mode === "lazy" && ssr === true;
 }
@@ -102,6 +111,7 @@ function getManifestPath(_manifestPath, basename) {
 }
 const MANIFEST_VERSION_STORAGE_KEY = "react-router-manifest-version";
 async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
+	paths = getPathsWithAncestors(paths);
 	const searchParams = new URLSearchParams();
 	searchParams.set("paths", paths.sort().join(","));
 	searchParams.set("version", manifest.version);
@@ -167,4 +177,4 @@ function debounce(callback, wait) {
 	};
 }
 //#endregion
-export { URL_LIMIT, getManifestPath, getPartialManifest, getPatchRoutesOnNavigationFunction, isFogOfWarEnabled, useFogOFWarDiscovery };
+export { URL_LIMIT, getManifestPath, getPartialManifest, getPatchRoutesOnNavigationFunction, getPathsWithAncestors, isFogOfWarEnabled, useFogOFWarDiscovery };

package/dist/development/lib/dom/ssr/hydration.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/development/lib/dom/ssr/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/development/lib/dom/ssr/links.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/development/lib/dom/ssr/markup.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/development/lib/dom/ssr/routeModules.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/development/lib/dom/ssr/routes-test-stub.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/development/lib/dom/ssr/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/development/lib/dom/ssr/server.d.ts

@@ -18,7 +18,10 @@ interface ServerRouterProps {
   url: string | URL;
   /**
    * An optional `nonce` for [Content Security Policy (CSP)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP)
-   * compliance, used to allow inline scripts to run safely.
+   * compliance. This is applied to inline scripts rendered by React Router and
+   * used as the default for nonce-aware components such as {@link Links | `<Links>`},
+   * {@link Scripts | `<Scripts>`}, and {@link ScrollRestoration | `<ScrollRestoration>`}
+   * when they do not provide their own `nonce`.
    */
   nonce?: string;
 }

package/dist/development/lib/dom/ssr/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.
  *
@@ -50,6 +50,7 @@ function ServerRouter({ context, url, nonce }) {
 		ssr: context.ssr,
 		isSpaMode: context.isSpaMode,
 		routeDiscovery: context.routeDiscovery,
+		nonce,
 		serializeError: context.serializeError,
 		renderMeta: context.renderMeta
 	} }, /* @__PURE__ */ React$1.createElement(RemixErrorBoundary, { location: router.state.location }, /* @__PURE__ */ React$1.createElement(StaticRouterProvider, {

package/dist/development/lib/dom/ssr/single-fetch.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,11 +8,10 @@
  *
  * @license MIT
  */
-import { ErrorResponseImpl, data, isRouteErrorResponse, redirect } from "../../router/utils.js";
+import { ErrorResponseImpl, SUPPORTED_ERROR_TYPES, data, isRouteErrorResponse, redirect } from "../../router/utils.js";
 import { isDataWithResponseInit, isResponse } from "../../router/router.js";
 import invariant from "./invariant.js";
 import { escapeHtml } from "./markup.js";
-import { SUPPORTED_ERROR_TYPES } from "../../../vendor/turbo-stream-v2/utils.js";
 import { decode } from "../../../vendor/turbo-stream-v2/turbo-stream.js";
 import { createRequestInit } from "./data.js";
 import * as React$1 from "react";

package/dist/development/lib/dom-export/dom-router-provider.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/development/lib/dom-export/hydrated-router.d.ts

@@ -80,7 +80,7 @@ interface HydratedRouterProps {
    * and is only present for render errors.
    *
    * ```tsx
-   * <HydratedRouter onError=(error, info) => {
+   * <HydratedRouter onError={(error, info) => {
    *   let { location, params, pattern, errorInfo } = info;
    *   console.error(error, location, errorInfo);
    *   reportToErrorService(error, location, errorInfo);

package/dist/development/lib/dom-export/hydrated-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.
  *
@@ -11,7 +11,7 @@
 import { CRITICAL_CSS_DATA_ATTRIBUTE } from "../dom/ssr/components.js";
 import { RouterProvider as RouterProvider$1 } from "./dom-router-provider.js";
 import * as React$1 from "react";
-import { UNSAFE_FrameworkContext, UNSAFE_RemixErrorBoundary, UNSAFE_createBrowserHistory, UNSAFE_createClientRoutes, UNSAFE_createClientRoutesWithHMRRevalidationOptOut, UNSAFE_createRouter, UNSAFE_decodeViaTurboStream, UNSAFE_defaultMapRouteProperties, UNSAFE_deserializeErrors, UNSAFE_getHydrationData, UNSAFE_getPatchRoutesOnNavigationFunction, UNSAFE_getTurboStreamSingleFetchDataStrategy, UNSAFE_hydrationRouteProperties, UNSAFE_invariant, UNSAFE_useFogOFWarDiscovery } from "react-router";
+import { UNSAFE_FrameworkContext, UNSAFE_RemixErrorBoundary, UNSAFE_createBrowserHistory, UNSAFE_createClientRoutes, UNSAFE_createClientRoutesWithHMRRevalidationOptOut, UNSAFE_createRouter, UNSAFE_decodeViaTurboStream, UNSAFE_defaultMapRouteProperties, UNSAFE_getHydrationData, UNSAFE_getPatchRoutesOnNavigationFunction, UNSAFE_getTurboStreamSingleFetchDataStrategy, UNSAFE_hydrationRouteProperties, UNSAFE_invariant, UNSAFE_useFogOFWarDiscovery } from "react-router";
 //#region lib/dom-export/hydrated-router.tsx
 let ssrInfo = null;
 let router = null;
@@ -57,21 +57,18 @@ function createHydratedRouter({ getContext, instrumentations }) {
 	if (ssrInfo.context.isSpaMode) {
 		let { loaderData } = ssrInfo.context.state;
 		if (ssrInfo.manifest.routes.root?.hasLoader && loaderData && "root" in loaderData) hydrationData = { loaderData: { root: loaderData.root } };
-	} else {
-		hydrationData = UNSAFE_getHydrationData({
-			state: ssrInfo.context.state,
-			routes,
-			getRouteInfo: (routeId) => ({
-				clientLoader: ssrInfo.routeModules[routeId]?.clientLoader,
-				hasLoader: ssrInfo.manifest.routes[routeId]?.hasLoader === true,
-				hasHydrateFallback: ssrInfo.routeModules[routeId]?.HydrateFallback != null
-			}),
-			location: window.location,
-			basename: window.__reactRouterContext?.basename,
-			isSpaMode: ssrInfo.context.isSpaMode
-		});
-		if (hydrationData && hydrationData.errors) hydrationData.errors = UNSAFE_deserializeErrors(hydrationData.errors);
-	}
+	} else hydrationData = UNSAFE_getHydrationData({
+		state: ssrInfo.context.state,
+		routes,
+		getRouteInfo: (routeId) => ({
+			clientLoader: ssrInfo.routeModules[routeId]?.clientLoader,
+			hasLoader: ssrInfo.manifest.routes[routeId]?.hasLoader === true,
+			hasHydrateFallback: ssrInfo.routeModules[routeId]?.HydrateFallback != null
+		}),
+		location: window.location,
+		basename: window.__reactRouterContext?.basename,
+		isSpaMode: ssrInfo.context.isSpaMode
+	});
 	if (window.history.state && window.history.state.masked) window.history.replaceState({
 		...window.history.state,
 		masked: void 0

package/dist/development/lib/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.
  *

package/dist/development/lib/hooks.js

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.0-pre.0
+ * react-router v8.0.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,7 +10,7 @@
  */
 import { invariant, parsePath, warning } from "./router/history.js";
 import { convertRouteMatchToUiMatch, decodePath, getResolveToMatches, getRoutePattern, isBrowser, isRouteErrorResponse, joinPaths, matchPath, matchRoutes, parseToInfo, resolveTo, stripBasename } from "./router/utils.js";
-import { IDLE_BLOCKER } from "./router/router.js";
+import { IDLE_BLOCKER, hasInvalidProtocol } from "./router/router.js";
 import { AwaitContext, DataRouterContext, DataRouterStateContext, LocationContext, NavigationContext, RSCRouterContext, RouteContext, RouteErrorContext } from "./context.js";
 import { decodeRedirectErrorDigest, decodeRouteErrorResponseDigest } from "./errors.js";
 import * as React$1 from "react";
@@ -690,7 +690,9 @@ function RSCErrorHandler({ children, error }) {
 			let existingRedirect = errorRedirectHandledMap.get(error);
 			if (existingRedirect) throw existingRedirect;
 			let parsed = parseToInfo(redirect.location, basename);
-			if (isBrowser && !errorRedirectHandledMap.get(error)) if (parsed.isExternal || redirect.reloadDocument) window.location.href = parsed.absoluteURL || parsed.to;
+			let target = parsed.absoluteURL || parsed.to;
+			if (hasInvalidProtocol(target)) throw new Error("Invalid redirect location");
+			if (isBrowser && !errorRedirectHandledMap.get(error)) if (parsed.isExternal || redirect.reloadDocument) window.location.href = target;
 			else {
 				const redirectPromise = Promise.resolve().then(() => window.__reactRouterDataRouter.navigate(parsed.to, { replace: redirect.replace }));
 				errorRedirectHandledMap.set(error, redirectPromise);
@@ -698,7 +700,7 @@ function RSCErrorHandler({ children, error }) {
 			}
 			return /* @__PURE__ */ React$1.createElement("meta", {
 				httpEquiv: "refresh",
-				content: `0;url=${parsed.absoluteURL || parsed.to}`
+				content: `0;url=${target}`
 			});
 		}
 	}

package/dist/development/lib/href.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/development/lib/router/history.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 } from "./url.js";
 //#region lib/router/history.ts
 /**
 * Actions represent the type of change to a location value.
@@ -364,7 +365,7 @@ function createBrowserURLImpl(windowImpl, to, isAbsolute = false) {
 	invariant(base, "No window.location.(origin|href) available to create URL");
 	let href = typeof to === "string" ? to : createPath(to);
 	href = href.replace(/ $/, "%20");
-	if (!isAbsolute && href.startsWith("//")) href = base + href;
+	if (!isAbsolute && PROTOCOL_RELATIVE_URL_REGEX.test(href)) href = base + href;
 	return new URL(href, base);
 }
 //#endregion

package/dist/development/lib/router/instrumentation.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/development/lib/router/links.d.ts

@@ -100,8 +100,9 @@ interface PageLinkDescriptor extends Omit<HtmlLinkDescriptor, "href" | "rel" | "
   /**
    * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
    * attribute to render on the [`<link>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link)
-   * element
-   */
+   * element. If not provided in Framework Mode, it will default to any
+   * {@link ServerRouter | `<ServerRouter nonce>`} prop.
+      */
   nonce?: string | undefined;
   /**
    * The absolute path of the page to prefetch, e.g. `/absolute/path`.

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