fix(remix): Accept and return plain ServerBuild on Cloudflare instrumentBuild

Author: onurtemizkan

packages/remix/src/cloudflare/index.ts

@@ -1,3 +1,4 @@
+import type { ServerBuild } from '@remix-run/server-runtime';
 import {
   instrumentBuild as instrumentRemixBuild,
   makeWrappedCreateRequestHandler,
@@ -14,11 +15,14 @@ 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: typeof instrumentRemixBuild = build => {
+export const instrumentBuild = (build: ServerBuild): ServerBuild => {
   return instrumentRemixBuild(build, {
     instrumentTracing: true,
-  });
+  }) as ServerBuild;
 };
 
 export type {

packages/remix/src/server/instrumentServer.ts

@@ -434,7 +434,7 @@ export const makeWrappedCreateRequestHandler = (options?: { instrumentTracing?:
   function (origCreateRequestHandler: CreateRequestHandlerFunction): CreateRequestHandlerFunction {
     return function (
       this: unknown,
-      build: ServerBuild | (() => ServerBuild | Promise<ServerBuild>),
+      build,
       ...args: unknown[]
     ): RequestHandler {
       const newBuild = instrumentBuild(build, options);