Skip to content

Commit 8c0a1ca

Browse files
committed
Add meta support for client loader
1 parent 8e0c346 commit 8c0a1ca

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

packages/react-router/lib/dom/ssr/routeModules.ts

+14-14
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ export interface LinksFunction {
9696

9797
export interface MetaMatch<
9898
RouteId extends string = string,
99-
Loader extends LoaderFunction | unknown = unknown
99+
Loader extends LoaderFunction | ClientLoaderFunction | unknown = unknown
100100
> {
101101
id: RouteId;
102102
pathname: DataRouteMatch["pathname"];
103-
data: Loader extends LoaderFunction
103+
data: Loader extends LoaderFunction | ClientLoaderFunction
104104
? DeprecatedSerializeFrom<Loader>
105105
: unknown;
106106
handle?: RouteHandle;
@@ -110,10 +110,10 @@ export interface MetaMatch<
110110
}
111111

112112
export type MetaMatches<
113-
MatchLoaders extends Record<string, LoaderFunction | unknown> = Record<
113+
MatchLoaders extends Record<
114114
string,
115-
unknown
116-
>
115+
LoaderFunction | ClientLoaderFunction | unknown
116+
> = Record<string, unknown>
117117
> = Array<
118118
{
119119
[K in keyof MatchLoaders]: MetaMatch<
@@ -124,14 +124,14 @@ export type MetaMatches<
124124
>;
125125

126126
export interface MetaArgs<
127-
Loader extends LoaderFunction | unknown = unknown,
128-
MatchLoaders extends Record<string, LoaderFunction | unknown> = Record<
127+
Loader extends LoaderFunction | ClientLoaderFunction | unknown = unknown,
128+
MatchLoaders extends Record<
129129
string,
130-
unknown
131-
>
130+
LoaderFunction | ClientLoaderFunction | unknown
131+
> = Record<string, unknown>
132132
> {
133133
data:
134-
| (Loader extends LoaderFunction
134+
| (Loader extends LoaderFunction | ClientLoaderFunction
135135
? DeprecatedSerializeFrom<Loader>
136136
: unknown)
137137
| undefined;
@@ -192,11 +192,11 @@ export interface MetaArgs<
192192
* ```
193193
*/
194194
export interface MetaFunction<
195-
Loader extends LoaderFunction | unknown = unknown,
196-
MatchLoaders extends Record<string, LoaderFunction | unknown> = Record<
195+
Loader extends LoaderFunction | ClientLoaderFunction | unknown = unknown,
196+
MatchLoaders extends Record<
197197
string,
198-
unknown
199-
>
198+
LoaderFunction | ClientLoaderFunction | unknown
199+
> = Record<string, unknown>
200200
> {
201201
(args: MetaArgs<Loader, MatchLoaders>): MetaDescriptor[] | undefined;
202202
}

0 commit comments

Comments
 (0)