react-router 8.0.1 → 8.2.0

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.1
+ * react-router v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -10,8 +10,8 @@
  */
 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";
+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";
 //#region lib/router/router.ts
 const validMutationMethodsArr = [
 	"POST",
@@ -341,7 +341,7 @@ function createRouter(init) {
 		else actionData = null;
 		let loaderData = newState.loaderData ? mergeLoaderData(state.loaderData, newState.loaderData, newState.matches || [], newState.errors) : state.loaderData;
 		let blockers = state.blockers;
-		if (blockers.size > 0) {
+		if (blockers.size > 0 && !isUninterruptedRevalidation) {
 			blockers = new Map(blockers);
 			blockers.forEach((_, k) => blockers.set(k, IDLE_BLOCKER));
 		}
@@ -409,6 +409,7 @@ function createRouter(init) {
 			init.history.go(to);
 			return promise;
 		}
+		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 = {
@@ -465,7 +466,8 @@ function createRouter(init) {
 			replace: opts && opts.replace,
 			enableViewTransition: opts && opts.viewTransition,
 			flushSync,
-			callSiteDefaultShouldRevalidate: opts && opts.defaultShouldRevalidate
+			callSiteDefaultShouldRevalidate: opts && opts.defaultShouldRevalidate,
+			instrumentationNavigateMetaReceiver
 		});
 	}
 	function revalidate() {
@@ -501,6 +503,10 @@ function createRouter(init) {
 		}
 		let fogOfWar = checkFogOfWar(matches, routesToUse, location.pathname);
 		if (fogOfWar.active && fogOfWar.matches) matches = fogOfWar.matches;
+		if (opts?.instrumentationNavigateMetaReceiver) {
+			let meta = getInstrumentationNavigateMeta(init.history, location, matches);
+			opts.instrumentationNavigateMetaReceiver(meta);
+		}
 		if (!matches) {
 			let { error, notFoundMatches, route } = handleNavigational404(location.pathname);
 			completeNavigation(location, {
@@ -760,11 +766,13 @@ function createRouter(init) {
 	async function fetch(key, routeId, href, opts) {
 		abortFetcher(key);
 		let flushSync = (opts && opts.flushSync) === true;
+		let instrumentationResultMetaReceiver = consumeInstrumentationClientResultMetaReceiver(router);
 		let routesToUse = dataRoutes.activeRoutes;
 		let normalizedPath = normalizeTo(state.location, state.matches, basename, href, routeId, opts?.relative);
 		let matches = matchRoutesImpl(routesToUse, normalizedPath, basename, false, dataRoutes.branches);
 		let fogOfWar = checkFogOfWar(matches, routesToUse, normalizedPath);
 		if (fogOfWar.active && fogOfWar.matches) matches = fogOfWar.matches;
+		if (instrumentationResultMetaReceiver) instrumentationResultMetaReceiver(getInstrumentationNavigateMeta(init.history, normalizedPath, matches));
 		if (!matches) {
 			setFetcherError(key, routeId, getInternalRouterError(404, { pathname: normalizedPath }), { flushSync });
 			return;
@@ -2608,21 +2616,6 @@ function createClientSideRequest(history, location, signal, submission) {
 	}
 	return new Request(url, init);
 }
-function createDataFunctionUrl(request, path) {
-	let url = new URL(request.url);
-	let parsed = typeof path === "string" ? parsePath(path) : path;
-	url.pathname = parsed.pathname || "/";
-	if (parsed.search) {
-		let searchParams = new URLSearchParams(parsed.search);
-		let indexValues = searchParams.getAll("index");
-		searchParams.delete("index");
-		for (let value of indexValues.filter(Boolean)) searchParams.append("index", value);
-		let search = searchParams.toString();
-		url.search = search ? `?${search}` : "";
-	} else url.search = "";
-	url.hash = parsed.hash || "";
-	return url;
-}
 function convertFormDataToSearchParams(formData) {
 	let searchParams = new URLSearchParams();
 	for (let [key, value] of formData.entries()) searchParams.append(key, typeof value === "string" ? value : value.name);
@@ -2827,6 +2820,13 @@ function getTargetMatch(matches, location) {
 	let pathMatches = getPathContributingMatches(matches);
 	return pathMatches[pathMatches.length - 1];
 }
+function getInstrumentationNavigateMeta(history, location, matches) {
+	return {
+		url: createDataFunctionUrl(history.createURL(location), location),
+		pattern: matches ? getRoutePattern(matches) : "",
+		params: matches?.[0]?.params ? { ...matches[0].params } : {}
+	};
+}
 function getSubmissionFromNavigation(navigation) {
 	let { formMethod, formAction, formEncType, text, formData, json } = navigation;
 	if (!formMethod || !formAction || !formEncType) return;

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.1
+ * react-router v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -314,6 +314,8 @@ function rankRouteBranches(branches) {
 	branches.sort((a, b) => a.score !== b.score ? b.score - a.score : compareIndexes(a.routesMeta.map((meta) => meta.childrenIndex), b.routesMeta.map((meta) => meta.childrenIndex)));
 }
 const paramRe = /^:[\w-]+$/;
+const partialParamRe = /^:[\w-]+/;
+const partialDynamicSegmentValue = 3.5;
 const dynamicSegmentValue = 3;
 const indexRouteValue = 2;
 const emptySegmentValue = 1;
@@ -325,7 +327,7 @@ function computeScore(path, index) {
 	let initialScore = segments.length;
 	if (segments.some(isSplat)) initialScore += splatPenalty;
 	if (index) initialScore += indexRouteValue;
-	return segments.filter((s) => !isSplat(s)).reduce((score, segment) => score + (paramRe.test(segment) ? dynamicSegmentValue : segment === "" ? emptySegmentValue : staticSegmentValue), initialScore);
+	return segments.filter((s) => !isSplat(s)).reduce((score, segment) => score + (paramRe.test(segment) ? dynamicSegmentValue : partialParamRe.test(segment) ? partialDynamicSegmentValue : segment === "" ? emptySegmentValue : staticSegmentValue), initialScore);
 }
 function compareIndexes(a, b) {
 	return a.length === b.length && a.slice(0, -1).every((n, i) => n === b[i]) ? a[a.length - 1] - b[b.length - 1] : 0;
@@ -456,7 +458,7 @@ function compilePath(path, caseSensitive = false, end = true) {
 			return "(?:/([^\\/]*))?";
 		}
 		return "/([^\\/]+)";
-	}).replace(/\/([\w-]+)\?(\/|$)/g, "(/$1)?$2");
+	}).replace(/\/([\w-]+)\?(?=\/|$|\()/g, "(?:/$1)?");
 	if (path.endsWith("*")) {
 		params.push({ paramName: "*" });
 		regexpSource += path === "*" || path === "/*" ? "(.*)$" : "(?:\\/(.+)|\\/*)$";
@@ -772,6 +774,21 @@ function isRouteErrorResponse(error) {
 function getRoutePattern(matches) {
 	return joinPaths(matches.map((m) => m.route.path).filter(Boolean)) || "/";
 }
+function createDataFunctionUrl(request, path) {
+	let url = new URL(typeof request === "string" || request instanceof URL ? request : request.url);
+	let parsed = typeof path === "string" ? parsePath(path) : path;
+	url.pathname = parsed.pathname || "/";
+	if (parsed.search) {
+		let searchParams = new URLSearchParams(parsed.search);
+		let indexValues = searchParams.getAll("index");
+		searchParams.delete("index");
+		for (let value of indexValues.filter(Boolean)) searchParams.append("index", value);
+		let search = searchParams.toString();
+		url.search = search ? `?${search}` : "";
+	} else url.search = "";
+	url.hash = parsed.hash || "";
+	return url;
+}
 const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 function parseToInfo(_to, basename) {
 	let to = _to;
@@ -798,4 +815,4 @@ function parseToInfo(_to, basename) {
 	};
 }
 //#endregion
-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 };
+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 };

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

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

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

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

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

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

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

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

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

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

package/dist/production/lib/rsc/server.rsc.d.ts

@@ -3,6 +3,7 @@ import { Location } from "../router/history.js";
 import { ActionFunction, LoaderFunction, Params, RouterContextProvider, ShouldRevalidateFunction } from "../router/utils.js";
 import { ClientActionFunction, ClientLoaderFunction, HeadersFunction, LinksFunction, MetaFunction } from "../dom/ssr/routeModules.js";
 import * as React$1 from "react";
+import { ReactFormState } from "react-dom/client";
 
 //#region lib/rsc/server.rsc.d.ts
 declare function getRequest(): Request;
@@ -71,7 +72,7 @@ type RSCRenderPayload = {
   matches: RSCRouteMatch[];
   patches?: Promise<RSCRouteManifest[]>;
   nonce?: string;
-  formState?: unknown;
+  formState?: ReactFormState;
 };
 type RSCManifestPayload = {
   type: "manifest";
@@ -97,7 +98,7 @@ type RSCMatch = {
   payload: RSCPayload;
 };
 type DecodeActionFunction = (formData: FormData) => Promise<() => Promise<unknown>>;
-type DecodeFormStateFunction = (result: unknown, formData: FormData) => unknown;
+type DecodeFormStateFunction = (result: unknown, formData: FormData) => Promise<ReactFormState | undefined>;
 type DecodeReplyFunction = (reply: FormData | string, options: {
   temporaryReferences: unknown;
 }) => Promise<unknown[]>;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.1
+ * react-router v8.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,8 +8,8 @@
  *
  * @license MIT
  */
-import { ErrorResponseImpl, RouterContextProvider, defaultMapRouteProperties, isRouteErrorResponse, removeTrailingSlash, stripBasename } from "../router/utils.js";
-import { instrumentHandler } from "../router/instrumentation.js";
+import { ErrorResponseImpl, RouterContextProvider, createDataFunctionUrl, defaultMapRouteProperties, getRoutePattern, isRouteErrorResponse, removeTrailingSlash, stripBasename } from "../router/utils.js";
+import { instrumentHandler, instrumentationResultMetaContext } 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";
@@ -36,6 +36,7 @@ function derive(build, mode) {
 	let errorHandler = build.entry.module.handleError || ((error, { request }) => {
 		if (serverMode !== "test" && !request.signal.aborted) console.error(isRouteErrorResponse(error) && error.error ? error.error : error);
 	});
+	let requestHandlerInstrumentations = build.entry.module.instrumentations?.map((i) => i.handler).filter(Boolean);
 	let requestHandler = async (request, initialContext) => {
 		let params = {};
 		let loadContext;
@@ -54,7 +55,8 @@ function derive(build, mode) {
 		}
 		loadContext = initialContext || new RouterContextProvider();
 		let requestUrl = new URL(request.url);
-		let normalizedPathname = getNormalizedPath(request).pathname;
+		let normalizedPath = getNormalizedPath(request);
+		let normalizedPathname = normalizedPath.pathname;
 		let isSpaMode = getBuildTimeHeader(request, "X-React-Router-SPA-Mode") === "yes";
 		if (!build.ssr) {
 			let decodedPath = decodeURI(normalizedPathname);
@@ -95,6 +97,11 @@ function derive(build, mode) {
 		}
 		let matches = matchServerRoutes(build.routes, staticHandler.dataRoutes, staticHandler._internalRouteBranches, normalizedPathname, build.basename);
 		if (matches && matches.length > 0) Object.assign(params, matches[0].params);
+		if (requestHandlerInstrumentations?.length) loadContext.set(instrumentationResultMetaContext, {
+			url: createDataFunctionUrl(request, normalizedPath),
+			pattern: matches ? getRoutePattern(matches) : "",
+			params: matches?.[0]?.params ? { ...matches[0].params } : {}
+		});
 		let response;
 		if (requestUrl.pathname.endsWith(".data")) {
 			response = await handleSingleFetchRequest(serverMode, build, staticHandler, request, loadContext, handleError);
@@ -122,7 +129,7 @@ function derive(build, mode) {
 		});
 		return response;
 	};
-	if (build.entry.module.instrumentations) requestHandler = instrumentHandler(requestHandler, build.entry.module.instrumentations.map((i) => i.handler).filter(Boolean));
+	if (requestHandlerInstrumentations?.length) requestHandler = instrumentHandler(requestHandler, requestHandlerInstrumentations);
 	return {
 		serverMode,
 		staticHandler,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/docs/explanation/hot-module-replacement.md

@@ -111,7 +111,7 @@ export default function Component({ loaderData }) {
 
 If you change the key `pet` to `dog`:
 
-```diff
+```tsx diff
  export default function Component() {
 -  const { pet } = useMyCustomHook();
 +  const { dog } = useMyCustomHook();

package/docs/how-to/data-strategy.md

@@ -166,7 +166,7 @@ With `shouldCallHandler`, you are in charge of which handlers should be called s
 
 Here's an example change from the prior API to the new API. Note that we pre-filter the `matchesToLoad` before calling `resolve()`:
 
-```diff
+```tsx diff
 let results = {};
 +let matchesToLoad = matches.filter(m => m.shouldCallHandler());
 await Promise.all(() =>