react-router 0.0.0-experimental-beaa4f52a → 0.0.0-experimental-df0f1dfda

package/dist/development/index.mjs

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

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

@@ -1,4 +1,5 @@
-import { aC as LinkDescriptor, az as MetaDescriptor, aQ as ServerDataFrom, aR as ClientDataFrom, aS as Func, a3 as MiddlewareFunctionArgs, A as AppLoadContext, R as RouterContext, aT as Equal, aU as Pretty } from '../../route-data-C9zMg-qq.mjs';
+import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, aP as Equal, aQ as Pretty } from '../../route-data-Cq_b5feC.mjs';
+import { A as AppLoadContext } from '../../data-CQbyyGzl.mjs';
 import 'react';
 
 type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
@@ -68,22 +69,13 @@ type _CreateActionData<ServerActionData, ClientActionData> = Awaited<[
     IsDefined<ServerActionData>,
     IsDefined<ClientActionData>
 ] extends [true, true] ? ServerActionData | ClientActionData : IsDefined<ClientActionData> extends true ? ClientActionData : IsDefined<ServerActionData> extends true ? ServerActionData : undefined>;
-type SharedDataFunctionArgs<T extends RouteInfo> = {
+type ClientDataFunctionArgs<T extends RouteInfo> = {
     request: Request;
     params: T["params"];
 };
-type ClientDataFunctionArgs<T extends RouteInfo> = SharedDataFunctionArgs<T> & {
-    context: RouterContext;
-};
-type ServerDataFunctionArgs<T extends RouteInfo> = SharedDataFunctionArgs<T> & {
+type ServerDataFunctionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     context: AppLoadContext;
 };
-type CreateServerMiddlewareArgs<T extends RouteInfo> = ServerDataFunctionArgs<T> & {
-    next: MiddlewareFunctionArgs<AppLoadContext, Response>["next"];
-};
-type CreateClientMiddlewareArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
-    next: MiddlewareFunctionArgs<RouterContext, undefined>["next"];
-};
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
 type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     serverLoader: () => Promise<ServerDataFrom<T["module"]["loader"]>>;
@@ -114,4 +106,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateClientMiddlewareArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, CreateServerMiddlewareArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };

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

@@ -1,4 +1,5 @@
-import { aC as LinkDescriptor, az as MetaDescriptor, aQ as ServerDataFrom, aR as ClientDataFrom, aS as Func, a3 as MiddlewareFunctionArgs, A as AppLoadContext, R as RouterContext, aT as Equal, aU as Pretty } from '../../route-data-C9zMg-qq.js';
+import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, aP as Equal, aQ as Pretty } from '../../route-data-Cq_b5feC.js';
+import { A as AppLoadContext } from '../../data-CQbyyGzl.js';
 import 'react';
 
 type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
@@ -68,22 +69,13 @@ type _CreateActionData<ServerActionData, ClientActionData> = Awaited<[
     IsDefined<ServerActionData>,
     IsDefined<ClientActionData>
 ] extends [true, true] ? ServerActionData | ClientActionData : IsDefined<ClientActionData> extends true ? ClientActionData : IsDefined<ServerActionData> extends true ? ServerActionData : undefined>;
-type SharedDataFunctionArgs<T extends RouteInfo> = {
+type ClientDataFunctionArgs<T extends RouteInfo> = {
     request: Request;
     params: T["params"];
 };
-type ClientDataFunctionArgs<T extends RouteInfo> = SharedDataFunctionArgs<T> & {
-    context: RouterContext;
-};
-type ServerDataFunctionArgs<T extends RouteInfo> = SharedDataFunctionArgs<T> & {
+type ServerDataFunctionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     context: AppLoadContext;
 };
-type CreateServerMiddlewareArgs<T extends RouteInfo> = ServerDataFunctionArgs<T> & {
-    next: MiddlewareFunctionArgs<AppLoadContext, Response>["next"];
-};
-type CreateClientMiddlewareArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
-    next: MiddlewareFunctionArgs<RouterContext, undefined>["next"];
-};
 type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
 type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
     serverLoader: () => Promise<ServerDataFrom<T["module"]["loader"]>>;
@@ -114,4 +106,4 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
     actionData?: T["actionData"];
 };
 
-export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateClientMiddlewareArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, CreateServerMiddlewareArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };
+export type { CreateActionData, CreateClientActionArgs, CreateClientLoaderArgs, CreateComponentProps, CreateErrorBoundaryProps, CreateHydrateFallbackProps, CreateLoaderData, CreateMetaArgs, CreateServerActionArgs, CreateServerLoaderArgs, HeadersArgs, LinkDescriptors, MetaDescriptors };

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

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

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

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

package/dist/development/{route-data-C9zMg-qq.d.ts → route-data-Cq_b5feC.d.mts}

@@ -260,15 +260,6 @@ type Submission = {
     json: undefined;
     text: string;
 };
-/**
- * An object of unknown type for client-side loaders and actions provided by the
- * `createBrowserRouter` `context` option.  This is defined as an empty interface
- * specifically so apps can leverage declaration merging to augment this type
- * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
- */
-interface RouterContext {
-    [key: string]: unknown;
-}
 /**
  * @private
  * Arguments passed to route loader/action functions.  Same for now but we keep
@@ -277,37 +268,29 @@ interface RouterContext {
 interface DataFunctionArgs<Context> {
     request: Request;
     params: Params;
-    context: Context;
+    context?: Context;
 }
-/**
- * Route middleware function arguments
- */
-type MiddlewareFunctionArgs<Context = RouterContext, Result = unknown> = DataFunctionArgs<Context> & {
-    next: () => Promise<Result>;
-};
-/**
- * Route middleware function signature
- */
-type MiddlewareFunction<Context = RouterContext, Result = unknown> = (args: MiddlewareFunctionArgs<Context, Result>) => Result | Promise<Result>;
 /**
  * Arguments passed to loader functions
  */
-interface LoaderFunctionArgs<Context = RouterContext> extends DataFunctionArgs<Context> {
+interface LoaderFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
 }
 /**
  * Arguments passed to action functions
  */
-interface ActionFunctionArgs<Context = RouterContext> extends DataFunctionArgs<Context> {
+interface ActionFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
 }
 /**
- * Loaders and actions can return anything
+ * 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
  */
-type DataFunctionValue = unknown;
+type DataFunctionValue = Response | NonNullable<unknown> | null;
 type DataFunctionReturnValue = Promise<DataFunctionValue> | DataFunctionValue;
 /**
  * Route loader function signature
  */
-type LoaderFunction<Context = RouterContext> = {
+type LoaderFunction<Context = any> = {
     (args: LoaderFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 } & {
     hydrate?: boolean;
@@ -315,7 +298,7 @@ type LoaderFunction<Context = RouterContext> = {
 /**
  * Route action function signature
  */
-interface ActionFunction<Context = RouterContext> {
+interface ActionFunction<Context = any> {
     (args: ActionFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 }
 /**
@@ -350,7 +333,7 @@ interface DataStrategyMatch extends AgnosticRouteMatch<string, AgnosticDataRoute
     shouldLoad: boolean;
     resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
-interface DataStrategyFunctionArgs<Context = RouterContext> extends DataFunctionArgs<Context> {
+interface DataStrategyFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
     matches: DataStrategyMatch[];
     fetcherKey: string | null;
 }
@@ -361,8 +344,8 @@ interface DataStrategyResult {
     type: "data" | "error";
     result: unknown;
 }
-interface DataStrategyFunction<Context = RouterContext> {
-    (args: DataStrategyFunctionArgs<Context>): Promise<Record<string, DataStrategyResult>>;
+interface DataStrategyFunction {
+    (args: DataStrategyFunctionArgs): Promise<Record<string, DataStrategyResult>>;
 }
 type AgnosticPatchRoutesOnNavigationFunctionArgs<O extends AgnosticRouteObject = AgnosticRouteObject, M extends AgnosticRouteMatch = AgnosticRouteMatch> = {
     path: string;
@@ -402,7 +385,6 @@ type AgnosticBaseRouteObject = {
     caseSensitive?: boolean;
     path?: string;
     id?: string;
-    middleware?: MiddlewareFunction[];
     loader?: LoaderFunction | boolean;
     action?: ActionFunction | boolean;
     hasErrorBoundary?: boolean;
@@ -886,7 +868,6 @@ interface RouterInit {
     routes: AgnosticRouteObject[];
     history: History;
     basename?: string;
-    context?: RouterContext;
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationData?: HydrationState;
@@ -916,17 +897,13 @@ interface StaticHandler {
     dataRoutes: AgnosticDataRouteObject[];
     query(request: Request, opts?: {
         requestContext?: unknown;
-        filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
         skipLoaderErrorBubbling?: boolean;
-        skipRevalidation?: boolean;
-        dataStrategy?: DataStrategyFunction<unknown>;
-        respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
+        dataStrategy?: DataStrategyFunction;
     }): Promise<StaticHandlerContext | Response>;
     queryRoute(request: Request, opts?: {
         routeId?: string;
         requestContext?: unknown;
-        dataStrategy?: DataStrategyFunction<unknown>;
-        respond?: (res: Response) => Promise<Response>;
+        dataStrategy?: DataStrategyFunction;
     }): Promise<any>;
 }
 type ViewTransitionOpts = {
@@ -1160,7 +1137,6 @@ interface IndexRouteObject {
     caseSensitive?: AgnosticIndexRouteObject["caseSensitive"];
     path?: AgnosticIndexRouteObject["path"];
     id?: AgnosticIndexRouteObject["id"];
-    middleware?: AgnosticIndexRouteObject["middleware"];
     loader?: AgnosticIndexRouteObject["loader"];
     action?: AgnosticIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -1180,7 +1156,6 @@ interface NonIndexRouteObject {
     caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
     path?: AgnosticNonIndexRouteObject["path"];
     id?: AgnosticNonIndexRouteObject["id"];
-    middleware?: AgnosticNonIndexRouteObject["middleware"];
     loader?: AgnosticNonIndexRouteObject["loader"];
     action?: AgnosticNonIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
@@ -1377,16 +1352,6 @@ interface PageLinkDescriptor extends Omit<HtmlLinkDescriptor, "href" | "rel" | "
 }
 type LinkDescriptor = HtmlLinkDescriptor | PageLinkDescriptor;
 
-/**
- * An object of unknown type for route loaders and actions provided by the
- * server's `getLoadContext()` function.  This is defined as an empty interface
- * specifically so apps can leverage declaration merging to augment this type
- * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
- */
-interface AppLoadContext {
-    [key: string]: unknown;
-}
-
 interface RouteModules {
     [routeId: string]: RouteModule | undefined;
 }
@@ -1396,7 +1361,6 @@ interface RouteModules {
 interface RouteModule {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
-    clientMiddleware?: MiddlewareFunction<RouterContext, undefined>[];
     ErrorBoundary?: ErrorBoundaryComponent;
     HydrateFallback?: HydrateFallbackComponent;
     Layout?: LayoutComponent;
@@ -1415,7 +1379,6 @@ interface ServerRouteModule extends RouteModule {
         [name: string]: string;
     };
     loader?: LoaderFunction;
-    middleware?: MiddlewareFunction<AppLoadContext, Response>[];
 }
 /**
  * A function that handles data mutations for a route on the client
@@ -1424,7 +1387,7 @@ type ClientActionFunction = (args: ClientActionFunctionArgs) => ReturnType<Actio
 /**
  * Arguments passed to a route `clientAction` function
  */
-type ClientActionFunctionArgs = ActionFunctionArgs & {
+type ClientActionFunctionArgs = ActionFunctionArgs<undefined> & {
     serverAction: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1436,7 +1399,7 @@ type ClientLoaderFunction = ((args: ClientLoaderFunctionArgs) => ReturnType<Load
 /**
  * Arguments passed to a route `clientLoader` function
  */
-type ClientLoaderFunctionArgs = LoaderFunctionArgs & {
+type ClientLoaderFunctionArgs = LoaderFunctionArgs<undefined> & {
     serverLoader: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1612,4 +1575,4 @@ 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 FormMethod as $, type AppLoadContext as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type NavigationStates as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type RouterInit as J, type RouterSubscriber as K, type LoaderFunctionArgs as L, type MetaFunction as M, type NavigateOptions as N, type RouterNavigateOptions as O, type ParamParseKey as P, type RouterFetchOptions as Q, type RouterContext as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type DataStrategyFunctionArgs as V, type DataStrategyMatch as W, type DataStrategyResult as X, DataWithResponseInit as Y, type ErrorResponse as Z, type FormEncType as _, type RouteModules as a, type HTMLFormMethod as a0, type LazyRouteFunction as a1, type MiddlewareFunction as a2, type MiddlewareFunctionArgs as a3, type PathParam as a4, type RedirectFunction as a5, type ShouldRevalidateFunction as a6, type ShouldRevalidateFunctionArgs as a7, createPath as a8, parsePath as a9, type PageLinkDescriptor as aA, type HtmlLinkDescriptor as aB, type LinkDescriptor as aC, createBrowserHistory as aD, invariant as aE, createRouter as aF, ErrorResponseImpl as aG, DataRouterContext as aH, DataRouterStateContext as aI, FetchersContext as aJ, LocationContext as aK, NavigationContext as aL, RouteContext as aM, ViewTransitionContext as aN, type RouteModule as aO, type History as aP, type ServerDataFrom as aQ, type ClientDataFrom as aR, type Func as aS, type Equal as aT, type Pretty as aU, 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 ClientActionFunction as as, type ClientActionFunctionArgs as at, type ClientLoaderFunction as au, type ClientLoaderFunctionArgs as av, type HeadersArgs as aw, type HeadersFunction as ax, type MetaArgs as ay, type MetaDescriptor as az, type Router as b, type RouteManifest as c, type ActionFunctionArgs as d, type RelativeRoutingType as e, type Location as f, Action as g, type Path as h, type PathPattern as i, type PathMatch as j, type Params as k, type RouteObject as l, type Navigation as m, type RevalidationState as n, type SerializeFrom as o, type Blocker as p, type StaticHandlerContext as q, type StaticHandler as r, type IndexRouteObject as s, type LoaderFunction as t, type ActionFunction as u, type LinksFunction as v, type NonIndexRouteObject as w, type RouterState as x, type GetScrollRestorationKeyFunction as y, type Fetcher as z };
+export { type LazyRouteFunction as $, type ActionFunctionArgs as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type RouterSubscriber as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type RouterNavigateOptions as J, type RouterFetchOptions as K, type LoaderFunctionArgs as L, type MetaFunction as M, type NavigateOptions as N, type DataStrategyFunctionArgs as O, type ParamParseKey as P, type DataStrategyMatch as Q, type RouteModules as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type DataStrategyResult as V, DataWithResponseInit as W, type ErrorResponse as X, type FormEncType as Y, type FormMethod as Z, type HTMLFormMethod as _, type Router as a, type PathParam as a0, type RedirectFunction as a1, type ShouldRevalidateFunction as a2, type ShouldRevalidateFunctionArgs as a3, createPath as a4, parsePath as a5, IDLE_NAVIGATION as a6, IDLE_FETCHER as a7, IDLE_BLOCKER as a8, data 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, generatePath as aa, isRouteErrorResponse as ab, matchPath as ac, matchRoutes as ad, redirect as ae, redirectDocument as af, replace as ag, resolvePath as ah, type DataRouteMatch as ai, type DataRouteObject as aj, type Navigator as ak, type PatchRoutesOnNavigationFunction as al, type PatchRoutesOnNavigationFunctionArgs as am, type RouteMatch as an, type ClientActionFunction as ao, type ClientActionFunctionArgs as ap, type ClientLoaderFunction as aq, type ClientLoaderFunctionArgs as ar, type HeadersArgs as as, type HeadersFunction 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 RouteManifest as b, type RelativeRoutingType as c, type Location as d, Action as e, type Path as f, type PathPattern as g, type PathMatch as h, type Params as i, type RouteObject as j, type Navigation as k, type RevalidationState as l, type SerializeFrom as m, type Blocker as n, type StaticHandlerContext as o, type StaticHandler as p, type IndexRouteObject as q, type LoaderFunction as r, type ActionFunction as s, type LinksFunction as t, type NonIndexRouteObject as u, type RouterState as v, type GetScrollRestorationKeyFunction as w, type Fetcher as x, type NavigationStates as y, type RouterInit as z };

package/dist/{production/route-data-C9zMg-qq.d.mts → development/route-data-Cq_b5feC.d.ts}

@@ -260,15 +260,6 @@ type Submission = {
     json: undefined;
     text: string;
 };
-/**
- * An object of unknown type for client-side loaders and actions provided by the
- * `createBrowserRouter` `context` option.  This is defined as an empty interface
- * specifically so apps can leverage declaration merging to augment this type
- * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
- */
-interface RouterContext {
-    [key: string]: unknown;
-}
 /**
  * @private
  * Arguments passed to route loader/action functions.  Same for now but we keep
@@ -277,37 +268,29 @@ interface RouterContext {
 interface DataFunctionArgs<Context> {
     request: Request;
     params: Params;
-    context: Context;
+    context?: Context;
 }
-/**
- * Route middleware function arguments
- */
-type MiddlewareFunctionArgs<Context = RouterContext, Result = unknown> = DataFunctionArgs<Context> & {
-    next: () => Promise<Result>;
-};
-/**
- * Route middleware function signature
- */
-type MiddlewareFunction<Context = RouterContext, Result = unknown> = (args: MiddlewareFunctionArgs<Context, Result>) => Result | Promise<Result>;
 /**
  * Arguments passed to loader functions
  */
-interface LoaderFunctionArgs<Context = RouterContext> extends DataFunctionArgs<Context> {
+interface LoaderFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
 }
 /**
  * Arguments passed to action functions
  */
-interface ActionFunctionArgs<Context = RouterContext> extends DataFunctionArgs<Context> {
+interface ActionFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
 }
 /**
- * Loaders and actions can return anything
+ * 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
  */
-type DataFunctionValue = unknown;
+type DataFunctionValue = Response | NonNullable<unknown> | null;
 type DataFunctionReturnValue = Promise<DataFunctionValue> | DataFunctionValue;
 /**
  * Route loader function signature
  */
-type LoaderFunction<Context = RouterContext> = {
+type LoaderFunction<Context = any> = {
     (args: LoaderFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 } & {
     hydrate?: boolean;
@@ -315,7 +298,7 @@ type LoaderFunction<Context = RouterContext> = {
 /**
  * Route action function signature
  */
-interface ActionFunction<Context = RouterContext> {
+interface ActionFunction<Context = any> {
     (args: ActionFunctionArgs<Context>, handlerCtx?: unknown): DataFunctionReturnValue;
 }
 /**
@@ -350,7 +333,7 @@ interface DataStrategyMatch extends AgnosticRouteMatch<string, AgnosticDataRoute
     shouldLoad: boolean;
     resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
-interface DataStrategyFunctionArgs<Context = RouterContext> extends DataFunctionArgs<Context> {
+interface DataStrategyFunctionArgs<Context = any> extends DataFunctionArgs<Context> {
     matches: DataStrategyMatch[];
     fetcherKey: string | null;
 }
@@ -361,8 +344,8 @@ interface DataStrategyResult {
     type: "data" | "error";
     result: unknown;
 }
-interface DataStrategyFunction<Context = RouterContext> {
-    (args: DataStrategyFunctionArgs<Context>): Promise<Record<string, DataStrategyResult>>;
+interface DataStrategyFunction {
+    (args: DataStrategyFunctionArgs): Promise<Record<string, DataStrategyResult>>;
 }
 type AgnosticPatchRoutesOnNavigationFunctionArgs<O extends AgnosticRouteObject = AgnosticRouteObject, M extends AgnosticRouteMatch = AgnosticRouteMatch> = {
     path: string;
@@ -402,7 +385,6 @@ type AgnosticBaseRouteObject = {
     caseSensitive?: boolean;
     path?: string;
     id?: string;
-    middleware?: MiddlewareFunction[];
     loader?: LoaderFunction | boolean;
     action?: ActionFunction | boolean;
     hasErrorBoundary?: boolean;
@@ -886,7 +868,6 @@ interface RouterInit {
     routes: AgnosticRouteObject[];
     history: History;
     basename?: string;
-    context?: RouterContext;
     mapRouteProperties?: MapRoutePropertiesFunction;
     future?: Partial<FutureConfig>;
     hydrationData?: HydrationState;
@@ -916,17 +897,13 @@ interface StaticHandler {
     dataRoutes: AgnosticDataRouteObject[];
     query(request: Request, opts?: {
         requestContext?: unknown;
-        filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
         skipLoaderErrorBubbling?: boolean;
-        skipRevalidation?: boolean;
-        dataStrategy?: DataStrategyFunction<unknown>;
-        respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
+        dataStrategy?: DataStrategyFunction;
     }): Promise<StaticHandlerContext | Response>;
     queryRoute(request: Request, opts?: {
         routeId?: string;
         requestContext?: unknown;
-        dataStrategy?: DataStrategyFunction<unknown>;
-        respond?: (res: Response) => Promise<Response>;
+        dataStrategy?: DataStrategyFunction;
     }): Promise<any>;
 }
 type ViewTransitionOpts = {
@@ -1160,7 +1137,6 @@ interface IndexRouteObject {
     caseSensitive?: AgnosticIndexRouteObject["caseSensitive"];
     path?: AgnosticIndexRouteObject["path"];
     id?: AgnosticIndexRouteObject["id"];
-    middleware?: AgnosticIndexRouteObject["middleware"];
     loader?: AgnosticIndexRouteObject["loader"];
     action?: AgnosticIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticIndexRouteObject["hasErrorBoundary"];
@@ -1180,7 +1156,6 @@ interface NonIndexRouteObject {
     caseSensitive?: AgnosticNonIndexRouteObject["caseSensitive"];
     path?: AgnosticNonIndexRouteObject["path"];
     id?: AgnosticNonIndexRouteObject["id"];
-    middleware?: AgnosticNonIndexRouteObject["middleware"];
     loader?: AgnosticNonIndexRouteObject["loader"];
     action?: AgnosticNonIndexRouteObject["action"];
     hasErrorBoundary?: AgnosticNonIndexRouteObject["hasErrorBoundary"];
@@ -1377,16 +1352,6 @@ interface PageLinkDescriptor extends Omit<HtmlLinkDescriptor, "href" | "rel" | "
 }
 type LinkDescriptor = HtmlLinkDescriptor | PageLinkDescriptor;
 
-/**
- * An object of unknown type for route loaders and actions provided by the
- * server's `getLoadContext()` function.  This is defined as an empty interface
- * specifically so apps can leverage declaration merging to augment this type
- * globally: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
- */
-interface AppLoadContext {
-    [key: string]: unknown;
-}
-
 interface RouteModules {
     [routeId: string]: RouteModule | undefined;
 }
@@ -1396,7 +1361,6 @@ interface RouteModules {
 interface RouteModule {
     clientAction?: ClientActionFunction;
     clientLoader?: ClientLoaderFunction;
-    clientMiddleware?: MiddlewareFunction<RouterContext, undefined>[];
     ErrorBoundary?: ErrorBoundaryComponent;
     HydrateFallback?: HydrateFallbackComponent;
     Layout?: LayoutComponent;
@@ -1415,7 +1379,6 @@ interface ServerRouteModule extends RouteModule {
         [name: string]: string;
     };
     loader?: LoaderFunction;
-    middleware?: MiddlewareFunction<AppLoadContext, Response>[];
 }
 /**
  * A function that handles data mutations for a route on the client
@@ -1424,7 +1387,7 @@ type ClientActionFunction = (args: ClientActionFunctionArgs) => ReturnType<Actio
 /**
  * Arguments passed to a route `clientAction` function
  */
-type ClientActionFunctionArgs = ActionFunctionArgs & {
+type ClientActionFunctionArgs = ActionFunctionArgs<undefined> & {
     serverAction: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1436,7 +1399,7 @@ type ClientLoaderFunction = ((args: ClientLoaderFunctionArgs) => ReturnType<Load
 /**
  * Arguments passed to a route `clientLoader` function
  */
-type ClientLoaderFunctionArgs = LoaderFunctionArgs & {
+type ClientLoaderFunctionArgs = LoaderFunctionArgs<undefined> & {
     serverLoader: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 /**
@@ -1612,4 +1575,4 @@ 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 FormMethod as $, type AppLoadContext as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type NavigationStates as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type RouterInit as J, type RouterSubscriber as K, type LoaderFunctionArgs as L, type MetaFunction as M, type NavigateOptions as N, type RouterNavigateOptions as O, type ParamParseKey as P, type RouterFetchOptions as Q, type RouterContext as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type DataStrategyFunctionArgs as V, type DataStrategyMatch as W, type DataStrategyResult as X, DataWithResponseInit as Y, type ErrorResponse as Z, type FormEncType as _, type RouteModules as a, type HTMLFormMethod as a0, type LazyRouteFunction as a1, type MiddlewareFunction as a2, type MiddlewareFunctionArgs as a3, type PathParam as a4, type RedirectFunction as a5, type ShouldRevalidateFunction as a6, type ShouldRevalidateFunctionArgs as a7, createPath as a8, parsePath as a9, type PageLinkDescriptor as aA, type HtmlLinkDescriptor as aB, type LinkDescriptor as aC, createBrowserHistory as aD, invariant as aE, createRouter as aF, ErrorResponseImpl as aG, DataRouterContext as aH, DataRouterStateContext as aI, FetchersContext as aJ, LocationContext as aK, NavigationContext as aL, RouteContext as aM, ViewTransitionContext as aN, type RouteModule as aO, type History as aP, type ServerDataFrom as aQ, type ClientDataFrom as aR, type Func as aS, type Equal as aT, type Pretty as aU, 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 ClientActionFunction as as, type ClientActionFunctionArgs as at, type ClientLoaderFunction as au, type ClientLoaderFunctionArgs as av, type HeadersArgs as aw, type HeadersFunction as ax, type MetaArgs as ay, type MetaDescriptor as az, type Router as b, type RouteManifest as c, type ActionFunctionArgs as d, type RelativeRoutingType as e, type Location as f, Action as g, type Path as h, type PathPattern as i, type PathMatch as j, type Params as k, type RouteObject as l, type Navigation as m, type RevalidationState as n, type SerializeFrom as o, type Blocker as p, type StaticHandlerContext as q, type StaticHandler as r, type IndexRouteObject as s, type LoaderFunction as t, type ActionFunction as u, type LinksFunction as v, type NonIndexRouteObject as w, type RouterState as x, type GetScrollRestorationKeyFunction as y, type Fetcher as z };
+export { type LazyRouteFunction as $, type ActionFunctionArgs as A, type BlockerFunction as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type RouterSubscriber as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type RouterNavigateOptions as J, type RouterFetchOptions as K, type LoaderFunctionArgs as L, type MetaFunction as M, type NavigateOptions as N, type DataStrategyFunctionArgs as O, type ParamParseKey as P, type DataStrategyMatch as Q, type RouteModules as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type DataStrategyResult as V, DataWithResponseInit as W, type ErrorResponse as X, type FormEncType as Y, type FormMethod as Z, type HTMLFormMethod as _, type Router as a, type PathParam as a0, type RedirectFunction as a1, type ShouldRevalidateFunction as a2, type ShouldRevalidateFunctionArgs as a3, createPath as a4, parsePath as a5, IDLE_NAVIGATION as a6, IDLE_FETCHER as a7, IDLE_BLOCKER as a8, data 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, generatePath as aa, isRouteErrorResponse as ab, matchPath as ac, matchRoutes as ad, redirect as ae, redirectDocument as af, replace as ag, resolvePath as ah, type DataRouteMatch as ai, type DataRouteObject as aj, type Navigator as ak, type PatchRoutesOnNavigationFunction as al, type PatchRoutesOnNavigationFunctionArgs as am, type RouteMatch as an, type ClientActionFunction as ao, type ClientActionFunctionArgs as ap, type ClientLoaderFunction as aq, type ClientLoaderFunctionArgs as ar, type HeadersArgs as as, type HeadersFunction 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 RouteManifest as b, type RelativeRoutingType as c, type Location as d, Action as e, type Path as f, type PathPattern as g, type PathMatch as h, type Params as i, type RouteObject as j, type Navigation as k, type RevalidationState as l, type SerializeFrom as m, type Blocker as n, type StaticHandlerContext as o, type StaticHandler as p, type IndexRouteObject as q, type LoaderFunction as r, type ActionFunction as s, type LinksFunction as t, type NonIndexRouteObject as u, type RouterState as v, type GetScrollRestorationKeyFunction as w, type Fetcher as x, type NavigationStates as y, type RouterInit as z };