Use generic types instead

Author: onurtemizkan

packages/remix/src/cloudflare/index.ts

@@ -1,4 +1,3 @@
-import type { ServerBuild } from '@remix-run/server-runtime';
 import {
   instrumentBuild as instrumentRemixBuild,
   makeWrappedCreateRequestHandler,
@@ -15,14 +14,11 @@ export { makeWrappedCreateRequestHandler, sentryHandleError };
  * Instruments a Remix build to capture errors and performance data.
  * @param build The Remix build to instrument.
  * @returns The instrumented Remix build.
- *
- * Note: CreateRequestHandlerFunction from @shopify/remix-oxygen accepts a ServerBuild, not a function unlike the rest of the Remix ecosystem
- * That's why we accept and return a ServerBuild type here.
  */
-export const instrumentBuild = (build: ServerBuild): ServerBuild => {
+export const instrumentBuild: typeof instrumentRemixBuild = build => {
   return instrumentRemixBuild(build, {
     instrumentTracing: true,
-  }) as ServerBuild;
+  });
 };
 
 export type {

packages/remix/src/server/instrumentServer.ts

@@ -246,12 +246,9 @@ function makeWrappedRootLoader() {
   };
 }
 
-function wrapRequestHandler(
+function wrapRequestHandler<T extends ServerBuild | (() => ServerBuild | Promise<ServerBuild>)>(
   origRequestHandler: RequestHandler,
-  build:
-    | ServerBuild
-    | { build: ServerBuild }
-    | (() => ServerBuild | { build: ServerBuild } | Promise<ServerBuild | { build: ServerBuild }>),
+  build: T,
   options?: {
     instrumentTracing?: boolean;
   },
@@ -278,7 +275,7 @@ function wrapRequestHandler(
 
       // check if the build is nested under `build` key
       if ('build' in resolvedBuild) {
-        resolvedRoutes = createRoutes(resolvedBuild.build.routes);
+        resolvedRoutes = createRoutes((resolvedBuild.build as ServerBuild).routes);
       } else {
         resolvedRoutes = createRoutes(resolvedBuild.routes);
       }
@@ -407,12 +404,12 @@ function instrumentBuildCallback(
 /**
  * Instruments `remix` ServerBuild for performance tracing and error tracking.
  */
-export function instrumentBuild(
-  build: ServerBuild | (() => ServerBuild | Promise<ServerBuild>),
+export function instrumentBuild<T extends ServerBuild | (() => ServerBuild | Promise<ServerBuild>)>(
+  build: T,
   options?: {
     instrumentTracing?: boolean;
   },
-): ServerBuild | (() => ServerBuild | Promise<ServerBuild>) {
+): T {
   if (typeof build === 'function') {
     return function () {
       const resolvedBuild = build();
@@ -424,9 +421,9 @@ export function instrumentBuild(
       } else {
         return instrumentBuildCallback(resolvedBuild, options);
       }
-    };
+    } as T;
   } else {
-    return instrumentBuildCallback(build, options);
+    return instrumentBuildCallback(build, options) as T;
   }
 }