react-router 8.3.1 → 8.4.0

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,10 +9,10 @@
  * @license MIT
  */
 import { isRouteErrorResponse } from "../router/utils.js";
-import { hasInvalidProtocol } from "../router/router.js";
+import { createDataRouteMatcher, hasInvalidProtocol } from "../router/router.js";
 import { RSCRouterContext } from "../context.js";
 import { decodeRedirectErrorDigest, decodeRouteErrorResponseDigest } from "../errors.js";
-import { escapeHtml } from "../dom/ssr/markup.js";
+import { escapeAttribute } from "../dom/ssr/markup.js";
 import { shouldHydrateRouteLoader } from "../dom/ssr/routes.js";
 import { FrameworkContext } from "../dom/ssr/components.js";
 import { StaticRouterProvider, createStaticRouter } from "../dom/server.js";
@@ -179,7 +179,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 		const redirectTransform = new TransformStream({ flush(controller) {
 			if (renderRedirect) {
 				if (hasInvalidProtocol(renderRedirect.location)) return;
-				controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(renderRedirect.location)}"/>`));
+				controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeAttribute(renderRedirect.location)}"/>`));
 			}
 		} });
 		if (!hydrate) return new Response(html.pipeThrough(redirectTransform), {
@@ -258,7 +258,7 @@ async function routeRSCServerRequest({ request, serverResponse, createFromReadab
 			const retryRedirectTransform = new TransformStream({ flush(controller) {
 				if (retryRedirect) {
 					if (hasInvalidProtocol(retryRedirect.location)) return;
-					controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeHtml(retryRedirect.location)}"/>`));
+					controller.enqueue(new TextEncoder().encode(`<meta http-equiv="refresh" content="0;url=${escapeAttribute(retryRedirect.location)}"/>`));
 				}
 			} });
 			if (!hydrate) return new Response(html.pipeThrough(retryRedirectTransform), {
@@ -333,6 +333,24 @@ function RSCStaticRouter({ getPayload, nonce }) {
 	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];
+	const routes = payload.matches.reduceRight((previous, match) => {
+		const route = {
+			id: match.id,
+			action: match.hasAction || !!match.clientAction,
+			element: match.element,
+			errorElement: match.errorElement,
+			handle: match.handle,
+			hydrateFallbackElement: match.hydrateFallbackElement,
+			index: match.index,
+			loader: match.hasLoader || !!match.clientLoader,
+			path: match.path,
+			shouldRevalidate: match.shouldRevalidate
+		};
+		if (previous.length > 0) route.children = previous;
+		return [route];
+	}, []);
+	const dataRouteMatcher = createDataRouteMatcher({}, payload.basename || "/");
+	dataRouteMatcher.update(routes);
 	const context = {
 		get _deepestRenderedBoundaryId() {
 			return decoded._deepestRenderedBoundaryId ?? null;
@@ -348,6 +366,7 @@ function RSCStaticRouter({ getPayload, nonce }) {
 		loaderHeaders: {},
 		location: payload.location,
 		statusCode: 200,
+		_match: (locationArg) => dataRouteMatcher.match(locationArg),
 		matches: payload.matches.map((match) => ({
 			params: match.params,
 			pathname: match.pathname,
@@ -363,22 +382,7 @@ function RSCStaticRouter({ getPayload, nonce }) {
 			}
 		}))
 	};
-	const router = createStaticRouter(payload.matches.reduceRight((previous, match) => {
-		const route = {
-			id: match.id,
-			action: match.hasAction || !!match.clientAction,
-			element: match.element,
-			errorElement: match.errorElement,
-			handle: match.handle,
-			hydrateFallbackElement: match.hydrateFallbackElement,
-			index: match.index,
-			loader: match.hasLoader || !!match.clientLoader,
-			path: match.path,
-			shouldRevalidate: match.shouldRevalidate
-		};
-		if (previous.length > 0) route.children = previous;
-		return [route];
-	}, []), context);
+	const router = createStaticRouter(routes, context);
 	const frameworkContext = {
 		future: {},
 		isSpaMode: false,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,11 +8,10 @@
  *
  * @license MIT
  */
-import { matchRoutesImpl } from "../router/utils.js";
 import invariant from "./invariant.js";
 //#region lib/server-runtime/routeMatching.ts
-function matchServerRoutes(manifest, dataRoutes, branches, pathname, basename) {
-	let matches = matchRoutesImpl(dataRoutes, pathname, basename ?? "/", false, branches);
+function matchServerRoutes(manifest, staticHandler, pathname) {
+	let matches = staticHandler.match(pathname);
 	if (!matches) return null;
 	return matches.map((match) => {
 		let route = manifest[match.route.id];

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.3.1
+ * react-router v8.4.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -90,12 +90,12 @@ function derive(build, mode) {
 		}
 		let manifestUrl = getManifestPath(build.routeDiscovery.manifestPath, build.basename);
 		if (build.routeDiscovery.mode === "lazy" && requestUrl.pathname === manifestUrl) try {
-			return await handleManifestRequest(build, staticHandler.dataRoutes, staticHandler._internalRouteBranches, requestUrl);
+			return await handleManifestRequest(build, staticHandler, requestUrl);
 		} catch (e) {
 			handleError(e);
 			return new Response("Unknown Server Error", { status: 500 });
 		}
-		let matches = matchServerRoutes(build.routes, staticHandler.dataRoutes, staticHandler._internalRouteBranches, normalizedPathname, build.basename);
+		let matches = matchServerRoutes(build.routes, staticHandler, normalizedPathname);
 		if (matches && matches.length > 0) Object.assign(params, matches[0].params);
 		if (requestHandlerInstrumentations?.length) loadContext.set(instrumentationResultMetaContext, {
 			url: createDataFunctionUrl(request, normalizedPath),
@@ -173,7 +173,7 @@ const createRequestHandler = (build, mode) => {
 		return _requestHandler(request, initialContext);
 	};
 };
-async function handleManifestRequest(build, dataRoutes, branches, url) {
+async function handleManifestRequest(build, staticHandler, url) {
 	if (url.toString().length > 7680) return new Response(null, {
 		statusText: "Bad Request",
 		status: 400
@@ -188,7 +188,7 @@ async function handleManifestRequest(build, dataRoutes, branches, url) {
 		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);
+			let matches = matchServerRoutes(build.routes, staticHandler, path);
 			if (matches) for (let match of matches) {
 				let routeId = match.route.id;
 				let route = build.assets.routes[routeId];
@@ -256,7 +256,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 		};
 		let entryContext = {
 			manifest: build.assets,
-			branches: staticHandler._internalRouteBranches,
+			branches: [],
 			routeModules: createEntryRouteModules(build.routes),
 			staticHandlerContext: context,
 			criticalCss,
@@ -291,6 +291,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
 			};
 			entryContext = {
 				...entryContext,
+				branches: [],
 				staticHandlerContext: context,
 				serverHandoffString: createServerHandoffString(baseServerHandoff),
 				serverHandoffStream: encodeViaTurboStream(state, request.signal, build.entry.module.streamTimeout, serverMode),

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

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

package/dist/development/lib/server-runtime/sessions/cookieStorage.js

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

package/dist/development/lib/server-runtime/sessions/memoryStorage.js

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

package/dist/development/lib/server-runtime/sessions.js

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

package/dist/development/lib/server-runtime/single-fetch.js

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

package/dist/development/lib/server-runtime/urls.js

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

package/dist/development/lib/server-runtime/warnings.js

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

package/dist/development/lib/types/internal.js

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

package/dist/development/route-pattern.d.ts

@@ -0,0 +1,3 @@
+
+import { unstable_preloadRoutePattern } from "./lib/router/matcher-route-pattern.preload.js";
+export { unstable_preloadRoutePattern };

package/dist/development/route-pattern.js

@@ -0,0 +1,12 @@
+/**
+ * react-router v8.4.0
+ *
+ * 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
+ */
+import { unstable_preloadRoutePattern } from "./lib/router/matcher-route-pattern.preload.js";
+export { unstable_preloadRoutePattern };

package/dist/development/vendor/turbo-stream-v2/flatten.js

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

package/dist/development/vendor/turbo-stream-v2/turbo-stream.js

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

package/dist/development/vendor/turbo-stream-v2/unflatten.js

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

package/dist/development/vendor/turbo-stream-v2/utils.js

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

package/dist/production/dom-export.js

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

package/dist/production/index-react-server-client.js

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

package/dist/production/index-react-server.d.ts

@@ -50,7 +50,7 @@ interface Path {
  * An entry in a history stack. A location contains information about the
  * URL path, as well as possibly some arbitrary state and a key.
  */
-interface Location<State = any> extends Path {
+interface Location$1<State = any> extends Path {
   /**
    * A value of arbitrary data associated with this location.
    */
@@ -79,7 +79,7 @@ interface Update {
   /**
    * The new location.
    */
-  location: Location;
+  location: Location$1;
   /**
    * The delta between this location and the former location in the history stack
    */
@@ -113,7 +113,7 @@ interface History {
   /**
    * The current location. This value is mutable.
    */
-  readonly location: Location;
+  readonly location: Location$1;
   /**
    * Returns a valid href for the given `to` value that may be used as
    * the value of an <a href> attribute.
@@ -597,7 +597,7 @@ interface MapRoutePropertiesFunction {
  * onto the route. Either they're meaningful to the router, or they'll get
  * ignored.
  */
-type UnsupportedLazyRouteObjectKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children";
+type UnsupportedLazyRouteObjectKey = "lazy" | "caseSensitive" | "path" | "id" | "index" | "children" | "unstable_validateParams";
 /**
  * Keys we cannot change from within a lazy() function. We spread all other keys
  * onto the route. Either they're meaningful to the router, or they'll get
@@ -655,6 +655,11 @@ type BaseRouteObject = {
    * See [`shouldRevalidate`](../../start/data/route-object#shouldRevalidate).
    */
   shouldRevalidate?: ShouldRevalidateFunction;
+  /**
+   * A map of route param names to regular expressions used to validate params
+   * after a route-pattern match.
+   */
+  unstable_validateParams?: Record<string, RegExp>;
   /**
    * The route handle.
    */
@@ -791,7 +796,7 @@ interface DataRouteMatch extends RouteMatch<string, DataRouteObject> {}
  * Defaults to `/`.
  * @returns An array of matched routes, or `null` if no matches were found.
  */
-declare function matchRoutes<RouteObjectType extends RouteObject = RouteObject>(routes: RouteObjectType[], locationArg: Partial<Location> | string, basename?: string): RouteMatch<string, RouteObjectType>[] | null;
+declare function matchRoutes<RouteObjectType extends RouteObject = RouteObject>(routes: RouteObjectType[], locationArg: Partial<Location$1> | string, basename?: string): RouteMatch<string, RouteObjectType>[] | null;
 interface UIMatch<Data = unknown, Handle = unknown> {
   id: string;
   pathname: string;
@@ -811,30 +816,6 @@ interface UIMatch<Data = unknown, Handle = unknown> {
    */
   handle: Handle;
 }
-interface RouteMeta<RouteObjectType extends RouteObject = RouteObject> {
-  relativePath: string;
-  caseSensitive: boolean;
-  childrenIndex: number;
-  route: RouteObjectType;
-  matcher?: RegExp;
-  compiledParams?: CompiledPathParam[];
-}
-/**
- * @private
- * PRIVATE - DO NOT USE
- *
- * A "branch" of routes that match a given route pattern.
- * This is an internal interface not intended for direct external usage.
- */
-interface RouteBranch<RouteObjectType extends RouteObject = RouteObject> {
-  path: string;
-  score: number;
-  routesMeta: RouteMeta<RouteObjectType>[];
-}
-type CompiledPathParam = {
-  paramName: string;
-  isOptional?: boolean;
-};
 declare class DataWithResponseInit<D> {
   type: string;
   data: D;
@@ -1143,9 +1124,10 @@ interface Router$1 {
    * @private
    * PRIVATE - DO NOT USE
    *
-   * Return the route branches for this router instance
+   * Match routes against a location using the router's configured route
+   * matching implementation.
    */
-  get branches(): RouteBranch<DataRouteObject>[] | undefined;
+  match(locationArg: Partial<Location$1> | string): DataRouteMatch[] | null;
   /**
    * @private
    * PRIVATE - DO NOT USE
@@ -1230,7 +1212,7 @@ interface Router$1 {
    * Utility function to create an href for the given location
    * @param location
    */
-  createHref(location: Location | URL): string;
+  createHref(location: Location$1 | URL): string;
   /**
    * @private
    * PRIVATE - DO NOT USE
@@ -1346,7 +1328,7 @@ interface RouterState {
   /**
    * The current location reflected by the router
    */
-  location: Location;
+  location: Location$1;
   /**
    * The current set of route matches
    */
@@ -1407,7 +1389,10 @@ type HydrationState = Partial<Pick<RouterState, "loaderData" | "actionData" | "e
 /**
  * Future flags to toggle new feature behavior
  */
-interface FutureConfig {}
+interface FutureConfig {
+  /** Enables route-pattern matching after calling `unstable_preloadRoutePattern()`. */
+  unstable_routePatternMatching?: boolean;
+}
 /**
  * Initialization options for createRouter
  */
@@ -1439,6 +1424,8 @@ interface StaticHandlerContext {
   loaderHeaders: Record<string, Headers>;
   actionHeaders: Record<string, Headers>;
   _deepestRenderedBoundaryId?: string | null;
+  /** @private */
+  _match: StaticHandler["match"];
 }
 /**
  * A StaticHandler instance manages a singular SSR navigation/fetch event
@@ -1452,10 +1439,10 @@ interface StaticHandler {
    * @private
    * PRIVATE - DO NOT USE
    *
-   * The route branches derived from the data routes, used for internal route
-   * matching in Framework Mode
+   * Match routes against a location using the handler's configured route
+   * matching implementation.
    */
-  _internalRouteBranches: RouteBranch<DataRouteObject>[];
+  match(locationArg: Partial<Location$1> | string): DataRouteMatch[] | null;
   /**
    * Perform a query for a given request - executing all matched route
    * loaders/actions.  Used for document requests.
@@ -1503,8 +1490,8 @@ interface StaticHandler {
   }): Promise<any>;
 }
 type ViewTransitionOpts = {
-  currentLocation: Location;
-  nextLocation: Location;
+  currentLocation: Location$1;
+  nextLocation: Location$1;
 };
 /**
  * Subscriber function signature for changes to router state
@@ -1522,7 +1509,7 @@ interface RouterSubscriber {
  * for a given location
  */
 interface GetScrollRestorationKeyFunction {
-  (location: Location, matches: UIMatch[]): string | null;
+  (location: Location$1, matches: UIMatch[]): string | null;
 }
 /**
  * Function signature for determining the current scroll position
@@ -1604,7 +1591,7 @@ type NavigationStates = {
   };
   Loading: {
     state: "loading";
-    location: Location;
+    location: Location$1;
     matches: DataRouteMatch[];
     historyAction: Action;
     formMethod: Submission["formMethod"] | undefined;
@@ -1616,7 +1603,7 @@ type NavigationStates = {
   };
   Submitting: {
     state: "submitting";
-    location: Location;
+    location: Location$1;
     matches: DataRouteMatch[];
     historyAction: Action;
     formMethod: Submission["formMethod"];
@@ -1706,7 +1693,7 @@ interface BlockerBlocked {
   state: "blocked";
   reset: () => void;
   proceed: () => void;
-  location: Location;
+  location: Location$1;
 }
 interface BlockerUnblocked {
   state: "unblocked";
@@ -1718,12 +1705,12 @@ interface BlockerProceeding {
   state: "proceeding";
   reset: undefined;
   proceed: undefined;
-  location: Location;
+  location: Location$1;
 }
 type Blocker = BlockerUnblocked | BlockerBlocked | BlockerProceeding;
 type BlockerFunction = (args: {
-  currentLocation: Location;
-  nextLocation: Location;
+  currentLocation: Location$1;
+  nextLocation: Location$1;
   historyAction: Action;
 }) => boolean;
 interface CreateStaticHandlerOptions {
@@ -2008,7 +1995,7 @@ type MetaMatches<MatchLoaders extends Record<string, LoaderFunction | ClientLoad
 interface MetaArgs<Loader extends LoaderFunction | ClientLoaderFunction | unknown = unknown, MatchLoaders extends Record<string, LoaderFunction | ClientLoaderFunction | unknown> = Record<string, unknown>> {
   loaderData: (Loader extends LoaderFunction | ClientLoaderFunction ? SerializeFrom<Loader> : unknown) | undefined;
   params: Params;
-  location: Location;
+  location: Location$1;
   matches: MetaMatches<MatchLoaders>;
   error?: unknown;
 }
@@ -2329,7 +2316,7 @@ type RSCRenderPayload = {
   clientVersion?: string;
   errors: Record<string, any> | null;
   loaderData: Record<string, any>;
-  location: Location;
+  location: Location$1;
   routeDiscovery: RouteDiscovery;
   matches: RSCRouteMatch[];
   patches?: Promise<RSCRouteManifest[]>;
@@ -2377,6 +2364,13 @@ type RouteDiscovery = {
  * encoding an {@link unstable_RSCPayload} for consumption by an [RSC](https://react.dev/reference/rsc/server-components)
  * enabled client router.
  *
+ * Treat every React Server Function as a public endpoint. Server Functions are
+ * not inherently associated with a route. Any route middleware that runs is
+ * selected from the URL used to call a Server Function, but the client controls
+ * both the Server Function identifier and the URL. Perform all access control
+ * checks within each Server Function, or use a route action for
+ * middleware-driven access control.
+ *
  * @example
  * import {
  *   createTemporaryReferenceSet,