@opennextjs/cloudflare 1.19.3 → 1.19.4

package/dist/api/durable-objects/queue.js

@@ -121,7 +121,7 @@ export class DOQueueHandler extends DurableObject {
             if (!this.disableSQLite) {
                 this.sql.exec("INSERT OR REPLACE INTO sync (id, lastSuccess, buildId) VALUES (?, unixepoch(), ?)", 
                 // We cannot use the deduplication id because it's not unique per route - every time a route is revalidated, the deduplication id is different.
-                `${host}${url}`, process.env.__NEXT_BUILD_ID);
+                `${host}${url}`, process.env.__OPEN_NEXT_BUILD_ID);
             }
             // If everything went well, we can remove the route from the failed state
             this.routeInFailedState.delete(msg.MessageDeduplicationId);
@@ -184,7 +184,7 @@ export class DOQueueHandler extends DurableObject {
         }
         this.routeInFailedState.set(msg.MessageDeduplicationId, updatedFailedState);
         if (!this.disableSQLite) {
-            this.sql.exec("INSERT OR REPLACE INTO failed_state (id, data, buildId) VALUES (?, ?, ?)", msg.MessageDeduplicationId, JSON.stringify(updatedFailedState), process.env.__NEXT_BUILD_ID);
+            this.sql.exec("INSERT OR REPLACE INTO failed_state (id, data, buildId) VALUES (?, ?, ?)", msg.MessageDeduplicationId, JSON.stringify(updatedFailedState), process.env.__OPEN_NEXT_BUILD_ID);
         }
         // We probably want to do something if routeInFailedState is becoming too big, at least log it
         await this.addAlarm();
@@ -214,8 +214,8 @@ export class DOQueueHandler extends DurableObject {
         this.sql.exec("CREATE TABLE IF NOT EXISTS sync (id TEXT PRIMARY KEY, lastSuccess INTEGER, buildId TEXT)");
         // Before doing anything else, we clear the DB for any potential old data
         // TODO: extract this to a function so that it could be called by the user at another time than init
-        this.sql.exec("DELETE FROM failed_state WHERE buildId != ?", process.env.__NEXT_BUILD_ID);
-        this.sql.exec("DELETE FROM sync WHERE buildId != ?", process.env.__NEXT_BUILD_ID);
+        this.sql.exec("DELETE FROM failed_state WHERE buildId != ?", process.env.__OPEN_NEXT_BUILD_ID);
+        this.sql.exec("DELETE FROM sync WHERE buildId != ?", process.env.__OPEN_NEXT_BUILD_ID);
         const failedStateCursor = this.sql.exec("SELECT * FROM failed_state");
         for (const row of failedStateCursor) {
             this.routeInFailedState.set(row.id, JSON.parse(row.data));

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

@@ -76,7 +76,7 @@ class KVIncrementalCache {
     getKVKey(key, cacheType) {
         return computeCacheKey(key, {
             prefix: getCloudflareContext().env[PREFIX_ENV_NAME],
-            buildId: process.env.NEXT_BUILD_ID,
+            buildId: process.env.OPEN_NEXT_BUILD_ID,
             cacheType,
         });
     }

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

@@ -60,7 +60,7 @@ class R2IncrementalCache {
     getR2Key(key, cacheType) {
         return computeCacheKey(key, {
             prefix: getCloudflareContext().env[PREFIX_ENV_NAME],
-            buildId: process.env.NEXT_BUILD_ID,
+            buildId: process.env.OPEN_NEXT_BUILD_ID,
             cacheType,
         });
     }

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

@@ -17,20 +17,32 @@ type Options = {
      */
     defaultLongLivedTtlSec?: number;
     /**
-     * Whether the regional cache entry should be updated in the background or not when it experiences
-     * a cache hit.
+     * Whether the regional cache entry should be updated in the background on regional cache hits.
      *
-     * @default `true` in `long-lived` mode when cache purge is not used, `false` otherwise.
+     * NOTE: Use the default value unless you know what you are doing. It is set to:
+     * - Next < 16:
+     *   `true` in `long-lived` mode when cache purge is not used, `false` otherwise.
+     * - Next >= 16:
+     *   `!bypassTagCacheOnCacheHit`
      */
     shouldLazilyUpdateOnCacheHit?: boolean;
     /**
-     * Whether on cache hits the tagCache should be skipped or not. Skipping the tagCache allows requests to be
-     * handled faster,
+     * Whether the tagCache should be skipped on regional cache hits.
      *
-     * Note: When this is enabled, make sure that the cache gets purged
-     *       either by enabling the auto cache purging feature or manually.
+     * Note:
+     * - Skipping the tagCache allows requests to be handled faster
+     * - When `true`, make sure the cache gets purged
+     *   either by enabling the auto cache purging feature or manually
      *
-     * @default `true` if the auto cache purging is enabled, `false` otherwise.
+     * `true` is not compatible with SWR types of revalidateTag
+     * i.e. on Next 16+, anything different than `revalidateTag("tag", { expire: 0 })`.
+     * That's why the default is `false` for Next 16+ which uses SWR by default.
+     *
+     * NOTE: Use the default value unless you know what you are doing. It is set to:
+     * - Next <16:
+     *    `true` if the auto cache purging is enabled, `false` otherwise.
+     * - Next >= 16:
+     *   `false`
      */
     bypassTagCacheOnCacheHit?: boolean;
 };
@@ -52,7 +64,6 @@ interface PutToCacheInput {
  * API is refreshed from the cache store on cache hits (for the long-lived mode).
  */
 declare class RegionalCache implements IncrementalCache {
-    #private;
     private store;
     private opts;
     name: string;

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

@@ -1,4 +1,5 @@
 import { error } from "@opennextjs/aws/adapters/logger.js";
+import { compareSemver } from "@opennextjs/aws/utils/semver.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { debugCache, FALLBACK_BUILD_ID, isPurgeCacheEnabled } from "../internal.js";
 const ONE_MINUTE_IN_SECONDS = 60;
@@ -24,15 +25,27 @@ class RegionalCache {
         this.store = store;
         this.opts = opts;
         this.name = this.store.name;
-        // `shouldLazilyUpdateOnCacheHit` is not needed when cache purge is enabled.
-        this.opts.shouldLazilyUpdateOnCacheHit ??= this.opts.mode === "long-lived" && !isPurgeCacheEnabled();
-    }
-    get #bypassTagCacheOnCacheHit() {
-        if (this.opts.bypassTagCacheOnCacheHit !== undefined) {
-            return this.opts.bypassTagCacheOnCacheHit;
+        // `globalThis.nextVersion` is only defined at runtime but not when the Open Next build runs.
+        // The options do no matter at build time so we can skip setting them.
+        const { nextVersion } = globalThis;
+        if (nextVersion) {
+            if (compareSemver(nextVersion, "<", "16")) {
+                // Next < 16
+                this.opts.shouldLazilyUpdateOnCacheHit ??= this.opts.mode === "long-lived" && !isPurgeCacheEnabled();
+                this.opts.bypassTagCacheOnCacheHit ??= isPurgeCacheEnabled();
+            }
+            else {
+                // Next >= 16
+                this.opts.bypassTagCacheOnCacheHit ??= false;
+                if (this.opts.bypassTagCacheOnCacheHit) {
+                    debugCache("RegionalCache", `bypassTagCacheOnCacheHit is not recommended for Next 16+ as it is not compatible with SWR tags. Make sure to always use \`revalidateTag\` with \`{ expire: 0 }\` if you want to bypass the tag cache.`);
+                }
+                this.opts.shouldLazilyUpdateOnCacheHit ??= !this.opts.bypassTagCacheOnCacheHit;
+                if (this.opts.shouldLazilyUpdateOnCacheHit !== this.opts.bypassTagCacheOnCacheHit) {
+                    debugCache("RegionalCache", `\`shouldLazilyUpdateOnCacheHit\` and \`bypassTagCacheOnCacheHit\` are mutually exclusive for Next 16+.`);
+                }
+            }
         }
-        // When `bypassTagCacheOnCacheHit` is not set, we default to whether the automatic cache purging is enabled or not
-        return isPurgeCacheEnabled();
     }
     async get(key, cacheType) {
         try {
@@ -55,7 +68,7 @@ class RegionalCache {
                 const responseJson = await cachedResponse.json();
                 return {
                     ...responseJson,
-                    shouldBypassTagCache: this.#bypassTagCacheOnCacheHit,
+                    shouldBypassTagCache: this.opts.bypassTagCacheOnCacheHit,
                 };
             }
             const rawEntry = await this.store.get(key, cacheType);
@@ -109,7 +122,7 @@ class RegionalCache {
         return this.localCache;
     }
     getCacheUrlKey(key, cacheType) {
-        const buildId = process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
+        const buildId = process.env.OPEN_NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
         return "http://cache.local" + `/${buildId}/${key}`.replace(/\/+/g, "/") + `.${cacheType ?? "cache"}`;
     }
     async putToCache({ key, cacheType, entry }) {

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

@@ -43,7 +43,7 @@ class StaticAssetsIncrementalCache {
         if (cacheType === "composable") {
             throw new Error("Composable cache is not supported in static assets incremental cache");
         }
-        const buildId = process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
+        const buildId = process.env.OPEN_NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
         const name = (cacheType === "fetch"
             ? `${CACHE_DIR}/__fetch/${buildId}/${key}`
             : `${CACHE_DIR}/${buildId}/${key}.cache`).replace(/\/+/g, "/");

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

@@ -80,8 +80,13 @@ export class D1NextModeTagCache {
             const isStale = [...result.values()].some((v) => {
                 if (v == null)
                     return false;
-                const { stale, expire } = v;
-                if (stale == null || stale <= (lastModified ?? now))
+                const { revalidatedAt, stale, expire } = v;
+                // A tag is stale when both its stale and revalidatedAt timestamps are newer than the page.
+                // revalidatedAt > lastModified ensures the revalidation that set this stale window happened
+                // after the page was generated, preventing a stale signal from a previous ISR cycle.
+                const lastModifiedOrNow = lastModified ?? now;
+                const isInStaleWindow = stale != null && revalidatedAt > lastModifiedOrNow && lastModifiedOrNow <= stale;
+                if (!isInStaleWindow)
                     return false;
                 return expire == null || expire > now;
             });
@@ -153,7 +158,7 @@ export class D1NextModeTagCache {
         return `${this.getBuildId()}/${key}`.replaceAll("//", "/");
     }
     getBuildId() {
-        return process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
+        return process.env.OPEN_NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
     }
     /**
      * @returns request scoped in-memory cache for tag values, or undefined if ALS is not available.

package/dist/api/overrides/tag-cache/do-sharded-tag-cache.js

@@ -89,8 +89,13 @@ class ShardedDOTagCache {
             const result = [...tagData.values()].some((data) => {
                 if (data == null)
                     return false;
-                const { stale, expire } = data;
-                if (stale == null || stale <= (lastModified ?? now))
+                const { revalidatedAt, stale, expire } = data;
+                // A tag is stale when both its stale timestamp and its revalidatedAt are newer than the page.
+                // revalidatedAt > lastModified ensures the revalidation that set this stale window happened
+                // after the page was generated, preventing a stale signal from a previous ISR cycle.
+                const lastModifiedOrNow = lastModified ?? now;
+                const isInStaleWindow = stale != null && revalidatedAt > lastModifiedOrNow && lastModifiedOrNow <= stale;
+                if (!isInStaleWindow)
                     return false;
                 return expire == null || expire > now;
             });

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

@@ -144,9 +144,14 @@ export class KVNextModeTagCache {
                 if (v == null)
                     return false;
                 const stale = getStale(v);
-                if (stale == null || stale <= (lastModified ?? now))
-                    return false;
                 const expire = getExpire(v);
+                // A tag is stale when both its stale timestamp and its revalidatedAt are newer than the page.
+                // revalidatedAt > lastModified ensures the revalidation that set this stale window happened
+                // after the page was generated, preventing a stale signal from a previous ISR cycle.
+                const lastModifiedOrNow = lastModified ?? now;
+                const isInStaleWindow = stale != null && getRevalidatedAt(v) > lastModifiedOrNow && lastModifiedOrNow <= stale;
+                if (!isInStaleWindow)
+                    return false;
                 return expire == null || expire > now;
             });
             debugCache("KVNextModeTagCache", `isStale tags=${tags} lastModified=${lastModified} -> ${isStale}`);
@@ -175,7 +180,7 @@ export class KVNextModeTagCache {
         return `${this.getBuildId()}/${key}`.replaceAll("//", "/");
     }
     getBuildId() {
-        return process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
+        return process.env.OPEN_NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
     }
     /**
      * @returns request scoped in-memory cache for tag values, or undefined if ALS is not available.

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

@@ -100,12 +100,17 @@ export async function bundleServer(buildOpts, projectOpts) {
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],
-        external: [
-            "./middleware/handler.mjs",
-            // Do not bundle og when it is not used
-            ...(useOg ? [] : ["next/dist/compiled/@vercel/og/index.edge.js"]),
-        ],
+        external: ["./middleware/handler.mjs"],
         alias: {
+            // When @vercel/og is not used, alias the edge entry to a throwing shim so the
+            // dynamic `import("next/dist/compiled/@vercel/og/index.edge.js")` call site
+            // emitted by Next.js does not drag the library (~800 KiB) and its
+            // `resvg.wasm` (~1.4 MiB) into the Worker bundle.
+            ...(useOg
+                ? {}
+                : {
+                    "next/dist/compiled/@vercel/og/index.edge.js": path.join(buildOpts.outputDir, "cloudflare-templates/shims/throw.js"),
+                }),
             // Workers have `fetch` so the `node-fetch` polyfill is not needed
             "next/dist/compiled/node-fetch": path.join(buildOpts.outputDir, "cloudflare-templates/shims/fetch.js"),
             // Workers have builtin Web Sockets

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

@@ -1,6 +1,6 @@
 import { createRequire } from "node:module";
 import path from "node:path";
-import { loadBuildId, loadPrerenderManifest } from "@opennextjs/aws/adapters/config/util.js";
+import { loadBuildId, loadConfig, loadPrerenderManifest } from "@opennextjs/aws/adapters/config/util.js";
 import { esbuildSync } from "@opennextjs/aws/build/helper.js";
 export function compileDurableObjects(buildOpts) {
     const _require = createRequire(import.meta.url);
@@ -13,6 +13,7 @@ export function compileDurableObjects(buildOpts) {
     const prerenderManifest = loadPrerenderManifest(buildOutputDotNextDir);
     const previewModeId = prerenderManifest?.preview?.previewModeId;
     const BUILD_ID = loadBuildId(buildOutputDotNextDir);
+    const nextConfig = loadConfig(buildOutputDotNextDir);
     return esbuildSync({
         entryPoints,
         bundle: true,
@@ -22,7 +23,7 @@ export function compileDurableObjects(buildOpts) {
         external: ["cloudflare:workers"],
         define: {
             "process.env.__NEXT_PREVIEW_MODE_ID": `"${previewModeId}"`,
-            "process.env.__NEXT_BUILD_ID": `"${BUILD_ID}"`,
+            "process.env.__OPEN_NEXT_BUILD_ID": JSON.stringify(nextConfig.deploymentId ?? BUILD_ID),
         },
     }, buildOpts);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -44,7 +44,7 @@
   "dependencies": {
     "@ast-grep/napi": "^0.40.5",
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "3.10.2",
+    "@opennextjs/aws": "3.10.4",
     "ci-info": "^4.2.0",
     "cloudflare": "^4.4.1",
     "comment-json": "^4.5.1",
@@ -54,7 +54,7 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20260114.0",
+    "@cloudflare/workers-types": "^4.20260423.1",
     "@eslint/js": "^9.11.1",
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
@@ -78,7 +78,7 @@
   },
   "peerDependencies": {
     "next": ">=15.5.15 <16 || >=16.2.3",
-    "wrangler": "^4.65.0"
+    "wrangler": "^4.84.1"
   },
   "scripts": {
     "clean": "rimraf dist",