Fix typings for MetaMatch across server and client

remix-run · Aug 24, 2023 · 779e123 · 779e123
1 parent ebc148c
commit 779e123
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/packages/remix-react/routeModules.ts b/packages/remix-react/routeModules.ts
@@ -55,7 +55,10 @@ export interface MetaMatch<
 }
 
 export type MetaMatches<
-  MatchLoaders extends Record<string, unknown> = Record<string, unknown>
+  MatchLoaders extends Record<string, LoaderFunction> = Record<
+    string,
+    LoaderFunction
+  >
 > = Array<
   {
     [K in keyof MatchLoaders]: MetaMatch<
@@ -67,7 +70,10 @@ export type MetaMatches<
 
 export interface MetaArgs<
   Loader extends LoaderFunction | unknown = unknown,
-  MatchLoaders extends Record<string, unknown> = Record<string, unknown>
+  MatchLoaders extends Record<string, LoaderFunction> = Record<
+    string,
+    LoaderFunction
+  >
 > {
   data:
     | (Loader extends LoaderFunction ? SerializeFrom<Loader> : AppData)
@@ -80,7 +86,10 @@ export interface MetaArgs<
 
 export interface MetaFunction<
   Loader extends LoaderFunction | unknown = unknown,
-  MatchLoaders extends Record<string, unknown> = Record<string, unknown>
+  MatchLoaders extends Record<string, LoaderFunction> = Record<
+    string,
+    LoaderFunction
+  >
 > {
   (args: MetaArgs<Loader, MatchLoaders>): MetaDescriptor[] | undefined;
 }

diff --git a/packages/remix-server-runtime/routeModules.ts b/packages/remix-server-runtime/routeModules.ts
@@ -131,7 +131,10 @@ export interface LoaderFunction {
  */
 export interface ServerRuntimeMetaFunction<
   Loader extends LoaderFunction | unknown = unknown,
-  ParentsLoaders extends Record<string, LoaderFunction> = {}
+  ParentsLoaders extends Record<string, LoaderFunction> = Record<
+    string,
+    LoaderFunction
+  >
 > {
   (
     args: ServerRuntimeMetaArgs<Loader, ParentsLoaders>
@@ -148,10 +151,14 @@ interface ServerRuntimeMetaMatch<
   handle?: unknown;
   params: AgnosticRouteMatch["params"];
   meta: ServerRuntimeMetaDescriptor[];
+  error?: unknown;
 }
 
 type ServerRuntimeMetaMatches<
-  MatchLoaders extends Record<string, unknown> = Record<string, unknown>
+  MatchLoaders extends Record<string, LoaderFunction> = Record<
+    string,
+    LoaderFunction
+  >
 > = Array<
   {
     [K in keyof MatchLoaders]: ServerRuntimeMetaMatch<
@@ -163,7 +170,10 @@ type ServerRuntimeMetaMatches<
 
 export interface ServerRuntimeMetaArgs<
   Loader extends LoaderFunction | unknown = unknown,
-  MatchLoaders extends Record<string, unknown> = Record<string, unknown>
+  MatchLoaders extends Record<string, LoaderFunction> = Record<
+    string,
+    LoaderFunction
+  >
 > {
   data:
     | (Loader extends LoaderFunction ? SerializeFrom<Loader> : AppData)