@opennextjs/cloudflare 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/api/config.js

@@ -17,6 +17,8 @@ export function defineCloudflareConfig(config = {}) {
                 queue: resolveQueue(queue),
             },
         },
+        // node:crypto is used to compute cache keys
+        edgeExternals: ["node:crypto"],
     };
 }
 function resolveIncrementalCache(value = "dummy") {

package/dist/api/overrides/incremental-cache/kv-incremental-cache.d.ts

@@ -1,6 +1,11 @@
 import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs/aws/types/overrides.js";
 export declare const NAME = "cf-kv-incremental-cache";
 export declare const BINDING_NAME = "NEXT_INC_CACHE_KV";
+export type KeyOptions = {
+    isFetch?: boolean;
+    buildId?: string;
+};
+export declare function computeCacheKey(key: string, options: KeyOptions): string;
 /**
  * Open Next cache based on Cloudflare KV.
  *

package/dist/api/overrides/incremental-cache/kv-incremental-cache.js

@@ -1,9 +1,15 @@
+import { createHash } from "node:crypto";
 import { error } from "@opennextjs/aws/adapters/logger.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { debugCache, FALLBACK_BUILD_ID } from "../internal.js";
 export const NAME = "cf-kv-incremental-cache";
 export const BINDING_NAME = "NEXT_INC_CACHE_KV";
+export function computeCacheKey(key, options) {
+    const { isFetch = false, buildId = FALLBACK_BUILD_ID } = options;
+    const hash = createHash("sha256").update(key).digest("hex");
+    return `${buildId}/${hash}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
+}
 /**
  * Open Next cache based on Cloudflare KV.
  *
@@ -28,7 +34,6 @@ class KVIncrementalCache {
             // if there is no lastModified property, the file was stored during build-time cache population.
             return {
                 value: entry,
-                // __BUILD_TIMESTAMP_MS__ is injected by ESBuild.
                 lastModified: globalThis.__BUILD_TIMESTAMP_MS__,
             };
         }
@@ -70,8 +75,10 @@ class KVIncrementalCache {
         }
     }
     getKVKey(key, isFetch) {
-        const buildId = process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
-        return `${buildId}/${key}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
+        return computeCacheKey(key, {
+            buildId: process.env.NEXT_BUILD_ID,
+            isFetch,
+        });
     }
 }
 export default new KVIncrementalCache();

package/dist/api/overrides/incremental-cache/r2-incremental-cache.d.ts

@@ -3,6 +3,12 @@ export declare const NAME = "cf-r2-incremental-cache";
 export declare const BINDING_NAME = "NEXT_INC_CACHE_R2_BUCKET";
 export declare const PREFIX_ENV_NAME = "NEXT_INC_CACHE_R2_PREFIX";
 export declare const DEFAULT_PREFIX = "incremental-cache";
+export type KeyOptions = {
+    isFetch?: boolean;
+    directory?: string;
+    buildId?: string;
+};
+export declare function computeCacheKey(key: string, options: KeyOptions): string;
 /**
  * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_INC_CACHE_R2_BUCKET`) as it's
  * underlying data store.

package/dist/api/overrides/incremental-cache/r2-incremental-cache.js

@@ -1,3 +1,4 @@
+import { createHash } from "node:crypto";
 import { error } from "@opennextjs/aws/adapters/logger.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
@@ -6,6 +7,11 @@ export const NAME = "cf-r2-incremental-cache";
 export const BINDING_NAME = "NEXT_INC_CACHE_R2_BUCKET";
 export const PREFIX_ENV_NAME = "NEXT_INC_CACHE_R2_PREFIX";
 export const DEFAULT_PREFIX = "incremental-cache";
+export function computeCacheKey(key, options) {
+    const { isFetch = false, directory = DEFAULT_PREFIX, buildId = FALLBACK_BUILD_ID } = options;
+    const hash = createHash("sha256").update(key).digest("hex");
+    return `${directory}/${buildId}/${hash}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
+}
 /**
  * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_INC_CACHE_R2_BUCKET`) as it's
  * underlying data store.
@@ -59,8 +65,11 @@ class R2IncrementalCache {
         }
     }
     getR2Key(key, isFetch) {
-        const directory = getCloudflareContext().env[PREFIX_ENV_NAME] ?? DEFAULT_PREFIX;
-        return `${directory}/${process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID}/${key}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
+        return computeCacheKey(key, {
+            directory: getCloudflareContext().env[PREFIX_ENV_NAME],
+            buildId: process.env.NEXT_BUILD_ID,
+            isFetch,
+        });
     }
 }
 export default new R2IncrementalCache();

package/dist/api/overrides/incremental-cache/regional-cache.d.ts

@@ -9,6 +9,13 @@ type Options = {
      *                 or an ISR/SSG entry for up to 30 minutes.
      */
     mode: "short-lived" | "long-lived";
+    /**
+     * The default TTL of long-lived cache entries.
+     * When no revalidate is provided, the default age will be used.
+     *
+     * @default `THIRTY_MINUTES_IN_SECONDS`
+     */
+    defaultLongLivedTtlSec?: number;
     /**
      * Whether the regional cache entry should be updated in the background or not when it experiences
      * a cache hit.
@@ -17,6 +24,11 @@ type Options = {
      */
     shouldLazilyUpdateOnCacheHit?: boolean;
 };
+interface PutToCacheInput {
+    key: string;
+    isFetch: boolean | undefined;
+    entry: IncrementalCacheEntry<boolean>;
+}
 /**
  * Wrapper adding a regional cache on an `IncrementalCache` implementation
  */
@@ -30,8 +42,8 @@ declare class RegionalCache implements IncrementalCache {
     set<IsFetch extends boolean = false>(key: string, value: CacheValue<IsFetch>, isFetch?: IsFetch): Promise<void>;
     delete(key: string): Promise<void>;
     protected getCacheInstance(): Promise<Cache>;
-    protected getCacheKey(key: string, isFetch?: boolean): Request<unknown, CfProperties<unknown>>;
-    protected putToCache(key: Request, entry: IncrementalCacheEntry<boolean>): Promise<void>;
+    protected getCacheUrlKey(key: string, isFetch?: boolean): string;
+    protected putToCache({ key, isFetch, entry }: PutToCacheInput): Promise<void>;
 }
 /**
  * A regional cache will wrap an incremental cache and provide faster cache lookups for an entry
@@ -50,6 +62,9 @@ declare class RegionalCache implements IncrementalCache {
  *                                  or an ISR/SSG entry for up to 30 minutes.
  * @param opts.shouldLazilyUpdateOnCacheHit Whether the regional cache entry should be updated in
  *                                          the background or not when it experiences a cache hit.
+ * @param opts.defaultLongLivedTtlSec The default age to use for long-lived cache entries.
+ *                                  When no revalidate is provided, the default age will be used.
+ *                                  @default `THIRTY_MINUTES_IN_SECONDS`
  *
  * @default `false` for the `short-lived` mode, and `true` for the `long-lived` mode.
  */

package/dist/api/overrides/incremental-cache/regional-cache.js

@@ -24,9 +24,9 @@ class RegionalCache {
     async get(key, isFetch) {
         try {
             const cache = await this.getCacheInstance();
-            const localCacheKey = this.getCacheKey(key, isFetch);
+            const urlKey = this.getCacheUrlKey(key, isFetch);
             // Check for a cached entry as this will be faster than the store response.
-            const cachedResponse = await cache.match(localCacheKey);
+            const cachedResponse = await cache.match(urlKey);
             if (cachedResponse) {
                 debugCache("Get - cached response");
                 // Re-fetch from the store and update the regional cache in the background
@@ -34,7 +34,7 @@ class RegionalCache {
                     getCloudflareContext().ctx.waitUntil(this.store.get(key, isFetch).then(async (rawEntry) => {
                         const { value, lastModified } = rawEntry ?? {};
                         if (value && typeof lastModified === "number") {
-                            await this.putToCache(localCacheKey, { value, lastModified });
+                            await this.putToCache({ key, isFetch, entry: { value, lastModified } });
                         }
                     }));
                 }
@@ -45,7 +45,7 @@ class RegionalCache {
             if (!value || typeof lastModified !== "number")
                 return null;
             // Update the locale cache after retrieving from the store.
-            getCloudflareContext().ctx.waitUntil(this.putToCache(localCacheKey, { value, lastModified }));
+            getCloudflareContext().ctx.waitUntil(this.putToCache({ key, isFetch, entry: { value, lastModified } }));
             return { value, lastModified };
         }
         catch (e) {
@@ -56,11 +56,15 @@ class RegionalCache {
     async set(key, value, isFetch) {
         try {
             await this.store.set(key, value, isFetch);
-            await this.putToCache(this.getCacheKey(key, isFetch), {
-                value,
-                // Note: `Date.now()` returns the time of the last IO rather than the actual time.
-                //       See https://developers.cloudflare.com/workers/reference/security-model/
-                lastModified: Date.now(),
+            await this.putToCache({
+                key,
+                isFetch,
+                entry: {
+                    value,
+                    // Note: `Date.now()` returns the time of the last IO rather than the actual time.
+                    //       See https://developers.cloudflare.com/workers/reference/security-model/
+                    lastModified: Date.now(),
+                },
             });
         }
         catch (e) {
@@ -71,7 +75,7 @@ class RegionalCache {
         try {
             await this.store.delete(key);
             const cache = await this.getCacheInstance();
-            await cache.delete(this.getCacheKey(key));
+            await cache.delete(this.getCacheUrlKey(key));
         }
         catch (e) {
             error("Failed to delete from regional cache", e);
@@ -83,16 +87,28 @@ class RegionalCache {
         this.localCache = await caches.open("incremental-cache");
         return this.localCache;
     }
-    getCacheKey(key, isFetch) {
-        return new Request(new URL(`${process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID}/${key}.${isFetch ? "fetch" : "cache"}`, "http://cache.local"));
+    getCacheUrlKey(key, isFetch) {
+        const buildId = process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
+        return ("http://cache.local" + `/${buildId}/${key}`.replace(/\/+/g, "/") + `.${isFetch ? "fetch" : "cache"}`);
     }
-    async putToCache(key, entry) {
+    async putToCache({ key, isFetch, entry }) {
+        const urlKey = this.getCacheUrlKey(key, isFetch);
         const cache = await this.getCacheInstance();
         const age = this.opts.mode === "short-lived"
             ? ONE_MINUTE_IN_SECONDS
-            : entry.value.revalidate || THIRTY_MINUTES_IN_SECONDS;
-        await cache.put(key, new Response(JSON.stringify(entry), {
-            headers: new Headers({ "cache-control": `max-age=${age}` }),
+            : entry.value.revalidate || this.opts.defaultLongLivedTtlSec || THIRTY_MINUTES_IN_SECONDS;
+        // We default to the entry key if no tags are found.
+        // so that we can also revalidate page router based entry this way.
+        const tags = getTagsFromCacheEntry(entry) ?? [key];
+        await cache.put(urlKey, new Response(JSON.stringify(entry), {
+            headers: new Headers({
+                "cache-control": `max-age=${age}`,
+                ...(tags.length > 0
+                    ? {
+                        "cache-tag": tags.join(","),
+                    }
+                    : {}),
+            }),
         }));
     }
 }
@@ -113,9 +129,29 @@ class RegionalCache {
  *                                  or an ISR/SSG entry for up to 30 minutes.
  * @param opts.shouldLazilyUpdateOnCacheHit Whether the regional cache entry should be updated in
  *                                          the background or not when it experiences a cache hit.
+ * @param opts.defaultLongLivedTtlSec The default age to use for long-lived cache entries.
+ *                                  When no revalidate is provided, the default age will be used.
+ *                                  @default `THIRTY_MINUTES_IN_SECONDS`
  *
  * @default `false` for the `short-lived` mode, and `true` for the `long-lived` mode.
  */
 export function withRegionalCache(cache, opts) {
     return new RegionalCache(cache, opts);
 }
+/**
+ * Extract the list of tags from a cache entry.
+ */
+function getTagsFromCacheEntry(entry) {
+    if ("tags" in entry.value && entry.value.tags) {
+        return entry.value.tags;
+    }
+    if ("meta" in entry.value &&
+        entry.value.meta &&
+        "headers" in entry.value.meta &&
+        entry.value.meta.headers) {
+        const rawTags = entry.value.meta.headers["x-next-cache-tags"];
+        if (typeof rawTags === "string") {
+            return rawTags.split(",");
+        }
+    }
+}

package/dist/api/overrides/incremental-cache/static-assets-incremental-cache.js

@@ -23,7 +23,6 @@ class StaticAssetsIncrementalCache {
                 return null;
             return {
                 value: await response.json(),
-                // __BUILD_TIMESTAMP_MS__ is injected by ESBuild.
                 lastModified: globalThis.__BUILD_TIMESTAMP_MS__,
             };
         }

package/dist/api/overrides/tag-cache/d1-next-tag-cache.d.ts

@@ -7,7 +7,6 @@ export declare class D1NextModeTagCache implements NextModeTagCache {
     hasBeenRevalidated(tags: string[], lastModified?: number): Promise<boolean>;
     writeTags(tags: string[]): Promise<void>;
     private getConfig;
-    protected removeBuildId(key: string): string;
     protected getCacheKey(key: string): string;
     protected getBuildId(): string;
 }

package/dist/api/overrides/tag-cache/d1-next-tag-cache.js

@@ -1,5 +1,4 @@
 import { error } from "@opennextjs/aws/adapters/logger.js";
-import { RecoverableError } from "@opennextjs/aws/utils/error.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { debugCache, FALLBACK_BUILD_ID } from "../internal.js";
 export const NAME = "d1-next-mode-tag-cache";
@@ -27,13 +26,12 @@ export class D1NextModeTagCache {
     }
     async writeTags(tags) {
         const { isDisabled, db } = this.getConfig();
-        if (isDisabled)
+        // TODO: Remove `tags.length === 0` when https://github.com/opennextjs/opennextjs-aws/pull/828 is used
+        if (isDisabled || tags.length === 0)
             return Promise.resolve();
-        const result = await db.batch(tags.map((tag) => db
+        await db.batch(tags.map((tag) => db
             .prepare(`INSERT INTO revalidations (tag, revalidatedAt) VALUES (?, ?)`)
             .bind(this.getCacheKey(tag), Date.now())));
-        if (!result)
-            throw new RecoverableError(`D1 insert failed for ${tags}`);
     }
     getConfig() {
         const db = getCloudflareContext().env[BINDING_NAME];
@@ -48,9 +46,6 @@ export class D1NextModeTagCache {
                 db,
             };
     }
-    removeBuildId(key) {
-        return key.replace(`${this.getBuildId()}/`, "");
-    }
     getCacheKey(key) {
         return `${this.getBuildId()}/${key}`.replaceAll("//", "/");
     }

package/dist/cli/args.d.ts

@@ -5,7 +5,7 @@ export type Arguments = ({
     skipWranglerConfigCheck: boolean;
     minify: boolean;
 } | {
-    command: "preview" | "deploy";
+    command: "preview" | "deploy" | "upload";
     passthroughArgs: string[];
 } | {
     command: "populateCache";

package/dist/cli/args.js

@@ -28,6 +28,7 @@ export function getArgs() {
             };
         case "preview":
         case "deploy":
+        case "upload":
             return {
                 command: positionals[0],
                 outputDir,
@@ -44,7 +45,7 @@ export function getArgs() {
                 environment: getWranglerEnvironmentFlag(passthroughArgs),
             };
         default:
-            throw new Error("Error: invalid command, expected 'build' | 'preview' | 'deploy' | 'populateCache'");
+            throw new Error("Error: invalid command, expected 'build' | 'preview' | 'deploy' | 'upload' | 'populateCache'");
     }
 }
 function getPassthroughArgs() {

package/dist/cli/build/build.js

@@ -8,6 +8,7 @@ import logger from "@opennextjs/aws/logger.js";
 import { bundleServer } from "./bundle-server.js";
 import { compileCacheAssetsManifestSqlFile } from "./open-next/compile-cache-assets-manifest.js";
 import { compileEnvFiles } from "./open-next/compile-env-files.js";
+import { compileInit } from "./open-next/compile-init.js";
 import { compileDurableObjects } from "./open-next/compileDurableObjects.js";
 import { createServerBundle } from "./open-next/createServerBundle.js";
 import { createWranglerConfigIfNotExistent } from "./utils/index.js";
@@ -49,9 +50,11 @@ export async function build(options, config, projectOpts) {
     compileCache(options);
     // Compile .env files
     compileEnvFiles(options);
+    // Compile workerd init
+    compileInit(options);
     // Compile middleware
     await createMiddleware(options, { forceOnlyBuildOnce: true });
-    createStaticAssets(options);
+    createStaticAssets(options, { useBasePath: true });
     if (config.dangerous?.disableIncrementalCache !== true) {
         const { useTagCache, metaFiles } = createCacheAssets(options);
         if (useTagCache) {

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

@@ -14,7 +14,6 @@ import { inlineEvalManifest } from "./patches/plugins/eval-manifest.js";
 import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
-import { patchNextMinimal } from "./patches/plugins/next-minimal.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
 import { fixRequire } from "./patches/plugins/require.js";
@@ -83,7 +82,6 @@ export async function bundleServer(buildOpts) {
             inlineLoadManifest(updater, buildOpts),
             inlineBuildId(updater),
             patchDepdDeprecations(updater),
-            patchNextMinimal(updater),
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
@@ -125,46 +123,6 @@ export async function bundleServer(buildOpts) {
             "process.env.__NEXT_EXPERIMENTAL_REACT": `${needsExperimentalReact(nextConfig)}`,
         },
         platform: "node",
-        banner: {
-            js: `
-// Used by unbundled js files (which don't inherit the __dirname present in the define field)
-// so we also need to set it on the global scope
-// Note: this was hit in the next/dist/compiled/@opentelemetry/api module
-globalThis.__dirname ??= "";
-globalThis.__filename ??= "";
-
-// Do not crash on cache not supported
-// https://github.com/cloudflare/workerd/pull/2434
-// compatibility flag "cache_option_enabled" -> does not support "force-cache"
-const curFetch = globalThis.fetch;
-globalThis.fetch = (input, init) => {
-  if (init) {
-    delete init.cache;
-  }
-  return curFetch(input, init);
-};
-import __cf_stream from 'node:stream';
-fetch = globalThis.fetch;
-const CustomRequest = class extends globalThis.Request {
-  constructor(input, init) {
-    if (init) {
-      delete init.cache;
-      // https://github.com/cloudflare/workerd/issues/2746
-      // https://github.com/cloudflare/workerd/issues/3245
-      Object.defineProperty(init, "body", {
-        value: init.body instanceof __cf_stream.Readable ? ReadableStream.from(init.body) : init.body
-      });
-    }
-    super(input, init);
-  }
-};
-globalThis.Request = CustomRequest;
-Request = globalThis.Request;
-// Makes the edge converter returns either a Response or a Request.
-globalThis.__dangerous_ON_edge_converter_returns_request = true;
-globalThis.__BUILD_TIMESTAMP_MS__ = ${Date.now()};
-`,
-        },
     });
     fs.writeFileSync(openNextServerBundle + ".meta.json", JSON.stringify(result.metafile, null, 2));
     await updateWorkerBundledCode(openNextServerBundle, buildOpts);
@@ -185,6 +143,7 @@ export async function updateWorkerBundledCode(workerOutputFile, buildOpts) {
         [
             "'require(this.middlewareManifestPath)'",
             (code) => patches.inlineMiddlewareManifestRequire(code, buildOpts),
+            { isOptional: true },
         ],
         [
             "`require.resolve` call",

package/dist/cli/build/open-next/compile-env-files.js

@@ -5,7 +5,7 @@ import { extractProjectEnvVars } from "../utils/index.js";
  * Compiles the values extracted from the project's env files to the output directory for use in the worker.
  */
 export function compileEnvFiles(buildOpts) {
-    const envDir = path.join(buildOpts.outputDir, "env");
+    const envDir = path.join(buildOpts.outputDir, "cloudflare");
     fs.mkdirSync(envDir, { recursive: true });
     ["production", "development", "test"].forEach((mode) => fs.appendFileSync(path.join(envDir, `next-env.mjs`), `export const ${mode} = ${JSON.stringify(extractProjectEnvVars(mode, buildOpts))};\n`));
 }

package/dist/cli/build/open-next/compile-init.d.ts

@@ -0,0 +1,5 @@
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+/**
+ * Compiles the initialization code for the workerd runtime
+ */
+export declare function compileInit(options: BuildOptions): Promise<void>;

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

@@ -0,0 +1,27 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { loadConfig } from "@opennextjs/aws/adapters/config/util.js";
+import { build } from "esbuild";
+/**
+ * Compiles the initialization code for the workerd runtime
+ */
+export async function compileInit(options) {
+    const currentDir = path.join(path.dirname(fileURLToPath(import.meta.url)));
+    const templatesDir = path.join(currentDir, "../../templates");
+    const initPath = path.join(templatesDir, "init.js");
+    const nextConfig = loadConfig(path.join(options.appBuildOutputPath, ".next"));
+    const basePath = nextConfig.basePath ?? "";
+    await build({
+        entryPoints: [initPath],
+        outdir: path.join(options.outputDir, "cloudflare"),
+        bundle: false,
+        minify: false,
+        format: "esm",
+        target: "esnext",
+        platform: "node",
+        define: {
+            __BUILD_TIMESTAMP_MS__: JSON.stringify(Date.now()),
+            __NEXT_BASE_PATH__: JSON.stringify(basePath),
+        },
+    });
+}

package/dist/cli/build/open-next/createServerBundle.js

@@ -10,8 +10,9 @@ import { copyMiddlewareResources, generateEdgeBundle } from "@opennextjs/aws/bui
 import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { installDependencies } from "@opennextjs/aws/build/installDeps.js";
 import { applyCodePatches } from "@opennextjs/aws/build/patch/codePatcher.js";
-import { patchFetchCacheForISR, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patchFetchCacheISR.js";
-import { patchFetchCacheSetMissingWaitUntil } from "@opennextjs/aws/build/patch/patchFetchCacheWaitUntil.js";
+import { patchEnvVars, patchFetchCacheForISR, patchFetchCacheSetMissingWaitUntil, patchNextServer, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patches/index.js";
+// TODO: import from patches/index.js when https://github.com/opennextjs/opennextjs-aws/pull/827 is released
+import { patchBackgroundRevalidation } from "@opennextjs/aws/build/patch/patches/patchBackgroundRevalidation.js";
 import logger from "@opennextjs/aws/logger.js";
 import { minifyAll } from "@opennextjs/aws/minimize-js.js";
 import { openNextEdgePlugins } from "@opennextjs/aws/plugins/edge.js";
@@ -124,6 +125,9 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         patchFetchCacheSetMissingWaitUntil,
         patchFetchCacheForISR,
         patchUnstableCacheForISR,
+        patchNextServer,
+        patchEnvVars,
+        patchBackgroundRevalidation,
         // Cloudflare specific patches
         patchResRevalidate,
         ...additionalCodePatches,
@@ -147,6 +151,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
                 ...(disableNextPrebundledReact ? ["applyNextjsPrebundledReact"] : []),
                 ...(disableRouting ? ["withRouting"] : []),
                 ...(isAfter142 ? ["patchAsyncStorage"] : []),
+                ...(isAfter141 ? ["appendPrefetch"] : []),
             ],
         }),
         openNextReplacementPlugin({

package/dist/cli/build/utils/ensure-cf-config.js

@@ -17,6 +17,7 @@ export function ensureCloudflareConfig(config) {
             config.default?.override?.queue === "direct" ||
             typeof config.default?.override?.queue === "function",
         mwIsMiddlewareIntegrated: config.middleware === undefined,
+        hasCryptoExternal: config.edgeExternals?.includes("node:crypto"),
     };
     if (config.default?.override?.queue === "direct") {
         logger.warn("The direct mode queue is not recommended for use in production.");
@@ -34,6 +35,7 @@ export function ensureCloudflareConfig(config) {
               queue: "dummy" | "direct" | function,
             },
           },
+          edgeExternals: ["node:crypto"],
         }\n\n`.replace(/^ {8}/gm, ""));
     }
 }

package/dist/cli/commands/populate-cache.d.ts

@@ -1,6 +1,13 @@
 import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
 import type { WranglerTarget } from "../utils/run-wrangler.js";
+export type CacheAsset = {
+    isFetch: boolean;
+    fullPath: string;
+    key: string;
+    buildId: string;
+};
+export declare function getCacheAssets(opts: BuildOptions): CacheAsset[];
 export declare function populateCache(options: BuildOptions, config: OpenNextConfig, populateCacheOptions: {
     target: WranglerTarget;
     environment?: string;

package/dist/cli/commands/populate-cache.js

@@ -4,29 +4,49 @@ import logger from "@opennextjs/aws/logger.js";
 import { globSync } from "glob";
 import { tqdm } from "ts-tqdm";
 import { unstable_readConfig } from "wrangler";
-import { BINDING_NAME as KV_CACHE_BINDING_NAME, NAME as KV_CACHE_NAME, } from "../../api/overrides/incremental-cache/kv-incremental-cache.js";
-import { BINDING_NAME as R2_CACHE_BINDING_NAME, DEFAULT_PREFIX as R2_CACHE_DEFAULT_PREFIX, NAME as R2_CACHE_NAME, PREFIX_ENV_NAME as R2_CACHE_PREFIX_ENV_NAME, } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
+import { BINDING_NAME as KV_CACHE_BINDING_NAME, computeCacheKey as computeKVCacheKey, NAME as KV_CACHE_NAME, } from "../../api/overrides/incremental-cache/kv-incremental-cache.js";
+import { BINDING_NAME as R2_CACHE_BINDING_NAME, computeCacheKey as computeR2CacheKey, NAME as R2_CACHE_NAME, PREFIX_ENV_NAME as R2_CACHE_PREFIX_ENV_NAME, } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
 import { CACHE_DIR as STATIC_ASSETS_CACHE_DIR, NAME as STATIC_ASSETS_CACHE_NAME, } from "../../api/overrides/incremental-cache/static-assets-incremental-cache.js";
 import { BINDING_NAME as D1_TAG_BINDING_NAME, NAME as D1_TAG_NAME, } from "../../api/overrides/tag-cache/d1-next-tag-cache.js";
 import { runWrangler } from "../utils/run-wrangler.js";
 async function resolveCacheName(value) {
     return typeof value === "function" ? (await value()).name : value;
 }
-function getCacheAssetPaths(opts) {
-    return globSync(path.join(opts.outputDir, "cache/**/*"), {
+export function getCacheAssets(opts) {
+    const allFiles = globSync(path.join(opts.outputDir, "cache/**/*"), {
         withFileTypes: true,
         windowsPathsNoEscape: true,
-    })
-        .filter((f) => f.isFile())
-        .map((f) => {
-        const relativePath = path.relative(path.join(opts.outputDir, "cache"), f.fullpathPosix());
-        return {
-            fsPath: f.fullpathPosix(),
-            destPath: relativePath.startsWith("__fetch")
-                ? `${relativePath.replace("__fetch/", "")}.fetch`
-                : relativePath,
-        };
-    });
+    }).filter((f) => f.isFile());
+    const assets = [];
+    for (const file of allFiles) {
+        const fullPath = file.fullpathPosix();
+        const relativePath = path.relative(path.join(opts.outputDir, "cache"), fullPath);
+        if (relativePath.startsWith("__fetch")) {
+            const [__fetch, buildId, ...keyParts] = relativePath.split("/");
+            if (__fetch !== "__fetch" || buildId === undefined || keyParts.length === 0) {
+                throw new Error(`Invalid path for a Cache Asset file: ${relativePath}`);
+            }
+            assets.push({
+                isFetch: true,
+                fullPath,
+                key: `/${keyParts.join("/")}`,
+                buildId,
+            });
+        }
+        else {
+            const [buildId, ...keyParts] = relativePath.slice(0, -".cache".length).split("/");
+            if (!relativePath.endsWith(".cache") || buildId === undefined || keyParts.length === 0) {
+                throw new Error(`Invalid path for a Cache Asset file: ${relativePath}`);
+            }
+            assets.push({
+                isFetch: false,
+                fullPath,
+                key: `/${keyParts.join("/")}`,
+                buildId,
+            });
+        }
+    }
+    return assets;
 }
 function populateR2IncrementalCache(options, populateCacheOptions) {
     logger.info("\nPopulating R2 incremental cache...");
@@ -39,10 +59,14 @@ function populateR2IncrementalCache(options, populateCacheOptions) {
     if (!bucket) {
         throw new Error(`R2 binding ${JSON.stringify(R2_CACHE_BINDING_NAME)} should have a 'bucket_name'`);
     }
-    const assets = getCacheAssetPaths(options);
-    for (const { fsPath, destPath } of tqdm(assets)) {
-        const fullDestPath = path.join(bucket, process.env[R2_CACHE_PREFIX_ENV_NAME] ?? R2_CACHE_DEFAULT_PREFIX, destPath);
-        runWrangler(options, ["r2 object put", JSON.stringify(fullDestPath), `--file ${JSON.stringify(fsPath)}`], 
+    const assets = getCacheAssets(options);
+    for (const { fullPath, key, buildId, isFetch } of tqdm(assets)) {
+        const cacheKey = computeR2CacheKey(key, {
+            directory: process.env[R2_CACHE_PREFIX_ENV_NAME],
+            buildId,
+            isFetch,
+        });
+        runWrangler(options, ["r2 object put", JSON.stringify(path.join(bucket, cacheKey)), `--file ${JSON.stringify(fullPath)}`], 
         // NOTE: R2 does not support the environment flag and results in the following error:
         // Incorrect type for the 'cacheExpiry' field on 'HttpMetadata': the provided value is not of type 'date'.
         { target: populateCacheOptions.target, excludeRemoteFlag: true, logging: "error" });
@@ -56,13 +80,17 @@ function populateKVIncrementalCache(options, populateCacheOptions) {
     if (!binding) {
         throw new Error(`No KV binding ${JSON.stringify(KV_CACHE_BINDING_NAME)} found!`);
     }
-    const assets = getCacheAssetPaths(options);
-    for (const { fsPath, destPath } of tqdm(assets)) {
+    const assets = getCacheAssets(options);
+    for (const { fullPath, key, buildId, isFetch } of tqdm(assets)) {
+        const cacheKey = computeKVCacheKey(key, {
+            buildId,
+            isFetch,
+        });
         runWrangler(options, [
             "kv key put",
-            JSON.stringify(destPath),
+            JSON.stringify(cacheKey),
             `--binding ${JSON.stringify(KV_CACHE_BINDING_NAME)}`,
-            `--path ${JSON.stringify(fsPath)}`,
+            `--path ${JSON.stringify(fullPath)}`,
         ], { ...populateCacheOptions, logging: "error" });
     }
     logger.info(`Successfully populated cache with ${assets.length} assets`);

package/dist/cli/commands/populate-cache.spec.js

@@ -0,0 +1,61 @@
+import { mkdirSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import mockFs from "mock-fs";
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
+import { getCacheAssets } from "./populate-cache";
+describe("getCacheAssets", () => {
+    beforeAll(() => {
+        mockFs();
+        const fetchBaseDir = "/base/path/cache/__fetch/buildID";
+        const cacheDir = "/base/path/cache/buildID/path/to";
+        mkdirSync(fetchBaseDir, { recursive: true });
+        mkdirSync(cacheDir, { recursive: true });
+        for (let i = 0; i < 3; i++) {
+            writeFileSync(path.join(fetchBaseDir, `${i}`), "", { encoding: "utf-8" });
+            writeFileSync(path.join(cacheDir, `${i}.cache`), "", { encoding: "utf-8" });
+        }
+    });
+    afterAll(() => mockFs.restore());
+    test("list cache assets", () => {
+        expect(getCacheAssets({ outputDir: "/base/path" })).toMatchInlineSnapshot(`
+      [
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/buildID/path/to/2.cache",
+          "isFetch": false,
+          "key": "/path/to/2",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/buildID/path/to/1.cache",
+          "isFetch": false,
+          "key": "/path/to/1",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/buildID/path/to/0.cache",
+          "isFetch": false,
+          "key": "/path/to/0",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/__fetch/buildID/2",
+          "isFetch": true,
+          "key": "/2",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/__fetch/buildID/1",
+          "isFetch": true,
+          "key": "/1",
+        },
+        {
+          "buildId": "buildID",
+          "fullPath": "/base/path/cache/__fetch/buildID/0",
+          "isFetch": true,
+          "key": "/0",
+        },
+      ]
+    `);
+    });
+});

package/dist/cli/commands/upload.d.ts

@@ -0,0 +1,5 @@
+import { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import { OpenNextConfig } from "@opennextjs/aws/types/open-next.js";
+export declare function upload(options: BuildOptions, config: OpenNextConfig, uploadOptions: {
+    passthroughArgs: string[];
+}): Promise<void>;

package/dist/cli/commands/upload.js

@@ -0,0 +1,9 @@
+import { getWranglerEnvironmentFlag, runWrangler } from "../utils/run-wrangler.js";
+import { populateCache } from "./populate-cache.js";
+export async function upload(options, config, uploadOptions) {
+    await populateCache(options, config, {
+        target: "remote",
+        environment: getWranglerEnvironmentFlag(uploadOptions.passthroughArgs),
+    });
+    runWrangler(options, ["versions upload", ...uploadOptions.passthroughArgs], { logging: "all" });
+}

package/dist/cli/index.js

@@ -11,6 +11,7 @@ import { createOpenNextConfigIfNotExistent, ensureCloudflareConfig } from "./bui
 import { deploy } from "./commands/deploy.js";
 import { populateCache } from "./commands/populate-cache.js";
 import { preview } from "./commands/preview.js";
+import { upload } from "./commands/upload.js";
 const nextAppDir = process.cwd();
 async function runCommand(args) {
     printHeader(`Cloudflare ${args.command}`);
@@ -33,6 +34,8 @@ async function runCommand(args) {
             return preview(options, config, args);
         case "deploy":
             return deploy(options, config, args);
+        case "upload":
+            return upload(options, config, args);
         case "populateCache":
             return populateCache(options, config, args);
     }

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

@@ -0,0 +1,13 @@
+/**
+ * Initialization for the workerd runtime.
+ *
+ * The file must be imported at the top level the worker.
+ */
+/**
+ * Executes the handler with the Cloudflare context.
+ */
+export declare function runWithCloudflareRequestContext(request: Request, env: CloudflareEnv, ctx: ExecutionContext, handler: () => Promise<Response>): Promise<Response>;
+declare global {
+    var __BUILD_TIMESTAMP_MS__: number;
+    var __NEXT_BASE_PATH__: string;
+}

package/dist/cli/templates/init.js

@@ -0,0 +1,105 @@
+/**
+ * Initialization for the workerd runtime.
+ *
+ * The file must be imported at the top level the worker.
+ */
+import { AsyncLocalStorage } from "node:async_hooks";
+import process from "node:process";
+import stream from "node:stream";
+// @ts-expect-error: resolved by wrangler build
+import * as nextEnvVars from "./next-env.mjs";
+const cloudflareContextALS = new AsyncLocalStorage();
+// Note: this symbol needs to be kept in sync with `src/api/get-cloudflare-context.ts`
+Object.defineProperty(globalThis, Symbol.for("__cloudflare-context__"), {
+    get() {
+        return cloudflareContextALS.getStore();
+    },
+});
+/**
+ * Executes the handler with the Cloudflare context.
+ */
+export async function runWithCloudflareRequestContext(request, env, ctx, handler) {
+    init(request, env);
+    return cloudflareContextALS.run({ env, ctx, cf: request.cf }, handler);
+}
+let initialized = false;
+/**
+ * Initializes the runtime on the first call,
+ * no-op on subsequent invocations.
+ */
+function init(request, env) {
+    if (initialized) {
+        return;
+    }
+    initialized = true;
+    const url = new URL(request.url);
+    initRuntime();
+    populateProcessEnv(url, env);
+}
+function initRuntime() {
+    // Some packages rely on `process.version` and `process.versions.node` (i.e. Jose@4)
+    // TODO: Remove when https://github.com/unjs/unenv/pull/493 is merged
+    Object.assign(process, { version: process.version || "v22.14.0" });
+    // @ts-expect-error Node type does not match workerd
+    Object.assign(process.versions, { node: "22.14.0", ...process.versions });
+    globalThis.__dirname ??= "";
+    globalThis.__filename ??= "";
+    // Do not crash on cache not supported
+    // https://github.com/cloudflare/workerd/pull/2434
+    // compatibility flag "cache_option_enabled" -> does not support "force-cache"
+    const __original_fetch = globalThis.fetch;
+    globalThis.fetch = (input, init) => {
+        if (init) {
+            delete init.cache;
+        }
+        return __original_fetch(input, init);
+    };
+    const CustomRequest = class extends globalThis.Request {
+        constructor(input, init) {
+            if (init) {
+                delete init.cache;
+                // https://github.com/cloudflare/workerd/issues/2746
+                // https://github.com/cloudflare/workerd/issues/3245
+                Object.defineProperty(init, "body", {
+                    // @ts-ignore
+                    value: init.body instanceof stream.Readable ? ReadableStream.from(init.body) : init.body,
+                });
+            }
+            super(input, init);
+        }
+    };
+    Object.assign(globalThis, {
+        Request: CustomRequest,
+        __BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__,
+        __NEXT_BASE_PATH__: __NEXT_BASE_PATH__,
+    });
+}
+/**
+ * Populate process.env with:
+ * - the environment variables and secrets from the cloudflare platform
+ * - the variables from Next .env* files
+ * - the origin resolver information
+ */
+function populateProcessEnv(url, env) {
+    for (const [key, value] of Object.entries(env)) {
+        if (typeof value === "string") {
+            process.env[key] = value;
+        }
+    }
+    const mode = env.NEXTJS_ENV ?? "production";
+    if (nextEnvVars[mode]) {
+        for (const key in nextEnvVars[mode]) {
+            process.env[key] ??= nextEnvVars[mode][key];
+        }
+    }
+    // Set the default Origin for the origin resolver.
+    // This is only needed for an external middleware bundle
+    process.env.OPEN_NEXT_ORIGIN = JSON.stringify({
+        default: {
+            host: url.hostname,
+            protocol: url.protocol.slice(0, -1),
+            port: url.port,
+        },
+    });
+}
+/* eslint-enable no-var */

package/dist/cli/templates/worker.js

@@ -1,25 +1,13 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-import process from "node:process";
-// @ts-expect-error: resolved by wrangler build
-import * as nextEnvVars from "./env/next-env.mjs";
-const cloudflareContextALS = new AsyncLocalStorage();
-// Note: this symbol needs to be kept in sync with `src/api/get-cloudflare-context.ts`
-Object.defineProperty(globalThis, Symbol.for("__cloudflare-context__"), {
-    get() {
-        return cloudflareContextALS.getStore();
-    },
-});
+//@ts-expect-error: Will be resolved by wrangler build
+import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOQueueHandler } from "./.build/durable-objects/queue.js";
 //@ts-expect-error: Will be resolved by wrangler build
 export { DOShardedTagCache } from "./.build/durable-objects/sharded-tag-cache.js";
-// Populate process.env on the first request
-let processEnvPopulated = false;
 export default {
     async fetch(request, env, ctx) {
-        return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
+        return runWithCloudflareRequestContext(request, env, ctx, async () => {
             const url = new URL(request.url);
-            populateProcessEnv(url, env);
             // Serve images in development.
             // Note: "/cdn-cgi/image/..." requests do not reach production workers.
             if (url.pathname.startsWith("/cdn-cgi/image/")) {
@@ -33,10 +21,10 @@ export default {
                     : env.ASSETS?.fetch(new URL(`/${imageUrl}`, url));
             }
             // Fallback for the Next default image loader.
-            if (url.pathname === "/_next/image") {
+            if (url.pathname === `${globalThis.__NEXT_BASE_PATH__}/_next/image`) {
                 const imageUrl = url.searchParams.get("url") ?? "";
                 return imageUrl.startsWith("/")
-                    ? env.ASSETS?.fetch(new URL(imageUrl, request.url))
+                    ? env.ASSETS?.fetch(`http://assets.local${imageUrl}`)
                     : fetch(imageUrl, { cf: { cacheEverything: true } });
             }
             // @ts-expect-error: resolved by wrangler build
@@ -45,39 +33,3 @@ export default {
         });
     },
 };
-/**
- * Populate process.env with:
- * - the environment variables and secrets from the cloudflare platform
- * - the variables from Next .env* files
- * - the origin resolver information
- */
-function populateProcessEnv(url, env) {
-    if (processEnvPopulated) {
-        return;
-    }
-    // Some packages rely on `process.version` and `process.versions.node` (i.e. Jose@4)
-    // TODO: Remove when https://github.com/unjs/unenv/pull/493 is merged
-    Object.assign(process, { version: process.version || "v22.14.0" });
-    // @ts-expect-error Node type does not match workerd
-    Object.assign(process.versions, { node: "22.14.0", ...process.versions });
-    processEnvPopulated = true;
-    for (const [key, value] of Object.entries(env)) {
-        if (typeof value === "string") {
-            process.env[key] = value;
-        }
-    }
-    const mode = env.NEXTJS_ENV ?? "production";
-    if (nextEnvVars[mode]) {
-        for (const key in nextEnvVars[mode]) {
-            process.env[key] ??= nextEnvVars[mode][key];
-        }
-    }
-    // Set the default Origin for the origin resolver.
-    process.env.OPEN_NEXT_ORIGIN = JSON.stringify({
-        default: {
-            host: url.hostname,
-            protocol: url.protocol.slice(0, -1),
-            port: url.port,
-        },
-    });
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "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.5.5",
+    "@opennextjs/aws": "3.5.7",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-tqdm": "^0.8.6"

package/templates/open-next.config.ts

@@ -1,7 +1,7 @@
 // default open-next.config.ts file created by @opennextjs/cloudflare
 import { defineCloudflareConfig } from "@opennextjs/cloudflare/config";
-import kvIncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache";
+import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 
 export default defineCloudflareConfig({
-  incrementalCache: kvIncrementalCache,
+  incrementalCache: r2IncrementalCache,
 });

package/templates/wrangler.jsonc

@@ -8,12 +8,14 @@
     "directory": ".open-next/assets",
     "binding": "ASSETS"
   },
-  "kv_namespaces": [
-    // Create a KV binding with the binding name "NEXT_INC_CACHE_KV"
-    // to enable the KV based caching:
-    // {
-    //   "binding": "NEXT_INC_CACHE_KV",
-    //   "id": "<BINDING_ID>"
-    // }
+  "r2_buckets": [
+    // Use R2 incremental cache
+    // See https://opennext.js.org/cloudflare/caching
+    {
+      "binding": "NEXT_INC_CACHE_R2_BUCKET",
+      // Create a bucket before deploying
+      // See https://developers.cloudflare.com/workers/wrangler/commands/#r2-bucket-create
+      "bucket_name": "<BUCKET_NAME>"
+    }
   ]
 }

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

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

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

@@ -1,86 +0,0 @@
-import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
-// Remove an instantiation of `AbortController` from the runtime.
-//
-//  Solves https://github.com/cloudflare/workerd/issues/3657:
-// - The `AbortController` is meant for the client side, but ends in the server code somehow.
-//   That's why we can get ride of it. See https://github.com/vercel/next.js/pull/73975/files.
-// - Top level instantiation of `AbortController` are not supported by workerd as of March, 2025.
-//   See https://github.com/cloudflare/workerd/issues/3657
-// - As Next code is not more executed at top level, we do not need to apply this patch
-//   See https://github.com/opennextjs/opennextjs-cloudflare/pull/497
-//
-// We try to be as specific as possible to avoid patching the wrong thing here
-export const abortControllerRule = `
-rule:
-  all:
-    - kind: lexical_declaration
-      pattern: let $VAR = new AbortController
-    - precedes:
-        kind: function_declaration
-        stopBy: end
-        has:
-          kind: statement_block
-          has:
-            kind: try_statement
-            has:
-              kind: catch_clause
-              has:
-                kind: statement_block
-                has:
-                  kind: return_statement
-                  all:
-                    - has:
-                        stopBy: end
-                        kind: member_expression
-                        pattern: $VAR.signal.aborted
-                    - has:
-                        stopBy: end
-                        kind: call_expression
-                        regex: console.error\\("Failed to fetch RSC payload for
-
-fix:
-  'let $VAR = {signal:{aborted: false}};'
-`;
-// This rule is used instead of defining `process.env.NEXT_MINIMAL` in the `esbuild config.
-// Do we want to entirely replace these functions to reduce the bundle size?
-// In next `renderHTML` is used as a fallback in case of errors, but in minimal mode it just throws the error and the responsibility of handling it is on the infra.
-export const nextMinimalRule = `
-rule:
-  kind: member_expression
-  pattern: process.env.NEXT_MINIMAL
-  any:
-    - inside:
-        kind: parenthesized_expression
-        stopBy: end
-        inside:
-          kind: if_statement
-          any:
-            - inside:
-                kind: statement_block
-                inside:
-                  kind: method_definition
-                  any:
-                    - has: {kind: property_identifier, field: name, regex: runEdgeFunction}
-                    - has: {kind: property_identifier, field: name, regex: runMiddleware}
-                    - has: {kind: property_identifier, field: name, regex: imageOptimizer}
-            - has:
-                kind: statement_block
-                has:
-                  kind: expression_statement
-                  pattern: res.statusCode = 400;
-fix:
-  'true'
-`;
-export function patchNextMinimal(updater) {
-    return updater.updateContent("patch-next-minimal", [
-        {
-            field: {
-                filter: /next-server\.(js)$/,
-                contentFilter: /.*/,
-                callback: ({ contents }) => {
-                    return patchCode(contents, nextMinimalRule);
-                },
-            },
-        },
-    ]);
-}

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

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