Merge pull request #11720 from remix-run/pedro/define-route-app-load-…

…context

defineRoute: use AppLoadContext

packages/react-router/lib/router/define-route.ts

@@ -5,12 +5,10 @@ import type {
   MetaMatch as _MetaMatch,
 } from "../dom/ssr/routeModules";
 import type { LinkDescriptor } from "../dom/ssr/links";
+import type { AppLoadContext } from "../server-runtime/data";
 import type { Location } from "./history";
 import type { UIMatch } from "./utils";
 
-// TODO: replace `Context` with `AppLoadContext` once `react-router` absorbs `server-runtime` (https://github.com/remix-run/react-router/pull/11669)
-interface Context {}
-
 type MaybePromise<T> = T | Promise<T>;
 type Pretty<T> = { [K in keyof T]: T[K] } & {};
 
@@ -43,15 +41,15 @@ export type ResponseStub = {
 
 // loader
 type LoaderArgs<Param extends string> = {
-  context: Context;
+  context: AppLoadContext;
   request: Request;
   params: Params<Param>;
   response: ResponseStub;
 };
 
 // action
 type ActionArgs<Param extends string> = {
-  context: Context;
+  context: AppLoadContext;
   request: Request;
   params: Params<Param>;
   response: ResponseStub;