react-router 0.0.0-experimental-a65d6f5 → 0.0.0-experimental-c19b79d

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

@@ -1,148 +1,5 @@
-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 { ai as HTMLFormMethod, ag as FormEncType, k as RelativeRoutingType, by as RouteManifest, bz as ServerRouteModule, O as MiddlewareEnabled, K as RouterContextProvider, J as AppLoadContext, ak as LoaderFunctionArgs, ab as ActionFunctionArgs, f as RouteModules, H as HydrationState, a0 as DataRouteObject, W as ClientLoaderFunction, a4 as StaticHandlerContext, bb as PageLinkDescriptor, T as To, bA as History, a3 as GetScrollRestorationKeyFunction, Z as RouterInit, bB as FutureConfig$1, g as DataStrategyFunction, $ as PatchRoutesOnNavigationFunction, h as NavigateOptions, a5 as Fetcher, r as RouteObject, e as Router, j as SerializeFrom, B as BlockerFunction, a as Location, bC as CreateStaticHandlerOptions$1, a1 as StaticHandler } from './routeModules-BmVo7q9e.js';
 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';
-
-interface Route {
-    index?: boolean;
-    caseSensitive?: boolean;
-    id: string;
-    parentId?: string;
-    path?: string;
-}
-interface EntryRoute extends Route {
-    hasAction: boolean;
-    hasLoader: boolean;
-    hasClientAction: boolean;
-    hasClientLoader: boolean;
-    hasClientMiddleware: boolean;
-    hasErrorBoundary: boolean;
-    imports?: string[];
-    css?: string[];
-    module: string;
-    clientActionModule: string | undefined;
-    clientLoaderModule: string | undefined;
-    clientMiddlewareModule: string | undefined;
-    hydrateFallbackModule: string | undefined;
-    parentId?: string;
-}
-declare function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation: Set<string>, manifest: RouteManifest<EntryRoute>, routeModulesCache: RouteModules, initialState: HydrationState, ssr: boolean, isSpaMode: boolean): DataRouteObject[];
-declare function createClientRoutes(manifest: RouteManifest<EntryRoute>, routeModulesCache: RouteModules, initialState: HydrationState | null, ssr: boolean, isSpaMode: boolean, parentId?: string, routesByParentId?: Record<string, Omit<EntryRoute, "children">[]>, needsRevalidation?: Set<string>): DataRouteObject[];
-declare function shouldHydrateRouteLoader(routeId: string, clientLoader: ClientLoaderFunction | undefined, hasLoader: boolean, isSpaMode: boolean): boolean;
-
-type SerializedError = {
-    message: string;
-    stack?: string;
-};
-interface FrameworkContextObject {
-    manifest: AssetsManifest;
-    routeModules: RouteModules;
-    criticalCss?: CriticalCss;
-    serverHandoffString?: string;
-    future: FutureConfig;
-    ssr: boolean;
-    isSpaMode: boolean;
-    routeDiscovery: ServerBuild["routeDiscovery"];
-    serializeError?(error: Error): SerializedError;
-    renderMeta?: {
-        didRenderScripts?: boolean;
-        streamCache?: Record<number, Promise<void> & {
-            result?: {
-                done: boolean;
-                value: string;
-            };
-            error?: unknown;
-        }>;
-    };
-}
-interface EntryContext extends FrameworkContextObject {
-    staticHandlerContext: StaticHandlerContext;
-    serverHandoffStream?: ReadableStream<Uint8Array>;
-}
-interface FutureConfig {
-    unstable_subResourceIntegrity: boolean;
-    v8_middleware: boolean;
-}
-type CriticalCss = string | {
-    rel: "stylesheet";
-    href: string;
-};
-interface AssetsManifest {
-    entry: {
-        imports: string[];
-        module: string;
-    };
-    routes: RouteManifest<EntryRoute>;
-    url: string;
-    version: string;
-    hmr?: {
-        timestamp?: number;
-        runtime: string;
-    };
-    sri?: Record<string, string> | true;
-}
-
-type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
-interface ServerRoute extends Route {
-    children: ServerRoute[];
-    module: ServerRouteModule;
-}
-
-type OptionalCriticalCss = CriticalCss | undefined;
-/**
- * The output of the compiler for the server build.
- */
-interface ServerBuild {
-    entry: {
-        module: ServerEntryModule;
-    };
-    routes: ServerRouteManifest;
-    assets: AssetsManifest;
-    basename?: string;
-    publicPath: string;
-    assetsBuildDirectory: string;
-    future: FutureConfig;
-    ssr: boolean;
-    unstable_getCriticalCss?: (args: {
-        pathname: string;
-    }) => OptionalCriticalCss | Promise<OptionalCriticalCss>;
-    /**
-     * @deprecated This is now done via a custom header during prerendering
-     */
-    isSpaMode: boolean;
-    prerender: string[];
-    routeDiscovery: {
-        mode: "lazy" | "initial";
-        manifestPath: string;
-    };
-}
-interface HandleDocumentRequestFunction {
-    (request: Request, responseStatusCode: number, responseHeaders: Headers, context: EntryContext, loadContext: MiddlewareEnabled extends true ? RouterContextProvider : AppLoadContext): Promise<Response> | Response;
-}
-interface HandleDataRequestFunction {
-    (response: Response, args: {
-        request: LoaderFunctionArgs["request"] | ActionFunctionArgs["request"];
-        context: LoaderFunctionArgs["context"] | ActionFunctionArgs["context"];
-        params: LoaderFunctionArgs["params"] | ActionFunctionArgs["params"];
-    }): Promise<Response> | Response;
-}
-interface HandleErrorFunction {
-    (error: unknown, args: {
-        request: LoaderFunctionArgs["request"] | ActionFunctionArgs["request"];
-        context: LoaderFunctionArgs["context"] | ActionFunctionArgs["context"];
-        params: LoaderFunctionArgs["params"] | ActionFunctionArgs["params"];
-    }): void;
-}
-/**
- * A module that serves as the entry point for a Remix app during server
- * rendering.
- */
-interface ServerEntryModule {
-    default: HandleDocumentRequestFunction;
-    handleDataRequest?: HandleDataRequestFunction;
-    handleError?: HandleErrorFunction;
-    unstable_instrumentations?: unstable_ServerInstrumentation[];
-    streamTimeout?: number;
-}
 
 type ParamKeyValuePair = [string, string];
 type URLSearchParamsInit = string | ParamKeyValuePair[] | Record<string, string | string[]> | URLSearchParams;
@@ -250,6 +107,139 @@ interface SubmitOptions extends FetcherSubmitOptions {
     viewTransition?: boolean;
 }
 
+type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
+interface ServerRoute extends Route {
+    children: ServerRoute[];
+    module: ServerRouteModule;
+}
+
+type OptionalCriticalCss = CriticalCss | undefined;
+/**
+ * The output of the compiler for the server build.
+ */
+interface ServerBuild {
+    entry: {
+        module: ServerEntryModule;
+    };
+    routes: ServerRouteManifest;
+    assets: AssetsManifest;
+    basename?: string;
+    publicPath: string;
+    assetsBuildDirectory: string;
+    future: FutureConfig;
+    ssr: boolean;
+    unstable_getCriticalCss?: (args: {
+        pathname: string;
+    }) => OptionalCriticalCss | Promise<OptionalCriticalCss>;
+    /**
+     * @deprecated This is now done via a custom header during prerendering
+     */
+    isSpaMode: boolean;
+    prerender: string[];
+    routeDiscovery: {
+        mode: "lazy" | "initial";
+        manifestPath: string;
+    };
+}
+interface HandleDocumentRequestFunction {
+    (request: Request, responseStatusCode: number, responseHeaders: Headers, context: EntryContext, loadContext: MiddlewareEnabled extends true ? RouterContextProvider : AppLoadContext): Promise<Response> | Response;
+}
+interface HandleDataRequestFunction {
+    (response: Response, args: LoaderFunctionArgs | ActionFunctionArgs): Promise<Response> | Response;
+}
+interface HandleErrorFunction {
+    (error: unknown, args: LoaderFunctionArgs | ActionFunctionArgs): void;
+}
+/**
+ * A module that serves as the entry point for a Remix app during server
+ * rendering.
+ */
+interface ServerEntryModule {
+    default: HandleDocumentRequestFunction;
+    handleDataRequest?: HandleDataRequestFunction;
+    handleError?: HandleErrorFunction;
+    streamTimeout?: number;
+}
+
+interface Route {
+    index?: boolean;
+    caseSensitive?: boolean;
+    id: string;
+    parentId?: string;
+    path?: string;
+}
+interface EntryRoute extends Route {
+    hasAction: boolean;
+    hasLoader: boolean;
+    hasClientAction: boolean;
+    hasClientLoader: boolean;
+    hasClientMiddleware: boolean;
+    hasErrorBoundary: boolean;
+    imports?: string[];
+    css?: string[];
+    module: string;
+    clientActionModule: string | undefined;
+    clientLoaderModule: string | undefined;
+    clientMiddlewareModule: string | undefined;
+    hydrateFallbackModule: string | undefined;
+    parentId?: string;
+}
+declare function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation: Set<string>, manifest: RouteManifest<EntryRoute>, routeModulesCache: RouteModules, initialState: HydrationState, ssr: boolean, isSpaMode: boolean): DataRouteObject[];
+declare function createClientRoutes(manifest: RouteManifest<EntryRoute>, routeModulesCache: RouteModules, initialState: HydrationState | null, ssr: boolean, isSpaMode: boolean, parentId?: string, routesByParentId?: Record<string, Omit<EntryRoute, "children">[]>, needsRevalidation?: Set<string>): DataRouteObject[];
+declare function shouldHydrateRouteLoader(routeId: string, clientLoader: ClientLoaderFunction | undefined, hasLoader: boolean, isSpaMode: boolean): boolean;
+
+type SerializedError = {
+    message: string;
+    stack?: string;
+};
+interface FrameworkContextObject {
+    manifest: AssetsManifest;
+    routeModules: RouteModules;
+    criticalCss?: CriticalCss;
+    serverHandoffString?: string;
+    future: FutureConfig;
+    ssr: boolean;
+    isSpaMode: boolean;
+    routeDiscovery: ServerBuild["routeDiscovery"];
+    serializeError?(error: Error): SerializedError;
+    renderMeta?: {
+        didRenderScripts?: boolean;
+        streamCache?: Record<number, Promise<void> & {
+            result?: {
+                done: boolean;
+                value: string;
+            };
+            error?: unknown;
+        }>;
+    };
+}
+interface EntryContext extends FrameworkContextObject {
+    staticHandlerContext: StaticHandlerContext;
+    serverHandoffStream?: ReadableStream<Uint8Array>;
+}
+interface FutureConfig {
+    unstable_subResourceIntegrity: boolean;
+    v8_middleware: boolean;
+}
+type CriticalCss = string | {
+    rel: "stylesheet";
+    href: string;
+};
+interface AssetsManifest {
+    entry: {
+        imports: string[];
+        module: string;
+    };
+    routes: RouteManifest<EntryRoute>;
+    url: string;
+    version: string;
+    hmr?: {
+        timestamp?: number;
+        runtime: string;
+    };
+    sri?: Record<string, string> | true;
+}
+
 declare const FrameworkContext: React.Context<FrameworkContextObject | undefined>;
 /**
  * Defines the discovery behavior of the link:
@@ -531,58 +521,6 @@ interface DOMRouterOpts {
      * ```
      */
     hydrationData?: HydrationState;
-    /**
-     * Array of instrumentation objects allowing you to instrument the router and
-     * individual routes prior to router initialization (and on any subsequently
-     * added routes via `route.lazy` or `patchRoutesOnNavigation`).  This is
-     * mostly useful for observability such as wrapping navigations, fetches,
-     * as well as route loaders/actions/middlewares with logging and/or performance
-     * tracing.
-     *
-     * ```tsx
-     * let router = createBrowserRouter(routes, {
-     *   unstable_instrumentations: [logging]
-     * });
-     *
-     *
-     * let logging = {
-     *   router({ instrument }) {
-     *     instrument({
-     *       navigate: (impl, info) => logExecution(`navigate ${info.to}`, impl),
-     *       fetch: (impl, info) => logExecution(`fetch ${info.to}`, impl)
-     *     });
-     *   },
-     *   route({ instrument, id }) {
-     *     instrument({
-     *       middleware: (impl, info) => logExecution(
-     *         `middleware ${info.request.url} (route ${id})`,
-     *         impl
-     *       ),
-     *       loader: (impl, info) => logExecution(
-     *         `loader ${info.request.url} (route ${id})`,
-     *         impl
-     *       ),
-     *       action: (impl, info) => logExecution(
-     *         `action ${info.request.url} (route ${id})`,
-     *         impl
-     *       ),
-     *     })
-     *   }
-     * };
-     *
-     * async function logExecution(label: string, impl: () => Promise<void>) {
-     *   let start = performance.now();
-     *   console.log(`start ${label}`);
-     *   try {
-     *     await impl();
-     *   } finally {
-     *     let end = performance.now();
-     *     console.log(`end ${label} (${Math.round(end - start)}ms)`);
-     *   }
-     * }
-     * ```
-     */
-    unstable_instrumentations?: unstable_ClientInstrumentation[];
     /**
      * Override the default data strategy of running loaders in parallel.
      * See {@link DataStrategyFunction}.
@@ -1088,7 +1026,6 @@ interface DOMRouterOpts {
  * @param {DOMRouterOpts.future} opts.future n/a
  * @param {DOMRouterOpts.getContext} opts.getContext n/a
  * @param {DOMRouterOpts.hydrationData} opts.hydrationData n/a
- * @param {DOMRouterOpts.unstable_instrumentations} opts.unstable_instrumentations n/a
  * @param {DOMRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
  * @param {DOMRouterOpts.window} opts.window n/a
  * @returns An initialized {@link DataRouter| data router} to pass to {@link RouterProvider | `<RouterProvider>`}
@@ -1107,7 +1044,6 @@ declare function createBrowserRouter(routes: RouteObject[], opts?: DOMRouterOpts
  * @param {DOMRouterOpts.future} opts.future n/a
  * @param {DOMRouterOpts.getContext} opts.getContext n/a
  * @param {DOMRouterOpts.hydrationData} opts.hydrationData n/a
- * @param {DOMRouterOpts.unstable_instrumentations} opts.unstable_instrumentations n/a
  * @param {DOMRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {DOMRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
  * @param {DOMRouterOpts.window} opts.window n/a

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 { aE as MemoryRouter, aF as Navigate, aG as Outlet, aH as Route, aI as Router, aJ as RouterProvider, aK as Routes, ar as UNSAFE_AwaitContextProvider, b1 as UNSAFE_WithComponentProps, b5 as UNSAFE_WithErrorBoundaryProps, b3 as UNSAFE_WithHydrateFallbackProps } from './context-BqL5Eckq.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-2EDmGlsZ.mjs';
 import 'react';
-import './routeModules--SgCTStn.mjs';
+import './route-data-CDwqkzPE.mjs';

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

@@ -1,4 +1,3 @@
-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 { aY as MemoryRouter, aZ as Navigate, a_ as Outlet, a$ as Route, b0 as Router, b1 as RouterProvider, b2 as Routes, aJ as UNSAFE_AwaitContextProvider, bs as UNSAFE_WithComponentProps, bw as UNSAFE_WithErrorBoundaryProps, bu as UNSAFE_WithHydrateFallbackProps } from './routeModules-BmVo7q9e.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-DKvU8YRr.js';
 import 'react';
-import './instrumentation-BWRz1MRU.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-c19b79d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -29,12 +29,12 @@
 
 
 
-var _chunkZLVXSGFLjs = require('./chunk-ZLVXSGFL.js');
+var _chunk2G2U5HGBjs = require('./chunk-2G2U5HGB.js');
 
 
 
 
-var _chunkQOFB7XZ5js = require('./chunk-QOFB7XZ5.js');
+var _chunkLUB73E44js = require('./chunk-LUB73E44.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 = _chunk2G2U5HGBjs.BrowserRouter; exports.Form = _chunk2G2U5HGBjs.Form; exports.HashRouter = _chunk2G2U5HGBjs.HashRouter; exports.Link = _chunk2G2U5HGBjs.Link; exports.Links = _chunkLUB73E44js.Links; exports.MemoryRouter = _chunk2G2U5HGBjs.MemoryRouter; exports.Meta = _chunkLUB73E44js.Meta; exports.NavLink = _chunk2G2U5HGBjs.NavLink; exports.Navigate = _chunk2G2U5HGBjs.Navigate; exports.Outlet = _chunk2G2U5HGBjs.Outlet; exports.Route = _chunk2G2U5HGBjs.Route; exports.Router = _chunk2G2U5HGBjs.Router; exports.RouterProvider = _chunk2G2U5HGBjs.RouterProvider; exports.Routes = _chunk2G2U5HGBjs.Routes; exports.ScrollRestoration = _chunk2G2U5HGBjs.ScrollRestoration; exports.StaticRouter = _chunk2G2U5HGBjs.StaticRouter; exports.StaticRouterProvider = _chunk2G2U5HGBjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkLUB73E44js.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunk2G2U5HGBjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk2G2U5HGBjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk2G2U5HGBjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk2G2U5HGBjs.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-c19b79d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-47MIYFLC.mjs";
+} from "./chunk-IMKEG5CI.mjs";
 export {
   BrowserRouter,
   Form,

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

@@ -351,11 +351,6 @@ type DefaultContext = MiddlewareEnabled extends true ? Readonly<RouterContextPro
 interface DataFunctionArgs<Context> {
     /** A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read headers (like cookies, and {@link https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams URLSearchParams} from the request. */
     request: Request;
-    /**
-     * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
-     * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
-     */
-    unstable_pattern: string;
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -576,7 +571,7 @@ type AgnosticPatchRoutesOnNavigationFunction<O extends AgnosticRouteObject = Agn
  * properties from framework-agnostic properties
  */
 interface MapRoutePropertiesFunction {
-    (route: AgnosticDataRouteObject): {
+    (route: AgnosticRouteObject): {
         hasErrorBoundary: boolean;
     } & Record<string, any>;
 }
@@ -892,99 +887,6 @@ type ErrorResponse = {
  */
 declare function isRouteErrorResponse(error: any): error is ErrorResponse;
 
-type unstable_ServerInstrumentation = {
-    handler?: unstable_InstrumentRequestHandlerFunction;
-    route?: unstable_InstrumentRouteFunction;
-};
-type unstable_ClientInstrumentation = {
-    router?: unstable_InstrumentRouterFunction;
-    route?: unstable_InstrumentRouteFunction;
-};
-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>;
-}
-type InstrumentableRoute = {
-    id: string;
-    index: boolean | undefined;
-    path: string | undefined;
-    instrument(instrumentations: RouteInstrumentations): void;
-};
-type RouteInstrumentations = {
-    lazy?: InstrumentLazyFunction;
-    "lazy.loader"?: InstrumentLazyFunction;
-    "lazy.action"?: InstrumentLazyFunction;
-    "lazy.middleware"?: InstrumentLazyFunction;
-    middleware?: InstrumentRouteHandlerFunction;
-    loader?: InstrumentRouteHandlerFunction;
-    action?: InstrumentRouteHandlerFunction;
-};
-type RouteHandlerInstrumentationInfo = Readonly<{
-    request: {
-        method: string;
-        url: string;
-        headers: Pick<Headers, "get">;
-    };
-    params: LoaderFunctionArgs["params"];
-    unstable_pattern: string;
-    context: Pick<RouterContextProvider, "get">;
-}>;
-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;
-};
-type RouterNavigationInstrumentationInfo = Readonly<{
-    to: string | number;
-    currentUrl: string;
-    formMethod?: HTMLFormMethod;
-    formEncType?: FormEncType;
-    formData?: FormData;
-    body?: any;
-}>;
-type RouterFetchInstrumentationInfo = Readonly<{
-    href: string;
-    currentUrl: string;
-    fetcherKey: string;
-    formMethod?: HTMLFormMethod;
-    formEncType?: FormEncType;
-    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;
-};
-type RequestHandlerInstrumentationInfo = Readonly<{
-    request: {
-        method: string;
-        url: string;
-        headers: Pick<Headers, "get">;
-    };
-    context: Pick<RouterContextProvider, "get">;
-}>;
-interface InstrumentRequestHandlerFunction extends GenericInstrumentFunction {
-    (handler: () => Promise<void>, info: RequestHandlerInstrumentationInfo): MaybePromise<void>;
-}
-
 /**
  * A Router instance manages all navigation and data loading/mutations
  */
@@ -1269,7 +1171,6 @@ interface RouterInit {
     history: History;
     basename?: string;
     getContext?: () => MaybePromise<RouterContextProvider>;
-    unstable_instrumentations?: unstable_ClientInstrumentation[];
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationRouteProperties?: string[];
@@ -1536,7 +1437,6 @@ type BlockerFunction = (args: {
 interface CreateStaticHandlerOptions {
     basename?: string;
     mapRouteProperties?: MapRoutePropertiesFunction;
-    unstable_instrumentations?: Pick<unstable_ServerInstrumentation, "route">[];
     future?: {};
 }
 declare function createStaticHandler(routes: AgnosticRouteObject[], opts?: CreateStaticHandlerOptions): StaticHandler;
@@ -1907,11 +1807,6 @@ type ClientDataFunctionArgs<Params> = {
      * }
      **/
     params: Params;
-    /**
-     * Matched un-interpolated route pattern for the current path (i.e., /blog/:slug).
-     * Mostly useful as a identifier to aggregate on for logging/tracing/etc.
-     */
-    unstable_pattern: string;
     /**
      * When `future.v8_middleware` is not enabled, this is undefined.
      *