Apply suggestions from code review

Co-authored-by: Victor Berchet <[email protected]>

Author: conico974

.changeset/nasty-geckos-sniff.md

@@ -1,5 +1,5 @@
 ---
-"@opennextjs/aws": major
+"@opennextjs/aws": minor
 ---
 
 Add support for the node middleware

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

@@ -128,8 +128,7 @@ export function loadMiddlewareManifest(nextDir: string) {
 export function loadFunctionsConfigManifest(nextDir: string) {
   const filePath = path.join(
     nextDir,
-    "server",
-    "functions-config-manifest.json",
+    "server/functions-config-manifest.json",
   );
   try {
     const json = fs.readFileSync(filePath, "utf-8");

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

@@ -55,15 +55,8 @@ export async function createMiddleware(
     ) as FunctionsConfigManifest;
 
     if (functionsConfigManifest?.functions["/_middleware"]) {
-      if (!config.middleware?.external) {
-        // If we are here, it means that we are using a node middleware
-        await buildBundledNodeMiddleware(options);
-        // We return early to not build the edge middleware
-        return;
-      }
-
-      // Here it means that we are using a node external middleware
-      await buildExternalNodeMiddleware(options);
+      await (config.middleware?.external  ? buildExternalNodeMiddleware(options) : buildBundledNodeMiddleware(options));
+      return;
       return;
     }
   }

packages/open-next/src/build/edge/createEdgeBundle.ts

@@ -90,7 +90,7 @@ export async function buildEdgeBundle({
           deletes: includeCache ? [] : ["includeCacheInMiddleware"],
         }),
         openNextExternalMiddlewarePlugin(
-          path.join(options.openNextDistDir, "core", "edgeFunctionHandler.js"),
+          path.join(options.openNextDistDir, "core/edgeFunctionHandler.js"),
         ),
         openNextEdgePlugins({
           middlewareInfo,

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

@@ -126,7 +126,7 @@ export async function buildBundledNodeMiddleware(
   await buildHelper.esbuildAsync(
     {
       entryPoints: [
-        path.join(options.openNextDistDir, "core", "nodeMiddlewareHandler.js"),
+        path.join(options.openNextDistDir, "core/nodeMiddlewareHandler.js"),
       ],
       external: ["./.next/*"],
       outfile: path.join(options.buildDir, "middleware.mjs"),

packages/open-next/src/plugins/externalMiddleware.ts

@@ -8,11 +8,7 @@ export function openNextExternalMiddlewarePlugin(functionPath: string): Plugin {
       // If we bundle the routing, we need to resolve the middleware
       build.onResolve(
         { filter: getCrossPlatformPathRegex("./middleware.mjs") },
-        () => {
-          return {
-            path: functionPath,
-          };
-        },
+        () => ({ path: functionPath }),
       );
     },
   };