review fix

Author: conico974

packages/open-next/src/adapters/config/util.ts

@@ -135,6 +135,6 @@ export function loadFunctionsConfigManifest(nextDir: string) {
     const json = fs.readFileSync(filePath, "utf-8");
     return JSON.parse(json) as FunctionsConfigManifest;
   } catch (e) {
-    return;
+    return { functions: {}, version: 1 };
   }
 }

packages/open-next/src/build/constant.ts

@@ -0,0 +1,2 @@
+//TODO: Move all other manifest path here as well
+export const MIDDLEWARE_TRACE_FILE = "server/middleware.js.nft.json";

packages/open-next/src/build/copyTracedFiles.ts

@@ -15,6 +15,7 @@ import path from "node:path";
 import type { NextConfig, PrerenderManifest } from "types/next-types";
 
 import logger from "../logger.js";
+import { MIDDLEWARE_TRACE_FILE } from "./constant.js";
 
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
@@ -143,11 +144,11 @@ File ${fullFilePath} does not exist
     }
   };
 
-  if (existsSync(path.join(dotNextDir, "server/middleware.js.nft.json"))) {
+  if (existsSync(path.join(dotNextDir, MIDDLEWARE_TRACE_FILE))) {
     // We still need to copy the nft.json file so that computeCopyFilesForPage doesn't throw
     copyFileSync(
-      path.join(dotNextDir, "server/middleware.js.nft.json"),
-      path.join(standaloneNextDir, "server/middleware.js.nft.json"),
+      path.join(dotNextDir, MIDDLEWARE_TRACE_FILE),
+      path.join(standaloneNextDir, MIDDLEWARE_TRACE_FILE),
     );
     computeCopyFilesForPage("middleware");
   }

packages/open-next/src/build/createMiddleware.ts

@@ -51,7 +51,7 @@ export async function createMiddleware(
     const functionsConfigManifest = JSON.parse(
       await fsAsync
         .readFile(functionsConfigManifestPath, "utf8")
-        .catch(() => '{"functions":{}}'),
+        .catch(() => '{"functions":{}, "version": 1}'),
     ) as FunctionsConfigManifest;
 
     if (functionsConfigManifest?.functions["/_middleware"]) {

packages/open-next/src/build/middleware/buildNodeMiddleware.ts

@@ -101,10 +101,10 @@ export async function buildExternalNodeMiddleware(
       ],
       banner: {
         js: [
-          `globalThis.monorepoPackagePath = "${packagePath}";`,
+          `globalThis.monorepoPackagePath = '${packagePath}';`,
           "import process from 'node:process';",
           "import { Buffer } from 'node:buffer';",
-          "import {AsyncLocalStorage} from 'node:async_hooks';",
+          "import { AsyncLocalStorage } from 'node:async_hooks';",
           "import { createRequire as topLevelCreateRequire } from 'module';",
           "const require = topLevelCreateRequire(import.meta.url);",
           "import bannerUrl from 'url';",

packages/open-next/src/core/edgeFunctionHandler.ts

@@ -28,8 +28,9 @@ export default async function edgeFunctionHandler(
       },
     },
   });
-  // TODO: use the global waitUntil
-  await result.waitUntil;
+  globalThis.__openNextAls
+    .getStore()
+    ?.pendingPromiseRunner.add(result.waitUntil);
   const response = result.response;
   return response;
 }

packages/open-next/src/core/nodeMiddlewareHandler.ts

@@ -39,7 +39,6 @@ export default async function middlewareHandler(
     request: request,
     page: "middleware",
   });
-  // Not sure if we should await it here or defer to the global als
   globalThis.__openNextAls
     .getStore()
     ?.pendingPromiseRunner.add(result.waitUntil);

packages/open-next/src/utils/promise.ts

@@ -122,8 +122,14 @@ export function runWithOpenNextRequestContext<T>(
     },
     async () => {
       provideNextAfterProvider();
-      const result = await fn();
-      await awaitAllDetachedPromise();
+      let result: T;
+      try {
+        result = await fn();
+        // We always await all detached promises before returning the result
+        // However we don't want to catch errors here, we want to let the parent handle it
+      } finally {
+        await awaitAllDetachedPromise();
+      }
       return result;
     },
   );