react-router 8.0.1 → 8.1.0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * react-router v8.0.1
+ * react-router v8.1.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/development/lib/server-runtime/serverHandoff.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/dist/production/dom-export.js

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

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

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

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

@@ -1009,6 +1009,19 @@ type ClientInstrumentation = {
 type InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
 type InstrumentRouterFunction = (router: InstrumentableRouter) => void;
 type InstrumentRouteFunction = (route: InstrumentableRoute) => void;
+/**
+ * Route metadata available after React Router has matched an instrumented
+ * request, navigation, or fetcher call.
+ */
+type InstrumentationResultMeta = {
+  url: LoaderFunctionArgs["url"];
+  pattern: string;
+  params: LoaderFunctionArgs["params"];
+};
+/**
+ * Result returned by route-level instrumented handler calls, such as
+ * instrumented loaders, actions, middleware, and lazy route functions.
+ */
 type InstrumentationHandlerResult = {
   status: "success";
   error: undefined;
@@ -1016,7 +1029,21 @@ type InstrumentationHandlerResult = {
   status: "error";
   error: Error;
 };
-type InstrumentFunction<T> = (handler: () => Promise<InstrumentationHandlerResult>, info: T) => Promise<void>;
+/**
+ * Result returned by client-side router instrumented navigation and fetcher
+ * calls.
+ */
+type InstrumentationClientRouterResult = InstrumentationHandlerResult & {
+  meta: InstrumentationResultMeta | undefined;
+};
+/**
+ * Result returned by server request handler instrumentation.
+ */
+type InstrumentationServerHandlerResult = InstrumentationHandlerResult & {
+  statusCode: number;
+  meta: InstrumentationResultMeta | undefined;
+};
+type InstrumentFunction<T, TInnerResult = InstrumentationHandlerResult> = (handler: () => Promise<TInnerResult>, info: T) => Promise<void>;
 type ReadonlyRequest = {
   method: string;
   url: string;
@@ -1039,18 +1066,16 @@ type RouteInstrumentations = {
   action?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
 };
 type RouteLazyInstrumentationInfo = undefined;
-type RouteHandlerInstrumentationInfo = Readonly<{
+type RouteHandlerInstrumentationInfo = Readonly<Omit<LoaderFunctionArgs, "request" | "context"> & {
   request: ReadonlyRequest;
-  params: LoaderFunctionArgs["params"];
-  pattern: string;
   context: ReadonlyContext;
 }>;
 type InstrumentableRouter = {
   instrument(instrumentations: RouterInstrumentations): void;
 };
 type RouterInstrumentations = {
-  navigate?: InstrumentFunction<RouterNavigationInstrumentationInfo>;
-  fetch?: InstrumentFunction<RouterFetchInstrumentationInfo>;
+  navigate?: InstrumentFunction<RouterNavigationInstrumentationInfo, InstrumentationClientRouterResult>;
+  fetch?: InstrumentFunction<RouterFetchInstrumentationInfo, InstrumentationClientRouterResult>;
 };
 type RouterNavigationInstrumentationInfo = Readonly<{
   to: string | number;
@@ -1073,7 +1098,7 @@ type InstrumentableRequestHandler = {
   instrument(instrumentations: RequestHandlerInstrumentations): void;
 };
 type RequestHandlerInstrumentations = {
-  request?: InstrumentFunction<RequestHandlerInstrumentationInfo>;
+  request?: InstrumentFunction<RequestHandlerInstrumentationInfo, InstrumentationServerHandlerResult>;
 };
 type RequestHandlerInstrumentationInfo = Readonly<{
   request: ReadonlyRequest;