@opennextjs/cloudflare 0.5.8 → 0.5.10

package/dist/api/cloudflare-context.d.ts

@@ -4,6 +4,7 @@ declare global {
         NEXT_CACHE_D1?: D1Database;
         NEXT_CACHE_D1_TAGS_TABLE?: string;
         NEXT_CACHE_D1_REVALIDATIONS_TABLE?: string;
+        NEXT_CACHE_REVALIDATION_WORKER?: Service;
         ASSETS?: Fetcher;
     }
 }

package/dist/api/memory-queue.d.ts

@@ -4,6 +4,8 @@ export declare const DEFAULT_REVALIDATION_TIMEOUT_MS = 10000;
  * The Memory Queue offers basic ISR revalidation by directly requesting a revalidation of a route.
  *
  * It offers basic support for in-memory de-duping per isolate.
+ *
+ * A service binding called `NEXT_CACHE_REVALIDATION_WORKER` that points to your worker is required.
  */
 export declare class MemoryQueue implements Queue {
     private opts;

package/dist/api/memory-queue.js

@@ -1,9 +1,13 @@
 import logger from "@opennextjs/aws/logger.js";
+import { IgnorableError } from "@opennextjs/aws/utils/error.js";
+import { getCloudflareContext } from "./cloudflare-context";
 export const DEFAULT_REVALIDATION_TIMEOUT_MS = 10_000;
 /**
  * The Memory Queue offers basic ISR revalidation by directly requesting a revalidation of a route.
  *
  * It offers basic support for in-memory de-duping per isolate.
+ *
+ * A service binding called `NEXT_CACHE_REVALIDATION_WORKER` that points to your worker is required.
  */
 export class MemoryQueue {
     opts;
@@ -13,6 +17,9 @@ export class MemoryQueue {
         this.opts = opts;
     }
     async send({ MessageBody: { host, url }, MessageGroupId }) {
+        const service = getCloudflareContext().env.NEXT_CACHE_REVALIDATION_WORKER;
+        if (!service)
+            throw new IgnorableError("No service binding for cache revalidation worker");
         if (this.revalidatedPaths.has(MessageGroupId))
             return;
         this.revalidatedPaths.set(MessageGroupId, 
@@ -23,7 +30,7 @@ export class MemoryQueue {
             // TODO: Drop the import - https://github.com/opennextjs/opennextjs-cloudflare/issues/361
             // @ts-ignore
             const manifest = await import("./.next/prerender-manifest.json");
-            await globalThis.internalFetch(`${protocol}://${host}${url}`, {
+            await service.fetch(`${protocol}://${host}${url}`, {
                 method: "HEAD",
                 headers: {
                     "x-prerender-revalidate": manifest.preview.previewModeId,

package/dist/api/memory-queue.spec.js

@@ -1,7 +1,13 @@
 import { generateMessageGroupId } from "@opennextjs/aws/core/routing/queue.js";
 import { afterEach, beforeAll, describe, expect, it, vi } from "vitest";
-import cache, { DEFAULT_REVALIDATION_TIMEOUT_MS } from "./memory-queue";
+import cache, { DEFAULT_REVALIDATION_TIMEOUT_MS } from "./memory-queue.js";
 vi.mock("./.next/prerender-manifest.json", () => Promise.resolve({ preview: { previewModeId: "id" } }));
+const mockServiceWorkerFetch = vi.fn();
+vi.mock("./cloudflare-context", () => ({
+    getCloudflareContext: () => ({
+        env: { NEXT_CACHE_REVALIDATION_WORKER: { fetch: mockServiceWorkerFetch } },
+    }),
+}));
 describe("MemoryQueue", () => {
     beforeAll(() => {
         vi.useFakeTimers();
@@ -16,7 +22,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(DEFAULT_REVALIDATION_TIMEOUT_MS);
         await firstRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(1);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(1);
         const secondRequest = cache.send({
             MessageBody: { host: "test.local", url: "/test" },
             MessageGroupId: generateMessageGroupId("/test"),
@@ -24,7 +30,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(1);
         await secondRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(2);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(2);
     });
     it("should process revalidations for multiple paths", async () => {
         const firstRequest = cache.send({
@@ -34,7 +40,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(1);
         await firstRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(1);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(1);
         const secondRequest = cache.send({
             MessageBody: { host: "test.local", url: "/test" },
             MessageGroupId: generateMessageGroupId("/other"),
@@ -42,7 +48,7 @@ describe("MemoryQueue", () => {
         });
         vi.advanceTimersByTime(1);
         await secondRequest;
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(2);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(2);
     });
     it("should de-dupe revalidations", async () => {
         const requests = [
@@ -59,6 +65,6 @@ describe("MemoryQueue", () => {
         ];
         vi.advanceTimersByTime(1);
         await Promise.all(requests);
-        expect(globalThis.internalFetch).toHaveBeenCalledTimes(1);
+        expect(mockServiceWorkerFetch).toHaveBeenCalledTimes(1);
     });
 });

package/dist/cli/build/bundle-server.js

@@ -15,12 +15,13 @@ import { patchFetchCacheSetMissingWaitUntil } from "./patches/plugins/fetch-cach
 import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
+import { patchNextMinimal } from "./patches/plugins/next-minimal.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
 import { setWranglerExternal } from "./patches/plugins/wrangler-external.js";
-import { normalizePath, patchCodeWithValidations } from "./utils/index.js";
+import { needsExperimentalReact, normalizePath, patchCodeWithValidations } from "./utils/index.js";
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "../..");
 /**
@@ -83,6 +84,7 @@ export async function bundleServer(buildOpts) {
             inlineLoadManifest(updater, buildOpts),
             inlineBuildId(updater),
             patchDepdDeprecations(updater),
+            patchNextMinimal(updater),
             // Apply updater updaters, must be the last plugin
             updater.plugin,
         ],
@@ -117,7 +119,12 @@ export async function bundleServer(buildOpts) {
             // We make sure that environment variables that Next.js expects are properly defined
             "process.env.NEXT_RUNTIME": '"nodejs"',
             "process.env.NODE_ENV": '"production"',
-            "process.env.NEXT_MINIMAL": "true",
+            // The 2 following defines are used to reduce the bundle size by removing unnecessary code
+            // Next uses different precompiled renderers (i.e. `app-page.runtime.prod.js`) based on if you use `TURBOPACK` or some experimental React features
+            // Turbopack is not supported for build at the moment, so we disable it
+            "process.env.TURBOPACK": "false",
+            // This define should be safe to use for Next 14.2+, earlier versions (13.5 and less) will cause trouble
+            "process.env.__NEXT_EXPERIMENTAL_REACT": `${needsExperimentalReact(nextConfig)}`,
         },
         platform: "node",
         banner: {

package/dist/cli/build/patches/plugins/next-minimal.d.ts

@@ -0,0 +1,7 @@
+import { ContentUpdater } from "./content-updater.js";
+export declare const abortControllerRule = "\nrule:\n  all: \n    - kind: lexical_declaration\n      pattern: let $VAR = new AbortController\n    - precedes:\n        kind: function_declaration\n        stopBy: end\n        has:\n          kind: statement_block\n          has:\n            kind: try_statement\n            has:\n              kind: catch_clause\n              has:\n                kind: statement_block\n                has: \n                  kind: return_statement\n                  all: \n                    - has: \n                        stopBy: end\n                        kind: member_expression\n                        pattern: $VAR.signal.aborted\n                    - has:\n                        stopBy: end\n                        kind: call_expression\n                        regex: console.error\\(\"Failed to fetch RSC payload for\n                    \nfix:\n  'let $VAR = {signal:{aborted: false}};'\n";
+export declare const nextMinimalRule = "\nrule:\n  kind: member_expression\n  pattern: process.env.NEXT_MINIMAL\n  any: \n    - inside:\n        kind: parenthesized_expression\n        stopBy: end\n        inside:\n          kind: if_statement\n          any:\n            - inside:\n                kind: statement_block\n                inside:\n                  kind: method_definition\n                  any:\n                    - has: {kind: property_identifier, field: name, regex: runEdgeFunction}\n                    - has: {kind: property_identifier, field: name, regex: runMiddleware}\n                    - has: {kind: property_identifier, field: name, regex: imageOptimizer}\n            - has:\n                kind: statement_block\n                has:\n                  kind: expression_statement\n                  pattern: res.statusCode = 400;\nfix:\n  'true'                \n";
+export declare function patchNextMinimal(updater: ContentUpdater): {
+    name: string;
+    setup(): void;
+};

package/dist/cli/build/patches/plugins/next-minimal.js

@@ -0,0 +1,78 @@
+import { patchCode } from "../ast/util.js";
+// We try to be as specific as possible to avoid patching the wrong thing here
+// It seems that there is a bug in the worker runtime. When the AbortController is created outside of the request context it throws an error (not sure if it's expected or not) except in this case. https://github.com/cloudflare/workerd/issues/3657
+// It fails while requiring the `app-page.runtime.prod.js` file, but instead of throwing an error, it just return an empty object for the `require('app-page.runtime.prod.js')` call which makes every request to an app router page fail.
+// If it's a bug in workerd and it's not expected to throw an error, we can remove this patch.
+export const abortControllerRule = `
+rule:
+  all: 
+    - kind: lexical_declaration
+      pattern: let $VAR = new AbortController
+    - precedes:
+        kind: function_declaration
+        stopBy: end
+        has:
+          kind: statement_block
+          has:
+            kind: try_statement
+            has:
+              kind: catch_clause
+              has:
+                kind: statement_block
+                has: 
+                  kind: return_statement
+                  all: 
+                    - has: 
+                        stopBy: end
+                        kind: member_expression
+                        pattern: $VAR.signal.aborted
+                    - has:
+                        stopBy: end
+                        kind: call_expression
+                        regex: console.error\\("Failed to fetch RSC payload for
+                    
+fix:
+  'let $VAR = {signal:{aborted: false}};'
+`;
+// This rule is used instead of defining `process.env.NEXT_MINIMAL` in the `esbuild config.
+// Do we want to entirely replace these functions to reduce the bundle size?
+// In next `renderHTML` is used as a fallback in case of errors, but in minimal mode it just throws the error and the responsability of handling it is on the infra.
+export const nextMinimalRule = `
+rule:
+  kind: member_expression
+  pattern: process.env.NEXT_MINIMAL
+  any: 
+    - inside:
+        kind: parenthesized_expression
+        stopBy: end
+        inside:
+          kind: if_statement
+          any:
+            - inside:
+                kind: statement_block
+                inside:
+                  kind: method_definition
+                  any:
+                    - has: {kind: property_identifier, field: name, regex: runEdgeFunction}
+                    - has: {kind: property_identifier, field: name, regex: runMiddleware}
+                    - has: {kind: property_identifier, field: name, regex: imageOptimizer}
+            - has:
+                kind: statement_block
+                has:
+                  kind: expression_statement
+                  pattern: res.statusCode = 400;
+fix:
+  'true'                
+`;
+export function patchNextMinimal(updater) {
+    updater.updateContent("patch-abortController-next15.2", { filter: /app-page(-experimental)?\.runtime\.prod\.js$/, contentFilter: /new AbortController/ }, async ({ contents }) => {
+        return patchCode(contents, abortControllerRule);
+    });
+    updater.updateContent("patch-next-minimal", { filter: /next-server\.(js)$/, contentFilter: /.*/ }, async ({ contents }) => {
+        return patchCode(contents, nextMinimalRule);
+    });
+    return {
+        name: "patch-abortController",
+        setup() { },
+    };
+}

package/dist/cli/build/patches/plugins/next-minimal.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli/build/patches/plugins/next-minimal.spec.js

@@ -0,0 +1,71 @@
+import { describe, expect, test } from "vitest";
+import { patchCode } from "../ast/util";
+import { abortControllerRule } from "./next-minimal";
+const appPageRuntimeProdJs = `let p = new AbortController;
+async function h(e3, t3) {
+  let { flightRouterState: r3, nextUrl: a2, prefetchKind: i2 } = t3, u2 = { [n2.hY]: "1", [n2.B]: encodeURIComponent(JSON.stringify(r3)) };
+  i2 === o.ob.AUTO && (u2[n2._V] = "1"), a2 && (u2[n2.kO] = a2);
+  try {
+    var c2;
+    let t4 = i2 ? i2 === o.ob.TEMPORARY ? "high" : "low" : "auto";
+    "export" === process.env.__NEXT_CONFIG_OUTPUT && ((e3 = new URL(e3)).pathname.endsWith("/") ? e3.pathname += "index.txt" : e3.pathname += ".txt");
+    let r4 = await m(e3, u2, t4, p.signal), a3 = d(r4.url), h2 = r4.redirected ? a3 : void 0, g = r4.headers.get("content-type") || "", v = !!(null == (c2 = r4.headers.get("vary")) ? void 0 : c2.includes(n2.kO)), b = !!r4.headers.get(n2.jc), S = r4.headers.get(n2.UK), _ = null !== S ? parseInt(S, 10) : -1, w = g.startsWith(n2.al);
+    if ("export" !== process.env.__NEXT_CONFIG_OUTPUT || w || (w = g.startsWith("text/plain")), !w || !r4.ok || !r4.body)
+      return e3.hash && (a3.hash = e3.hash), f(a3.toString());
+    let k = b ? function(e4) {
+      let t5 = e4.getReader();
+      return new ReadableStream({ async pull(e5) {
+        for (; ; ) {
+          let { done: r5, value: n3 } = await t5.read();
+          if (!r5) {
+            e5.enqueue(n3);
+            continue;
+          }
+          return;
+        }
+      } });
+    }(r4.body) : r4.body, E = await y(k);
+    if ((0, l.X)() !== E.b)
+      return f(r4.url);
+    return { flightData: (0, s.aj)(E.f), canonicalUrl: h2, couldBeIntercepted: v, prerendered: E.S, postponed: b, staleTime: _ };
+  } catch (t4) {
+    return p.signal.aborted || console.error("Failed to fetch RSC payload for " + e3 + ". Falling back to browser navigation.", t4), { flightData: e3.toString(), canonicalUrl: void 0, couldBeIntercepted: false, prerendered: false, postponed: false, staleTime: -1 };
+  }
+}
+`;
+describe("Abort controller", () => {
+    test("minimal", () => {
+        expect(patchCode(appPageRuntimeProdJs, abortControllerRule)).toBe(`let p = {signal:{aborted: false}};
+async function h(e3, t3) {
+  let { flightRouterState: r3, nextUrl: a2, prefetchKind: i2 } = t3, u2 = { [n2.hY]: "1", [n2.B]: encodeURIComponent(JSON.stringify(r3)) };
+  i2 === o.ob.AUTO && (u2[n2._V] = "1"), a2 && (u2[n2.kO] = a2);
+  try {
+    var c2;
+    let t4 = i2 ? i2 === o.ob.TEMPORARY ? "high" : "low" : "auto";
+    "export" === process.env.__NEXT_CONFIG_OUTPUT && ((e3 = new URL(e3)).pathname.endsWith("/") ? e3.pathname += "index.txt" : e3.pathname += ".txt");
+    let r4 = await m(e3, u2, t4, p.signal), a3 = d(r4.url), h2 = r4.redirected ? a3 : void 0, g = r4.headers.get("content-type") || "", v = !!(null == (c2 = r4.headers.get("vary")) ? void 0 : c2.includes(n2.kO)), b = !!r4.headers.get(n2.jc), S = r4.headers.get(n2.UK), _ = null !== S ? parseInt(S, 10) : -1, w = g.startsWith(n2.al);
+    if ("export" !== process.env.__NEXT_CONFIG_OUTPUT || w || (w = g.startsWith("text/plain")), !w || !r4.ok || !r4.body)
+      return e3.hash && (a3.hash = e3.hash), f(a3.toString());
+    let k = b ? function(e4) {
+      let t5 = e4.getReader();
+      return new ReadableStream({ async pull(e5) {
+        for (; ; ) {
+          let { done: r5, value: n3 } = await t5.read();
+          if (!r5) {
+            e5.enqueue(n3);
+            continue;
+          }
+          return;
+        }
+      } });
+    }(r4.body) : r4.body, E = await y(k);
+    if ((0, l.X)() !== E.b)
+      return f(r4.url);
+    return { flightData: (0, s.aj)(E.f), canonicalUrl: h2, couldBeIntercepted: v, prerendered: E.S, postponed: b, staleTime: _ };
+  } catch (t4) {
+    return p.signal.aborted || console.error("Failed to fetch RSC payload for " + e3 + ". Falling back to browser navigation.", t4), { flightData: e3.toString(), canonicalUrl: void 0, couldBeIntercepted: false, prerendered: false, postponed: false, staleTime: -1 };
+  }
+}
+`);
+    });
+});

package/dist/cli/build/utils/index.d.ts

@@ -2,4 +2,5 @@ export * from "./apply-patches.js";
 export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";
+export * from "./needs-experimental-react.js";
 export * from "./normalize-path.js";

package/dist/cli/build/utils/index.js

@@ -2,4 +2,5 @@ export * from "./apply-patches.js";
 export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";
+export * from "./needs-experimental-react.js";
 export * from "./normalize-path.js";

package/dist/cli/build/utils/needs-experimental-react.d.ts

@@ -0,0 +1,11 @@
+import type { NextConfig } from "@opennextjs/aws/types/next-types";
+interface ExtendedNextConfig extends NextConfig {
+    experimental: {
+        ppr?: boolean;
+        taint?: boolean;
+        viewTransition?: boolean;
+        serverActions?: boolean;
+    };
+}
+export declare function needsExperimentalReact(nextConfig: ExtendedNextConfig): boolean;
+export {};

package/dist/cli/build/utils/needs-experimental-react.js

@@ -0,0 +1,5 @@
+// Copied from https://github.com/vercel/next.js/blob/4518bc91641a0fd938664b781e12ae7c145f3396/packages/next/src/lib/needs-experimental-react.ts#L3-L6
+export function needsExperimentalReact(nextConfig) {
+    const { ppr, taint, viewTransition } = nextConfig.experimental || {};
+    return Boolean(ppr || taint || viewTransition);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"