fix: enable using the direct queue for isr

Author: james-elicx

.changeset/slimy-houses-punch.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+fix: enable using the `direct` queue for isr

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",
   });

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">

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);

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;
   });

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",
     },
   },
 

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>

examples/next-partial-prerendering/package.json

@@ -1,4 +1,5 @@
 {
+  "name": "next-partial-prerendering",
   "private": true,
   "scripts": {
     "build": "next build",

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",
             },
           },