Change edge wrapper to proxy exports

#62141

crates/next-core/src/next_edge/entry.rs

@@ -17,10 +17,19 @@ pub async fn wrap_edge_entry(
     // The wrapped module could be an async module, we handle that with the proxy
     // here. The comma expression makes sure we don't call the function with the
     // module as the "this" arg.
+    // Turn exports into functions that are also a thenable. This way you can await exports (e.g.
+    // for Components) or call them directly as though they are async function (e.g. edge
+    // functions/middleware, this is what the Edge Runtime does).
     let source = formatdoc!(
         r#"
             self._ENTRIES ||= {{}}
-            self._ENTRIES[{}] = import('MODULE')
+            self._ENTRIES[{}] = new Proxy(import('MODULE'), {{
+                get(modProm, name) {{
+                    let result = (...args) => modProm.then((mod) => (0, mod[name])(...args));
+                    result.then = (v) => v(modProm.then((mod) => (0, mod[name])));
+                    return result;
+                }}
+            }})
         "#,
         StringifyJs(&format_args!("middleware_{}", pathname))
     );

packages/next/src/build/utils.ts

@@ -1563,9 +1563,9 @@ export async function isPageStatic({
           useCache: true,
           distDir,
         })
-        const mod = (
+        const mod =
           await runtime.context._ENTRIES[`middleware_${edgeInfo.name}`]
-        ).ComponentMod
+            .ComponentMod
 
         // This is not needed during require.
         const buildManifest = {} as BuildManifest

packages/next/src/server/web/sandbox/sandbox.ts

@@ -115,9 +115,8 @@ export const run = withTaggedErrors(async function runWithTaggedErrors(params) {
 
   const edgeFunction: (args: {
     request: RequestData
-  }) => Promise<FetchEventResult> = (
-    await runtime.context._ENTRIES[`middleware_${params.name}`]
-  ).default
+  }) => Promise<FetchEventResult> =
+    await runtime.context._ENTRIES[`middleware_${params.name}`].default
 
   const cloned = !['HEAD', 'GET'].includes(params.request.method)
     ? params.request.body?.cloneBodyStream()