From c4a6a0a6f83f17369563131a866c611bf28750b3 Mon Sep 17 00:00:00 2001
From: James <james@eli.cx>
Date: Sun, 2 Feb 2025 17:41:56 +0000
Subject: [PATCH 1/5] fix: enable using the `direct` queue for isr

---
 .changeset/slimy-houses-punch.md                 |  5 +++++
 examples/e2e/app-router/app/api/isr/route.ts     | 16 +++++++++++++---
 examples/e2e/app-router/app/page.tsx             |  2 +-
 .../e2e/app-router/e2e/isr.revalidate.test.ts    |  3 +--
 examples/e2e/app-router/e2e/isr.test.ts          |  6 ++----
 examples/e2e/app-router/open-next.config.ts      |  3 ++-
 examples/e2e/shared/components/Nav/index.tsx     |  9 +++++++--
 examples/next-partial-prerendering/package.json  |  1 +
 .../src/cli/build/utils/ensure-cf-config.ts      |  7 ++++---
 9 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/slimy-houses-punch.md

diff --git a/.changeset/slimy-houses-punch.md b/.changeset/slimy-houses-punch.md
new file mode 100644
index 00000000..737a6aaa
--- /dev/null
+++ b/.changeset/slimy-houses-punch.md
@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix: enable using the `direct` queue for isr
diff --git a/examples/e2e/app-router/app/api/isr/route.ts b/examples/e2e/app-router/app/api/isr/route.ts
index 1fc3e43d..3a6b728e 100644
--- a/examples/e2e/app-router/app/api/isr/route.ts
+++ b/examples/e2e/app-router/app/api/isr/route.ts
@@ -8,11 +8,21 @@ export const dynamic = "force-dynamic";
 // This endpoint simulates an on demand revalidation request
 export async function GET(request: NextRequest) {
   const cwd = process.cwd();
-  const prerenderManifest = await fs.readFile(path.join(cwd, ".next/prerender-manifest.json"), "utf-8");
-  const manifest = JSON.parse(prerenderManifest);
+
+  let manifest;
+  // this fails at build time when next.js tries to evaluate the route
+  try {
+    // @ts-expect-error
+    const prerenderManifest = await import(/* webpackIgnore: true */ "./.next/prerender-manifest.json");
+    manifest = prerenderManifest.default;
+  } catch {
+    return new Response(null, { status: 500 });
+  }
+
   const previewId = manifest.preview.previewModeId;
 
-  const result = await fetch(`https://${request.headers.get("host")}/isr`, {
+  const host = request.headers.get("host");
+  const result = await fetch(`http${host?.includes("localhost") ? "" : "s"}://${host}/isr`, {
     headers: { "x-prerender-revalidate": previewId },
     method: "HEAD",
   });
diff --git a/examples/e2e/app-router/app/page.tsx b/examples/e2e/app-router/app/page.tsx
index 7480a490..c7f3d9a2 100644
--- a/examples/e2e/app-router/app/page.tsx
+++ b/examples/e2e/app-router/app/page.tsx
@@ -22,7 +22,7 @@ export default function Home() {
         <Nav href={"/isr"} title="ISR">
           Incremental Static Regeneration revalidates every 10 seconds with a new timestamp
         </Nav>
-        <Nav href={"/ssr"} title="SSR">
+        <Nav href={"/ssr"} title="SSR" prefetch={false}>
           Server Side Render should generate a new timestamp on each load. Streaming support for loading...
         </Nav>
         <Nav href={"/api"} title="API">
diff --git a/examples/e2e/app-router/e2e/isr.revalidate.test.ts b/examples/e2e/app-router/e2e/isr.revalidate.test.ts
index a8463c94..3df688e0 100644
--- a/examples/e2e/app-router/e2e/isr.revalidate.test.ts
+++ b/examples/e2e/app-router/e2e/isr.revalidate.test.ts
@@ -1,7 +1,6 @@
 import { expect, test } from "@playwright/test";
 
-// Cache (and revalidation) is currently not supported: https://github.com/opennextjs/opennextjs-cloudflare/issues/105
-test.skip("Test revalidate", async ({ request }) => {
+test("Test revalidate", async ({ request }) => {
   const result = await request.get("/api/isr");
 
   expect(result.status()).toEqual(200);
diff --git a/examples/e2e/app-router/e2e/isr.test.ts b/examples/e2e/app-router/e2e/isr.test.ts
index 58f32ede..934925e9 100644
--- a/examples/e2e/app-router/e2e/isr.test.ts
+++ b/examples/e2e/app-router/e2e/isr.test.ts
@@ -1,7 +1,6 @@
 import { expect, test } from "@playwright/test";
 
-// ISR is currently not supported: https://github.com/opennextjs/opennextjs-cloudflare/issues/105
-test.skip("Incremental Static Regeneration", async ({ page }) => {
+test("Incremental Static Regeneration", async ({ page }) => {
   test.setTimeout(45000);
   await page.goto("/");
   await page.locator("[href='/isr']").click();
@@ -41,8 +40,7 @@ test.skip("Incremental Static Regeneration", async ({ page }) => {
   expect(newTime).not.toEqual(finalTime);
 });
 
-// ISR is currently not supported: https://github.com/opennextjs/opennextjs-cloudflare/issues/105
-test.skip("headers", async ({ page }) => {
+test("headers", async ({ page }) => {
   let responsePromise = page.waitForResponse((response) => {
     return response.status() === 200;
   });
diff --git a/examples/e2e/app-router/open-next.config.ts b/examples/e2e/app-router/open-next.config.ts
index b5de97ab..f1f956ca 100644
--- a/examples/e2e/app-router/open-next.config.ts
+++ b/examples/e2e/app-router/open-next.config.ts
@@ -7,8 +7,9 @@ const config: OpenNextConfig = {
       wrapper: "cloudflare-node",
       converter: "edge",
       incrementalCache: async () => cache,
+      queue: "direct",
+      // Unused implementation
       tagCache: "dummy",
-      queue: "dummy",
     },
   },
 
diff --git a/examples/e2e/shared/components/Nav/index.tsx b/examples/e2e/shared/components/Nav/index.tsx
index 14ae126c..0c79048f 100644
--- a/examples/e2e/shared/components/Nav/index.tsx
+++ b/examples/e2e/shared/components/Nav/index.tsx
@@ -6,11 +6,16 @@ type Props = PropsWithChildren & {
   href: string;
   title: string;
   icon?: string;
+  prefetch?: boolean;
 };
 export default function Nav(p: Props) {
-  const { children, href, title, icon = "/static/frank.webp" } = p;
+  const { children, href, title, icon = "/static/frank.webp", prefetch } = p;
   return (
-    <Link href={href} className="flex flex-col group border p-2 rounded-sm border-orange-500">
+    <Link
+      href={href}
+      className="flex flex-col group border p-2 rounded-sm border-orange-500"
+      prefetch={prefetch}
+    >
       <div className="flex items-center relative">
         <div>{title}</div>
         <div>
diff --git a/examples/next-partial-prerendering/package.json b/examples/next-partial-prerendering/package.json
index 79582b0e..8d66afa2 100644
--- a/examples/next-partial-prerendering/package.json
+++ b/examples/next-partial-prerendering/package.json
@@ -1,4 +1,5 @@
 {
+  "name": "next-partial-prerendering",
   "private": true,
   "name": "next-partial-prerendering",
   "scripts": {
diff --git a/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts b/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
index 9a3138a3..6594629e 100644
--- a/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
+++ b/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
@@ -12,8 +12,9 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
     dftMaybeUseCache:
       config.default?.override?.incrementalCache === "dummy" ||
       typeof config.default?.override?.incrementalCache === "function",
-    dftUseDummyTagCacheAndQueue:
-      config.default?.override?.tagCache === "dummy" && config.default?.override?.queue === "dummy",
+    dftUseDummyTagCache: config.default?.override?.tagCache === "dummy",
+    dftMaybeUseQueue:
+      config.default?.override?.queue === "dummy" || config.default?.override?.queue === "direct",
     disableCacheInterception: config.dangerous?.enableCacheInterception !== true,
     mwIsMiddlewareExternal: config.middleware?.external == true,
     mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
@@ -31,7 +32,7 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
               converter: "edge",
               incrementalCache: "dummy" | function,
               tagCache: "dummy",
-              queue: "dummy",
+              queue: "dummy" | "direct",
             },
           },
 

From c81582f77e76e9329db7bde1a6bde5a40293dd66 Mon Sep 17 00:00:00 2001
From: James <james@eli.cx>
Date: Sun, 2 Feb 2025 18:26:34 +0000
Subject: [PATCH 2/5] skip the ssr fetch cache test due to flakiness

---
 examples/e2e/app-router/app/page.tsx         | 2 +-
 examples/e2e/shared/components/Nav/index.tsx | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/examples/e2e/app-router/app/page.tsx b/examples/e2e/app-router/app/page.tsx
index c7f3d9a2..7480a490 100644
--- a/examples/e2e/app-router/app/page.tsx
+++ b/examples/e2e/app-router/app/page.tsx
@@ -22,7 +22,7 @@ export default function Home() {
         <Nav href={"/isr"} title="ISR">
           Incremental Static Regeneration revalidates every 10 seconds with a new timestamp
         </Nav>
-        <Nav href={"/ssr"} title="SSR" prefetch={false}>
+        <Nav href={"/ssr"} title="SSR">
           Server Side Render should generate a new timestamp on each load. Streaming support for loading...
         </Nav>
         <Nav href={"/api"} title="API">
diff --git a/examples/e2e/shared/components/Nav/index.tsx b/examples/e2e/shared/components/Nav/index.tsx
index 0c79048f..14ae126c 100644
--- a/examples/e2e/shared/components/Nav/index.tsx
+++ b/examples/e2e/shared/components/Nav/index.tsx
@@ -6,16 +6,11 @@ type Props = PropsWithChildren & {
   href: string;
   title: string;
   icon?: string;
-  prefetch?: boolean;
 };
 export default function Nav(p: Props) {
-  const { children, href, title, icon = "/static/frank.webp", prefetch } = p;
+  const { children, href, title, icon = "/static/frank.webp" } = p;
   return (
-    <Link
-      href={href}
-      className="flex flex-col group border p-2 rounded-sm border-orange-500"
-      prefetch={prefetch}
-    >
+    <Link href={href} className="flex flex-col group border p-2 rounded-sm border-orange-500">
       <div className="flex items-center relative">
         <div>{title}</div>
         <div>

From fa3b42018c3d994c737c2ced0a0bbed6a69f7c19 Mon Sep 17 00:00:00 2001
From: James <james@eli.cx>
Date: Thu, 6 Feb 2025 21:58:17 +0000
Subject: [PATCH 3/5] remove redundant import

---
 examples/e2e/app-router/app/api/isr/route.ts    | 6 +-----
 examples/next-partial-prerendering/package.json | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/examples/e2e/app-router/app/api/isr/route.ts b/examples/e2e/app-router/app/api/isr/route.ts
index 3a6b728e..03bf5003 100644
--- a/examples/e2e/app-router/app/api/isr/route.ts
+++ b/examples/e2e/app-router/app/api/isr/route.ts
@@ -1,5 +1,3 @@
-import fs from "node:fs/promises";
-import path from "node:path";
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
 
@@ -7,9 +5,7 @@ export const dynamic = "force-dynamic";
 
 // This endpoint simulates an on demand revalidation request
 export async function GET(request: NextRequest) {
-  const cwd = process.cwd();
-
-  let manifest;
+  let manifest: { preview: { previewModeId: string } };
   // this fails at build time when next.js tries to evaluate the route
   try {
     // @ts-expect-error
diff --git a/examples/next-partial-prerendering/package.json b/examples/next-partial-prerendering/package.json
index 8d66afa2..79582b0e 100644
--- a/examples/next-partial-prerendering/package.json
+++ b/examples/next-partial-prerendering/package.json
@@ -1,5 +1,4 @@
 {
-  "name": "next-partial-prerendering",
   "private": true,
   "name": "next-partial-prerendering",
   "scripts": {

From 63b653379ff46780f26310bd57545c9f90749e74 Mon Sep 17 00:00:00 2001
From: James <james@eli.cx>
Date: Fri, 7 Feb 2025 11:17:01 +0000
Subject: [PATCH 4/5] add warning

---
 .changeset/slimy-houses-punch.md                            | 2 ++
 packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/.changeset/slimy-houses-punch.md b/.changeset/slimy-houses-punch.md
index 737a6aaa..5033bf7d 100644
--- a/.changeset/slimy-houses-punch.md
+++ b/.changeset/slimy-houses-punch.md
@@ -3,3 +3,5 @@
 ---
 
 fix: enable using the `direct` queue for isr
+
+The `direct` mode is not recommended for use in production as it does not de-dupe requests.
diff --git a/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts b/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
index 6594629e..55e1cc25 100644
--- a/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
+++ b/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
@@ -1,3 +1,4 @@
+import logger from "@opennextjs/aws/logger";
 import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 
 /**
@@ -22,6 +23,10 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
     mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
   };
 
+  if (config.default?.override?.queue === "direct") {
+    logger.warn("The direct mode queue is not recommended for use in production.");
+  }
+
   if (Object.values(requirements).some((satisfied) => !satisfied)) {
     throw new Error(
       "The `open-next.config.ts` should have a default export like this:\n\n" +

From 4fb97c3f470c0fc40c69f7493413dfe198d4ce8b Mon Sep 17 00:00:00 2001
From: James <james@eli.cx>
Date: Fri, 7 Feb 2025 11:20:13 +0000
Subject: [PATCH 5/5] .js

---
 packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts b/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
index 55e1cc25..84b7668e 100644
--- a/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
+++ b/packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts
@@ -1,4 +1,4 @@
-import logger from "@opennextjs/aws/logger";
+import logger from "@opennextjs/aws/logger.js";
 import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 
 /**