Do not pass down promises.

Author: onurtemizkan

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/server.mjs

@@ -44,7 +44,7 @@ app.all(
   '*',
   sentryCreateRequestHandler({
     build: viteDevServer
-      ? viteDevServer.ssrLoadModule('virtual:remix/server-build')
+      ? () => viteDevServer.ssrLoadModule('virtual:remix/server-build')
       : await import('./build/server/index.js'),
   }),
 );

dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/yarn.lock

@@ -2418,7 +2418,7 @@ esbuild@0.17.6:
     "@esbuild/win32-ia32" "0.17.6"
     "@esbuild/win32-x64" "0.17.6"
 
-esbuild@^0.19.3, "esbuild@npm:esbuild@~0.17.6 || ~0.18.0 || ~0.19.0":
+esbuild@0.19.12, esbuild@^0.19.3, "esbuild@npm:esbuild@~0.17.6 || ~0.18.0 || ~0.19.0":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
   integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==

packages/remix/src/utils/serverAdapters/express.ts

@@ -20,7 +20,7 @@ import type {
 
 function wrapExpressRequestHandler(
   origRequestHandler: ExpressRequestHandler,
-  build: ServerBuild | Promise<ServerBuild> | (() => Promise<ServerBuild> | ServerBuild),
+  build: ServerBuild | (() => Promise<ServerBuild> | ServerBuild),
 ): ExpressRequestHandler {
   let routes: ServerRoute[];
 
@@ -52,20 +52,14 @@ function wrapExpressRequestHandler(
       const url = new URL(request.url);
 
       // This is only meant to be used on development servers, so we don't need to worry about performance here
-      if (!routes) {
-        if (build instanceof Promise) {
-          const resolvedBuild = await build;
-          routes = createRoutes(resolvedBuild.routes);
-        }
+      if (!routes && typeof build === 'function') {
+        const resolvedBuild = build();
 
-        if (typeof build === 'function') {
-          const resolvedBuild = build();
-          if (resolvedBuild instanceof Promise) {
-            const resolved = await resolvedBuild;
-            routes = createRoutes(resolved.routes);
-          } else {
-            routes = createRoutes(resolvedBuild.routes);
-          }
+        if (resolvedBuild instanceof Promise) {
+          const resolved = await resolvedBuild;
+          routes = createRoutes(resolved.routes);
+        } else {
+          routes = createRoutes(resolvedBuild.routes);
         }
       }
 
@@ -98,16 +92,12 @@ function wrapGetLoadContext(origGetLoadContext: () => AppLoadContext): GetLoadCo
 // A wrapper around build if it's a Promise or a function that returns a Promise that calls instrumentServer on the resolved value
 // This is currently only required for Vite development mode with HMR
 function wrapBuild(
-  build: ServerBuild | Promise<ServerBuild> | (() => Promise<ServerBuild> | ServerBuild),
-): ServerBuild | Promise<ServerBuild> {
-  if (build instanceof Promise) {
-    return build.then(resolved => instrumentBuild(resolved, true));
-  }
-
+  build: ServerBuild | (() => Promise<ServerBuild> | ServerBuild),
+): ServerBuild | (() => Promise<ServerBuild> | ServerBuild) {
   if (typeof build === 'function') {
     const resolved = build();
     if (resolved instanceof Promise) {
-      return resolved.then(resolved => instrumentBuild(resolved, true));
+      return () => resolved.then(resolved => instrumentBuild(resolved, true));
     }
 
     return instrumentBuild(resolved, true);