@opennextjs/cloudflare 1.6.3 → 1.6.5

package/dist/cli/build/build.js

@@ -74,11 +74,4 @@ function ensureNextjsVersionSupported(options) {
         logger.error("Next.js version unsupported, please upgrade to version 14.2 or greater.");
         process.exit(1);
     }
-    // TODO: remove when 15.4 is supported
-    // Note: `e2e/experimental` is on 15.4.0-canary.14 which works
-    if (!options.appPath.endsWith("opennextjs-cloudflare/examples/e2e/experimental") &&
-        buildHelper.compareSemver(options.nextVersion, ">=", "15.4.0")) {
-        logger.error("Next.js version unsupported, the latest supported version is 15.3");
-        process.exit(1);
-    }
 }

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

@@ -13,12 +13,14 @@ import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
 import { patchNextServer } from "./patches/plugins/next-server.js";
+import { patchNodeEnvironment } from "./patches/plugins/node-environment.js";
 import { patchResolveCache } from "./patches/plugins/open-next.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchPagesRouterContext } from "./patches/plugins/pages-router-context.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 { patchRouteModules } from "./patches/plugins/route-module.js";
 import { setWranglerExternal } from "./patches/plugins/wrangler-external.js";
 import { copyPackageCliFiles, needsExperimentalReact, normalizePath } from "./utils/index.js";
 /** The dist directory of the Cloudflare adapter package */
@@ -86,8 +88,10 @@ export async function bundleServer(buildOpts, projectOpts) {
             inlineFindDir(updater, buildOpts),
             inlineLoadManifest(updater, buildOpts),
             patchNextServer(updater, buildOpts),
+            patchRouteModules(updater, buildOpts),
             patchDepdDeprecations(updater),
             patchResolveCache(updater, buildOpts),
+            patchNodeEnvironment(updater),
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
@@ -124,6 +128,8 @@ export async function bundleServer(buildOpts, projectOpts) {
             "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)}`,
+            // Fix `res.validate` in Next 15.4 (together with the `route-module` patch)
+            "process.env.__NEXT_TRUST_HOST_HEADER": "true",
         },
         banner: {
             // We need to import them here, assigning them to `globalThis` does not work because node:timers use `globalThis` and thus create an infinite loop

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

@@ -46,8 +46,8 @@ function loadManifest($PATH, $$$ARGS) {
         fix: `
 function loadManifest($PATH, $$$ARGS) {
   $PATH = $PATH.replaceAll(${JSON.stringify(sep)}, ${JSON.stringify(posix.sep)});
-  if ($PATH === "/.next/BUILD_ID") {
-  return process.env.NEXT_BUILD_ID;
+  if ($PATH.endsWith(".next/BUILD_ID")) {
+    return process.env.NEXT_BUILD_ID;
 	}
   ${returnManifests}
   throw new Error(\`Unexpected loadManifest(\${$PATH}) call!\`);

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

@@ -9,6 +9,7 @@
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 export declare function patchNextServer(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
+export declare const disableNodeMiddlewareRule = "\nrule:\n  pattern:\n    selector: method_definition\n    context: \"class { async loadNodeMiddleware($$$PARAMS) { $$$_ } }\"\nfix: |-\n  async loadNodeMiddleware($$$PARAMS) {\n    // patched by open next\n  }\n";
 export declare const buildIdRule = "\nrule:\n  pattern:\n    selector: method_definition\n    context: \"class { getBuildId($$$PARAMS) { $$$_ } }\"\nfix: |-\n  getBuildId($$$PARAMS) {\n    return process.env.NEXT_BUILD_ID;\n  }\n";
 /**
  * The cache handler used by Next.js is normally defined in the config file as a path. At runtime,

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

@@ -26,11 +26,24 @@ export function patchNextServer(updater, buildOpts) {
                 contents = patchCode(contents, createCacheHandlerRule(cacheHandler));
                 const composableCacheHandler = path.join(outputPath, getPackagePath(buildOpts), "composable-cache.cjs");
                 contents = patchCode(contents, createComposableCacheHandlersRule(composableCacheHandler));
+                // Node middleware are not supported on Cloudflare yet
+                contents = patchCode(contents, disableNodeMiddlewareRule);
                 return contents;
             },
         },
     ]);
 }
+// Do not try to load Node middlewares
+export const disableNodeMiddlewareRule = `
+rule:
+  pattern:
+    selector: method_definition
+    context: "class { async loadNodeMiddleware($$$PARAMS) { $$$_ } }"
+fix: |-
+  async loadNodeMiddleware($$$PARAMS) {
+    // patched by open next
+  }
+`;
 export const buildIdRule = `
 rule:
   pattern:

package/dist/cli/build/patches/plugins/node-environment.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Remove a dependency on Babel by dropping the require of error-inspect
+ */
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function patchNodeEnvironment(updater: ContentUpdater): Plugin;
+/**
+ * Drops `require("./node-environment-extensions/error-inspect");`
+ */
+export declare const errorInspectRule = "\nrule:\n  pattern: require(\"./node-environment-extensions/error-inspect\");\nfix: |-\n  // Removed by OpenNext\n  // require(\"./node-environment-extensions/error-inspect\");\n";

package/dist/cli/build/patches/plugins/node-environment.js

@@ -0,0 +1,26 @@
+/**
+ * Remove a dependency on Babel by dropping the require of error-inspect
+ */
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";
+export function patchNodeEnvironment(updater) {
+    return updater.updateContent("node-environment", [
+        {
+            filter: getCrossPlatformPathRegex(String.raw `/next/dist/server/node-environment\.js$`, {
+                escape: false,
+            }),
+            contentFilter: /error-inspect/,
+            callback: async ({ contents }) => patchCode(contents, errorInspectRule),
+        },
+    ]);
+}
+/**
+ * Drops `require("./node-environment-extensions/error-inspect");`
+ */
+export const errorInspectRule = `
+rule:
+  pattern: require("./node-environment-extensions/error-inspect");
+fix: |-
+  // Removed by OpenNext
+  // require("./node-environment-extensions/error-inspect");
+`;

package/dist/cli/build/patches/plugins/route-module.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Patch for `next/src/server/route-modules/route-module.ts`
+ * https://github.com/vercel/next.js/blob/c8c9bef/packages/next/src/server/route-modules/route-module.ts#L389-L437
+ *
+ * Patch getIncrementalCache to use a string literal for the cache handler path
+ *
+ */
+import { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
+export declare function patchRouteModules(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
+/**
+ * The cache handler used by Next.js is normally defined in the config file as a path. At runtime,
+ * Next.js would then do a dynamic require on a transformed version of the path to retrieve the
+ * cache handler and create a new instance of it.
+ *
+ * This is problematic in workerd due to the dynamic import of the file that is not known from
+ * build-time. Therefore, we have to manually override the default way that the cache handler is
+ * instantiated with a dynamic require that uses a string literal for the path.
+ */
+export declare function getIncrementalCacheRule(handlerPath: string): string;
+/**
+ * Force trustHostHeader to be true for revalidation
+ */
+export declare const forceTrustHostHeader = "\nrule:\n  pattern: async function $FN($$$ARGS) { $$$BODY }\n  all:\n    - has:\n        pattern: if ($CONTEXT.trustHostHeader) { $$$_ }\n        stopBy: end\n    - has:\n        regex: \"^x-vercel-protection-bypass$\"\n        stopBy: end\n    - has:\n        regex: \"Invariant: missing internal\"\n        stopBy: end\nfix: |-\n    async function $FN($$$ARGS) {\n      $CONTEXT.trustHostHeader = true;\n      $$$BODY\n    }\n";

package/dist/cli/build/patches/plugins/route-module.js

@@ -0,0 +1,77 @@
+/**
+ * Patch for `next/src/server/route-modules/route-module.ts`
+ * https://github.com/vercel/next.js/blob/c8c9bef/packages/next/src/server/route-modules/route-module.ts#L389-L437
+ *
+ * Patch getIncrementalCache to use a string literal for the cache handler path
+ *
+ */
+import path 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 { normalizePath } from "../../utils/index.js";
+export function patchRouteModules(updater, buildOpts) {
+    return updater.updateContent("route-module", [
+        {
+            filter: getCrossPlatformPathRegex(String.raw `/next/dist/compiled/next-server/.*?\.runtime\.prod\.js$`, {
+                escape: false,
+            }),
+            versions: ">=15.4.0",
+            contentFilter: /getIncrementalCache\(/,
+            callback: async ({ contents }) => {
+                const { outputDir } = buildOpts;
+                const outputPath = path.join(outputDir, "server-functions/default");
+                const cacheHandler = path.join(outputPath, getPackagePath(buildOpts), "cache.cjs");
+                contents = patchCode(contents, getIncrementalCacheRule(cacheHandler));
+                contents = patchCode(contents, forceTrustHostHeader);
+                return contents;
+            },
+        },
+    ]);
+}
+/**
+ * The cache handler used by Next.js is normally defined in the config file as a path. At runtime,
+ * Next.js would then do a dynamic require on a transformed version of the path to retrieve the
+ * cache handler and create a new instance of it.
+ *
+ * This is problematic in workerd due to the dynamic import of the file that is not known from
+ * build-time. Therefore, we have to manually override the default way that the cache handler is
+ * instantiated with a dynamic require that uses a string literal for the path.
+ */
+export function getIncrementalCacheRule(handlerPath) {
+    return `
+rule:
+  pattern: "let $CACHE_HANDLER, { cacheHandler: $HANDLER_PATH } = $C"
+  inside:
+    kind: method_definition
+    has:
+      field: name
+      regex: ^getIncrementalCache$
+    stopBy: end
+fix: |-
+  const $HANDLER_PATH = null;
+  let $CACHE_HANDLER = require('${normalizePath(handlerPath)}').default;
+`;
+}
+/**
+ * Force trustHostHeader to be true for revalidation
+ */
+export const forceTrustHostHeader = `
+rule:
+  pattern: async function $FN($$$ARGS) { $$$BODY }
+  all:
+    - has:
+        pattern: if ($CONTEXT.trustHostHeader) { $$$_ }
+        stopBy: end
+    - has:
+        regex: "^x-vercel-protection-bypass$"
+        stopBy: end
+    - has:
+        regex: "Invariant: missing internal"
+        stopBy: end
+fix: |-
+    async function $FN($$$ARGS) {
+      $CONTEXT.trustHostHeader = true;
+      $$$BODY
+    }
+`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,7 +43,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "3.7.2",
+    "@opennextjs/aws": "3.7.4",
     "cloudflare": "^4.4.1",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",