react-router 0.0.0-experimental-a65d6f5 → 0.0.0-experimental-e0b6ce9

package/dist/development/dom-export.d.mts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1, a as RouterInit, u as unstable_ClientInstrumentation, b as unstable_ClientOnErrorFunction } from './router-DQIRhYoj.mjs';
+import { R as RouterProviderProps$1, a as RouterInit, u as unstable_ClientInstrumentation, b as unstable_ClientOnErrorFunction } from './router-DWv6Clt-.mjs';
 import './browser-z32v5KVN.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

package/dist/development/dom-export.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { RouterProviderProps as RouterProviderProps$1, RouterInit, unstable_ClientOnErrorFunction } from 'react-router';
-import { u as unstable_ClientInstrumentation } from './instrumentation-BWRz1MRU.js';
+import { u as unstable_ClientInstrumentation } from './instrumentation-BGrNA7uj.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v0.0.0-experimental-a65d6f5
+ * react-router v0.0.0-experimental-e0b6ce9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 "use client";
 
 
-var _chunkQOFB7XZ5js = require('./chunk-QOFB7XZ5.js');
+var _chunkINO4IHBFjs = require('./chunk-INO4IHBF.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react);
@@ -183,7 +183,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkQOFB7XZ5js.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkINO4IHBFjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location, setLocation] = React2.useState(router.state.location);

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-a65d6f5
+ * react-router v0.0.0-experimental-e0b6ce9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 import {
   deserializeErrors,
   getHydrationData
-} from "./chunk-CWSJ6RYI.mjs";
+} from "./chunk-4FI4BC6Y.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   FrameworkContext,
@@ -29,7 +29,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-47MIYFLC.mjs";
+} from "./chunk-F6CT5MEB.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/{production/index-react-server-client-lf74v6ET.d.mts → development/index-react-server-client-CYIi6gi0.d.mts}

@@ -1,6 +1,6 @@
-import { bc as RouteManifest, H as HydrationState, G as DataRouteObject, Q as StaticHandlerContext, e as MiddlewareEnabled, c as RouterContextProvider, f as LoaderFunctionArgs, A as ActionFunctionArgs, ad as unstable_ServerInstrumentation, a4 as HTMLFormMethod, a2 as FormEncType, n as RelativeRoutingType, T as To, bd as History, O as GetScrollRestorationKeyFunction, a as RouterInit, be as FutureConfig$1, u as unstable_ClientInstrumentation, l as DataStrategyFunction, F as PatchRoutesOnNavigationFunction, N as NavigateOptions, V as Fetcher, v as RouteObject, k as Router, B as BlockerFunction, L as Location, bf as CreateStaticHandlerOptions$1, J as StaticHandler } from './router-DQIRhYoj.mjs';
+import { bc as RouteManifest, H as HydrationState, G as DataRouteObject, Q as StaticHandlerContext, e as MiddlewareEnabled, c as RouterContextProvider, f as LoaderFunctionArgs, A as ActionFunctionArgs, ad as unstable_ServerInstrumentation, a4 as HTMLFormMethod, a2 as FormEncType, n as RelativeRoutingType, T as To, bd as History, O as GetScrollRestorationKeyFunction, a as RouterInit, be as FutureConfig$1, u as unstable_ClientInstrumentation, l as DataStrategyFunction, F as PatchRoutesOnNavigationFunction, N as NavigateOptions, V as Fetcher, v as RouteObject, k as Router, B as BlockerFunction, L as Location, bf as CreateStaticHandlerOptions$1, J as StaticHandler } from './router-DWv6Clt-.mjs';
 import * as React from 'react';
-import { c as RouteModules, h as ClientLoaderFunction, o as ServerRouteModule, A as AppLoadContext, m as PageLinkDescriptor, d as SerializeFrom } from './routeModules--SgCTStn.mjs';
+import { c as RouteModules, h as ClientLoaderFunction, o as ServerRouteModule, A as AppLoadContext, m as PageLinkDescriptor, d as SerializeFrom } from './routeModules-Cy4Xsfoi.mjs';
 
 interface Route {
     index?: boolean;

package/dist/development/{index-react-server-client-Iw2PMej2.d.ts → index-react-server-client-ChBGplLn.d.ts}

@@ -1,6 +1,6 @@
-import { d as RouteModules, H as HydrationState, D as DataRouteObject, r as ClientLoaderFunction, z as StaticHandlerContext, aN as ServerRouteModule, A as AppLoadContext, h as RelativeRoutingType, au as PageLinkDescriptor, y as GetScrollRestorationKeyFunction, t as RouterInit, aO as FutureConfig$1, v as PatchRoutesOnNavigationFunction, e as NavigateOptions, J as Fetcher, j as RouteObject, c as Router, g as SerializeFrom, B as BlockerFunction, aP as CreateStaticHandlerOptions$1, w as StaticHandler } from './routeModules-rxNxBmdR.js';
+import { d as RouteModules, H as HydrationState, D as DataRouteObject, r as ClientLoaderFunction, z as StaticHandlerContext, aN as ServerRouteModule, A as AppLoadContext, h as RelativeRoutingType, au as PageLinkDescriptor, y as GetScrollRestorationKeyFunction, t as RouterInit, aO as FutureConfig$1, v as PatchRoutesOnNavigationFunction, e as NavigateOptions, J as Fetcher, j as RouteObject, c as Router, g as SerializeFrom, B as BlockerFunction, aP as CreateStaticHandlerOptions$1, w as StaticHandler } from './routeModules-DqotkItD.js';
 import * as React from 'react';
-import { af as RouteManifest, t as MiddlewareEnabled, R as RouterContextProvider, w as LoaderFunctionArgs, v as ActionFunctionArgs, j as unstable_ServerInstrumentation, i as HTMLFormMethod, F as FormEncType, T as To, H as History, u as unstable_ClientInstrumentation, f as DataStrategyFunction, L as Location } from './instrumentation-BWRz1MRU.js';
+import { af as RouteManifest, t as MiddlewareEnabled, R as RouterContextProvider, w as LoaderFunctionArgs, v as ActionFunctionArgs, j as unstable_ServerInstrumentation, i as HTMLFormMethod, F as FormEncType, T as To, H as History, u as unstable_ClientInstrumentation, f as DataStrategyFunction, L as Location } from './instrumentation-BGrNA7uj.js';
 
 interface Route {
     index?: boolean;

package/dist/development/index-react-server-client.d.mts

@@ -1,4 +1,4 @@
-export { aJ as MemoryRouter, aK as Navigate, aL as Outlet, aM as Route, aN as Router, aO as RouterProvider, aP as Routes, aw as UNSAFE_AwaitContextProvider, b6 as UNSAFE_WithComponentProps, ba as UNSAFE_WithErrorBoundaryProps, b8 as UNSAFE_WithHydrateFallbackProps } from './router-DQIRhYoj.mjs';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-lf74v6ET.mjs';
+export { aJ as MemoryRouter, aK as Navigate, aL as Outlet, aM as Route, aN as Router, aO as RouterProvider, aP as Routes, aw as UNSAFE_AwaitContextProvider, b6 as UNSAFE_WithComponentProps, ba as UNSAFE_WithErrorBoundaryProps, b8 as UNSAFE_WithHydrateFallbackProps } from './router-DWv6Clt-.mjs';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-CYIi6gi0.mjs';
 import 'react';
-import './routeModules--SgCTStn.mjs';
+import './routeModules-Cy4Xsfoi.mjs';

package/dist/development/index-react-server-client.d.ts

@@ -1,4 +1,4 @@
-export { af as MemoryRouter, ag as Navigate, ah as Outlet, ai as Route, aj as Router, ak as RouterProvider, al as Routes, a0 as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps } from './routeModules-rxNxBmdR.js';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-Iw2PMej2.js';
+export { af as MemoryRouter, ag as Navigate, ah as Outlet, ai as Route, aj as Router, ak as RouterProvider, al as Routes, a0 as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps } from './routeModules-DqotkItD.js';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-ChBGplLn.js';
 import 'react';
-import './instrumentation-BWRz1MRU.js';
+import './instrumentation-BGrNA7uj.js';

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

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v0.0.0-experimental-a65d6f5
+ * react-router v0.0.0-experimental-e0b6ce9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -29,12 +29,12 @@
 
 
 
-var _chunkZLVXSGFLjs = require('./chunk-ZLVXSGFL.js');
+var _chunkITZFCV4Jjs = require('./chunk-ITZFCV4J.js');
 
 
 
 
-var _chunkQOFB7XZ5js = require('./chunk-QOFB7XZ5.js');
+var _chunkINO4IHBFjs = require('./chunk-INO4IHBF.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkQOFB7XZ5js = require('./chunk-QOFB7XZ5.js');
 
 
 
-exports.BrowserRouter = _chunkZLVXSGFLjs.BrowserRouter; exports.Form = _chunkZLVXSGFLjs.Form; exports.HashRouter = _chunkZLVXSGFLjs.HashRouter; exports.Link = _chunkZLVXSGFLjs.Link; exports.Links = _chunkQOFB7XZ5js.Links; exports.MemoryRouter = _chunkZLVXSGFLjs.MemoryRouter; exports.Meta = _chunkQOFB7XZ5js.Meta; exports.NavLink = _chunkZLVXSGFLjs.NavLink; exports.Navigate = _chunkZLVXSGFLjs.Navigate; exports.Outlet = _chunkZLVXSGFLjs.Outlet; exports.Route = _chunkZLVXSGFLjs.Route; exports.Router = _chunkZLVXSGFLjs.Router; exports.RouterProvider = _chunkZLVXSGFLjs.RouterProvider; exports.Routes = _chunkZLVXSGFLjs.Routes; exports.ScrollRestoration = _chunkZLVXSGFLjs.ScrollRestoration; exports.StaticRouter = _chunkZLVXSGFLjs.StaticRouter; exports.StaticRouterProvider = _chunkZLVXSGFLjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkQOFB7XZ5js.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkZLVXSGFLjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkZLVXSGFLjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkZLVXSGFLjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkZLVXSGFLjs.HistoryRouter;
+exports.BrowserRouter = _chunkITZFCV4Jjs.BrowserRouter; exports.Form = _chunkITZFCV4Jjs.Form; exports.HashRouter = _chunkITZFCV4Jjs.HashRouter; exports.Link = _chunkITZFCV4Jjs.Link; exports.Links = _chunkINO4IHBFjs.Links; exports.MemoryRouter = _chunkITZFCV4Jjs.MemoryRouter; exports.Meta = _chunkINO4IHBFjs.Meta; exports.NavLink = _chunkITZFCV4Jjs.NavLink; exports.Navigate = _chunkITZFCV4Jjs.Navigate; exports.Outlet = _chunkITZFCV4Jjs.Outlet; exports.Route = _chunkITZFCV4Jjs.Route; exports.Router = _chunkITZFCV4Jjs.Router; exports.RouterProvider = _chunkITZFCV4Jjs.RouterProvider; exports.Routes = _chunkITZFCV4Jjs.Routes; exports.ScrollRestoration = _chunkITZFCV4Jjs.ScrollRestoration; exports.StaticRouter = _chunkITZFCV4Jjs.StaticRouter; exports.StaticRouterProvider = _chunkITZFCV4Jjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkINO4IHBFjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkITZFCV4Jjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkITZFCV4Jjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkITZFCV4Jjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkITZFCV4Jjs.HistoryRouter;

package/dist/development/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-a65d6f5
+ * react-router v0.0.0-experimental-e0b6ce9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-47MIYFLC.mjs";
+} from "./chunk-F6CT5MEB.mjs";
 export {
   BrowserRouter,
   Form,

package/dist/development/index-react-server.d.mts

@@ -903,9 +903,15 @@ type unstable_ClientInstrumentation = {
 type unstable_InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
 type unstable_InstrumentRouterFunction = (router: InstrumentableRouter) => void;
 type unstable_InstrumentRouteFunction = (route: InstrumentableRoute) => void;
-interface GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: unknown): Promise<void>;
+interface InstrumentFunction<T> {
+    (handler: () => Promise<void>, info: T): Promise<void>;
 }
+type ReadonlyRequest = {
+    method: string;
+    url: string;
+    headers: Pick<Headers, "get">;
+};
+type ReadonlyContext = Pick<RouterContextProvider, "get">;
 type InstrumentableRoute = {
     id: string;
     index: boolean | undefined;
@@ -913,36 +919,27 @@ type InstrumentableRoute = {
     instrument(instrumentations: RouteInstrumentations): void;
 };
 type RouteInstrumentations = {
-    lazy?: InstrumentLazyFunction;
-    "lazy.loader"?: InstrumentLazyFunction;
-    "lazy.action"?: InstrumentLazyFunction;
-    "lazy.middleware"?: InstrumentLazyFunction;
-    middleware?: InstrumentRouteHandlerFunction;
-    loader?: InstrumentRouteHandlerFunction;
-    action?: InstrumentRouteHandlerFunction;
+    lazy?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    "lazy.loader"?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    "lazy.action"?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    "lazy.middleware"?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    middleware?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
+    loader?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
+    action?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
 };
+type RouteLazyInstrumentationInfo = undefined;
 type RouteHandlerInstrumentationInfo = Readonly<{
-    request: {
-        method: string;
-        url: string;
-        headers: Pick<Headers, "get">;
-    };
+    request: ReadonlyRequest;
     params: LoaderFunctionArgs["params"];
     unstable_pattern: string;
-    context: Pick<RouterContextProvider, "get">;
+    context: ReadonlyContext;
 }>;
-interface InstrumentLazyFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>): Promise<void>;
-}
-interface InstrumentRouteHandlerFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RouteHandlerInstrumentationInfo): Promise<void>;
-}
 type InstrumentableRouter = {
     instrument(instrumentations: RouterInstrumentations): void;
 };
 type RouterInstrumentations = {
-    navigate?: InstrumentNavigateFunction;
-    fetch?: InstrumentFetchFunction;
+    navigate?: InstrumentFunction<RouterNavigationInstrumentationInfo>;
+    fetch?: InstrumentFunction<RouterFetchInstrumentationInfo>;
 };
 type RouterNavigationInstrumentationInfo = Readonly<{
     to: string | number;
@@ -961,29 +958,16 @@ type RouterFetchInstrumentationInfo = Readonly<{
     formData?: FormData;
     body?: any;
 }>;
-interface InstrumentNavigateFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RouterNavigationInstrumentationInfo): MaybePromise<void>;
-}
-interface InstrumentFetchFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RouterFetchInstrumentationInfo): MaybePromise<void>;
-}
 type InstrumentableRequestHandler = {
     instrument(instrumentations: RequestHandlerInstrumentations): void;
 };
 type RequestHandlerInstrumentations = {
-    request?: InstrumentRequestHandlerFunction;
+    request?: InstrumentFunction<RequestHandlerInstrumentationInfo>;
 };
 type RequestHandlerInstrumentationInfo = Readonly<{
-    request: {
-        method: string;
-        url: string;
-        headers: Pick<Headers, "get">;
-    };
-    context: Pick<RouterContextProvider, "get">;
+    request: ReadonlyRequest;
+    context: ReadonlyContext;
 }>;
-interface InstrumentRequestHandlerFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RequestHandlerInstrumentationInfo): MaybePromise<void>;
-}
 
 /**
  * A Router instance manages all navigation and data loading/mutations

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

@@ -903,9 +903,15 @@ type unstable_ClientInstrumentation = {
 type unstable_InstrumentRequestHandlerFunction = (handler: InstrumentableRequestHandler) => void;
 type unstable_InstrumentRouterFunction = (router: InstrumentableRouter) => void;
 type unstable_InstrumentRouteFunction = (route: InstrumentableRoute) => void;
-interface GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: unknown): Promise<void>;
+interface InstrumentFunction<T> {
+    (handler: () => Promise<void>, info: T): Promise<void>;
 }
+type ReadonlyRequest = {
+    method: string;
+    url: string;
+    headers: Pick<Headers, "get">;
+};
+type ReadonlyContext = Pick<RouterContextProvider, "get">;
 type InstrumentableRoute = {
     id: string;
     index: boolean | undefined;
@@ -913,36 +919,27 @@ type InstrumentableRoute = {
     instrument(instrumentations: RouteInstrumentations): void;
 };
 type RouteInstrumentations = {
-    lazy?: InstrumentLazyFunction;
-    "lazy.loader"?: InstrumentLazyFunction;
-    "lazy.action"?: InstrumentLazyFunction;
-    "lazy.middleware"?: InstrumentLazyFunction;
-    middleware?: InstrumentRouteHandlerFunction;
-    loader?: InstrumentRouteHandlerFunction;
-    action?: InstrumentRouteHandlerFunction;
+    lazy?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    "lazy.loader"?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    "lazy.action"?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    "lazy.middleware"?: InstrumentFunction<RouteLazyInstrumentationInfo>;
+    middleware?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
+    loader?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
+    action?: InstrumentFunction<RouteHandlerInstrumentationInfo>;
 };
+type RouteLazyInstrumentationInfo = undefined;
 type RouteHandlerInstrumentationInfo = Readonly<{
-    request: {
-        method: string;
-        url: string;
-        headers: Pick<Headers, "get">;
-    };
+    request: ReadonlyRequest;
     params: LoaderFunctionArgs["params"];
     unstable_pattern: string;
-    context: Pick<RouterContextProvider, "get">;
+    context: ReadonlyContext;
 }>;
-interface InstrumentLazyFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>): Promise<void>;
-}
-interface InstrumentRouteHandlerFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RouteHandlerInstrumentationInfo): Promise<void>;
-}
 type InstrumentableRouter = {
     instrument(instrumentations: RouterInstrumentations): void;
 };
 type RouterInstrumentations = {
-    navigate?: InstrumentNavigateFunction;
-    fetch?: InstrumentFetchFunction;
+    navigate?: InstrumentFunction<RouterNavigationInstrumentationInfo>;
+    fetch?: InstrumentFunction<RouterFetchInstrumentationInfo>;
 };
 type RouterNavigationInstrumentationInfo = Readonly<{
     to: string | number;
@@ -961,29 +958,16 @@ type RouterFetchInstrumentationInfo = Readonly<{
     formData?: FormData;
     body?: any;
 }>;
-interface InstrumentNavigateFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RouterNavigationInstrumentationInfo): MaybePromise<void>;
-}
-interface InstrumentFetchFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RouterFetchInstrumentationInfo): MaybePromise<void>;
-}
 type InstrumentableRequestHandler = {
     instrument(instrumentations: RequestHandlerInstrumentations): void;
 };
 type RequestHandlerInstrumentations = {
-    request?: InstrumentRequestHandlerFunction;
+    request?: InstrumentFunction<RequestHandlerInstrumentationInfo>;
 };
 type RequestHandlerInstrumentationInfo = Readonly<{
-    request: {
-        method: string;
-        url: string;
-        headers: Pick<Headers, "get">;
-    };
-    context: Pick<RouterContextProvider, "get">;
+    request: ReadonlyRequest;
+    context: ReadonlyContext;
 }>;
-interface InstrumentRequestHandlerFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RequestHandlerInstrumentationInfo): MaybePromise<void>;
-}
 
 /**
  * A Router instance manages all navigation and data loading/mutations

package/dist/development/index-react-server.js

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v0.0.0-experimental-a65d6f5
+ * react-router v0.0.0-experimental-e0b6ce9
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -109,7 +109,86 @@ function parsePath(path) {
 
 // lib/router/instrumentation.ts
 var UninstrumentedSymbol = Symbol("Uninstrumented");
-function getInstrumentedImplementation(impls, handler, getInfo = () => void 0) {
+function getRouteInstrumentationUpdates(fns, route) {
+  let aggregated = {
+    lazy: [],
+    "lazy.loader": [],
+    "lazy.action": [],
+    "lazy.middleware": [],
+    middleware: [],
+    loader: [],
+    action: []
+  };
+  fns.forEach(
+    (fn) => fn({
+      id: route.id,
+      index: route.index,
+      path: route.path,
+      instrument(i) {
+        let keys = Object.keys(aggregated);
+        for (let key of keys) {
+          if (i[key]) {
+            aggregated[key].push(i[key]);
+          }
+        }
+      }
+    })
+  );
+  let updates = {};
+  if (typeof route.lazy === "function" && aggregated.lazy.length > 0) {
+    let instrumented = wrapImpl(aggregated.lazy, route.lazy, () => void 0);
+    if (instrumented) {
+      updates.lazy = instrumented;
+    }
+  }
+  if (typeof route.lazy === "object") {
+    let lazyObject = route.lazy;
+    ["middleware", "loader", "action"].forEach((key) => {
+      let lazyFn = lazyObject[key];
+      let instrumentations = aggregated[`lazy.${key}`];
+      if (typeof lazyFn === "function" && instrumentations.length > 0) {
+        let instrumented = wrapImpl(instrumentations, lazyFn, () => void 0);
+        if (instrumented) {
+          updates.lazy = Object.assign(updates.lazy || {}, {
+            [key]: instrumented
+          });
+        }
+      }
+    });
+  }
+  ["loader", "action"].forEach((key) => {
+    let handler = route[key];
+    if (typeof handler === "function" && aggregated[key].length > 0) {
+      let original = handler[UninstrumentedSymbol] ?? handler;
+      let instrumented = wrapImpl(
+        aggregated[key],
+        original,
+        (...args) => getHandlerInfo(args[0])
+      );
+      if (instrumented) {
+        instrumented[UninstrumentedSymbol] = original;
+        updates[key] = instrumented;
+      }
+    }
+  });
+  if (route.middleware && route.middleware.length > 0 && aggregated.middleware.length > 0) {
+    updates.middleware = route.middleware.map((middleware) => {
+      let original = middleware[UninstrumentedSymbol] ?? middleware;
+      let instrumented = wrapImpl(
+        aggregated.middleware,
+        original,
+        (...args) => getHandlerInfo(args[0])
+      );
+      if (instrumented) {
+        instrumented[UninstrumentedSymbol] = original;
+        return instrumented;
+      }
+      return middleware;
+    });
+  }
+  return updates;
+}
+function wrapImpl(impls, handler, getInfo) {
   if (impls.length === 0) {
     return null;
   }
@@ -137,102 +216,28 @@ async function recurseRight(impls, info, handler, index) {
     }, info);
   }
 }
-function getInstrumentationInfo(args) {
+function getHandlerInfo(args) {
   let { request, context, params, unstable_pattern } = args;
   return {
-    // pseudo "Request" with the info they may want to read from
-    request: {
-      method: request.method,
-      url: request.url,
-      // Maybe make this a proxy that only supports `get`?
-      headers: {
-        get: (...args2) => request.headers.get(...args2)
-      }
-    },
+    request: getReadonlyRequest(request),
     params: { ...params },
     unstable_pattern,
-    context: {
-      get: (...args2) => context.get(...args2)
-    }
+    context: getReadonlyContext(context)
   };
 }
-function getInstrumentationsByType(instrumentations, key) {
-  let value = [];
-  for (let i in instrumentations) {
-    let instrumentation = instrumentations[i];
-    if (key in instrumentation && instrumentation[key] != null) {
-      value.push(instrumentation[key]);
+function getReadonlyRequest(request) {
+  return {
+    method: request.method,
+    url: request.url,
+    headers: {
+      get: (...args) => request.headers.get(...args)
     }
-  }
-  return value;
+  };
 }
-function getInstrumentationUpdates(fns, route) {
-  let instrumentations = [];
-  fns.forEach(
-    (fn) => fn({
-      id: route.id,
-      index: route.index,
-      path: route.path,
-      instrument(i) {
-        instrumentations.push(i);
-      }
-    })
-  );
-  let updates = {};
-  if (instrumentations.length > 0) {
-    ["lazy", "loader", "action"].forEach((key) => {
-      let func = route[key];
-      if (typeof func === "function") {
-        let original = func[UninstrumentedSymbol] ?? func;
-        let instrumented = getInstrumentedImplementation(
-          getInstrumentationsByType(instrumentations, key),
-          original,
-          key === "lazy" ? () => void 0 : (...args) => getInstrumentationInfo(
-            args[0]
-          )
-        );
-        if (instrumented) {
-          instrumented[UninstrumentedSymbol] = original;
-          updates[key] = instrumented;
-        }
-      }
-    });
-    if (route.middleware && route.middleware.length > 0) {
-      updates.middleware = route.middleware.map((middleware) => {
-        let original = middleware[UninstrumentedSymbol] ?? middleware;
-        let instrumented = getInstrumentedImplementation(
-          getInstrumentationsByType(instrumentations, "middleware"),
-          original,
-          (...args) => getInstrumentationInfo(
-            args[0]
-          )
-        );
-        if (instrumented) {
-          instrumented[UninstrumentedSymbol] = original;
-          return instrumented;
-        }
-        return middleware;
-      });
-    }
-    if (typeof route.lazy === "object") {
-      let lazyObject = route.lazy;
-      ["middleware", "loader", "action"].forEach((key) => {
-        let func = lazyObject[key];
-        if (typeof func === "function") {
-          let instrumented = getInstrumentedImplementation(
-            getInstrumentationsByType(instrumentations, `lazy.${key}`),
-            func
-          );
-          if (instrumented) {
-            updates.lazy = Object.assign(updates.lazy || {}, {
-              [key]: instrumented
-            });
-          }
-        }
-      });
-    }
-  }
-  return updates;
+function getReadonlyContext(context) {
+  return {
+    get: (ctx) => context.get(ctx)
+  };
 }
 
 // lib/router/utils.ts
@@ -835,7 +840,7 @@ function createStaticHandler(routes, opts) {
     mapRouteProperties = (route) => {
       return {
         ..._mapRouteProperties(route),
-        ...getInstrumentationUpdates(
+        ...getRouteInstrumentationUpdates(
           instrumentations.map((i) => i.route).filter(Boolean),
           route
         )
@@ -1333,13 +1338,14 @@ function createStaticHandler(routes, opts) {
         // Up to but not including the boundary
         matches.findIndex((m) => m.route.id === pendingActionResult[0]) - 1
       ) : void 0;
+      let pattern = getRoutePattern(matches.map((m) => m.route.path));
       dsMatches = matches.map((match, index) => {
         if (maxIdx != null && index > maxIdx) {
           return getDataStrategyMatch(
             mapRouteProperties,
             manifest,
             request,
-            getRoutePattern(matches.map((m) => m.route.path)),
+            pattern,
             match,
             [],
             requestContext,
@@ -1350,7 +1356,7 @@ function createStaticHandler(routes, opts) {
           mapRouteProperties,
           manifest,
           request,
-          getRoutePattern(matches.map((m) => m.route.path)),
+          pattern,
           match,
           [],
           requestContext,
@@ -1689,7 +1695,7 @@ function runServerMiddlewarePipeline(args, handler, errorHandler) {
   }
 }
 async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
-  let { matches, request, params, context } = args;
+  let { matches, request, params, context, unstable_pattern } = args;
   let tuples = matches.flatMap(
     (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
@@ -1698,7 +1704,7 @@ async function runMiddlewarePipeline(args, handler, processResult, isResult, err
       request,
       params,
       context,
-      unstable_pattern: getRoutePattern(matches.map((m) => m.route.path))
+      unstable_pattern
     },
     tuples,
     handler,