@opennextjs/cloudflare 1.8.4 → 1.9.0

package/dist/api/cloudflare-context.d.ts

@@ -14,6 +14,7 @@ declare global {
         NEXT_INC_CACHE_R2_BUCKET?: R2Bucket;
         [R2_CACHE_PREFIX_ENV_NAME]?: string;
         NEXT_TAG_CACHE_D1?: D1Database;
+        NEXT_TAG_CACHE_KV?: KVNamespace;
         NEXT_TAG_CACHE_DO_SHARDED?: DurableObjectNamespace<DOShardedTagCache>;
         NEXT_TAG_CACHE_DO_SHARDED_DLQ?: Queue;
         NEXT_CACHE_DO_QUEUE?: DurableObjectNamespace<DOQueueHandler>;

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

@@ -1,6 +1,6 @@
 import { error } from "@opennextjs/aws/adapters/logger.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
-import { debugCache, FALLBACK_BUILD_ID } from "../internal.js";
+import { debugCache, FALLBACK_BUILD_ID, isPurgeCacheEnabled } from "../internal.js";
 import { NAME as KV_CACHE_NAME } from "./kv-incremental-cache.js";
 const ONE_MINUTE_IN_SECONDS = 60;
 const THIRTY_MINUTES_IN_SECONDS = ONE_MINUTE_IN_SECONDS * 30;
@@ -28,8 +28,7 @@ class RegionalCache {
             throw new Error("The KV incremental cache does not need a regional cache.");
         }
         this.name = this.store.name;
-        this.opts.shouldLazilyUpdateOnCacheHit ??=
-            this.opts.mode === "long-lived" && !this.#hasAutomaticCachePurging;
+        this.opts.shouldLazilyUpdateOnCacheHit ??= this.opts.mode === "long-lived" && !isPurgeCacheEnabled();
     }
     get #bypassTagCacheOnCacheHit() {
         if (this.opts.bypassTagCacheOnCacheHit !== undefined) {
@@ -37,12 +36,7 @@ class RegionalCache {
             return this.opts.bypassTagCacheOnCacheHit;
         }
         // Otherwise we default to whether the automatic cache purging is enabled or not
-        return this.#hasAutomaticCachePurging;
-    }
-    get #hasAutomaticCachePurging() {
-        // The `?` is required at `openNextConfig?` or the Open Next build fails because of a type error
-        const cdnInvalidation = globalThis.openNextConfig?.default?.override?.cdnInvalidation;
-        return cdnInvalidation !== undefined && cdnInvalidation !== "dummy";
+        return isPurgeCacheEnabled();
     }
     async get(key, cacheType) {
         try {

package/dist/api/overrides/internal.d.ts

@@ -12,5 +12,6 @@ export type KeyOptions = {
     buildId: string | undefined;
 };
 export declare function computeCacheKey(key: string, options: KeyOptions): string;
+export declare function isPurgeCacheEnabled(): boolean;
 export declare function purgeCacheByTags(tags: string[]): Promise<void>;
 export declare function internalPurgeCacheByTags(env: CloudflareEnv, tags: string[]): Promise<"missing-credentials" | "rate-limit-exceeded" | "purge-failed" | "purge-success">;

package/dist/api/overrides/internal.js

@@ -13,6 +13,11 @@ export function computeCacheKey(key, options) {
     const hash = createHash("sha256").update(key).digest("hex");
     return `${prefix}/${buildId}/${hash}.${cacheType}`.replace(/\/+/g, "/");
 }
+export function isPurgeCacheEnabled() {
+    // The `?` is required at `openNextConfig?` or the Open Next build fails because of a type error
+    const cdnInvalidation = globalThis.openNextConfig?.default?.override?.cdnInvalidation;
+    return cdnInvalidation !== undefined && cdnInvalidation !== "dummy";
+}
 export async function purgeCacheByTags(tags) {
     const { env } = getCloudflareContext();
     // We have a durable object for purging cache

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

@@ -1,6 +1,6 @@
 import { error } from "@opennextjs/aws/adapters/logger.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
-import { debugCache, FALLBACK_BUILD_ID, purgeCacheByTags } from "../internal.js";
+import { debugCache, FALLBACK_BUILD_ID, isPurgeCacheEnabled, purgeCacheByTags } from "../internal.js";
 export const NAME = "d1-next-mode-tag-cache";
 export const BINDING_NAME = "NEXT_TAG_CACHE_D1";
 export class D1NextModeTagCache {
@@ -21,9 +21,9 @@ export class D1NextModeTagCache {
             return (result.results[0]?.time ?? 0);
         }
         catch (e) {
-            error(e);
             // By default we don't want to crash here, so we return false
             // We still log the error though so we can debug it
+            error(e);
             return 0;
         }
     }
@@ -47,20 +47,21 @@ export class D1NextModeTagCache {
     }
     async writeTags(tags) {
         const { isDisabled, db } = this.getConfig();
-        // TODO: Remove `tags.length === 0` when https://github.com/opennextjs/opennextjs-aws/pull/828 is used
         if (isDisabled || tags.length === 0)
             return Promise.resolve();
         await db.batch(tags.map((tag) => db
             .prepare(`INSERT INTO revalidations (tag, revalidatedAt) VALUES (?, ?)`)
             .bind(this.getCacheKey(tag), Date.now())));
-        await purgeCacheByTags(tags);
+        // TODO: See https://github.com/opennextjs/opennextjs-aws/issues/986
+        if (isPurgeCacheEnabled()) {
+            await purgeCacheByTags(tags);
+        }
     }
     getConfig() {
         const db = getCloudflareContext().env[BINDING_NAME];
         if (!db)
             debugCache("No D1 database found");
-        const isDisabled = !!globalThis.openNextConfig
-            .dangerous?.disableTagCache;
+        const isDisabled = Boolean(globalThis.openNextConfig.dangerous?.disableTagCache);
         return !db || isDisabled
             ? { isDisabled: true }
             : {

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

@@ -2,7 +2,7 @@ import { debug, error } from "@opennextjs/aws/adapters/logger.js";
 import { generateShardId } from "@opennextjs/aws/core/routing/queue.js";
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
-import { debugCache, purgeCacheByTags } from "../internal.js";
+import { debugCache, isPurgeCacheEnabled, purgeCacheByTags } from "../internal.js";
 export const DEFAULT_WRITE_RETRIES = 3;
 export const DEFAULT_NUM_SHARDS = 4;
 export const NAME = "do-sharded-tag-cache";
@@ -115,7 +115,10 @@ class ShardedDOTagCache {
         await Promise.all(shardedTagGroups.map(async ({ doId, tags }) => {
             await this.performWriteTagsWithRetry(doId, tags, currentTime);
         }));
-        await purgeCacheByTags(tags);
+        // TODO: See https://github.com/opennextjs/opennextjs-aws/issues/986
+        if (isPurgeCacheEnabled()) {
+            await purgeCacheByTags(tags);
+        }
     }
     /**
      * The following methods are public only because they are accessed from the tests

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

@@ -0,0 +1,32 @@
+import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js";
+export declare const NAME = "kv-next-mode-tag-cache";
+export declare const BINDING_NAME = "NEXT_TAG_CACHE_KV";
+/**
+ * Tag Cache based on a KV namespace
+ *
+ * Warning:
+ * This implementation is considered experimental for now.
+ * KV is eventually consistent and can take up to 60s to reflect the last write.
+ * This means that:
+ * - revalidations can take up to 60s to apply
+ * - when a page depends on multiple tags they can be inconsistent for up to 60s.
+ *   It also means that cached data could be outdated for one tag when other tags
+ *   are revalidated resulting in the page being generated based on outdated data.
+ */
+export declare class KVNextModeTagCache implements NextModeTagCache {
+    readonly mode: "nextMode";
+    readonly name = "kv-next-mode-tag-cache";
+    getLastRevalidated(tags: string[]): Promise<number>;
+    hasBeenRevalidated(tags: string[], lastModified?: number): Promise<boolean>;
+    writeTags(tags: string[]): Promise<void>;
+    /**
+     * Returns the KV namespace when it exists and tag cache is not disabled.
+     *
+     * @returns KV namespace or undefined
+     */
+    private getKv;
+    protected getCacheKey(key: string): string;
+    protected getBuildId(): string;
+}
+declare const _default: KVNextModeTagCache;
+export default _default;

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

@@ -0,0 +1,78 @@
+import { error } from "@opennextjs/aws/adapters/logger.js";
+import { getCloudflareContext } from "../../cloudflare-context.js";
+import { FALLBACK_BUILD_ID, isPurgeCacheEnabled, purgeCacheByTags } from "../internal.js";
+export const NAME = "kv-next-mode-tag-cache";
+export const BINDING_NAME = "NEXT_TAG_CACHE_KV";
+/**
+ * Tag Cache based on a KV namespace
+ *
+ * Warning:
+ * This implementation is considered experimental for now.
+ * KV is eventually consistent and can take up to 60s to reflect the last write.
+ * This means that:
+ * - revalidations can take up to 60s to apply
+ * - when a page depends on multiple tags they can be inconsistent for up to 60s.
+ *   It also means that cached data could be outdated for one tag when other tags
+ *   are revalidated resulting in the page being generated based on outdated data.
+ */
+export class KVNextModeTagCache {
+    mode = "nextMode";
+    name = NAME;
+    async getLastRevalidated(tags) {
+        const kv = this.getKv();
+        if (!kv) {
+            return 0;
+        }
+        try {
+            const keys = tags.map((tag) => this.getCacheKey(tag));
+            // Use the `json` type to get back numbers/null
+            const result = await kv.get(keys, { type: "json" });
+            const revalidations = [...result.values()].filter((v) => v != null);
+            return revalidations.length === 0 ? 0 : Math.max(...revalidations);
+        }
+        catch (e) {
+            // By default we don't want to crash here, so we return false
+            // We still log the error though so we can debug it
+            error(e);
+            return 0;
+        }
+    }
+    async hasBeenRevalidated(tags, lastModified) {
+        return (await this.getLastRevalidated(tags)) > (lastModified ?? Date.now());
+    }
+    async writeTags(tags) {
+        const kv = this.getKv();
+        if (!kv || tags.length === 0) {
+            return Promise.resolve();
+        }
+        const timeMs = String(Date.now());
+        await Promise.all(tags.map(async (tag) => {
+            await kv.put(this.getCacheKey(tag), timeMs);
+        }));
+        // TODO: See https://github.com/opennextjs/opennextjs-aws/issues/986
+        if (isPurgeCacheEnabled()) {
+            await purgeCacheByTags(tags);
+        }
+    }
+    /**
+     * Returns the KV namespace when it exists and tag cache is not disabled.
+     *
+     * @returns KV namespace or undefined
+     */
+    getKv() {
+        const kv = getCloudflareContext().env[BINDING_NAME];
+        if (!kv) {
+            error(`No KV binding ${BINDING_NAME} found`);
+            return undefined;
+        }
+        const isDisabled = Boolean(globalThis.openNextConfig.dangerous?.disableTagCache);
+        return isDisabled ? undefined : kv;
+    }
+    getCacheKey(key) {
+        return `${this.getBuildId()}/${key}`.replaceAll("//", "/");
+    }
+    getBuildId() {
+        return process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
+    }
+}
+export default new KVNextModeTagCache();

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

@@ -13,7 +13,7 @@ import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
 import { inlineLoadManifest } from "./patches/plugins/load-manifest.js";
 import { patchNextServer } from "./patches/plugins/next-server.js";
-import { patchResolveCache } from "./patches/plugins/open-next.js";
+import { patchResolveCache, patchSetWorkingDirectory } from "./patches/plugins/open-next.js";
 import { handleOptionalDependencies } from "./patches/plugins/optional-deps.js";
 import { patchPagesRouterContext } from "./patches/plugins/pages-router-context.js";
 import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations.js";
@@ -90,6 +90,7 @@ export async function bundleServer(buildOpts, projectOpts) {
             patchRouteModules(updater, buildOpts),
             patchDepdDeprecations(updater),
             patchResolveCache(updater, buildOpts),
+            patchSetWorkingDirectory(updater, buildOpts),
             // Apply updater updates, must be the last plugin
             updater.plugin,
         ],

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

@@ -6,3 +6,5 @@ import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-upd
 export declare function patchResolveCache(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
 export declare const cacheHandlerRule = "\nrule:\n  pattern: var cacheHandlerPath = __require.resolve(\"./cache.cjs\");\nfix: |-\n  var cacheHandlerPath = \"\";\n";
 export declare const compositeCacheHandlerRule = "\nrule:\n  pattern: var composableCacheHandlerPath = __require.resolve(\"./composable-cache.cjs\");\nfix: |-\n  var composableCacheHandlerPath = \"\";\n";
+export declare function patchSetWorkingDirectory(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
+export declare const workingDirectoryRule = "\nrule:\n  pattern: function setNextjsServerWorkingDirectory() { $$$BODY }\nfix: |-\n    function setNextjsServerWorkingDirectory() {\n    }\n";

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

@@ -34,3 +34,25 @@ rule:
 fix: |-
   var composableCacheHandlerPath = "";
 `;
+export function patchSetWorkingDirectory(updater, buildOpts) {
+    const { outputDir } = buildOpts;
+    const packagePath = getPackagePath(buildOpts);
+    const outputPath = path.join(outputDir, "server-functions/default");
+    const indexPath = path.relative(buildOpts.appBuildOutputPath, path.join(outputPath, packagePath, `index.mjs`));
+    return updater.updateContent("do-not-set-working-directory", [
+        {
+            filter: getCrossPlatformPathRegex(indexPath),
+            contentFilter: /function setNextjsServerWorkingDirectory\(/,
+            callback: async ({ contents }) => patchCode(contents, workingDirectoryRule),
+        },
+    ]);
+}
+// `setNextjsServerWorkingDirectory` calls `process.chdir("")` which errors because the directory does not exists
+// See https://github.com/opennextjs/opennextjs-cloudflare/issues/899
+export const workingDirectoryRule = `
+rule:
+  pattern: function setNextjsServerWorkingDirectory() { $$$BODY }
+fix: |-
+    function setNextjsServerWorkingDirectory() {
+    }
+`;

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

@@ -2,6 +2,6 @@ export { DOQueueHandler } from "./.build/durable-objects/queue.js";
 export { DOShardedTagCache } from "./.build/durable-objects/sharded-tag-cache.js";
 export { BucketCachePurge } from "./.build/durable-objects/bucket-cache-purge.js";
 declare const _default: {
-    fetch(request: Request<unknown, IncomingRequestCfProperties<unknown>>, env: CloudflareEnv, ctx: ExecutionContext): Promise<any>;
+    fetch(request: Request<unknown, IncomingRequestCfProperties<unknown>>, env: CloudflareEnv, ctx: ExecutionContext<unknown>): Promise<any>;
 };
 export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.8.4",
+  "version": "1.9.0",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -51,7 +51,7 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250224.0",
+    "@cloudflare/workers-types": "^4.20250917.0",
     "@eslint/js": "^9.11.1",
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
@@ -74,7 +74,7 @@
     "vitest": "^2.1.1"
   },
   "peerDependencies": {
-    "wrangler": "^4.24.4"
+    "wrangler": "^4.38.0"
   },
   "scripts": {
     "clean": "rimraf dist",