review fix

Author: conico974

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

@@ -126,10 +126,7 @@ export function loadMiddlewareManifest(nextDir: string) {
 }
 
 export function loadFunctionsConfigManifest(nextDir: string) {
-  const filePath = path.join(
-    nextDir,
-    "server/functions-config-manifest.json",
-  );
+  const filePath = path.join(nextDir, "server/functions-config-manifest.json");
   try {
     const json = fs.readFileSync(filePath, "utf-8");
     return JSON.parse(json) as FunctionsConfigManifest;

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

@@ -25,15 +25,24 @@ function copyPatchFile(outputDir: string) {
   copyFileSync(patchFile, outputPatchFile);
 }
 
+interface CopyTracedFilesOptions {
+  buildOutputPath: string;
+  packagePath: string;
+  outputDir: string;
+  routes: string[];
+  bundledNextServer: boolean;
+  skipServerFiles?: boolean;
+}
+
 // eslint-disable-next-line sonarjs/cognitive-complexity
-export async function copyTracedFiles(
-  buildOutputPath: string,
-  packagePath: string,
-  outputDir: string,
-  routes: string[],
-  bundledNextServer: boolean,
-  skipServerFiles = false,
-) {
+export async function copyTracedFiles({
+  buildOutputPath,
+  packagePath,
+  outputDir,
+  routes,
+  bundledNextServer,
+  skipServerFiles,
+}: CopyTracedFilesOptions) {
   const tsStart = Date.now();
   const dotNextDir = path.join(buildOutputPath, ".next");
   const standaloneDir = path.join(dotNextDir, "standalone");

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

@@ -1,10 +1,9 @@
 import fs from "node:fs";
-import fsAsync from "node:fs/promises";
 import path from "node:path";
 
+import { loadFunctionsConfigManifest } from "config/util.js";
 import logger from "../logger.js";
 import type {
-  FunctionsConfigManifest,
   MiddlewareInfo,
   MiddlewareManifest,
 } from "../types/next-types.js";
@@ -38,25 +37,20 @@ export async function createMiddleware(
     ),
   ) as MiddlewareManifest;
 
-  const middlewareInfo = middlewareManifest.middleware["/"] as
+  const edgeMiddlewareInfo = middlewareManifest.middleware["/"] as
     | MiddlewareInfo
     | undefined;
 
-  if (!middlewareInfo) {
+  if (!edgeMiddlewareInfo) {
     // If there is no middleware info, it might be a node middleware
-    const functionsConfigManifestPath = path.join(
-      appBuildOutputPath,
-      ".next/server/functions-config-manifest.json",
+    const functionsConfigManifest = loadFunctionsConfigManifest(
+      path.join(appBuildOutputPath, ".next"),
     );
-    const functionsConfigManifest = JSON.parse(
-      await fsAsync
-        .readFile(functionsConfigManifestPath, "utf8")
-        .catch(() => '{"functions":{}, "version": 1}'),
-    ) as FunctionsConfigManifest;
 
     if (functionsConfigManifest?.functions["/_middleware"]) {
-      await (config.middleware?.external  ? buildExternalNodeMiddleware(options) : buildBundledNodeMiddleware(options));
-      return;
+      await (config.middleware?.external
+        ? buildExternalNodeMiddleware(options)
+        : buildBundledNodeMiddleware(options));
       return;
     }
   }
@@ -80,7 +74,7 @@ export async function createMiddleware(
         "middleware.js",
       ),
       outfile: path.join(outputPath, "handler.mjs"),
-      middlewareInfo,
+      middlewareInfo: edgeMiddlewareInfo,
       options,
       overrides: {
         ...config.middleware.override,
@@ -102,7 +96,7 @@ export async function createMiddleware(
         "edgeFunctionHandler.js",
       ),
       outfile: path.join(options.buildDir, "middleware.mjs"),
-      middlewareInfo,
+      middlewareInfo: edgeMiddlewareInfo,
       options,
       onlyBuildOnce: true,
       name: "middleware",

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

@@ -153,13 +153,13 @@ async function generateBundle(
   buildHelper.copyEnvFile(appBuildOutputPath, packagePath, outputPath);
 
   // Copy all necessary traced files
-  await copyTracedFiles(
-    appBuildOutputPath,
+  await copyTracedFiles({
+    buildOutputPath: appBuildOutputPath,
     packagePath,
-    outputPath,
-    fnOptions.routes ?? ["app/page.tsx"],
-    isBundled,
-  );
+    outputDir: outputPath,
+    routes: fnOptions.routes ?? ["app/page.tsx"],
+    bundledNextServer: isBundled,
+  });
 
   // Build Lambda code
   // note: bundle in OpenNext package b/c the adapter relies on the

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

@@ -45,14 +45,14 @@ export async function buildExternalNodeMiddleware(
   const packagePath = buildHelper.getPackagePath(options);
 
   // TODO: change this so that we don't copy unnecessary files
-  await copyTracedFiles(
-    appBuildOutputPath,
+  await copyTracedFiles({
+    buildOutputPath: appBuildOutputPath,
     packagePath,
-    outputPath,
-    [],
-    false,
-    true,
-  );
+    outputDir: outputPath,
+    routes: [],
+    bundledNextServer: false,
+    skipServerFiles: true,
+  });
 
   function override<T extends keyof Override>(target: T) {
     return typeof overrides?.[target] === "string"