@opennextjs/cloudflare 1.2.1 → 1.3.0

package/dist/cli/build/bundle-server.d.ts

@@ -4,7 +4,7 @@ import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
  */
 export declare function bundleServer(buildOpts: BuildOptions): Promise<void>;
 /**
- * This function applies patches required for the code to run on workers.
+ * This function apply updates to the bundled code.
  */
 export declare function updateWorkerBundledCode(workerOutputFile: string): Promise<void>;
 /**

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

@@ -8,7 +8,6 @@ import { build } from "esbuild";
 import { getOpenNextConfig } from "../../api/config.js";
 import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
-import * as patches from "./patches/index.js";
 import { inlineDynamicRequires } from "./patches/plugins/dynamic-requires.js";
 import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
@@ -21,7 +20,7 @@ import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
 import { setWranglerExternal } from "./patches/plugins/wrangler-external.js";
-import { needsExperimentalReact, normalizePath, patchCodeWithValidations } from "./utils/index.js";
+import { copyPackageCliFiles, needsExperimentalReact, normalizePath } from "./utils/index.js";
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "../..");
 /**
@@ -41,7 +40,7 @@ const optionalDependencies = [
  * Bundle the Open Next server.
  */
 export async function bundleServer(buildOpts) {
-    patches.copyPackageCliFiles(packageDistDir, buildOpts);
+    copyPackageCliFiles(packageDistDir, buildOpts);
     const { appPath, outputDir, monorepoRoot, debug } = buildOpts;
     const baseManifestPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
     const serverFiles = path.join(baseManifestPath, "required-server-files.json");
@@ -142,13 +141,11 @@ export async function bundleServer(buildOpts) {
     console.log(`\x1b[35mWorker saved in \`${path.relative(buildOpts.appPath, getOutputWorkerPath(buildOpts))}\` 🚀\n\x1b[0m`);
 }
 /**
- * This function applies patches required for the code to run on workers.
+ * This function apply updates to the bundled code.
  */
 export async function updateWorkerBundledCode(workerOutputFile) {
     const code = await readFile(workerOutputFile, "utf8");
-    const patchedCode = await patchCodeWithValidations(code, [
-        ["require", patches.patchRequire, { isOptional: true }],
-    ]);
+    const patchedCode = code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");
     await writeFile(workerOutputFile, patchedCode);
 }
 /**

package/dist/cli/build/open-next/compile-init.js

@@ -1,7 +1,9 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { loadConfig } from "@opennextjs/aws/adapters/config/util.js";
 import { build } from "esbuild";
+import pm from "picomatch";
 /**
  * Compiles the initialization code for the workerd runtime
  */
@@ -11,6 +13,23 @@ export async function compileInit(options) {
     const initPath = path.join(templatesDir, "init.js");
     const nextConfig = loadConfig(path.join(options.appBuildOutputPath, ".next"));
     const basePath = nextConfig.basePath ?? "";
+    // https://github.com/vercel/next.js/blob/d76f0b13/packages/next/src/build/index.ts#L573
+    const nextRemotePatterns = nextConfig.images?.remotePatterns ?? [];
+    const remotePatterns = nextRemotePatterns.map((p) => ({
+        protocol: p.protocol,
+        hostname: p.hostname ? pm.makeRe(p.hostname).source : undefined,
+        port: p.port,
+        pathname: pm.makeRe(p.pathname ?? "**", { dot: true }).source,
+        // search is canary only as of June 2025
+        search: p.search,
+    }));
+    // Local patterns are only in canary as of June 2025
+    const nextLocalPatterns = nextConfig.images?.localPatterns ?? [];
+    // https://github.com/vercel/next.js/blob/d76f0b13/packages/next/src/build/index.ts#L573
+    const localPatterns = nextLocalPatterns.map((p) => ({
+        pathname: pm.makeRe(p.pathname ?? "**", { dot: true }).source,
+        search: p.search,
+    }));
     await build({
         entryPoints: [initPath],
         outdir: path.join(options.outputDir, "cloudflare"),
@@ -22,6 +41,8 @@ export async function compileInit(options) {
         define: {
             __BUILD_TIMESTAMP_MS__: JSON.stringify(Date.now()),
             __NEXT_BASE_PATH__: JSON.stringify(basePath),
+            __IMAGES_REMOTE_PATTERNS__: JSON.stringify(remotePatterns),
+            __IMAGES_LOCAL_PATTERNS__: JSON.stringify(localPatterns),
         },
     });
 }

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

@@ -1,5 +1,5 @@
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
+import { computePatchDiff } from "../../utils/test-patch.js";
 import { buildIdRule, createCacheHandlerRule, createComposableCacheHandlersRule, createMiddlewareManifestRule, } from "./next-server.js";
 describe("Next Server", () => {
     const nextServerCode = `
@@ -86,344 +86,131 @@ class NextNodeServer extends _baseserver.default {
     // ...
 }`;
     test("build ID", () => {
-        expect(patchCode(nextServerCode, buildIdRule)).toMatchInlineSnapshot(`
-        "class NextNodeServer extends _baseserver.default {
-            constructor(options){
-                // Initialize super class
-                super(options);
-                this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ };
-            }
-            async handleUpgrade() {
-            // The web server does not support web sockets, it's only used for HMR in
-            // development.
-            }
-            loadEnvConfig({ dev, forceReload, silent }) {
-                (0, _env.loadEnvConfig)(this.dir, dev, silent ? {
-                    info: ()=>{},
-                    error: ()=>{}
-                } : _log, forceReload);
-            }
-            async hasPage(pathname) {
-                var _this_nextConfig_i18n;
-                return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
-            }
-            getBuildId() {
-          return process.env.NEXT_BUILD_ID;
-        }
-            getMiddlewareManifest() {
-                if (this.minimalMode) return null;
-                const manifest = require(this.middlewareManifestPath);
-                return manifest;
-            }
-            async loadCustomCacheHandlers() {
-                const { cacheHandlers } = this.nextConfig.experimental;
-                if (!cacheHandlers) return;
-                // If we've already initialized the cache handlers interface, don't do it
-                // again.
-                if (!(0, _handlers.initializeCacheHandlers)()) return;
-                for (const [kind, handler] of Object.entries(cacheHandlers)){
-                    if (!handler) continue;
-                    (0, _handlers.setCacheHandler)(kind, (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, handler))));
-                }
-            }
-            async getIncrementalCache({ requestHeaders, requestProtocol }) {
-                const dev = !!this.renderOpts.dev;
-                let CacheHandler;
-                const { cacheHandler } = this.nextConfig;
-                if (cacheHandler) {
-                    CacheHandler = (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, cacheHandler)));
-                }
-                await this.loadCustomCacheHandlers();
-                // incremental-cache is request specific
-                // although can have shared caches in module scope
-                // per-cache handler
-                return new _incrementalcache.IncrementalCache({
-                    fs: this.getCacheFilesystem(),
-                    dev,
-                    requestHeaders,
-                    requestProtocol,
-                    allowedRevalidateHeaderKeys: this.nextConfig.experimental.allowedRevalidateHeaderKeys,
-                    minimalMode: this.minimalMode,
-                    serverDistDir: this.serverDistDir,
-                    fetchCacheKeyPrefix: this.nextConfig.experimental.fetchCacheKeyPrefix,
-                    maxMemoryCacheSize: this.nextConfig.cacheMaxMemorySize,
-                    flushToDisk: !this.minimalMode && this.nextConfig.experimental.isrFlushToDisk,
-                    getPrerenderManifest: ()=>this.getPrerenderManifest(),
-                    CurCacheHandler: CacheHandler
-                });
-            }
-            getEnabledDirectories(dev) {
-                const dir = dev ? this.dir : this.serverDistDir;
-                return {
-                    app: (0, _findpagesdir.findDir)(dir, "app") ? true : false,
-                    pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false
-                };
-            }
-            // ...
-        }"
-      `);
+        expect(computePatchDiff("next-server.js", nextServerCode, buildIdRule)).toMatchInlineSnapshot(`
+      "Index: next-server.js
+      ===================================================================
+      --- next-server.js
+      +++ next-server.js
+      @@ -1,5 +1,4 @@
+      -
+       class NextNodeServer extends _baseserver.default {
+           constructor(options){
+               // Initialize super class
+               super(options);
+      @@ -19,18 +18,10 @@
+               var _this_nextConfig_i18n;
+               return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
+           }
+           getBuildId() {
+      -        const buildIdFile = (0, _path.join)(this.distDir, _constants.BUILD_ID_FILE);
+      -        try {
+      -            return _fs.default.readFileSync(buildIdFile, "utf8").trim();
+      -        } catch (err) {
+      -            if (err.code === "ENOENT") {
+      -                throw new Error(\`Could not find a production build in the '\${this.distDir}' directory. Try building your app with 'next build' before starting the production server. https://nextjs.org/docs/messages/production-start-no-build-id\`);
+      -            }
+      -            throw err;
+      -        }
+      -    }
+      +  return process.env.NEXT_BUILD_ID;
+      +}
+           getMiddlewareManifest() {
+               if (this.minimalMode) return null;
+               const manifest = require(this.middlewareManifestPath);
+               return manifest;
+      "
+    `);
     });
     test("middleware manifest", () => {
-        expect(patchCode(nextServerCode, createMiddlewareManifestRule("manifest"))).toMatchInlineSnapshot(`
-      "class NextNodeServer extends _baseserver.default {
-          constructor(options){
-              // Initialize super class
-              super(options);
-              this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ };
-          }
-          async handleUpgrade() {
-          // The web server does not support web sockets, it's only used for HMR in
-          // development.
-          }
-          loadEnvConfig({ dev, forceReload, silent }) {
-              (0, _env.loadEnvConfig)(this.dir, dev, silent ? {
-                  info: ()=>{},
-                  error: ()=>{}
-              } : _log, forceReload);
-          }
-          async hasPage(pathname) {
-              var _this_nextConfig_i18n;
-              return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
-          }
-          getBuildId() {
-              const buildIdFile = (0, _path.join)(this.distDir, _constants.BUILD_ID_FILE);
-              try {
-                  return _fs.default.readFileSync(buildIdFile, "utf8").trim();
-              } catch (err) {
-                  if (err.code === "ENOENT") {
-                      throw new Error(\`Could not find a production build in the '\${this.distDir}' directory. Try building your app with 'next build' before starting the production server. https://nextjs.org/docs/messages/production-start-no-build-id\`);
-                  }
-                  throw err;
-              }
-          }
-          getMiddlewareManifest() {
-        return "manifest";
-      }
-          async loadCustomCacheHandlers() {
-              const { cacheHandlers } = this.nextConfig.experimental;
-              if (!cacheHandlers) return;
-              // If we've already initialized the cache handlers interface, don't do it
-              // again.
-              if (!(0, _handlers.initializeCacheHandlers)()) return;
-              for (const [kind, handler] of Object.entries(cacheHandlers)){
-                  if (!handler) continue;
-                  (0, _handlers.setCacheHandler)(kind, (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, handler))));
-              }
-          }
-          async getIncrementalCache({ requestHeaders, requestProtocol }) {
-              const dev = !!this.renderOpts.dev;
-              let CacheHandler;
-              const { cacheHandler } = this.nextConfig;
-              if (cacheHandler) {
-                  CacheHandler = (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, cacheHandler)));
-              }
-              await this.loadCustomCacheHandlers();
-              // incremental-cache is request specific
-              // although can have shared caches in module scope
-              // per-cache handler
-              return new _incrementalcache.IncrementalCache({
-                  fs: this.getCacheFilesystem(),
-                  dev,
-                  requestHeaders,
-                  requestProtocol,
-                  allowedRevalidateHeaderKeys: this.nextConfig.experimental.allowedRevalidateHeaderKeys,
-                  minimalMode: this.minimalMode,
-                  serverDistDir: this.serverDistDir,
-                  fetchCacheKeyPrefix: this.nextConfig.experimental.fetchCacheKeyPrefix,
-                  maxMemoryCacheSize: this.nextConfig.cacheMaxMemorySize,
-                  flushToDisk: !this.minimalMode && this.nextConfig.experimental.isrFlushToDisk,
-                  getPrerenderManifest: ()=>this.getPrerenderManifest(),
-                  CurCacheHandler: CacheHandler
-              });
-          }
-          getEnabledDirectories(dev) {
-              const dir = dev ? this.dir : this.serverDistDir;
-              return {
-                  app: (0, _findpagesdir.findDir)(dir, "app") ? true : false,
-                  pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false
-              };
-          }
-          // ...
-      }"
+        expect(computePatchDiff("next-server.js", nextServerCode, createMiddlewareManifestRule("manifest")))
+            .toMatchInlineSnapshot(`
+      "Index: next-server.js
+      ===================================================================
+      --- next-server.js
+      +++ next-server.js
+      @@ -1,5 +1,4 @@
+      -
+       class NextNodeServer extends _baseserver.default {
+           constructor(options){
+               // Initialize super class
+               super(options);
+      @@ -30,12 +29,10 @@
+                   throw err;
+               }
+           }
+           getMiddlewareManifest() {
+      -        if (this.minimalMode) return null;
+      -        const manifest = require(this.middlewareManifestPath);
+      -        return manifest;
+      -    }
+      +  return "manifest";
+      +}
+           async loadCustomCacheHandlers() {
+               const { cacheHandlers } = this.nextConfig.experimental;
+               if (!cacheHandlers) return;
+               // If we've already initialized the cache handlers interface, don't do it
+      "
     `);
     });
     test("cache handler", () => {
-        expect(patchCode(nextServerCode, createCacheHandlerRule("manifest"))).toMatchInlineSnapshot(`
-      "class NextNodeServer extends _baseserver.default {
-          constructor(options){
-              // Initialize super class
-              super(options);
-              this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ };
-          }
-          async handleUpgrade() {
-          // The web server does not support web sockets, it's only used for HMR in
-          // development.
-          }
-          loadEnvConfig({ dev, forceReload, silent }) {
-              (0, _env.loadEnvConfig)(this.dir, dev, silent ? {
-                  info: ()=>{},
-                  error: ()=>{}
-              } : _log, forceReload);
-          }
-          async hasPage(pathname) {
-              var _this_nextConfig_i18n;
-              return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
-          }
-          getBuildId() {
-              const buildIdFile = (0, _path.join)(this.distDir, _constants.BUILD_ID_FILE);
-              try {
-                  return _fs.default.readFileSync(buildIdFile, "utf8").trim();
-              } catch (err) {
-                  if (err.code === "ENOENT") {
-                      throw new Error(\`Could not find a production build in the '\${this.distDir}' directory. Try building your app with 'next build' before starting the production server. https://nextjs.org/docs/messages/production-start-no-build-id\`);
-                  }
-                  throw err;
-              }
-          }
-          getMiddlewareManifest() {
-              if (this.minimalMode) return null;
-              const manifest = require(this.middlewareManifestPath);
-              return manifest;
-          }
-          async loadCustomCacheHandlers() {
-              const { cacheHandlers } = this.nextConfig.experimental;
-              if (!cacheHandlers) return;
-              // If we've already initialized the cache handlers interface, don't do it
-              // again.
-              if (!(0, _handlers.initializeCacheHandlers)()) return;
-              for (const [kind, handler] of Object.entries(cacheHandlers)){
-                  if (!handler) continue;
-                  (0, _handlers.setCacheHandler)(kind, (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, handler))));
-              }
-          }
-          async getIncrementalCache({ requestHeaders, requestProtocol }) {
-              const dev = !!this.renderOpts.dev;
-              let CacheHandler;
-              const cacheHandler = null;
-      CacheHandler = require('manifest').default;
-              if (cacheHandler) {
-                  CacheHandler = (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, cacheHandler)));
-              }
-              await this.loadCustomCacheHandlers();
-              // incremental-cache is request specific
-              // although can have shared caches in module scope
-              // per-cache handler
-              return new _incrementalcache.IncrementalCache({
-                  fs: this.getCacheFilesystem(),
-                  dev,
-                  requestHeaders,
-                  requestProtocol,
-                  allowedRevalidateHeaderKeys: this.nextConfig.experimental.allowedRevalidateHeaderKeys,
-                  minimalMode: this.minimalMode,
-                  serverDistDir: this.serverDistDir,
-                  fetchCacheKeyPrefix: this.nextConfig.experimental.fetchCacheKeyPrefix,
-                  maxMemoryCacheSize: this.nextConfig.cacheMaxMemorySize,
-                  flushToDisk: !this.minimalMode && this.nextConfig.experimental.isrFlushToDisk,
-                  getPrerenderManifest: ()=>this.getPrerenderManifest(),
-                  CurCacheHandler: CacheHandler
-              });
-          }
-          getEnabledDirectories(dev) {
-              const dir = dev ? this.dir : this.serverDistDir;
-              return {
-                  app: (0, _findpagesdir.findDir)(dir, "app") ? true : false,
-                  pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false
-              };
-          }
-          // ...
-      }"
+        expect(computePatchDiff("next-server.js", nextServerCode, createCacheHandlerRule("manifest")))
+            .toMatchInlineSnapshot(`
+      "Index: next-server.js
+      ===================================================================
+      --- next-server.js
+      +++ next-server.js
+      @@ -1,5 +1,4 @@
+      -
+       class NextNodeServer extends _baseserver.default {
+           constructor(options){
+               // Initialize super class
+               super(options);
+      @@ -48,9 +47,10 @@
+           }
+           async getIncrementalCache({ requestHeaders, requestProtocol }) {
+               const dev = !!this.renderOpts.dev;
+               let CacheHandler;
+      -        const { cacheHandler } = this.nextConfig;
+      +        const cacheHandler = null;
+      +CacheHandler = require('manifest').default;
+               if (cacheHandler) {
+                   CacheHandler = (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, cacheHandler)));
+               }
+               await this.loadCustomCacheHandlers();
+      "
     `);
     });
     test("composable cache handler", () => {
-        expect(patchCode(nextServerCode, createComposableCacheHandlersRule("manifest"))).toMatchInlineSnapshot(`
-      "class NextNodeServer extends _baseserver.default {
-          constructor(options){
-              // Initialize super class
-              super(options);
-              this.handleNextImageRequest = async (req, res, parsedUrl) => { /* ... */ };
-          }
-          async handleUpgrade() {
-          // The web server does not support web sockets, it's only used for HMR in
-          // development.
-          }
-          loadEnvConfig({ dev, forceReload, silent }) {
-              (0, _env.loadEnvConfig)(this.dir, dev, silent ? {
-                  info: ()=>{},
-                  error: ()=>{}
-              } : _log, forceReload);
-          }
-          async hasPage(pathname) {
-              var _this_nextConfig_i18n;
-              return !!(0, _require.getMaybePagePath)(pathname, this.distDir, (_this_nextConfig_i18n = this.nextConfig.i18n) == null ? void 0 : _this_nextConfig_i18n.locales, this.enabledDirectories.app);
-          }
-          getBuildId() {
-              const buildIdFile = (0, _path.join)(this.distDir, _constants.BUILD_ID_FILE);
-              try {
-                  return _fs.default.readFileSync(buildIdFile, "utf8").trim();
-              } catch (err) {
-                  if (err.code === "ENOENT") {
-                      throw new Error(\`Could not find a production build in the '\${this.distDir}' directory. Try building your app with 'next build' before starting the production server. https://nextjs.org/docs/messages/production-start-no-build-id\`);
-                  }
-                  throw err;
-              }
-          }
-          getMiddlewareManifest() {
-              if (this.minimalMode) return null;
-              const manifest = require(this.middlewareManifestPath);
-              return manifest;
-          }
-          async loadCustomCacheHandlers() {
-              const cacheHandlers = null;
-      const handlersSymbol = Symbol.for('@next/cache-handlers');
-      const handlersMapSymbol = Symbol.for('@next/cache-handlers-map');
-      const handlersSetSymbol = Symbol.for('@next/cache-handlers-set');
-      globalThis[handlersMapSymbol] = new Map();
-      globalThis[handlersMapSymbol].set("default", require('manifest').default);
-      globalThis[handlersSetSymbol] = new Set(globalThis[handlersMapSymbol].values());
-              if (!cacheHandlers) return;
-              // If we've already initialized the cache handlers interface, don't do it
-              // again.
-              if (!(0, _handlers.initializeCacheHandlers)()) return;
-              for (const [kind, handler] of Object.entries(cacheHandlers)){
-                  if (!handler) continue;
-                  (0, _handlers.setCacheHandler)(kind, (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, handler))));
-              }
-          }
-          async getIncrementalCache({ requestHeaders, requestProtocol }) {
-              const dev = !!this.renderOpts.dev;
-              let CacheHandler;
-              const { cacheHandler } = this.nextConfig;
-              if (cacheHandler) {
-                  CacheHandler = (0, _interopdefault.interopDefault)(await dynamicImportEsmDefault((0, _formatdynamicimportpath.formatDynamicImportPath)(this.distDir, cacheHandler)));
-              }
-              await this.loadCustomCacheHandlers();
-              // incremental-cache is request specific
-              // although can have shared caches in module scope
-              // per-cache handler
-              return new _incrementalcache.IncrementalCache({
-                  fs: this.getCacheFilesystem(),
-                  dev,
-                  requestHeaders,
-                  requestProtocol,
-                  allowedRevalidateHeaderKeys: this.nextConfig.experimental.allowedRevalidateHeaderKeys,
-                  minimalMode: this.minimalMode,
-                  serverDistDir: this.serverDistDir,
-                  fetchCacheKeyPrefix: this.nextConfig.experimental.fetchCacheKeyPrefix,
-                  maxMemoryCacheSize: this.nextConfig.cacheMaxMemorySize,
-                  flushToDisk: !this.minimalMode && this.nextConfig.experimental.isrFlushToDisk,
-                  getPrerenderManifest: ()=>this.getPrerenderManifest(),
-                  CurCacheHandler: CacheHandler
-              });
-          }
-          getEnabledDirectories(dev) {
-              const dir = dev ? this.dir : this.serverDistDir;
-              return {
-                  app: (0, _findpagesdir.findDir)(dir, "app") ? true : false,
-                  pages: (0, _findpagesdir.findDir)(dir, "pages") ? true : false
-              };
-          }
-          // ...
-      }"
+        expect(computePatchDiff("next-server.js", nextServerCode, createComposableCacheHandlersRule("manifest")))
+            .toMatchInlineSnapshot(`
+      "Index: next-server.js
+      ===================================================================
+      --- next-server.js
+      +++ next-server.js
+      @@ -1,5 +1,4 @@
+      -
+       class NextNodeServer extends _baseserver.default {
+           constructor(options){
+               // Initialize super class
+               super(options);
+      @@ -35,9 +34,15 @@
+               const manifest = require(this.middlewareManifestPath);
+               return manifest;
+           }
+           async loadCustomCacheHandlers() {
+      -        const { cacheHandlers } = this.nextConfig.experimental;
+      +        const cacheHandlers = null;
+      +const handlersSymbol = Symbol.for('@next/cache-handlers');
+      +const handlersMapSymbol = Symbol.for('@next/cache-handlers-map');
+      +const handlersSetSymbol = Symbol.for('@next/cache-handlers-set');
+      +globalThis[handlersMapSymbol] = new Map();
+      +globalThis[handlersMapSymbol].set("default", require('manifest').default);
+      +globalThis[handlersSetSymbol] = new Set(globalThis[handlersMapSymbol].values());
+               if (!cacheHandlers) return;
+               // If we've already initialized the cache handlers interface, don't do it
+               // again.
+               if (!(0, _handlers.initializeCacheHandlers)()) return;
+      "
     `);
     });
 });

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

@@ -1,5 +1,6 @@
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { describe, expect, test } from "vitest";
+import { computePatchDiff } from "../../utils/test-patch.js";
 import { rule } from "./res-revalidate.js";
 const minifiedApiPageRuntimeCode = `var r=/(?:^|,)\\s*?no-cache\\s*?(?:,|$)/;function t(e){var r=e&&Date.parse(e);return"number"==typeof r?r:NaN}e.exports=function(e,n){var o=e["if-modified-since"],i=e["if-none-match"];if(!o&&!i)return!1;var a=e["cache-control"];if(a&&r.test(a))return!1;if(i&&"*"!==i){var s=n.etag;if(!s)return!1;for(var d=!0,u=function(e){for(var r=0,t=[],n=0,o=0,i=e.length;o<i;o++)switch(e.charCodeAt(o)){case 32:n===r&&(n=r=o+1);break;case 44:t.push(e.substring(n,r)),n=r=o+1;break;default:r=o+1}return t.push(e.substring(n,r)),t}(i),l=0;l<u.length;l++){var p=u[l];if(p===s||p==="W/"+s||"W/"+p===s){d=!1;break}}if(d)return!1}if(o){var c=n["last-modified"];if(!c||!(t(c)<=t(o)))return!1}return!0}}},t={};function n(e){var o=t[e];if(void 0!==o)return o.exports;var i=t[e]={exports:{}},a=!0;try{r[e](i,i.exports,n),a=!1}finally{a&&delete t[e]}return i.exports}n.ab=__dirname+"/";var o=n(695);e.exports=o})()},"./dist/esm/server/crypto-utils.js":(e,r,t)=>{"use strict";t.r(r),t.d(r,{decryptWithSecret:()=>s,encryptWithSecret:()=>a});let n=require("crypto");var o=/*#__PURE__*/t.n(n);let i="aes-256-gcm";function a(e,r){let t=o().randomBytes(16),n=o().randomBytes(64),a=o().pbkdf2Sync(e,n,1e5,32,"sha512"),s=o().createCipheriv(i,a,t),d=Buffer.concat([s.update(r,"utf8"),s.final()]),u=s.getAuthTag();return Buffer.concat([n,t,u,d]).toString("hex")}function s(e,r){let t=Buffer.from(r,"hex"),n=t.slice(0,64),a=t.slice(64,80),s=t.slice(80,96),d=t.slice(96),u=o().pbkdf2Sync(e,n,1e5,32,"sha512"),l=o().createDecipheriv(i,u,a);return l.setAuthTag(s),l.update(d)+l.final("utf8")}},"next/dist/compiled/jsonwebtoken":e=>{"use strict";e.exports=require("next/dist/compiled/jsonwebtoken")},"next/dist/compiled/raw-body":e=>{"use strict";e.exports=require("next/dist/compiled/raw-body")},querystring:e=>{"use strict";e.exports=require("querystring")}},r={};function t(n){var o=r[n];if(void 0!==o)return o.exports;var i=r[n]={exports:{}};return e[n](i,i.exports,t),i.exports}t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var n in r)t.o(r,n)&&!t.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:r[n]})},t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var n={};(()=>{"use strict";t.r(n),t.d(n,{PagesAPIRouteModule:()=>z,default:()=>U});class e{static get(e,r,t){let n=Reflect.get(e,r,t);return"function"==typeof n?n.bind(e):n}static set(e,r,t,n){return Reflect.set(e,r,t,n)}static has(e,r){return Reflect.has(e,r)}static deleteProperty(e,r){return Reflect.deleteProperty(e,r)}}class r extends Error{constructor(){super("Headers cannot be modified. Read more: https://nextjs.org/docs/app/api-reference/functions/headers")}static callable(){throw new r}}class o extends Headers{constructor(r){super(),this.headers=new Proxy(r,{get(t,n,o){if("symbol"==typeof n)return e.get(t,n,o);let i=n.toLowerCase(),a=Object.keys(r).find(e=>e.toLowerCase()===i);if(void 0!==a)return e.get(t,a,o)},set(t,n,o,i){if("symbol"==typeof n)return e.set(t,n,o,i);let a=n.toLowerCase(),s=Object.keys(r).find(e=>e.toLowerCase()===a);return e.set(t,s??n,o,i)},has(t,n){if("symbol"==typeof n)return e.has(t,n);let o=n.toLowerCase(),i=Object.keys(r).find(e=>e.toLowerCase()===o);return void 0!==i&&e.has(t,i)},deleteProperty(t,n){if("symbol"==typeof n)return e.deleteProperty(t,n);let o=n.toLowerCase(),i=Object.keys(r).find(e=>e.toLowerCase()===o);return void 0===i||e.deleteProperty(t,i)}})}static seal(t){return new Proxy(t,{get(t,n,o){switch(n){case"append":case"delete":case"set":return r.callable;default:return e.get(t,n,o)}}})}merge(e){return Array.isArray(e)?e.join(", "):e}static from(e){return e instanceof Headers?e:new o(e)}append(e,r){let t=this.headers[e];"string"==typeof t?this.headers[e]=[t,r]:Array.isArray(t)?t.push(r):this.headers[e]=r}delete(e){delete this.headers[e]}get(e){let r=this.headers[e];return void 0!==r?this.merge(r):null}has(e){return void 0!==this.headers[e]}set(e,r){this.headers[e]=r}forEach(e,r){for(let[t,n]of this.entries())e.call(r,n,t,this)}*entries(){for(let e of Object.keys(this.headers)){let r=e.toLowerCase(),t=this.get(r);yield[r,t]}}*keys(){for(let e of Object.keys(this.headers)){let r=e.toLowerCase();yield r}}*values(){for(let e of Object.keys(this.headers)){let r=this.get(e);yield r}}[Symbol.iterator](){return this.entries()}}let i="x-prerender-revalidate",a="x-prerender-revalidate-if-generated",s={shared:"shared",reactServerComponents:"rsc",serverSideRendering:"ssr",actionBrowser:"action-browser",apiNode:"api-node",apiEdge:"api-edge",middleware:"middleware",instrument:"instrument",edgeAsset:"edge-asset",appPagesBrowser:"app-pages-browser",pagesDirBrowser:"pages-dir-browser",pagesDirEdge:"pages-dir-edge",pagesDirNode:"pages-dir-node"};({...s,GROUP:{builtinReact:[s.reactServerComponents,s.actionBrowser],serverOnly:[s.reactServerComponents,s.actionBrowser,s.instrument,s.middleware],neutralTarget:[s.apiNode,s.apiEdge],clientOnly:[s.serverSideRendering,s.appPagesBrowser],bundled:[s.reactServerComponents,s.actionBrowser,s.serverSideRendering,s.appPagesBrowser,s.shared,s.instrument,s.middleware],appPages:[s.reactServerComponents,s.serverSideRendering,s.appPagesBrowser,s.actionBrowser]}});let d=require("next/dist/server/lib/trace/tracer");var u=/*#__PURE__*/function(e){return e.handleRequest="BaseServer.handleRequest",e.run="BaseServer.run",e.pipe="BaseServer.pipe",e.getStaticHTML="BaseServer.getStaticHTML",e.render="BaseServer.render",e.renderToResponseWithComponents="BaseServer.renderToResponseWithComponents",e.renderToResponse="BaseServer.renderToResponse",e.renderToHTML="BaseServer.renderToHTML",e.renderError="BaseServer.renderError",e.renderErrorToResponse="BaseServer.renderErrorToResponse",e.renderErrorToHTML="BaseServer.renderErrorToHTML",e.render404="BaseServer.render404",e}(u||{}),l=/*#__PURE__*/function(e){return e.loadDefaultErrorComponents="LoadComponents.loadDefaultErrorComponents",e.loadComponents="LoadComponents.loadComponents",e}(l||{}),p=/*#__PURE__*/function(e){return e.getRequestHandler="NextServer.getRequestHandler",e.getServer="NextServer.getServer",e.getServerRequestHandler="NextServer.getServerRequestHandler",e.createServer="createServer.createServer",e}(p||{}),c=/*#__PURE__*/function(e){return e.compression="NextNodeServer.compression",e.getBuildId="NextNodeServer.getBuildId",e.createComponentTree="NextNodeServer.createComponentTree",e.clientComponentLoading="NextNodeServer.clientComponentLoading",e.getLayoutOrPageModule="NextNodeServer.getLayoutOrPageModule",e.generateStaticRoutes="NextNodeServer.generateStaticRoutes",e.generateFsStaticRoutes="NextNodeServer.generateFsStaticRoutes",e.generatePublicRoutes="NextNodeServer.generatePublicRoutes",e.generateImageRoutes="NextNodeServer.generateImageRoutes.route",e.sendRenderResult="NextNodeServer.sendRenderResult",e.proxyRequest="NextNodeServer.proxyRequest",e.runApi="NextNodeServer.runApi",e.render="NextNodeServer.render",e.renderHTML="NextNodeServer.renderHTML",e.imageOptimizer="NextNodeServer.imageOptimizer",e.getPagePath="NextNodeServer.getPagePath",e.getRoutesManifest="NextNodeServer.getRoutesManifest",e.findPageComponents="NextNodeServer.findPageComponents",e.getFontManifest="NextNodeServer.getFontManifest",e.getServerComponentManifest="NextNodeServer.getServerComponentManifest",e.getRequestHandler="NextNodeServer.getRequestHandler",e.renderToHTML="NextNodeServer.renderToHTML",e.renderError="NextNodeServer.renderError",e.renderErrorToHTML="NextNodeServer.renderErrorToHTML",e.render404="NextNodeServer.render404",e.startResponse="NextNodeServer.startResponse",e.route="route",e.onProxyReq="onProxyReq",e.apiResolver="apiResolver",e.internalFetch="internalFetch",e}(c||{}),f=/*#__PURE__*/function(e){return e.startServer="startServer.startServer",e}(f||{}),g=/*#__PURE__*/function(e){return e.getServerSideProps="Render.getServerSideProps",e.getStaticProps="Render.getStaticProps",e.renderToString="Render.renderToString",e.renderDocument="Render.renderDocument",e.createBodyResult="Render.createBodyResult",e}(g||{}),v=/*#__PURE__*/function(e){return e.renderToString="AppRender.renderToString",e.renderToReadableStream="AppRender.renderToReadableStream",e.getBodyResult="AppRender.getBodyResult",e.fetch="AppRender.fetch",e}(v||{}),m=/*#__PURE__*/function(e){return e.executeRoute="Router.executeRoute",e}(m||{}),h=/*#__PURE__*/function(e){return e.runHandler="Node.runHandler",e}(h||{}),y=/*#__PURE__*/function(e){return e.runHandler="AppRouteRouteHandlers.runHandler",e}(y||{}),b=/*#__PURE__*/function(e){return e.generateMetadata="ResolveMetadata.generateMetadata",e.generateViewport="ResolveMetadata.generateViewport",e}(b||{}),x=/*#__PURE__*/function(e){return e.execute="Middleware.execute",e}(x||{});let w="__prerender_bypass",S="__next_preview_data",R=Symbol(S),_=Symbol(w);function E(e,r={}){if(_ in e)return e;let{serialize:n}=t("./dist/compiled/cookie/index.js"),o=e.getHeader("Set-Cookie");return e.setHeader("Set-Cookie",[..."string"==typeof o?[o]:Array.isArray(o)?o:[],n(w,"",{expires:new Date(0),httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==r.path?{path:r.path}:void 0}),n(S,"",{expires:new Date(0),httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==r.path?{path:r.path}:void 0})]),Object.defineProperty(e,_,{value:!0,enumerable:!1}),e}class O extends Error{constructor(e,r){super(r),this.statusCode=e}}function C(e,r,t){e.statusCode=r,e.statusMessage=t,e.end(t)}function N({req:e},r,t){let n={configurable:!0,enumerable:!0},o={...n,writable:!0};Object.defineProperty(e,r,{...n,get:()=>{let n=t();return Object.defineProperty(e,r,{...o,value:n}),n},set:t=>{Object.defineProperty(e,r,{...o,value:t})}})}class j{constructor({userland:e,definition:r}){this.userland=e,this.definition=r}}var T=t("./dist/compiled/bytes/index.js"),P=/*#__PURE__*/t.n(T);let A=e=>{let r=e.length,t=0,n=0,o=8997,i=0,a=33826,s=0,d=40164,u=0,l=52210;for(;t<r;)o^=e.charCodeAt(t++),n=435*o,i=435*a,s=435*d,u=435*l,s+=o<<8,u+=a<<8,i+=n>>>16,o=65535&n,s+=i>>>16,a=65535&i,l=u+(s>>>16)&65535,d=65535&s;return(15&l)*0x1000000000000+0x100000000*d+65536*a+(o^l>>4)},H=(e,r=!1)=>(r?'W/"':'"')+A(e).toString(36)+e.length.toString(36)+'"';"undefined"!=typeof performance&&["mark","measure","getEntriesByName"].every(e=>"function"==typeof performance[e]);var M=t("./dist/compiled/fresh/index.js"),k=/*#__PURE__*/t.n(M);let B=require("stream");function L(e){return"object"==typeof e&&null!==e&&"name"in e&&"message"in e}var D=t("./dist/compiled/@edge-runtime/cookies/index.js"),$=t("./dist/compiled/content-type/index.js");async function q(e,r){let n,o;try{n=(0,$.parse)(e.headers["content-type"]||"text/plain")}catch{n=(0,$.parse)("text/plain")}let{type:i,parameters:a}=n,s=a.charset||"utf-8";try{let n=t("next/dist/compiled/raw-body");o=await n(e,{encoding:s,limit:r})}catch(e){if(L(e)&&"entity.too.large"===e.type)throw Object.defineProperty(new O(413,\`Body exceeded \${r} limit\`),"__NEXT_ERROR_CODE",{value:"E394",enumerable:!1,configurable:!0});throw Object.defineProperty(new O(400,"Invalid body"),"__NEXT_ERROR_CODE",{value:"E394",enumerable:!1,configurable:!0})}let d=o.toString();return"application/json"===i||"application/ld+json"===i?function(e){if(0===e.length)return{};try{return JSON.parse(e)}catch(e){throw Object.defineProperty(new O(400,"Invalid JSON"),"__NEXT_ERROR_CODE",{value:"E394",enumerable:!1,configurable:!0})}}(d):"application/x-www-form-urlencoded"===i?t("querystring").decode(d):d}function I(e){return"string"==typeof e&&e.length>=16}async function K(e,r,t,n){if("string"!=typeof e||!e.startsWith("/"))throw Object.defineProperty(Error(\`Invalid urlPath provided to revalidate(), must be a path e.g. /blog/post-1, received \${e}\`),"__NEXT_ERROR_CODE",{value:"E153",enumerable:!1,configurable:!0});let o={[i]:n.previewModeId,...r.unstable_onlyGenerated?{[a]:"1"}:{}},s=[...n.allowedRevalidateHeaderKeys||[]];for(let e of((n.trustHostHeader||n.dev)&&s.push("cookie"),n.trustHostHeader&&s.push("x-vercel-protection-bypass"),Object.keys(t.headers)))s.includes(e)&&(o[e]=t.headers[e]);try{if(n.trustHostHeader){let n=await fetch(\`https://\${t.headers.host}\${e}\`,{method:"HEAD",headers:o}),i=n.headers.get("x-vercel-cache")||n.headers.get("x-nextjs-cache");if((null==i?void 0:i.toUpperCase())!=="REVALIDATED"&&200!==n.status&&!(404===n.status&&r.unstable_onlyGenerated))throw Object.defineProperty(Error(\`Invalid response \${n.status}\`),"__NEXT_ERROR_CODE",{value:"E175",enumerable:!1,configurable:!0})}else if(n.revalidate)await n.revalidate({urlPath:e,revalidateHeaders:o,opts:r});else throw Object.defineProperty(Error("Invariant: required internal revalidate method not passed to api-utils"),"__NEXT_ERROR_CODE",{value:"E174",enumerable:!1,configurable:!0})}catch(r){throw Object.defineProperty(Error(\`Failed to revalidate \${e}: \${L(r)?r.message:r}\`),"__NEXT_ERROR_CODE",{value:"E240",enumerable:!1,configurable:!0})}}async function X(e,r,n,s,d,u,l,p,c){try{var f,g,v,m;if(!s){r.statusCode=404,r.end("Not Found");return}let u=s.config||{},l=(null==(f=u.api)?void 0:f.bodyParser)!==!1,p=(null==(g=u.api)?void 0:g.responseLimit)??!0;null==(v=u.api)||v.externalResolver,N({req:e},"cookies",(m=e.headers,function(){let{cookie:e}=m;if(!e)return{};let{parse:r}=t("./dist/compiled/cookie/index.js");return r(Array.isArray(e)?e.join("; "):e)})),e.query=n,N({req:e},"previewData",()=>(function(e,r,n,s){var d,u;let l;if(n&&function(e,r){let t=o.from(e.headers);return{isOnDemandRevalidate:t.get(i)===r.previewModeId,revalidateOnlyGenerated:t.has(a)}}(e,n).isOnDemandRevalidate)return!1;if(R in e)return e[R];let p=o.from(e.headers),c=new D.RequestCookies(p),f=null==(d=c.get(w))?void 0:d.value,g=null==(u=c.get(S))?void 0:u.value;if(f&&!g&&f===n.previewModeId){let r={};return Object.defineProperty(e,R,{value:r,enumerable:!1}),r}if(!f&&!g)return!1;if(!f||!g||f!==n.previewModeId)return s||E(r),!1;try{l=t("next/dist/compiled/jsonwebtoken").verify(g,n.previewModeSigningKey)}catch{return E(r),!1}let{decryptWithSecret:v}=t("./dist/esm/server/crypto-utils.js"),m=v(Buffer.from(n.previewModeEncryptionKey),l.data);try{let r=JSON.parse(m);return Object.defineProperty(e,R,{value:r,enumerable:!1}),r}catch{return!1}})(e,r,d,!!d.multiZoneDraftMode)),N({req:e},"preview",()=>!1!==e.previewData||void 0),N({req:e},"draftMode",()=>e.preview),l&&!e.body&&(e.body=await q(e,u.api&&u.api.bodyParser&&u.api.bodyParser.sizeLimit?u.api.bodyParser.sizeLimit:"1mb"));let c=0,h=p&&"boolean"!=typeof p?P().parse(p):4194304,y=r.write,b=r.end;r.write=(...e)=>(c+=Buffer.byteLength(e[0]||""),y.apply(r,e)),r.end=(...t)=>(t.length&&"function"!=typeof t[0]&&(c+=Buffer.byteLength(t[0]||"")),p&&c>=h&&console.warn(\`API response for \${e.url} exceeds \${P().format(h)}. API Routes are meant to respond quickly. https://nextjs.org/docs/messages/api-routes-response-size-limit\`),b.apply(r,t)),r.status=e=>(r.statusCode=e,r),r.send=t=>(function(e,r,t){var n;if(null==t){r.end();return}if(204===r.statusCode||304===r.statusCode){r.removeHeader("Content-Type"),r.removeHeader("Content-Length"),r.removeHeader("Transfer-Encoding"),r.end();return}let o=r.getHeader("Content-Type");if(t instanceof B.Stream){o||r.setHeader("Content-Type","application/octet-stream"),t.pipe(r);return}let i=["object","number","boolean"].includes(typeof t),a=i?JSON.stringify(t):t;if((n=H(a))&&r.setHeader("ETag",n),!k()(e.headers,{etag:n})||(r.statusCode=304,r.end(),0)){if(Buffer.isBuffer(t)){o||r.setHeader("Content-Type","application/octet-stream"),r.setHeader("Content-Length",t.length),r.end(t);return}i&&r.setHeader("Content-Type","application/json; charset=utf-8"),r.setHeader("Content-Length",Buffer.byteLength(a)),r.end(a)}})(e,r,t),r.json=e=>{r.setHeader("Content-Type","application/json; charset=utf-8"),r.send(JSON.stringify(e))},r.redirect=(e,t)=>(function(e,r,t){if("string"==typeof r&&(t=r,r=307),"number"!=typeof r||"string"!=typeof t)throw Object.defineProperty(Error("Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination')."),"__NEXT_ERROR_CODE",{value:"E389",enumerable:!1,configurable:!0});return e.writeHead(r,{Location:t}),e.write(t),e.end(),e})(r,e,t),r.setDraftMode=(e={enable:!0})=>(function(e,r){if(!I(r.previewModeId))throw Object.defineProperty(Error("invariant: invalid previewModeId"),"__NEXT_ERROR_CODE",{value:"E169",enumerable:!1,configurable:!0});let n=r.enable?void 0:new Date(0),{serialize:o}=t("./dist/compiled/cookie/index.js"),i=e.getHeader("Set-Cookie");return e.setHeader("Set-Cookie",[..."string"==typeof i?[i]:Array.isArray(i)?i:[],o(w,r.previewModeId,{httpOnly:!0,sameSite:"none",secure:!0,path:"/",expires:n})]),e})(r,Object.assign({},d,e)),r.setPreviewData=(e,n={})=>(function(e,r,n){if(!I(n.previewModeId))throw Object.defineProperty(Error("invariant: invalid previewModeId"),"__NEXT_ERROR_CODE",{value:"E169",enumerable:!1,configurable:!0});if(!I(n.previewModeEncryptionKey))throw Object.defineProperty(Error("invariant: invalid previewModeEncryptionKey"),"__NEXT_ERROR_CODE",{value:"E334",enumerable:!1,configurable:!0});if(!I(n.previewModeSigningKey))throw Object.defineProperty(Error("invariant: invalid previewModeSigningKey"),"__NEXT_ERROR_CODE",{value:"E436",enumerable:!1,configurable:!0});let o=t("next/dist/compiled/jsonwebtoken"),{encryptWithSecret:i}=t("./dist/esm/server/crypto-utils.js"),a=o.sign({data:i(Buffer.from(n.previewModeEncryptionKey),JSON.stringify(r))},n.previewModeSigningKey,{algorithm:"HS256",...void 0!==n.maxAge?{expiresIn:n.maxAge}:void 0});if(a.length>2048)throw Object.defineProperty(Error("Preview data is limited to 2KB currently, reduce how much data you are storing as preview data to continue"),"__NEXT_ERROR_CODE",{value:"E465",enumerable:!1,configurable:!0});let{serialize:s}=t("./dist/compiled/cookie/index.js"),d=e.getHeader("Set-Cookie");return e.setHeader("Set-Cookie",[..."string"==typeof d?[d]:Array.isArray(d)?d:[],s(w,n.previewModeId,{httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==n.maxAge?{maxAge:n.maxAge}:void 0,...void 0!==n.path?{path:n.path}:void 0}),s(S,a,{httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==n.maxAge?{maxAge:n.maxAge}:void 0,...void 0!==n.path?{path:n.path}:void 0})]),e})(r,e,Object.assign({},d,n)),r.clearPreviewData=(e={})=>E(r,e),r.revalidate=(r,t)=>K(r,t||{},e,d);let x=s.default||s;await x(e,r)}catch(t){if(null==c||c(t,e,{routerKind:"Pages Router",routePath:p||"",routeType:"route",revalidateReason:void 0}),t instanceof O)C(r,t.statusCode,t.message);else{if(l)throw L(t)&&(t.page=p),t;if(console.error(t),u)throw t;C(r,500,"Internal Server Error")}}}class z extends j{constructor(e){if(super(e),"function"!=typeof e.userland.default)throw Object.defineProperty(Error(\`Page \${e.definition.page} does not export a default function.\`),"__NEXT_ERROR_CODE",{value:"E379",enumerable:!1,configurable:!0});this.apiResolverWrapped=function(e,r){return(...t)=>((0,d.getTracer)().setRootSpanAttribute("next.route",e),(0,d.getTracer)().trace(h.runHandler,{spanName:\`executing api route (pages) \${e}\`},()=>r(...t)))}(e.definition.page,X)}async render(e,r,t){let{apiResolverWrapped:n}=this;await n(e,r,t.query,this.userland,{...t.previewProps,revalidate:t.revalidate,trustHostHeader:t.trustHostHeader,allowedRevalidateHeaderKeys:t.allowedRevalidateHeaderKeys,hostname:t.hostname,multiZoneDraftMode:t.multiZoneDraftMode,dev:t.dev},t.minimalMode,t.dev,t.page,t.onError)}}let U=z})(),module.exports=n})();`;
 const unminifiedCode = `async function revalidate(urlPath, opts, req, context) {
@@ -73,69 +74,26 @@ describe("patchResRevalidate", () => {
         expect(patchCode(minifiedApiPageRuntimeCode, rule)).toMatchInlineSnapshot(`"var r=/(?:^|,)\\s*?no-cache\\s*?(?:,|$)/;function t(e){var r=e&&Date.parse(e);return"number"==typeof r?r:NaN}e.exports=function(e,n){var o=e["if-modified-since"],i=e["if-none-match"];if(!o&&!i)return!1;var a=e["cache-control"];if(a&&r.test(a))return!1;if(i&&"*"!==i){var s=n.etag;if(!s)return!1;for(var d=!0,u=function(e){for(var r=0,t=[],n=0,o=0,i=e.length;o<i;o++)switch(e.charCodeAt(o)){case 32:n===r&&(n=r=o+1);break;case 44:t.push(e.substring(n,r)),n=r=o+1;break;default:r=o+1}return t.push(e.substring(n,r)),t}(i),l=0;l<u.length;l++){var p=u[l];if(p===s||p==="W/"+s||"W/"+p===s){d=!1;break}}if(d)return!1}if(o){var c=n["last-modified"];if(!c||!(t(c)<=t(o)))return!1}return!0}}},t={};function n(e){var o=t[e];if(void 0!==o)return o.exports;var i=t[e]={exports:{}},a=!0;try{r[e](i,i.exports,n),a=!1}finally{a&&delete t[e]}return i.exports}n.ab=__dirname+"/";var o=n(695);e.exports=o})()},"./dist/esm/server/crypto-utils.js":(e,r,t)=>{"use strict";t.r(r),t.d(r,{decryptWithSecret:()=>s,encryptWithSecret:()=>a});let n=require("crypto");var o=/*#__PURE__*/t.n(n);let i="aes-256-gcm";function a(e,r){let t=o().randomBytes(16),n=o().randomBytes(64),a=o().pbkdf2Sync(e,n,1e5,32,"sha512"),s=o().createCipheriv(i,a,t),d=Buffer.concat([s.update(r,"utf8"),s.final()]),u=s.getAuthTag();return Buffer.concat([n,t,u,d]).toString("hex")}function s(e,r){let t=Buffer.from(r,"hex"),n=t.slice(0,64),a=t.slice(64,80),s=t.slice(80,96),d=t.slice(96),u=o().pbkdf2Sync(e,n,1e5,32,"sha512"),l=o().createDecipheriv(i,u,a);return l.setAuthTag(s),l.update(d)+l.final("utf8")}},"next/dist/compiled/jsonwebtoken":e=>{"use strict";e.exports=require("next/dist/compiled/jsonwebtoken")},"next/dist/compiled/raw-body":e=>{"use strict";e.exports=require("next/dist/compiled/raw-body")},querystring:e=>{"use strict";e.exports=require("querystring")}},r={};function t(n){var o=r[n];if(void 0!==o)return o.exports;var i=r[n]={exports:{}};return e[n](i,i.exports,t),i.exports}t.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return t.d(r,{a:r}),r},t.d=(e,r)=>{for(var n in r)t.o(r,n)&&!t.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:r[n]})},t.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),t.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var n={};(()=>{"use strict";t.r(n),t.d(n,{PagesAPIRouteModule:()=>z,default:()=>U});class e{static get(e,r,t){let n=Reflect.get(e,r,t);return"function"==typeof n?n.bind(e):n}static set(e,r,t,n){return Reflect.set(e,r,t,n)}static has(e,r){return Reflect.has(e,r)}static deleteProperty(e,r){return Reflect.deleteProperty(e,r)}}class r extends Error{constructor(){super("Headers cannot be modified. Read more: https://nextjs.org/docs/app/api-reference/functions/headers")}static callable(){throw new r}}class o extends Headers{constructor(r){super(),this.headers=new Proxy(r,{get(t,n,o){if("symbol"==typeof n)return e.get(t,n,o);let i=n.toLowerCase(),a=Object.keys(r).find(e=>e.toLowerCase()===i);if(void 0!==a)return e.get(t,a,o)},set(t,n,o,i){if("symbol"==typeof n)return e.set(t,n,o,i);let a=n.toLowerCase(),s=Object.keys(r).find(e=>e.toLowerCase()===a);return e.set(t,s??n,o,i)},has(t,n){if("symbol"==typeof n)return e.has(t,n);let o=n.toLowerCase(),i=Object.keys(r).find(e=>e.toLowerCase()===o);return void 0!==i&&e.has(t,i)},deleteProperty(t,n){if("symbol"==typeof n)return e.deleteProperty(t,n);let o=n.toLowerCase(),i=Object.keys(r).find(e=>e.toLowerCase()===o);return void 0===i||e.deleteProperty(t,i)}})}static seal(t){return new Proxy(t,{get(t,n,o){switch(n){case"append":case"delete":case"set":return r.callable;default:return e.get(t,n,o)}}})}merge(e){return Array.isArray(e)?e.join(", "):e}static from(e){return e instanceof Headers?e:new o(e)}append(e,r){let t=this.headers[e];"string"==typeof t?this.headers[e]=[t,r]:Array.isArray(t)?t.push(r):this.headers[e]=r}delete(e){delete this.headers[e]}get(e){let r=this.headers[e];return void 0!==r?this.merge(r):null}has(e){return void 0!==this.headers[e]}set(e,r){this.headers[e]=r}forEach(e,r){for(let[t,n]of this.entries())e.call(r,n,t,this)}*entries(){for(let e of Object.keys(this.headers)){let r=e.toLowerCase(),t=this.get(r);yield[r,t]}}*keys(){for(let e of Object.keys(this.headers)){let r=e.toLowerCase();yield r}}*values(){for(let e of Object.keys(this.headers)){let r=this.get(e);yield r}}[Symbol.iterator](){return this.entries()}}let i="x-prerender-revalidate",a="x-prerender-revalidate-if-generated",s={shared:"shared",reactServerComponents:"rsc",serverSideRendering:"ssr",actionBrowser:"action-browser",apiNode:"api-node",apiEdge:"api-edge",middleware:"middleware",instrument:"instrument",edgeAsset:"edge-asset",appPagesBrowser:"app-pages-browser",pagesDirBrowser:"pages-dir-browser",pagesDirEdge:"pages-dir-edge",pagesDirNode:"pages-dir-node"};({...s,GROUP:{builtinReact:[s.reactServerComponents,s.actionBrowser],serverOnly:[s.reactServerComponents,s.actionBrowser,s.instrument,s.middleware],neutralTarget:[s.apiNode,s.apiEdge],clientOnly:[s.serverSideRendering,s.appPagesBrowser],bundled:[s.reactServerComponents,s.actionBrowser,s.serverSideRendering,s.appPagesBrowser,s.shared,s.instrument,s.middleware],appPages:[s.reactServerComponents,s.serverSideRendering,s.appPagesBrowser,s.actionBrowser]}});let d=require("next/dist/server/lib/trace/tracer");var u=/*#__PURE__*/function(e){return e.handleRequest="BaseServer.handleRequest",e.run="BaseServer.run",e.pipe="BaseServer.pipe",e.getStaticHTML="BaseServer.getStaticHTML",e.render="BaseServer.render",e.renderToResponseWithComponents="BaseServer.renderToResponseWithComponents",e.renderToResponse="BaseServer.renderToResponse",e.renderToHTML="BaseServer.renderToHTML",e.renderError="BaseServer.renderError",e.renderErrorToResponse="BaseServer.renderErrorToResponse",e.renderErrorToHTML="BaseServer.renderErrorToHTML",e.render404="BaseServer.render404",e}(u||{}),l=/*#__PURE__*/function(e){return e.loadDefaultErrorComponents="LoadComponents.loadDefaultErrorComponents",e.loadComponents="LoadComponents.loadComponents",e}(l||{}),p=/*#__PURE__*/function(e){return e.getRequestHandler="NextServer.getRequestHandler",e.getServer="NextServer.getServer",e.getServerRequestHandler="NextServer.getServerRequestHandler",e.createServer="createServer.createServer",e}(p||{}),c=/*#__PURE__*/function(e){return e.compression="NextNodeServer.compression",e.getBuildId="NextNodeServer.getBuildId",e.createComponentTree="NextNodeServer.createComponentTree",e.clientComponentLoading="NextNodeServer.clientComponentLoading",e.getLayoutOrPageModule="NextNodeServer.getLayoutOrPageModule",e.generateStaticRoutes="NextNodeServer.generateStaticRoutes",e.generateFsStaticRoutes="NextNodeServer.generateFsStaticRoutes",e.generatePublicRoutes="NextNodeServer.generatePublicRoutes",e.generateImageRoutes="NextNodeServer.generateImageRoutes.route",e.sendRenderResult="NextNodeServer.sendRenderResult",e.proxyRequest="NextNodeServer.proxyRequest",e.runApi="NextNodeServer.runApi",e.render="NextNodeServer.render",e.renderHTML="NextNodeServer.renderHTML",e.imageOptimizer="NextNodeServer.imageOptimizer",e.getPagePath="NextNodeServer.getPagePath",e.getRoutesManifest="NextNodeServer.getRoutesManifest",e.findPageComponents="NextNodeServer.findPageComponents",e.getFontManifest="NextNodeServer.getFontManifest",e.getServerComponentManifest="NextNodeServer.getServerComponentManifest",e.getRequestHandler="NextNodeServer.getRequestHandler",e.renderToHTML="NextNodeServer.renderToHTML",e.renderError="NextNodeServer.renderError",e.renderErrorToHTML="NextNodeServer.renderErrorToHTML",e.render404="NextNodeServer.render404",e.startResponse="NextNodeServer.startResponse",e.route="route",e.onProxyReq="onProxyReq",e.apiResolver="apiResolver",e.internalFetch="internalFetch",e}(c||{}),f=/*#__PURE__*/function(e){return e.startServer="startServer.startServer",e}(f||{}),g=/*#__PURE__*/function(e){return e.getServerSideProps="Render.getServerSideProps",e.getStaticProps="Render.getStaticProps",e.renderToString="Render.renderToString",e.renderDocument="Render.renderDocument",e.createBodyResult="Render.createBodyResult",e}(g||{}),v=/*#__PURE__*/function(e){return e.renderToString="AppRender.renderToString",e.renderToReadableStream="AppRender.renderToReadableStream",e.getBodyResult="AppRender.getBodyResult",e.fetch="AppRender.fetch",e}(v||{}),m=/*#__PURE__*/function(e){return e.executeRoute="Router.executeRoute",e}(m||{}),h=/*#__PURE__*/function(e){return e.runHandler="Node.runHandler",e}(h||{}),y=/*#__PURE__*/function(e){return e.runHandler="AppRouteRouteHandlers.runHandler",e}(y||{}),b=/*#__PURE__*/function(e){return e.generateMetadata="ResolveMetadata.generateMetadata",e.generateViewport="ResolveMetadata.generateViewport",e}(b||{}),x=/*#__PURE__*/function(e){return e.execute="Middleware.execute",e}(x||{});let w="__prerender_bypass",S="__next_preview_data",R=Symbol(S),_=Symbol(w);function E(e,r={}){if(_ in e)return e;let{serialize:n}=t("./dist/compiled/cookie/index.js"),o=e.getHeader("Set-Cookie");return e.setHeader("Set-Cookie",[..."string"==typeof o?[o]:Array.isArray(o)?o:[],n(w,"",{expires:new Date(0),httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==r.path?{path:r.path}:void 0}),n(S,"",{expires:new Date(0),httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==r.path?{path:r.path}:void 0})]),Object.defineProperty(e,_,{value:!0,enumerable:!1}),e}class O extends Error{constructor(e,r){super(r),this.statusCode=e}}function C(e,r,t){e.statusCode=r,e.statusMessage=t,e.end(t)}function N({req:e},r,t){let n={configurable:!0,enumerable:!0},o={...n,writable:!0};Object.defineProperty(e,r,{...n,get:()=>{let n=t();return Object.defineProperty(e,r,{...o,value:n}),n},set:t=>{Object.defineProperty(e,r,{...o,value:t})}})}class j{constructor({userland:e,definition:r}){this.userland=e,this.definition=r}}var T=t("./dist/compiled/bytes/index.js"),P=/*#__PURE__*/t.n(T);let A=e=>{let r=e.length,t=0,n=0,o=8997,i=0,a=33826,s=0,d=40164,u=0,l=52210;for(;t<r;)o^=e.charCodeAt(t++),n=435*o,i=435*a,s=435*d,u=435*l,s+=o<<8,u+=a<<8,i+=n>>>16,o=65535&n,s+=i>>>16,a=65535&i,l=u+(s>>>16)&65535,d=65535&s;return(15&l)*0x1000000000000+0x100000000*d+65536*a+(o^l>>4)},H=(e,r=!1)=>(r?'W/"':'"')+A(e).toString(36)+e.length.toString(36)+'"';"undefined"!=typeof performance&&["mark","measure","getEntriesByName"].every(e=>"function"==typeof performance[e]);var M=t("./dist/compiled/fresh/index.js"),k=/*#__PURE__*/t.n(M);let B=require("stream");function L(e){return"object"==typeof e&&null!==e&&"name"in e&&"message"in e}var D=t("./dist/compiled/@edge-runtime/cookies/index.js"),$=t("./dist/compiled/content-type/index.js");async function q(e,r){let n,o;try{n=(0,$.parse)(e.headers["content-type"]||"text/plain")}catch{n=(0,$.parse)("text/plain")}let{type:i,parameters:a}=n,s=a.charset||"utf-8";try{let n=t("next/dist/compiled/raw-body");o=await n(e,{encoding:s,limit:r})}catch(e){if(L(e)&&"entity.too.large"===e.type)throw Object.defineProperty(new O(413,\`Body exceeded \${r} limit\`),"__NEXT_ERROR_CODE",{value:"E394",enumerable:!1,configurable:!0});throw Object.defineProperty(new O(400,"Invalid body"),"__NEXT_ERROR_CODE",{value:"E394",enumerable:!1,configurable:!0})}let d=o.toString();return"application/json"===i||"application/ld+json"===i?function(e){if(0===e.length)return{};try{return JSON.parse(e)}catch(e){throw Object.defineProperty(new O(400,"Invalid JSON"),"__NEXT_ERROR_CODE",{value:"E394",enumerable:!1,configurable:!0})}}(d):"application/x-www-form-urlencoded"===i?t("querystring").decode(d):d}function I(e){return"string"==typeof e&&e.length>=16}async function K(e,r,t,n){if("string"!=typeof e||!e.startsWith("/"))throw Object.defineProperty(Error(\`Invalid urlPath provided to revalidate(), must be a path e.g. /blog/post-1, received \${e}\`),"__NEXT_ERROR_CODE",{value:"E153",enumerable:!1,configurable:!0});let o={[i]:n.previewModeId,...r.unstable_onlyGenerated?{[a]:"1"}:{}},s=[...n.allowedRevalidateHeaderKeys||[]];for(let e of((n.trustHostHeader||n.dev)&&s.push("cookie"),n.trustHostHeader&&s.push("x-vercel-protection-bypass"),Object.keys(t.headers)))s.includes(e)&&(o[e]=t.headers[e]);try{if(n.trustHostHeader){let n=await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`\${t.headers.host.includes("localhost") ? "http":"https" }://\${t.headers.host}\${e}\`,{method:'HEAD', headers:o}),i=n.headers.get("x-vercel-cache")||n.headers.get("x-nextjs-cache");if((null==i?void 0:i.toUpperCase())!=="REVALIDATED"&&200!==n.status&&!(404===n.status&&r.unstable_onlyGenerated))throw Object.defineProperty(Error(\`Invalid response \${n.status}\`),"__NEXT_ERROR_CODE",{value:"E175",enumerable:!1,configurable:!0})}else if(n.revalidate)await n.revalidate({urlPath:e,revalidateHeaders:o,opts:r});else throw Object.defineProperty(Error("Invariant: required internal revalidate method not passed to api-utils"),"__NEXT_ERROR_CODE",{value:"E174",enumerable:!1,configurable:!0})}catch(r){throw Object.defineProperty(Error(\`Failed to revalidate \${e}: \${L(r)?r.message:r}\`),"__NEXT_ERROR_CODE",{value:"E240",enumerable:!1,configurable:!0})}}async function X(e,r,n,s,d,u,l,p,c){try{var f,g,v,m;if(!s){r.statusCode=404,r.end("Not Found");return}let u=s.config||{},l=(null==(f=u.api)?void 0:f.bodyParser)!==!1,p=(null==(g=u.api)?void 0:g.responseLimit)??!0;null==(v=u.api)||v.externalResolver,N({req:e},"cookies",(m=e.headers,function(){let{cookie:e}=m;if(!e)return{};let{parse:r}=t("./dist/compiled/cookie/index.js");return r(Array.isArray(e)?e.join("; "):e)})),e.query=n,N({req:e},"previewData",()=>(function(e,r,n,s){var d,u;let l;if(n&&function(e,r){let t=o.from(e.headers);return{isOnDemandRevalidate:t.get(i)===r.previewModeId,revalidateOnlyGenerated:t.has(a)}}(e,n).isOnDemandRevalidate)return!1;if(R in e)return e[R];let p=o.from(e.headers),c=new D.RequestCookies(p),f=null==(d=c.get(w))?void 0:d.value,g=null==(u=c.get(S))?void 0:u.value;if(f&&!g&&f===n.previewModeId){let r={};return Object.defineProperty(e,R,{value:r,enumerable:!1}),r}if(!f&&!g)return!1;if(!f||!g||f!==n.previewModeId)return s||E(r),!1;try{l=t("next/dist/compiled/jsonwebtoken").verify(g,n.previewModeSigningKey)}catch{return E(r),!1}let{decryptWithSecret:v}=t("./dist/esm/server/crypto-utils.js"),m=v(Buffer.from(n.previewModeEncryptionKey),l.data);try{let r=JSON.parse(m);return Object.defineProperty(e,R,{value:r,enumerable:!1}),r}catch{return!1}})(e,r,d,!!d.multiZoneDraftMode)),N({req:e},"preview",()=>!1!==e.previewData||void 0),N({req:e},"draftMode",()=>e.preview),l&&!e.body&&(e.body=await q(e,u.api&&u.api.bodyParser&&u.api.bodyParser.sizeLimit?u.api.bodyParser.sizeLimit:"1mb"));let c=0,h=p&&"boolean"!=typeof p?P().parse(p):4194304,y=r.write,b=r.end;r.write=(...e)=>(c+=Buffer.byteLength(e[0]||""),y.apply(r,e)),r.end=(...t)=>(t.length&&"function"!=typeof t[0]&&(c+=Buffer.byteLength(t[0]||"")),p&&c>=h&&console.warn(\`API response for \${e.url} exceeds \${P().format(h)}. API Routes are meant to respond quickly. https://nextjs.org/docs/messages/api-routes-response-size-limit\`),b.apply(r,t)),r.status=e=>(r.statusCode=e,r),r.send=t=>(function(e,r,t){var n;if(null==t){r.end();return}if(204===r.statusCode||304===r.statusCode){r.removeHeader("Content-Type"),r.removeHeader("Content-Length"),r.removeHeader("Transfer-Encoding"),r.end();return}let o=r.getHeader("Content-Type");if(t instanceof B.Stream){o||r.setHeader("Content-Type","application/octet-stream"),t.pipe(r);return}let i=["object","number","boolean"].includes(typeof t),a=i?JSON.stringify(t):t;if((n=H(a))&&r.setHeader("ETag",n),!k()(e.headers,{etag:n})||(r.statusCode=304,r.end(),0)){if(Buffer.isBuffer(t)){o||r.setHeader("Content-Type","application/octet-stream"),r.setHeader("Content-Length",t.length),r.end(t);return}i&&r.setHeader("Content-Type","application/json; charset=utf-8"),r.setHeader("Content-Length",Buffer.byteLength(a)),r.end(a)}})(e,r,t),r.json=e=>{r.setHeader("Content-Type","application/json; charset=utf-8"),r.send(JSON.stringify(e))},r.redirect=(e,t)=>(function(e,r,t){if("string"==typeof r&&(t=r,r=307),"number"!=typeof r||"string"!=typeof t)throw Object.defineProperty(Error("Invalid redirect arguments. Please use a single argument URL, e.g. res.redirect('/destination') or use a status code and URL, e.g. res.redirect(307, '/destination')."),"__NEXT_ERROR_CODE",{value:"E389",enumerable:!1,configurable:!0});return e.writeHead(r,{Location:t}),e.write(t),e.end(),e})(r,e,t),r.setDraftMode=(e={enable:!0})=>(function(e,r){if(!I(r.previewModeId))throw Object.defineProperty(Error("invariant: invalid previewModeId"),"__NEXT_ERROR_CODE",{value:"E169",enumerable:!1,configurable:!0});let n=r.enable?void 0:new Date(0),{serialize:o}=t("./dist/compiled/cookie/index.js"),i=e.getHeader("Set-Cookie");return e.setHeader("Set-Cookie",[..."string"==typeof i?[i]:Array.isArray(i)?i:[],o(w,r.previewModeId,{httpOnly:!0,sameSite:"none",secure:!0,path:"/",expires:n})]),e})(r,Object.assign({},d,e)),r.setPreviewData=(e,n={})=>(function(e,r,n){if(!I(n.previewModeId))throw Object.defineProperty(Error("invariant: invalid previewModeId"),"__NEXT_ERROR_CODE",{value:"E169",enumerable:!1,configurable:!0});if(!I(n.previewModeEncryptionKey))throw Object.defineProperty(Error("invariant: invalid previewModeEncryptionKey"),"__NEXT_ERROR_CODE",{value:"E334",enumerable:!1,configurable:!0});if(!I(n.previewModeSigningKey))throw Object.defineProperty(Error("invariant: invalid previewModeSigningKey"),"__NEXT_ERROR_CODE",{value:"E436",enumerable:!1,configurable:!0});let o=t("next/dist/compiled/jsonwebtoken"),{encryptWithSecret:i}=t("./dist/esm/server/crypto-utils.js"),a=o.sign({data:i(Buffer.from(n.previewModeEncryptionKey),JSON.stringify(r))},n.previewModeSigningKey,{algorithm:"HS256",...void 0!==n.maxAge?{expiresIn:n.maxAge}:void 0});if(a.length>2048)throw Object.defineProperty(Error("Preview data is limited to 2KB currently, reduce how much data you are storing as preview data to continue"),"__NEXT_ERROR_CODE",{value:"E465",enumerable:!1,configurable:!0});let{serialize:s}=t("./dist/compiled/cookie/index.js"),d=e.getHeader("Set-Cookie");return e.setHeader("Set-Cookie",[..."string"==typeof d?[d]:Array.isArray(d)?d:[],s(w,n.previewModeId,{httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==n.maxAge?{maxAge:n.maxAge}:void 0,...void 0!==n.path?{path:n.path}:void 0}),s(S,a,{httpOnly:!0,sameSite:"none",secure:!0,path:"/",...void 0!==n.maxAge?{maxAge:n.maxAge}:void 0,...void 0!==n.path?{path:n.path}:void 0})]),e})(r,e,Object.assign({},d,n)),r.clearPreviewData=(e={})=>E(r,e),r.revalidate=(r,t)=>K(r,t||{},e,d);let x=s.default||s;await x(e,r)}catch(t){if(null==c||c(t,e,{routerKind:"Pages Router",routePath:p||"",routeType:"route",revalidateReason:void 0}),t instanceof O)C(r,t.statusCode,t.message);else{if(l)throw L(t)&&(t.page=p),t;if(console.error(t),u)throw t;C(r,500,"Internal Server Error")}}}class z extends j{constructor(e){if(super(e),"function"!=typeof e.userland.default)throw Object.defineProperty(Error(\`Page \${e.definition.page} does not export a default function.\`),"__NEXT_ERROR_CODE",{value:"E379",enumerable:!1,configurable:!0});this.apiResolverWrapped=function(e,r){return(...t)=>((0,d.getTracer)().setRootSpanAttribute("next.route",e),(0,d.getTracer)().trace(h.runHandler,{spanName:\`executing api route (pages) \${e}\`},()=>r(...t)))}(e.definition.page,X)}async render(e,r,t){let{apiResolverWrapped:n}=this;await n(e,r,t.query,this.userland,{...t.previewProps,revalidate:t.revalidate,trustHostHeader:t.trustHostHeader,allowedRevalidateHeaderKeys:t.allowedRevalidateHeaderKeys,hostname:t.hostname,multiZoneDraftMode:t.multiZoneDraftMode,dev:t.dev},t.minimalMode,t.dev,t.page,t.onError)}}let U=z})(),module.exports=n})();"`);
     });
     test("patch unminified code", () => {
-        expect(patchCode(unminifiedCode, rule))
-            .toMatchInlineSnapshot(`"async function revalidate(urlPath, opts, req, context) {
-    if (typeof urlPath !== 'string' || !urlPath.startsWith('/')) {
-        throw Object.defineProperty(new Error(\`Invalid urlPath provided to revalidate(), must be a path e.g. /blog/post-1, received \${urlPath}\`), "__NEXT_ERROR_CODE", {
-            value: "E153",
-            enumerable: false,
-            configurable: true
-        });
-    }
-    const revalidateHeaders = {
-        [_constants.PRERENDER_REVALIDATE_HEADER]: context.previewModeId,
-        ...opts.unstable_onlyGenerated ? {
-            [_constants.PRERENDER_REVALIDATE_ONLY_GENERATED_HEADER]: '1'
-        } : {}
-    };
-    const allowedRevalidateHeaderKeys = [
-        ...context.allowedRevalidateHeaderKeys || []
-    ];
-    if (context.trustHostHeader || context.dev) {
-        allowedRevalidateHeaderKeys.push('cookie');
-    }
-    if (context.trustHostHeader) {
-        allowedRevalidateHeaderKeys.push('x-vercel-protection-bypass');
-    }
-    for (const key of Object.keys(req.headers)){
-        if (allowedRevalidateHeaderKeys.includes(key)) {
-            revalidateHeaders[key] = req.headers[key];
-        }
-    }
-    try {
-        if (context.trustHostHeader) {
-            const res = await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`\${req.headers.host.includes("localhost") ? "http":"https" }://\${req.headers.host}\${urlPath}\`,{method:'HEAD', headers:revalidateHeaders});
-            // we use the cache header to determine successful revalidate as
-            // a non-200 status code can be returned from a successful revalidate
-            // e.g. notFound: true returns 404 status code but is successful
-            const cacheHeader = res.headers.get('x-vercel-cache') || res.headers.get('x-nextjs-cache');
-            if ((cacheHeader == null ? void 0 : cacheHeader.toUpperCase()) !== 'REVALIDATED' && res.status !== 200 && !(res.status === 404 && opts.unstable_onlyGenerated)) {
-                throw Object.defineProperty(new Error(\`Invalid response \${res.status}\`), "__NEXT_ERROR_CODE", {
-                    value: "E175",
-                    enumerable: false,
-                    configurable: true
-                });
-            }
-        } else if (context.revalidate) {
-            await context.revalidate({
-                urlPath,
-                revalidateHeaders,
-                opts
-            });
-        } else {
-            throw Object.defineProperty(new Error(\`Invariant: required internal revalidate method not passed to api-utils\`), "__NEXT_ERROR_CODE", {
-                value: "E174",
-                enumerable: false,
-                configurable: true
-            });
-        }
-    } catch (err) {
-        throw Object.defineProperty(new Error(\`Failed to revalidate \${urlPath}: \${(0, _iserror.default)(err) ? err.message : err}\`), "__NEXT_ERROR_CODE", {
-            value: "E240",
-            enumerable: false,
-            configurable: true
-        });
-    }
-}"`);
+        expect(computePatchDiff("pages-api.runtime.prod.js", unminifiedCode, rule)).toMatchInlineSnapshot(`
+      "Index: pages-api.runtime.prod.js
+      ===================================================================
+      --- pages-api.runtime.prod.js
+      +++ pages-api.runtime.prod.js
+      @@ -27,12 +27,9 @@
+               }
+           }
+           try {
+               if (context.trustHostHeader) {
+      -            const res = await fetch(\`https://\${req.headers.host}\${urlPath}\`, {
+      -                method: 'HEAD',
+      -                headers: revalidateHeaders
+      -            });
+      +            const res = await (await import("@opennextjs/cloudflare")).getCloudflareContext().env.WORKER_SELF_REFERENCE.fetch(\`\${req.headers.host.includes("localhost") ? "http":"https" }://\${req.headers.host}\${urlPath}\`,{method:'HEAD', headers:revalidateHeaders});
+                   // we use the cache header to determine successful revalidate as
+                   // a non-200 status code can be returned from a successful revalidate
+                   // e.g. notFound: true returns 404 status code but is successful
+                   const cacheHeader = res.headers.get('x-vercel-cache') || res.headers.get('x-nextjs-cache');
+      "
+    `);
     });
 });

package/dist/cli/build/patches/plugins/use-cache.spec.js

@@ -1,7 +1,7 @@
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
 import { expect, test } from "vitest";
+import { computePatchDiff } from "../../utils/test-patch.js";
 import { rule } from "./use-cache.js";
-const codeToPatch = `"use strict";
+const code = `"use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -78,79 +78,24 @@ function createSnapshot() {
 //# sourceMappingURL=async-local-storage.js.map
 `;
 test("patch the createSnapshot function", () => {
-    const patchedCode = patchCode(codeToPatch, rule);
-    expect(patchedCode).toMatchInlineSnapshot(`""use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-0 && (module.exports = {
-    bindSnapshot: null,
-    createAsyncLocalStorage: null,
-    createSnapshot: null
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    bindSnapshot: function() {
-        return bindSnapshot;
-    },
-    createAsyncLocalStorage: function() {
-        return createAsyncLocalStorage;
-    },
-    createSnapshot: function() {
-        return createSnapshot;
-    }
-});
-const sharedAsyncLocalStorageNotAvailableError = Object.defineProperty(new Error('Invariant: AsyncLocalStorage accessed in runtime where it is not available'), "__NEXT_ERROR_CODE", {
-    value: "E504",
-    enumerable: false,
-    configurable: true
-});
-class FakeAsyncLocalStorage {
-    disable() {
-        throw sharedAsyncLocalStorageNotAvailableError;
-    }
-    getStore() {
-        // This fake implementation of AsyncLocalStorage always returns \`undefined\`.
-        return undefined;
-    }
-    run() {
-        throw sharedAsyncLocalStorageNotAvailableError;
-    }
-    exit() {
-        throw sharedAsyncLocalStorageNotAvailableError;
-    }
-    enterWith() {
-        throw sharedAsyncLocalStorageNotAvailableError;
-    }
-    static bind(fn) {
-        return fn;
-    }
-}
-const maybeGlobalAsyncLocalStorage = typeof globalThis !== 'undefined' && globalThis.AsyncLocalStorage;
-function createAsyncLocalStorage() {
-    if (maybeGlobalAsyncLocalStorage) {
-        return new maybeGlobalAsyncLocalStorage();
-    }
-    return new FakeAsyncLocalStorage();
-}
-function bindSnapshot(fn) {
-    if (maybeGlobalAsyncLocalStorage) {
-        return maybeGlobalAsyncLocalStorage.bind(fn);
-    }
-    return FakeAsyncLocalStorage.bind(fn);
-}
-function createSnapshot() {
-    // Ignored snapshot
-    return function(fn, ...args) {
-        return fn(...args);
-    };
-}
-
-//# sourceMappingURL=async-local-storage.js.map
-"`);
+    expect(computePatchDiff("async-local-storage.js", code, rule)).toMatchInlineSnapshot(`
+    "Index: async-local-storage.js
+    ===================================================================
+    --- async-local-storage.js
+    +++ async-local-storage.js
+    @@ -63,11 +63,9 @@
+         }
+         return FakeAsyncLocalStorage.bind(fn);
+     }
+     function createSnapshot() {
+    -    if (maybeGlobalAsyncLocalStorage) {
+    -        return maybeGlobalAsyncLocalStorage.snapshot();
+    -    }
+    +    // Ignored snapshot
+         return function(fn, ...args) {
+             return fn(...args);
+         };
+     }
+    "
+  `);
 });

package/dist/cli/build/{patches/investigated → utils}/copy-package-cli-files.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { getOutputWorkerPath } from "../../bundle-server.js";
+import { getOutputWorkerPath } from "../bundle-server.js";
 /**
  * Copies
  * - the template files present in the cloudflare adapter package to `.open-next/cloudflare-templates`

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

@@ -1,4 +1,4 @@
-export * from "./apply-patches.js";
+export * from "./copy-package-cli-files.js";
 export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";

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

@@ -1,4 +1,4 @@
-export * from "./apply-patches.js";
+export * from "./copy-package-cli-files.js";
 export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";

package/dist/cli/build/utils/test-patch.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Compute the diff resulting of applying the `rule` to `src`.
+ *
+ * @param filename Filename used in the patch output
+ * @param src Content of the source code
+ * @param rule ASTgrep rule
+ * @returns diff in unified diff format
+ */
+export declare function computePatchDiff(filename: string, src: string, rule: string): string;

package/dist/cli/build/utils/test-patch.js

@@ -0,0 +1,14 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { createPatch } from "diff";
+/**
+ * Compute the diff resulting of applying the `rule` to `src`.
+ *
+ * @param filename Filename used in the patch output
+ * @param src Content of the source code
+ * @param rule ASTgrep rule
+ * @returns diff in unified diff format
+ */
+export function computePatchDiff(filename, src, rule) {
+    const dst = patchCode(src, rule);
+    return createPatch(filename, src, dst);
+}

package/dist/cli/templates/init.d.ts

@@ -7,7 +7,24 @@
  * Executes the handler with the Cloudflare context.
  */
 export declare function runWithCloudflareRequestContext(request: Request, env: CloudflareEnv, ctx: ExecutionContext, handler: () => Promise<Response>): Promise<Response>;
+export type RemotePattern = {
+    protocol?: "http" | "https";
+    hostname: string;
+    port?: string;
+    pathname: string;
+    search?: string;
+};
+/**
+ * Fetches an images.
+ *
+ * Local images (starting with a '/' as fetched using the passed fetcher).
+ * Remote images should match the configured remote patterns or a 404 response is returned.
+ */
+export declare function fetchImage(fetcher: Fetcher | undefined, url: string): Response | Promise<Response> | undefined;
+export declare function matchRemotePattern(pattern: RemotePattern, url: URL): boolean;
 declare global {
     var __BUILD_TIMESTAMP_MS__: number;
     var __NEXT_BASE_PATH__: string;
+    var __IMAGES_REMOTE_PATTERNS__: RemotePattern[];
+    var __IMAGES_LOCAL_PATTERNS__: unknown[];
 }

package/dist/cli/templates/init.js

@@ -114,4 +114,80 @@ function populateProcessEnv(url, env) {
      */
     process.env.__NEXT_PRIVATE_ORIGIN = url.origin;
 }
+const imgRemotePatterns = __IMAGES_REMOTE_PATTERNS__;
+/**
+ * Fetches an images.
+ *
+ * Local images (starting with a '/' as fetched using the passed fetcher).
+ * Remote images should match the configured remote patterns or a 404 response is returned.
+ */
+export function fetchImage(fetcher, url) {
+    // https://github.com/vercel/next.js/blob/d76f0b1/packages/next/src/server/image-optimizer.ts#L208
+    if (!url || url.length > 3072 || url.startsWith("//")) {
+        return new Response("Not Found", { status: 404 });
+    }
+    // Local
+    if (url.startsWith("/")) {
+        if (/\/_next\/image($|\/)/.test(decodeURIComponent(parseUrl(url)?.pathname ?? ""))) {
+            return new Response("Not Found", { status: 404 });
+        }
+        return fetcher?.fetch(`http://assets.local${url}`);
+    }
+    // Remote
+    let hrefParsed;
+    try {
+        hrefParsed = new URL(url);
+    }
+    catch {
+        return new Response("Not Found", { status: 404 });
+    }
+    if (!["http:", "https:"].includes(hrefParsed.protocol)) {
+        return new Response("Not Found", { status: 404 });
+    }
+    if (!imgRemotePatterns.some((p) => matchRemotePattern(p, hrefParsed))) {
+        return new Response("Not Found", { status: 404 });
+    }
+    return fetch(url, { cf: { cacheEverything: true } });
+}
+export function matchRemotePattern(pattern, url) {
+    // https://github.com/vercel/next.js/blob/d76f0b1/packages/next/src/shared/lib/match-remote-pattern.ts
+    if (pattern.protocol !== undefined) {
+        if (pattern.protocol.replace(/:$/, "") !== url.protocol.replace(/:$/, "")) {
+            return false;
+        }
+    }
+    if (pattern.port !== undefined) {
+        if (pattern.port !== url.port) {
+            return false;
+        }
+    }
+    if (pattern.hostname === undefined) {
+        throw new Error(`Pattern should define hostname but found\n${JSON.stringify(pattern)}`);
+    }
+    else {
+        if (!new RegExp(pattern.hostname).test(url.hostname)) {
+            return false;
+        }
+    }
+    if (pattern.search !== undefined) {
+        if (pattern.search !== url.search) {
+            return false;
+        }
+    }
+    // Should be the same as writeImagesManifest()
+    if (!new RegExp(pattern.pathname).test(url.pathname)) {
+        return false;
+    }
+    return true;
+}
+function parseUrl(url) {
+    let parsed = undefined;
+    try {
+        parsed = new URL(url, "http://n");
+    }
+    catch {
+        // empty
+    }
+    return parsed;
+}
 /* eslint-enable no-var */

package/dist/cli/templates/worker.js

@@ -1,5 +1,5 @@
 //@ts-expect-error: Will be resolved by wrangler build
-import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
+import { fetchImage, runWithCloudflareRequestContext } from "./cloudflare/init.js";
 // @ts-expect-error: Will be resolved by wrangler build
 import { handler as middlewareHandler } from "./middleware/handler.mjs";
 //@ts-expect-error: Will be resolved by wrangler build
@@ -27,9 +27,7 @@ export default {
             // Fallback for the Next default image loader.
             if (url.pathname === `${globalThis.__NEXT_BASE_PATH__}/_next/image`) {
                 const imageUrl = url.searchParams.get("url") ?? "";
-                return imageUrl.startsWith("/")
-                    ? env.ASSETS?.fetch(`http://assets.local${imageUrl}`)
-                    : fetch(imageUrl, { cf: { cacheEverything: true } });
+                return fetchImage(env.ASSETS, imageUrl);
             }
             // - `Request`s are handled by the Next server
             const reqOrResp = await middlewareHandler(request, env, ctx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -54,6 +54,8 @@
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^22.2.0",
+    "@types/picomatch": "^4.0.0",
+    "diff": "^8.0.2",
     "esbuild": "^0.25.4",
     "eslint": "^9.11.1",
     "eslint-plugin-import": "^2.31.0",
@@ -62,6 +64,7 @@
     "globals": "^15.9.0",
     "mock-fs": "^5.4.1",
     "next": "~14.2.24",
+    "picomatch": "^4.0.2",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.7.0",

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

@@ -1 +0,0 @@
-export * from "./investigated/index.js";

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

@@ -1 +0,0 @@
-export * from "./investigated/index.js";

package/dist/cli/build/patches/investigated/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./copy-package-cli-files.js";
-export * from "./patch-require.js";

package/dist/cli/build/patches/investigated/index.js

@@ -1,2 +0,0 @@
-export * from "./copy-package-cli-files.js";
-export * from "./patch-require.js";

package/dist/cli/build/patches/investigated/patch-require.d.ts

@@ -1,4 +0,0 @@
-/**
- * Replaces webpack `__require` with actual `require`
- */
-export declare function patchRequire(code: string): string;

package/dist/cli/build/patches/investigated/patch-require.js

@@ -1,6 +0,0 @@
-/**
- * Replaces webpack `__require` with actual `require`
- */
-export function patchRequire(code) {
-    return code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");
-}

package/dist/cli/build/utils/apply-patches.d.ts

@@ -1,12 +0,0 @@
-/**
- * Applies multiple code patches in order to a given piece of code, at each step it validates that the code
- * has actually been patched/changed, if not an error is thrown
- *
- * @param code the code to apply the patches to
- * @param patches array of tuples, containing a string indicating the target of the patching (for logging) and
- *                a patching function that takes a string (pre-patch code) and returns a string (post-patch code)
- * @returns the patched code
- */
-export declare function patchCodeWithValidations(code: string, patches: [string, (code: string) => string | Promise<string>, opts?: {
-    isOptional?: boolean;
-}][]): Promise<string>;

package/dist/cli/build/utils/apply-patches.js

@@ -1,22 +0,0 @@
-/**
- * Applies multiple code patches in order to a given piece of code, at each step it validates that the code
- * has actually been patched/changed, if not an error is thrown
- *
- * @param code the code to apply the patches to
- * @param patches array of tuples, containing a string indicating the target of the patching (for logging) and
- *                a patching function that takes a string (pre-patch code) and returns a string (post-patch code)
- * @returns the patched code
- */
-export async function patchCodeWithValidations(code, patches) {
-    console.log(`Applying code patches:`);
-    let patchedCode = code;
-    for (const [target, patchFunction, opts] of patches) {
-        console.log(` - patching ${target}`);
-        const prePatchCode = patchedCode;
-        patchedCode = await patchFunction(patchedCode);
-        if (!opts?.isOptional && prePatchCode === patchedCode) {
-            throw new Error(`Failed to patch ${target}`);
-        }
-    }
-    return patchedCode;
-}