move back to external middleware

Author: conico974

packages/cloudflare/src/api/config.ts

@@ -77,6 +77,18 @@ export function defineCloudflareConfig(config: CloudflareOverrides = {}): OpenNe
     dangerous: {
       enableCacheInterception,
     },
+    middleware: {
+      external: true,
+      override: {
+        wrapper: "cloudflare-edge",
+        converter: "edge",
+        proxyExternalRequest: "fetch",
+        incrementalCache: resolveIncrementalCache(incrementalCache),
+        tagCache: resolveTagCache(tagCache),
+        queue: resolveQueue(queue),
+        cdnInvalidation: resolveCdnInvalidation(cachePurge),
+      }
+    }
   };
 }
 

packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts

@@ -22,7 +22,7 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
       config.default?.override?.queue === "dummy" ||
       config.default?.override?.queue === "direct" ||
       typeof config.default?.override?.queue === "function",
-    mwIsMiddlewareIntegrated: config.middleware === undefined,
+    // mwIsMiddlewareIntegrated: config.middleware === undefined,
     hasCryptoExternal: config.edgeExternals?.includes("node:crypto"),
   };
 

packages/cloudflare/src/cli/templates/init.ts

@@ -96,6 +96,7 @@ function initRuntime() {
     Request: CustomRequest,
     __BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__,
     __NEXT_BASE_PATH__: __NEXT_BASE_PATH__,
+    __dangerous_ON_edge_converter_returns_request: true,
   });
 }
 

packages/cloudflare/src/cli/templates/worker.ts

@@ -1,5 +1,7 @@
 //@ts-expect-error: Will be resolved by wrangler build
 import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
+// @ts-expect-error: Will be resolved by wrangler build
+import { handler as middlewareHandler } from "./middleware/handler.mjs";
 
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOQueueHandler } from "./.build/durable-objects/queue.js";
@@ -32,10 +34,17 @@ export default {
           : fetch(imageUrl, { cf: { cacheEverything: true } });
       }
 
+      // - `Request`s are handled by the Next server
+      const reqOrResp = await middlewareHandler(request, env, ctx);
+
+      if (reqOrResp instanceof Response) {
+        return reqOrResp;
+      }
+
       // @ts-expect-error: resolved by wrangler build
       const { handler } = await import("./server-functions/default/handler.mjs");
 
-      return handler(request, env, ctx);
+      return handler(reqOrResp, env, ctx);
     });
   },
 } satisfies ExportedHandler<CloudflareEnv>;