react-router 0.0.0-experimental-1ebb6d403 → 0.0.0-experimental-e41ede670

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-1ebb6d403
+ * react-router v0.0.0-experimental-e41ede670
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -120,7 +120,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-5XVYBMAF.mjs";
+} from "./chunk-H3OBLXFX.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/route-module.d.mts

@@ -1,4 +1,4 @@
-import { av as LinkDescriptor, as as MetaDescriptor, aJ as ServerDataFrom, aK as ClientDataFrom, aL as Func, aM as Equal, aN as Pretty } from '../../route-data-JFOfNyPS.mjs';
+import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, M as MiddlewareFunction, d as ClientMiddlewareFunction, aP as Equal, aQ as Pretty } from '../../route-data-C96IyGKo.mjs';
 import { A as AppLoadContext } from '../../data-CQbyyGzl.mjs';
 import 'react';
 
@@ -76,6 +76,10 @@ type ClientDataFunctionArgs<T extends RouteInfo> = {
 type ServerDataFunctionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     context: AppLoadContext;
 };
+type CreateServerMiddlewareArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
+type ServerMiddlewareNextFunction = Parameters<MiddlewareFunction>[1];
+type CreateClientMiddlewareArgs<T extends RouteInfo> = Parameters<ClientMiddlewareFunction>[0];
+type ClientMiddlewareNextFunction = Parameters<ClientMiddlewareFunction>[1];
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
 type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     serverLoader: () => Promise<ServerDataFrom<T["module"]["loader"]>>;
@@ -106,4 +110,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };
+export type { ClientMiddlewareNextFunction, CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateClientMiddlewareArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, CreateServerMiddlewareArgs, HeadersArgs, LinkDescriptors, MetaDescriptors, ServerMiddlewareNextFunction };

package/dist/development/lib/types/route-module.d.ts

@@ -1,4 +1,4 @@
-import { av as LinkDescriptor, as as MetaDescriptor, aJ as ServerDataFrom, aK as ClientDataFrom, aL as Func, aM as Equal, aN as Pretty } from '../../route-data-JFOfNyPS.js';
+import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, M as MiddlewareFunction, d as ClientMiddlewareFunction, aP as Equal, aQ as Pretty } from '../../route-data-C96IyGKo.js';
 import { A as AppLoadContext } from '../../data-CQbyyGzl.js';
 import 'react';
 
@@ -76,6 +76,10 @@ type ClientDataFunctionArgs<T extends RouteInfo> = {
 type ServerDataFunctionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     context: AppLoadContext;
 };
+type CreateServerMiddlewareArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
+type ServerMiddlewareNextFunction = Parameters<MiddlewareFunction>[1];
+type CreateClientMiddlewareArgs<T extends RouteInfo> = Parameters<ClientMiddlewareFunction>[0];
+type ClientMiddlewareNextFunction = Parameters<ClientMiddlewareFunction>[1];
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
 type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     serverLoader: () => Promise<ServerDataFrom<T["module"]["loader"]>>;
@@ -106,4 +110,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };
+export type { ClientMiddlewareNextFunction, CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateClientMiddlewareArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, CreateServerMiddlewareArgs, HeadersArgs, LinkDescriptors, MetaDescriptors, ServerMiddlewareNextFunction };

package/dist/development/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-1ebb6d403
+ * react-router v0.0.0-experimental-e41ede670
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-1ebb6d403
+ * react-router v0.0.0-experimental-e41ede670
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/{route-data-JFOfNyPS.d.ts → route-data-C96IyGKo.d.mts}

@@ -260,6 +260,12 @@ type Submission = {
     json: undefined;
     text: string;
 };
+/**
+ * @private
+ * Default context value type for `createRouter`, can be overridden via the generics
+ * on LoaderFunction/LoaderFunctionArgs/ActionFunction/ActionFunctionArgs
+ */
+type DefaultRouterContext = any;
 /**
  * @private
  * Arguments passed to route loader/action functions.  Same for now but we keep
@@ -268,29 +274,38 @@ type Submission = {
 interface DataFunctionArgs<Context> {
     request: Request;
     params: Params;
-    context?: Context;
+    context: Context;
 }
+type BaseMiddlewareFunction<Result, Context> = {
+    (args: DataFunctionArgs<Context>, next: () => Promise<Result>): Result | Promise<Result>;
+};
+/**
+ * Server-side route middleware function signature
+ */
+type MiddlewareFunction<Context = DefaultRouterContext> = BaseMiddlewareFunction<unknown, Context>;
+/**
+ * Client-side route middleware function signature
+ */
+type ClientMiddlewareFunction<Context = DefaultRouterContext> = BaseMiddlewareFunction<unknown, Context>;
 /**
  * Arguments passed to loader functions
  */
-interface LoaderFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
+interface LoaderFunctionArgs<Context = DefaultRouterContext> extends DataFunctionArgs<Context> {
 }
 /**
  * Arguments passed to action functions
  */
-interface ActionFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
+interface ActionFunctionArgs<Context = DefaultRouterContext> extends DataFunctionArgs<Context> {
 }
 /**
- * Loaders and actions can return anything except `undefined` (`null` is a
- * valid return value if there is no data to return).  Responses are preferred
- * and will ease any future migration to Remix
+ * Loaders and actions can return anything
  */
-type DataFunctionValue = Response | NonNullable<unknown> | null;
+type DataFunctionValue = unknown;
 type DataFunctionReturnValue = Promise<DataFunctionValue> | DataFunctionValue;
 /**
  * Route loader function signature
  */
-type LoaderFunction<Context = any> = {
+type LoaderFunction<Context = DefaultRouterContext> = {
     (args: LoaderFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 } & {
     hydrate?: boolean;
@@ -298,7 +313,7 @@ type LoaderFunction<Context = any> = {
 /**
  * Route action function signature
  */
-interface ActionFunction<Context = any> {
+interface ActionFunction<Context = DefaultRouterContext> {
     (args: ActionFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 }
 /**
@@ -333,7 +348,7 @@ interface DataStrategyMatch extends AgnosticRouteMatch<string, AgnosticDataRoute
     shouldLoad: boolean;
     resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
-interface DataStrategyFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
+interface DataStrategyFunctionArgs<Context = DefaultRouterContext> extends DataFunctionArgs<Context> {
     matches: DataStrategyMatch[];
     fetcherKey: string | null;
 }
@@ -385,6 +400,7 @@ type AgnosticBaseRouteObject = {
     caseSensitive?: boolean;
     path?: string;
     id?: string;
+    middleware?: ClientMiddlewareFunction[];
     loader?: LoaderFunction | boolean;
     action?: ActionFunction | boolean;
     hasErrorBoundary?: boolean;
@@ -868,6 +884,7 @@ interface RouterInit {
     routes: AgnosticRouteObject[];
     history: History;
     basename?: string;
+    context?: DefaultRouterContext;
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationData?: HydrationState;
@@ -899,11 +916,13 @@ interface StaticHandler {
         requestContext?: unknown;
         skipLoaderErrorBubbling?: boolean;
         dataStrategy?: DataStrategyFunction;
+        respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
     }): Promise<StaticHandlerContext | Response>;
     queryRoute(request: Request, opts?: {
         routeId?: string;
         requestContext?: unknown;
         dataStrategy?: DataStrategyFunction;
+        respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
     }): Promise<any>;
 }
 type ViewTransitionOpts = {
@@ -1137,6 +1156,7 @@ interface IndexRouteObject {
     caseSensitive?: AgnosticIndexRouteObject["caseSensitive"];
     path?: AgnosticIndexRouteObject["path"];
     id?: AgnosticIndexRouteObject["id"];
+    middleware?: AgnosticIndexRouteObject["middleware"];
     loader?: AgnosticIndexRouteObject["loader"];
     action?: AgnosticIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -1156,6 +1176,7 @@ interface NonIndexRouteObject {
     caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
     path?: AgnosticNonIndexRouteObject["path"];
     id?: AgnosticNonIndexRouteObject["id"];
+    middleware?: AgnosticNonIndexRouteObject["middleware"];
     loader?: AgnosticNonIndexRouteObject["loader"];
     action?: AgnosticNonIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
@@ -1352,6 +1373,7 @@ interface RouteModules {
 interface RouteModule {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
+    clientMiddleware?: ClientMiddlewareFunction[];
     ErrorBoundary?: ErrorBoundaryComponent;
     HydrateFallback?: HydrateFallbackComponent;
     Layout?: LayoutComponent;
@@ -1368,7 +1390,7 @@ type ClientActionFunction = (args: ClientActionFunctionArgs) => ReturnType<Actio
 /**
  * Arguments passed to a route `clientAction` function
  */
-type ClientActionFunctionArgs = ActionFunctionArgs<undefined> & {
+type ClientActionFunctionArgs = ActionFunctionArgs & {
     serverAction: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1380,7 +1402,7 @@ type ClientLoaderFunction = ((args: ClientLoaderFunctionArgs) => ReturnType<Load
 /**
  * Arguments passed to a route `clientLoader` function
  */
-type ClientLoaderFunctionArgs = LoaderFunctionArgs<undefined> & {
+type ClientLoaderFunctionArgs = LoaderFunctionArgs & {
     serverLoader: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1537,10 +1559,10 @@ type Serialize<T> = T extends Serializable ? T : T extends (...args: any[]) => u
 } : undefined;
 type VoidToUndefined<T> = Equal<T, void> extends true ? undefined : T;
 type DataFrom<T> = IsAny<T> extends true ? undefined : T extends Func ? VoidToUndefined<Awaited<ReturnType<T>>> : undefined;
-type ClientData<T> = T extends Response ? never : T extends DataWithResponseInit<infer U> ? U : T;
-type ServerData<T> = T extends Response ? never : T extends DataWithResponseInit<infer U> ? Serialize<U> : Serialize<T>;
+type ClientData<T> = T extends DataWithResponseInit<infer U> ? U : T;
+type ServerData<T> = T extends DataWithResponseInit<infer U> ? Serialize<U> : Serialize<T>;
 type ServerDataFrom<T> = ServerData<DataFrom<T>>;
 type ClientDataFrom<T> = ClientData<DataFrom<T>>;
 type SerializeFrom<T> = T extends (...args: infer Args) => unknown ? Args extends [ClientLoaderFunctionArgs | ClientActionFunctionArgs] ? ClientDataFrom<T> : ServerDataFrom<T> : T;
 
-export { type HTMLFormMethod as $, type ActionFunction as A, type BlockerFunction as B, type ClientActionFunction as C, type DataStrategyFunction as D, type RouterInit as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type RouterSubscriber as J, type RouterNavigateOptions as K, type LoaderFunction as L, type MetaFunction as M, type NavigateOptions as N, type RouterFetchOptions as O, type ParamParseKey as P, type DataStrategyFunctionArgs as Q, type RouteModules as R, type SerializeFrom as S, type To as T, type UIMatch as U, type DataStrategyMatch as V, type DataStrategyResult as W, DataWithResponseInit as X, type ErrorResponse as Y, type FormEncType as Z, type FormMethod as _, type Router as a, type LazyRouteFunction as a0, type PathParam as a1, type RedirectFunction as a2, type ShouldRevalidateFunction as a3, type ShouldRevalidateFunctionArgs as a4, createPath as a5, parsePath as a6, IDLE_NAVIGATION as a7, IDLE_FETCHER as a8, IDLE_BLOCKER as a9, DataRouterContext as aA, DataRouterStateContext as aB, FetchersContext as aC, LocationContext as aD, NavigationContext as aE, RouteContext as aF, ViewTransitionContext as aG, type RouteModule as aH, type History as aI, type ServerDataFrom as aJ, type ClientDataFrom as aK, type Func as aL, type Equal as aM, type Pretty as aN, data as aa, generatePath as ab, isRouteErrorResponse as ac, matchPath as ad, matchRoutes as ae, redirect as af, redirectDocument as ag, replace as ah, resolvePath as ai, type DataRouteMatch as aj, type DataRouteObject as ak, type Navigator as al, type PatchRoutesOnNavigationFunction as am, type PatchRoutesOnNavigationFunctionArgs as an, type RouteMatch as ao, type ClientActionFunctionArgs as ap, type ClientLoaderFunctionArgs as aq, type MetaArgs as ar, type MetaDescriptor as as, type PageLinkDescriptor as at, type HtmlLinkDescriptor as au, type LinkDescriptor as av, createBrowserHistory as aw, invariant as ax, createRouter as ay, ErrorResponseImpl as az, type ClientLoaderFunction as b, type LinksFunction as c, type RouteManifest as d, type LoaderFunctionArgs as e, type ActionFunctionArgs as f, type RelativeRoutingType as g, type Location as h, Action as i, type Path as j, type PathPattern as k, type PathMatch as l, type Params as m, type RouteObject as n, type Navigation as o, type RevalidationState as p, type Blocker as q, type StaticHandlerContext as r, type StaticHandler as s, type CreateStaticHandlerOptions as t, type IndexRouteObject as u, type NonIndexRouteObject as v, type RouterState as w, type GetScrollRestorationKeyFunction as x, type Fetcher as y, type NavigationStates as z };
+export { type ErrorResponse as $, type ActionFunction as A, type BlockerFunction as B, type ClientActionFunction as C, type DefaultRouterContext as D, type GetScrollRestorationKeyFunction as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type Fetcher as J, type NavigationStates as K, type LoaderFunction as L, type MiddlewareFunction as M, type NavigateOptions as N, type RouterInit as O, type ParamParseKey as P, type RouterSubscriber as Q, type RouteModules as R, type SerializeFrom as S, type To as T, type UIMatch as U, type RouterNavigateOptions as V, type RouterFetchOptions as W, type DataStrategyFunctionArgs as X, type DataStrategyMatch as Y, type DataStrategyResult as Z, DataWithResponseInit as _, type Router as a, type FormEncType as a0, type FormMethod as a1, type HTMLFormMethod as a2, type LazyRouteFunction as a3, type PathParam as a4, type RedirectFunction as a5, type ShouldRevalidateFunction as a6, type ShouldRevalidateFunctionArgs as a7, createPath as a8, parsePath as a9, invariant as aA, createRouter as aB, ErrorResponseImpl as aC, DataRouterContext as aD, DataRouterStateContext as aE, FetchersContext as aF, LocationContext as aG, NavigationContext as aH, RouteContext as aI, ViewTransitionContext as aJ, type RouteModule as aK, type History as aL, type ServerDataFrom as aM, type ClientDataFrom as aN, type Func as aO, type Equal as aP, type Pretty as aQ, IDLE_NAVIGATION as aa, IDLE_FETCHER as ab, IDLE_BLOCKER as ac, data as ad, generatePath as ae, isRouteErrorResponse as af, matchPath as ag, matchRoutes as ah, redirect as ai, redirectDocument as aj, replace as ak, resolvePath as al, type DataRouteMatch as am, type DataRouteObject as an, type Navigator as ao, type PatchRoutesOnNavigationFunction as ap, type PatchRoutesOnNavigationFunctionArgs as aq, type RouteMatch as ar, type ClientActionFunctionArgs as as, type ClientLoaderFunctionArgs as at, type MetaArgs as au, type MetaDescriptor as av, type PageLinkDescriptor as aw, type HtmlLinkDescriptor as ax, type LinkDescriptor as ay, createBrowserHistory as az, type DataStrategyFunction as b, type ClientLoaderFunction as c, type ClientMiddlewareFunction as d, type LinksFunction as e, type MetaFunction as f, type RouteManifest as g, type LoaderFunctionArgs as h, type ActionFunctionArgs as i, type RelativeRoutingType as j, type Location as k, Action as l, type Path as m, type PathPattern as n, type PathMatch as o, type Params as p, type RouteObject as q, type Navigation as r, type RevalidationState as s, type Blocker as t, type StaticHandlerContext as u, type StaticHandler as v, type CreateStaticHandlerOptions as w, type IndexRouteObject as x, type NonIndexRouteObject as y, type RouterState as z };

package/dist/{production/route-data-JFOfNyPS.d.mts → development/route-data-C96IyGKo.d.ts}

@@ -260,6 +260,12 @@ type Submission = {
     json: undefined;
     text: string;
 };
+/**
+ * @private
+ * Default context value type for `createRouter`, can be overridden via the generics
+ * on LoaderFunction/LoaderFunctionArgs/ActionFunction/ActionFunctionArgs
+ */
+type DefaultRouterContext = any;
 /**
  * @private
  * Arguments passed to route loader/action functions.  Same for now but we keep
@@ -268,29 +274,38 @@ type Submission = {
 interface DataFunctionArgs<Context> {
     request: Request;
     params: Params;
-    context?: Context;
+    context: Context;
 }
+type BaseMiddlewareFunction<Result, Context> = {
+    (args: DataFunctionArgs<Context>, next: () => Promise<Result>): Result | Promise<Result>;
+};
+/**
+ * Server-side route middleware function signature
+ */
+type MiddlewareFunction<Context = DefaultRouterContext> = BaseMiddlewareFunction<unknown, Context>;
+/**
+ * Client-side route middleware function signature
+ */
+type ClientMiddlewareFunction<Context = DefaultRouterContext> = BaseMiddlewareFunction<unknown, Context>;
 /**
  * Arguments passed to loader functions
  */
-interface LoaderFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
+interface LoaderFunctionArgs<Context = DefaultRouterContext> extends DataFunctionArgs<Context> {
 }
 /**
  * Arguments passed to action functions
  */
-interface ActionFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
+interface ActionFunctionArgs<Context = DefaultRouterContext> extends DataFunctionArgs<Context> {
 }
 /**
- * Loaders and actions can return anything except `undefined` (`null` is a
- * valid return value if there is no data to return).  Responses are preferred
- * and will ease any future migration to Remix
+ * Loaders and actions can return anything
  */
-type DataFunctionValue = Response | NonNullable<unknown> | null;
+type DataFunctionValue = unknown;
 type DataFunctionReturnValue = Promise<DataFunctionValue> | DataFunctionValue;
 /**
  * Route loader function signature
  */
-type LoaderFunction<Context = any> = {
+type LoaderFunction<Context = DefaultRouterContext> = {
     (args: LoaderFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 } & {
     hydrate?: boolean;
@@ -298,7 +313,7 @@ type LoaderFunction<Context = any> = {
 /**
  * Route action function signature
  */
-interface ActionFunction<Context = any> {
+interface ActionFunction<Context = DefaultRouterContext> {
     (args: ActionFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 }
 /**
@@ -333,7 +348,7 @@ interface DataStrategyMatch extends AgnosticRouteMatch<string, AgnosticDataRoute
     shouldLoad: boolean;
     resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
-interface DataStrategyFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
+interface DataStrategyFunctionArgs<Context = DefaultRouterContext> extends DataFunctionArgs<Context> {
     matches: DataStrategyMatch[];
     fetcherKey: string | null;
 }
@@ -385,6 +400,7 @@ type AgnosticBaseRouteObject = {
     caseSensitive?: boolean;
     path?: string;
     id?: string;
+    middleware?: ClientMiddlewareFunction[];
     loader?: LoaderFunction | boolean;
     action?: ActionFunction | boolean;
     hasErrorBoundary?: boolean;
@@ -868,6 +884,7 @@ interface RouterInit {
     routes: AgnosticRouteObject[];
     history: History;
     basename?: string;
+    context?: DefaultRouterContext;
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationData?: HydrationState;
@@ -899,11 +916,13 @@ interface StaticHandler {
         requestContext?: unknown;
         skipLoaderErrorBubbling?: boolean;
         dataStrategy?: DataStrategyFunction;
+        respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
     }): Promise<StaticHandlerContext | Response>;
     queryRoute(request: Request, opts?: {
         routeId?: string;
         requestContext?: unknown;
         dataStrategy?: DataStrategyFunction;
+        respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
     }): Promise<any>;
 }
 type ViewTransitionOpts = {
@@ -1137,6 +1156,7 @@ interface IndexRouteObject {
     caseSensitive?: AgnosticIndexRouteObject["caseSensitive"];
     path?: AgnosticIndexRouteObject["path"];
     id?: AgnosticIndexRouteObject["id"];
+    middleware?: AgnosticIndexRouteObject["middleware"];
     loader?: AgnosticIndexRouteObject["loader"];
     action?: AgnosticIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -1156,6 +1176,7 @@ interface NonIndexRouteObject {
     caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
     path?: AgnosticNonIndexRouteObject["path"];
     id?: AgnosticNonIndexRouteObject["id"];
+    middleware?: AgnosticNonIndexRouteObject["middleware"];
     loader?: AgnosticNonIndexRouteObject["loader"];
     action?: AgnosticNonIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
@@ -1352,6 +1373,7 @@ interface RouteModules {
 interface RouteModule {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
+    clientMiddleware?: ClientMiddlewareFunction[];
     ErrorBoundary?: ErrorBoundaryComponent;
     HydrateFallback?: HydrateFallbackComponent;
     Layout?: LayoutComponent;
@@ -1368,7 +1390,7 @@ type ClientActionFunction = (args: ClientActionFunctionArgs) => ReturnType<Actio
 /**
  * Arguments passed to a route `clientAction` function
  */
-type ClientActionFunctionArgs = ActionFunctionArgs<undefined> & {
+type ClientActionFunctionArgs = ActionFunctionArgs & {
     serverAction: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1380,7 +1402,7 @@ type ClientLoaderFunction = ((args: ClientLoaderFunctionArgs) => ReturnType<Load
 /**
  * Arguments passed to a route `clientLoader` function
  */
-type ClientLoaderFunctionArgs = LoaderFunctionArgs<undefined> & {
+type ClientLoaderFunctionArgs = LoaderFunctionArgs & {
     serverLoader: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1537,10 +1559,10 @@ type Serialize<T> = T extends Serializable ? T : T extends (...args: any[]) => u
 } : undefined;
 type VoidToUndefined<T> = Equal<T, void> extends true ? undefined : T;
 type DataFrom<T> = IsAny<T> extends true ? undefined : T extends Func ? VoidToUndefined<Awaited<ReturnType<T>>> : undefined;
-type ClientData<T> = T extends Response ? never : T extends DataWithResponseInit<infer U> ? U : T;
-type ServerData<T> = T extends Response ? never : T extends DataWithResponseInit<infer U> ? Serialize<U> : Serialize<T>;
+type ClientData<T> = T extends DataWithResponseInit<infer U> ? U : T;
+type ServerData<T> = T extends DataWithResponseInit<infer U> ? Serialize<U> : Serialize<T>;
 type ServerDataFrom<T> = ServerData<DataFrom<T>>;
 type ClientDataFrom<T> = ClientData<DataFrom<T>>;
 type SerializeFrom<T> = T extends (...args: infer Args) => unknown ? Args extends [ClientLoaderFunctionArgs | ClientActionFunctionArgs] ? ClientDataFrom<T> : ServerDataFrom<T> : T;
 
-export { type HTMLFormMethod as $, type ActionFunction as A, type BlockerFunction as B, type ClientActionFunction as C, type DataStrategyFunction as D, type RouterInit as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type RouterSubscriber as J, type RouterNavigateOptions as K, type LoaderFunction as L, type MetaFunction as M, type NavigateOptions as N, type RouterFetchOptions as O, type ParamParseKey as P, type DataStrategyFunctionArgs as Q, type RouteModules as R, type SerializeFrom as S, type To as T, type UIMatch as U, type DataStrategyMatch as V, type DataStrategyResult as W, DataWithResponseInit as X, type ErrorResponse as Y, type FormEncType as Z, type FormMethod as _, type Router as a, type LazyRouteFunction as a0, type PathParam as a1, type RedirectFunction as a2, type ShouldRevalidateFunction as a3, type ShouldRevalidateFunctionArgs as a4, createPath as a5, parsePath as a6, IDLE_NAVIGATION as a7, IDLE_FETCHER as a8, IDLE_BLOCKER as a9, DataRouterContext as aA, DataRouterStateContext as aB, FetchersContext as aC, LocationContext as aD, NavigationContext as aE, RouteContext as aF, ViewTransitionContext as aG, type RouteModule as aH, type History as aI, type ServerDataFrom as aJ, type ClientDataFrom as aK, type Func as aL, type Equal as aM, type Pretty as aN, data as aa, generatePath as ab, isRouteErrorResponse as ac, matchPath as ad, matchRoutes as ae, redirect as af, redirectDocument as ag, replace as ah, resolvePath as ai, type DataRouteMatch as aj, type DataRouteObject as ak, type Navigator as al, type PatchRoutesOnNavigationFunction as am, type PatchRoutesOnNavigationFunctionArgs as an, type RouteMatch as ao, type ClientActionFunctionArgs as ap, type ClientLoaderFunctionArgs as aq, type MetaArgs as ar, type MetaDescriptor as as, type PageLinkDescriptor as at, type HtmlLinkDescriptor as au, type LinkDescriptor as av, createBrowserHistory as aw, invariant as ax, createRouter as ay, ErrorResponseImpl as az, type ClientLoaderFunction as b, type LinksFunction as c, type RouteManifest as d, type LoaderFunctionArgs as e, type ActionFunctionArgs as f, type RelativeRoutingType as g, type Location as h, Action as i, type Path as j, type PathPattern as k, type PathMatch as l, type Params as m, type RouteObject as n, type Navigation as o, type RevalidationState as p, type Blocker as q, type StaticHandlerContext as r, type StaticHandler as s, type CreateStaticHandlerOptions as t, type IndexRouteObject as u, type NonIndexRouteObject as v, type RouterState as w, type GetScrollRestorationKeyFunction as x, type Fetcher as y, type NavigationStates as z };
+export { type ErrorResponse as $, type ActionFunction as A, type BlockerFunction as B, type ClientActionFunction as C, type DefaultRouterContext as D, type GetScrollRestorationKeyFunction as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type Fetcher as J, type NavigationStates as K, type LoaderFunction as L, type MiddlewareFunction as M, type NavigateOptions as N, type RouterInit as O, type ParamParseKey as P, type RouterSubscriber as Q, type RouteModules as R, type SerializeFrom as S, type To as T, type UIMatch as U, type RouterNavigateOptions as V, type RouterFetchOptions as W, type DataStrategyFunctionArgs as X, type DataStrategyMatch as Y, type DataStrategyResult as Z, DataWithResponseInit as _, type Router as a, type FormEncType as a0, type FormMethod as a1, type HTMLFormMethod as a2, type LazyRouteFunction as a3, type PathParam as a4, type RedirectFunction as a5, type ShouldRevalidateFunction as a6, type ShouldRevalidateFunctionArgs as a7, createPath as a8, parsePath as a9, invariant as aA, createRouter as aB, ErrorResponseImpl as aC, DataRouterContext as aD, DataRouterStateContext as aE, FetchersContext as aF, LocationContext as aG, NavigationContext as aH, RouteContext as aI, ViewTransitionContext as aJ, type RouteModule as aK, type History as aL, type ServerDataFrom as aM, type ClientDataFrom as aN, type Func as aO, type Equal as aP, type Pretty as aQ, IDLE_NAVIGATION as aa, IDLE_FETCHER as ab, IDLE_BLOCKER as ac, data as ad, generatePath as ae, isRouteErrorResponse as af, matchPath as ag, matchRoutes as ah, redirect as ai, redirectDocument as aj, replace as ak, resolvePath as al, type DataRouteMatch as am, type DataRouteObject as an, type Navigator as ao, type PatchRoutesOnNavigationFunction as ap, type PatchRoutesOnNavigationFunctionArgs as aq, type RouteMatch as ar, type ClientActionFunctionArgs as as, type ClientLoaderFunctionArgs as at, type MetaArgs as au, type MetaDescriptor as av, type PageLinkDescriptor as aw, type HtmlLinkDescriptor as ax, type LinkDescriptor as ay, createBrowserHistory as az, type DataStrategyFunction as b, type ClientLoaderFunction as c, type ClientMiddlewareFunction as d, type LinksFunction as e, type MetaFunction as f, type RouteManifest as g, type LoaderFunctionArgs as h, type ActionFunctionArgs as i, type RelativeRoutingType as j, type Location as k, Action as l, type Path as m, type PathPattern as n, type PathMatch as o, type Params as p, type RouteObject as q, type Navigation as r, type RevalidationState as s, type Blocker as t, type StaticHandlerContext as u, type StaticHandler as v, type CreateStaticHandlerOptions as w, type IndexRouteObject as x, type NonIndexRouteObject as y, type RouterState as z };