@opennextjs/cloudflare 0.5.12 → 0.6.1

package/dist/cli/build/patches/plugins/instrumentation.js

@@ -1,11 +1,27 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
-import { patchCode } from "../ast/util.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 export function patchInstrumentation(updater, buildOpts) {
     const builtInstrumentationPath = getBuiltInstrumentationPath(buildOpts);
-    updater.updateContent("patch-instrumentation-next15", { filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/, contentFilter: /async loadInstrumentationModule\(/ }, async ({ contents }) => patchCode(contents, getNext15Rule(builtInstrumentationPath)));
-    updater.updateContent("patch-instrumentation-next14", { filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/, contentFilter: /async prepareImpl\(/ }, async ({ contents }) => patchCode(contents, getNext14Rule(builtInstrumentationPath)));
+    updater.updateContent("patch-instrumentation-next15", [
+        {
+            field: {
+                filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/,
+                contentFilter: /async loadInstrumentationModule\(/,
+                callback: ({ contents }) => patchCode(contents, getNext15Rule(builtInstrumentationPath)),
+            },
+        },
+    ]);
+    updater.updateContent("patch-instrumentation-next14", [
+        {
+            field: {
+                filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/,
+                contentFilter: /async prepareImpl\(/,
+                callback: ({ contents }) => patchCode(contents, getNext14Rule(builtInstrumentationPath)),
+            },
+        },
+    ]);
     return {
         name: "patch-instrumentation",
         setup() { },

package/dist/cli/build/patches/plugins/instrumentation.spec.js

@@ -1,5 +1,5 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
-import { patchCode } from "../ast/util.js";
 import { getNext14Rule, getNext15Rule } from "./instrumentation.js";
 describe("LoadInstrumentationModule (Next15)", () => {
     const code = `

package/dist/cli/build/patches/plugins/load-manifest.d.ts

@@ -2,5 +2,5 @@
  * Inline `loadManifest` as it relies on `readFileSync` that is not supported by workerd.
  */
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
-import type { ContentUpdater } from "./content-updater.js";
-export declare function inlineLoadManifest(updater: ContentUpdater, buildOpts: BuildOptions): import("esbuild").Plugin;
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function inlineLoadManifest(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;

package/dist/cli/build/patches/plugins/load-manifest.js

@@ -4,15 +4,22 @@
 import { readFile } from "node:fs/promises";
 import { join, posix, relative, sep } from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
 import { glob } from "glob";
 import { normalizePath } from "../../utils/normalize-path.js";
-import { patchCode } from "../ast/util.js";
 export function inlineLoadManifest(updater, buildOpts) {
-    return updater.updateContent("inline-load-manifest", {
-        filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest\.js$`, { escape: false }),
-        contentFilter: /function loadManifest\(/,
-    }, async ({ contents }) => patchCode(contents, await getRule(buildOpts)));
+    return updater.updateContent("inline-load-manifest", [
+        {
+            field: {
+                filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/load-manifest\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /function loadManifest\(/,
+                callback: async ({ contents }) => patchCode(contents, await getRule(buildOpts)),
+            },
+        },
+    ]);
 }
 async function getRule(buildOpts) {
     const { outputDir } = buildOpts;

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

@@ -1,7 +1,4 @@
-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;
-};
+import { ContentUpdater, type Plugin } from "@opennextjs/aws/plugins/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): Plugin;

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

@@ -1,11 +1,11 @@
-import { patchCode } from "../ast/util.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.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: 
+  all:
     - kind: lexical_declaration
       pattern: let $VAR = new AbortController
     - precedes:
@@ -19,10 +19,10 @@ rule:
               kind: catch_clause
               has:
                 kind: statement_block
-                has: 
+                has:
                   kind: return_statement
-                  all: 
-                    - has: 
+                  all:
+                    - has:
                         stopBy: end
                         kind: member_expression
                         pattern: $VAR.signal.aborted
@@ -30,18 +30,18 @@ rule:
                         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.
+// In next `renderHTML` is used as a fallback in case of errors, but in minimal mode it just throws the error and the responsibility of handling it is on the infra.
 export const nextMinimalRule = `
 rule:
   kind: member_expression
   pattern: process.env.NEXT_MINIMAL
-  any: 
+  any:
     - inside:
         kind: parenthesized_expression
         stopBy: end
@@ -62,15 +62,31 @@ rule:
                   kind: expression_statement
                   pattern: res.statusCode = 400;
 fix:
-  'true'                
+  '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);
-    });
+    updater.updateContent("patch-abortController-next15.2", [
+        {
+            field: {
+                filter: /app-page(-experimental)?\.runtime\.prod\.js$/,
+                contentFilter: /new AbortController/,
+                callback: ({ contents }) => {
+                    return patchCode(contents, abortControllerRule);
+                },
+            },
+        },
+    ]);
+    updater.updateContent("patch-next-minimal", [
+        {
+            field: {
+                filter: /next-server\.(js)$/,
+                contentFilter: /.*/,
+                callback: ({ contents }) => {
+                    return patchCode(contents, nextMinimalRule);
+                },
+            },
+        },
+    ]);
     return {
         name: "patch-abortController",
         setup() { },

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

@@ -1,5 +1,5 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 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) {

package/dist/cli/build/patches/plugins/patch-depd-deprecations.d.ts

@@ -1,9 +1,9 @@
-import type { ContentUpdater } from "./content-updater.js";
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 /**
  * Some dependencies of Next.js use depd to deprecate some of their functions, depd uses `eval` to generate
  * a deprecated version of such functions, this causes `eval` warnings in the terminal even if these functions
  * are never called, this function fixes that by patching the depd `wrapfunction` function so that it still
  * retains the same type of behavior but without using `eval`
  */
-export declare function patchDepdDeprecations(updater: ContentUpdater): import("esbuild").Plugin;
+export declare function patchDepdDeprecations(updater: ContentUpdater): Plugin;
 export declare const rule = "\nrule:\n  kind: function_declaration\n  pattern: function wrapfunction($FN, $MESSAGE) { $$$ }\n  all:\n    - has:\n        kind: variable_declarator\n        stopBy: end\n        has:\n          field: name\n          pattern: deprecatedfn\n    - has:\n        kind: call_expression\n        stopBy: end\n        has:\n          kind: identifier\n          pattern: eval\nfix:\n  function wrapfunction($FN, $MESSAGE) {\n    if(typeof $FN !== 'function') throw new Error(\"argument fn must be a function\");\n    return function deprecated_$FN(...args) {\n      console.warn($MESSAGE);\n      return $FN(...args);\n    }\n  }\n";

package/dist/cli/build/patches/plugins/patch-depd-deprecations.js

@@ -1,4 +1,4 @@
-import { patchCode } from "../ast/util.js";
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 /**
  * Some dependencies of Next.js use depd to deprecate some of their functions, depd uses `eval` to generate
  * a deprecated version of such functions, this causes `eval` warnings in the terminal even if these functions
@@ -6,7 +6,15 @@ import { patchCode } from "../ast/util.js";
  * retains the same type of behavior but without using `eval`
  */
 export function patchDepdDeprecations(updater) {
-    return updater.updateContent("patch-depd-deprecations", { filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/, contentFilter: /argument fn must be a function/ }, ({ contents }) => patchCode(contents, rule));
+    return updater.updateContent("patch-depd-deprecations", [
+        {
+            field: {
+                filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/,
+                contentFilter: /argument fn must be a function/,
+                callback: ({ contents }) => patchCode(contents, rule),
+            },
+        },
+    ]);
 }
 export const rule = `
 rule:

package/dist/cli/build/patches/plugins/patch-depd-deprecations.spec.js

@@ -1,5 +1,5 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
-import { patchCode } from "../ast/util.js";
 import { rule } from "./patch-depd-deprecations.js";
 describe("patchDepdDeprecations", () => {
     test("patch", () => {

package/dist/cli/build/patches/plugins/require.d.ts

@@ -1,2 +1,2 @@
-import type { ContentUpdater } from "./content-updater";
-export declare function fixRequire(updater: ContentUpdater): import("esbuild").Plugin;
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function fixRequire(updater: ContentUpdater): Plugin;

package/dist/cli/build/patches/plugins/require.js

@@ -1,37 +1,45 @@
 export function fixRequire(updater) {
-    return updater.updateContent("fix-require", { filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/, contentFilter: /.*/ }, ({ contents }) => {
-        // `eval(...)` is not supported by workerd.
-        contents = contents.replaceAll(`eval("require")`, "require");
-        // `@opentelemetry` has a few issues.
-        //
-        // Next.js has the following code in `next/dist/server/lib/trace/tracer.js`:
-        //
-        //     try {
-        //       api = require('@opentelemetry/api');
-        //     } catch (err) {
-        //       api = require('next/dist/compiled/@opentelemetry/api');
-        //     }
-        //
-        // The intent is to allow users to install their own version of `@opentelemetry/api`.
-        //
-        // The problem is that even when users do not explicitly install `@opentelemetry/api`,
-        // `require('@opentelemetry/api')` resolves to the package which is a dependency
-        // of Next.
-        //
-        // The second problem is that when Next traces files, it would not copy the `api/build/esm`
-        // folder (used by the `module` conditions in package.json) it would only copy `api/build/src`.
-        // This could be solved by updating the next config:
-        //
-        //     const nextConfig: NextConfig = {
-        //       // ...
-        //       outputFileTracingIncludes: {
-        //         "*": ["./node_modules/@opentelemetry/api/build/**/*"],
-        //       },
-        //     };
-        //
-        // We can consider doing that when we want to enable users to install their own version
-        // of `@opentelemetry/api`. For now we simply use the pre-compiled version.
-        contents = contents.replace(/require\(.@opentelemetry\/api.\)/g, `require("next/dist/compiled/@opentelemetry/api")`);
-        return contents;
-    });
+    return updater.updateContent("fix-require", [
+        {
+            field: {
+                filter: /\.(js|mjs|cjs|jsx|ts|tsx)$/,
+                contentFilter: /.*/,
+                callback: ({ contents }) => {
+                    // `eval(...)` is not supported by workerd.
+                    contents = contents.replaceAll(`eval("require")`, "require");
+                    // `@opentelemetry` has a few issues.
+                    //
+                    // Next.js has the following code in `next/dist/server/lib/trace/tracer.js`:
+                    //
+                    //     try {
+                    //       api = require('@opentelemetry/api');
+                    //     } catch (err) {
+                    //       api = require('next/dist/compiled/@opentelemetry/api');
+                    //     }
+                    //
+                    // The intent is to allow users to install their own version of `@opentelemetry/api`.
+                    //
+                    // The problem is that even when users do not explicitly install `@opentelemetry/api`,
+                    // `require('@opentelemetry/api')` resolves to the package which is a dependency
+                    // of Next.
+                    //
+                    // The second problem is that when Next traces files, it would not copy the `api/build/esm`
+                    // folder (used by the `module` conditions in package.json) it would only copy `api/build/src`.
+                    // This could be solved by updating the next config:
+                    //
+                    //     const nextConfig: NextConfig = {
+                    //       // ...
+                    //       outputFileTracingIncludes: {
+                    //         "*": ["./node_modules/@opentelemetry/api/build/**/*"],
+                    //       },
+                    //     };
+                    //
+                    // We can consider doing that when we want to enable users to install their own version
+                    // of `@opentelemetry/api`. For now we simply use the pre-compiled version.
+                    contents = contents.replace(/require\(.@opentelemetry\/api.\)/g, `require("next/dist/compiled/@opentelemetry/api")`);
+                    return contents;
+                },
+            },
+        },
+    ]);
 }

package/dist/cli/build/patches/plugins/res-revalidate.d.ts

@@ -0,0 +1,3 @@
+import type { CodePatcher } from "@opennextjs/aws/build/patch/codePatcher.js";
+export declare const rule = "\nrule:\n  kind: await_expression\n  inside:\n    kind: if_statement\n    stopBy: end\n    has:\n      kind: parenthesized_expression\n      has: { kind: property_identifier , stopBy: end, regex: trustHostHeader}\n  has:\n    kind: call_expression\n    all:\n      - has: {kind: identifier, pattern: fetch}\n      - has:\n          kind: arguments\n          all:\n            - has:\n                kind: object\n                all:\n                  - has:\n                      kind: pair\n                      all:\n                        - has: {kind: property_identifier, regex: method }\n                        - has: {kind: string, regex: 'HEAD'}\n                  - has:\n                      kind: pair\n                      all:\n                        - has: {kind: property_identifier, regex: headers}\n                        - has: {kind: identifier, pattern: $HEADERS}\n            - has:\n                kind: template_string\n                all:\n                  - has:\n                      kind: string_fragment\n                      regex: https://\n                  - has:\n                      kind: template_substitution\n                      all:\n                        - has: { kind: identifier, stopBy: end, pattern: $REQ }\n                        - has:\n                            kind: property_identifier\n                            regex: headers\n                            stopBy: end\n                        - has:\n                            kind: property_identifier\n                            regex: host\n                            stopBy: end\n                  - has:\n                      kind: template_substitution\n                      pattern: $URL_PATH\n                      has:\n                        kind: identifier\n\nfix: await (await import(\"@opennextjs/cloudflare\")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(`${$REQ.headers.host.includes(\"localhost\") ? \"http\":\"https\" }://${$REQ.headers.host}$URL_PATH`,{method:'HEAD', headers:$HEADERS})\n";
+export declare const patchResRevalidate: CodePatcher;

package/dist/cli/build/patches/plugins/res-revalidate.js

@@ -0,0 +1,77 @@
+/**
+ * This patch will replace code used for `res.revalidate` in page router
+ * Without the patch it uses `fetch` to make a call to itself, which doesn't work once deployed in cloudflare workers
+ * This patch will replace this fetch by a call to `WORKER_SELF_REFERENCE` service binding
+ */
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+export const rule = `
+rule:
+  kind: await_expression
+  inside:
+    kind: if_statement
+    stopBy: end
+    has:
+      kind: parenthesized_expression
+      has: { kind: property_identifier , stopBy: end, regex: trustHostHeader}
+  has:
+    kind: call_expression
+    all:
+      - has: {kind: identifier, pattern: fetch}
+      - has:
+          kind: arguments
+          all:
+            - has:
+                kind: object
+                all:
+                  - has:
+                      kind: pair
+                      all:
+                        - has: {kind: property_identifier, regex: method }
+                        - has: {kind: string, regex: 'HEAD'}
+                  - has:
+                      kind: pair
+                      all:
+                        - has: {kind: property_identifier, regex: headers}
+                        - has: {kind: identifier, pattern: $HEADERS}
+            - has:
+                kind: template_string
+                all:
+                  - has:
+                      kind: string_fragment
+                      regex: https://
+                  - has:
+                      kind: template_substitution
+                      all:
+                        - has: { kind: identifier, stopBy: end, pattern: $REQ }
+                        - has:
+                            kind: property_identifier
+                            regex: headers
+                            stopBy: end
+                        - has:
+                            kind: property_identifier
+                            regex: host
+                            stopBy: end
+                  - has:
+                      kind: template_substitution
+                      pattern: $URL_PATH
+                      has:
+                        kind: identifier
+
+fix: await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`\${$REQ.headers.host.includes("localhost") ? "http":"https" }://\${$REQ.headers.host}$URL_PATH\`,{method:'HEAD', headers:$HEADERS})
+`;
+export const patchResRevalidate = {
+    name: "patch-res-revalidate",
+    patches: [
+        {
+            versions: ">=14.2.0",
+            field: {
+                pathFilter: getCrossPlatformPathRegex(String.raw `(pages-api\.runtime\.prod\.js|node/api-resolver\.js)$`, {
+                    escape: false,
+                }),
+                contentFilter: /\.trustHostHeader/,
+                patchCode: async ({ code }) => patchCode(code, rule),
+            },
+        },
+    ],
+};

package/dist/cli/build/patches/plugins/res-revalidate.spec.d.ts

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