fixup! renaming

vicb · vicb · commit 56c2aebb9914 · 2025-03-25T20:45:28.000+01:00
diff --git a/examples/e2e/app-pages-router/wrangler.jsonc b/examples/e2e/app-pages-router/wrangler.jsonc
@@ -10,7 +10,7 @@
   },
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
diff --git a/examples/e2e/app-router/wrangler.jsonc b/examples/e2e/app-router/wrangler.jsonc
@@ -11,11 +11,11 @@
   "durable_objects": {
     "bindings": [
       {
-        "name": "NEXT_CACHE_DO_REVALIDATION",
+        "name": "NEXT_CACHE_DO_QUEUE",
         "class_name": "DurableObjectQueueHandler"
       },
       {
-        "name": "NEXT_CACHE_DO_SHARDED",
+        "name": "NEXT_TAG_CACHE_DO_SHARDED",
         "class_name": "DOShardedTagCache"
       }
     ]
@@ -28,7 +28,7 @@
   ],
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
diff --git a/examples/e2e/pages-router/wrangler.jsonc b/examples/e2e/pages-router/wrangler.jsonc
@@ -10,7 +10,7 @@
   },
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
diff --git a/examples/overrides/d1-tag-next/wrangler.jsonc b/examples/overrides/d1-tag-next/wrangler.jsonc
@@ -13,15 +13,15 @@
   },
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
   "d1_databases": [
     {
-      "binding": "NEXT_CACHE_D1",
-      "database_id": "NEXT_CACHE_D1",
-      "database_name": "NEXT_CACHE_D1"
+      "binding": "NEXT_TAG_CACHE_D1",
+      "database_id": "NEXT_TAG_CACHE_D1",
+      "database_name": "NEXT_TAG_CACHE_D1"
     }
   ]
 }
diff --git a/examples/overrides/memory-queue/wrangler.jsonc b/examples/overrides/memory-queue/wrangler.jsonc
@@ -10,7 +10,7 @@
   },
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
diff --git a/examples/overrides/r2-incremental-cache/wrangler.jsonc b/examples/overrides/r2-incremental-cache/wrangler.jsonc
@@ -12,9 +12,9 @@
     "e2e": {
       "d1_databases": [
         {
-          "binding": "NEXT_CACHE_D1",
-          "database_id": "NEXT_CACHE_D1",
-          "database_name": "NEXT_CACHE_D1"
+          "binding": "NEXT_TAG_CACHE_D1",
+          "database_id": "NEXT_TAG_CACHE_D1",
+          "database_name": "NEXT_TAG_CACHE_D1"
         }
       ],
       "services": [
@@ -25,9 +25,9 @@
       ],
       "r2_buckets": [
         {
-          "binding": "NEXT_CACHE_R2_BUCKET",
-          "bucket_name": "NEXT_CACHE_R2_BUCKET",
-          "preview_bucket_name": "NEXT_CACHE_R2_BUCKET"
+          "binding": "NEXT_INC_CACHE_R2_BUCKET",
+          "bucket_name": "NEXT_INC_CACHE_R2_BUCKET",
+          "preview_bucket_name": "NEXT_INC_CACHE_R2_BUCKET"
         }
       ]
     },
diff --git a/examples/playground14/wrangler.jsonc b/examples/playground14/wrangler.jsonc
@@ -10,7 +10,7 @@
   },
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
diff --git a/examples/playground15/wrangler.jsonc b/examples/playground15/wrangler.jsonc
@@ -10,7 +10,7 @@
   },
   "kv_namespaces": [
     {
-      "binding": "NEXT_CACHE_KV",
+      "binding": "NEXT_INC_CACHE_KV",
       "id": "<BINDING_ID>"
     }
   ],
diff --git a/packages/cloudflare/src/api/cloudflare-context.ts b/packages/cloudflare/src/api/cloudflare-context.ts
@@ -16,37 +16,38 @@ declare global {
     WORKER_SELF_REFERENCE?: Service;
 
     // KV used for the incremental cache
-    NEXT_CACHE_KV?: KVNamespace;
+    NEXT_INC_CACHE_KV?: KVNamespace;
 
     // R2 bucket used for the incremental cache
-    NEXT_CACHE_R2_BUCKET?: R2Bucket;
+    NEXT_INC_CACHE_R2_BUCKET?: R2Bucket;
     // Prefix used for the R2 incremental cache bucket
-    NEXT_CACHE_R2_PREFIX?: string;
+    NEXT_INC_CACHE_R2_PREFIX?: string;
 
     // D1 db used for the tag cache
-    NEXT_CACHE_D1?: D1Database;
+    NEXT_TAG_CACHE_D1?: D1Database;
 
-    // Durable Object namespace to use for the durable object queue handler
-    NEXT_CACHE_DO_REVALIDATION?: DurableObjectNamespace<DurableObjectQueueHandler>;
     // Durables object namespace to use for the sharded tag cache
-    NEXT_CACHE_DO_SHARDED?: DurableObjectNamespace<DOShardedTagCache>;
+    NEXT_TAG_CACHE_DO_SHARDED?: DurableObjectNamespace<DOShardedTagCache>;
     // Queue of failed tag write
     // Optional, could be used to monitor or reprocess failed writes
-    NEXT_CACHE_DO_SHARDED_DLQ?: Queue;
+    NEXT_TAG_CACHE_DO_SHARDED_DLQ?: Queue;
 
-    // Below are the potential environment variables that can be set by the user to configure the durable object queue handler
+    // Durable Object namespace to use for the durable object queue
+    NEXT_CACHE_DO_QUEUE?: DurableObjectNamespace<DurableObjectQueueHandler>;
+
+    // Below are the environment variables to configure the durable object queue
     // The max number of revalidations that can be processed by the durable worker at the same time
-    MAX_REVALIDATION_BY_DURABLE_OBJECT?: string;
+    NEXT_CACHE_DO_QUEUE_MAX_REVALIDATION?: string;
     // The max time in milliseconds that a revalidation can take before being considered as failed
-    REVALIDATION_TIMEOUT_MS?: string;
+    NEXT_CACHE_DO_QUEUE_REVALIDATION_TIMEOUT_MS?: string;
     // The amount of time after which a revalidation will be attempted again if it failed
     // If it fails again it will exponentially back off until it reaches the max retry interval
-    REVALIDATION_RETRY_INTERVAL_MS?: string;
+    NEXT_CACHE_DO_QUEUE_RETRY_INTERVAL_MS?: string;
     // The maximum number of attempts that can be made to revalidate a path
-    MAX_REVALIDATION_ATTEMPTS?: string;
+    NEXT_CACHE_DO_QUEUE_MAX_NUM_REVALIDATIONS?: string;
     // Disable SQLite for the durable object queue handler
     // This can be safely used if you don't use an eventually consistent incremental cache (i.e. R2 without the regional cache for example)
-    REVALIDATION_DO_DISABLE_SQLITE?: string;
+    NEXT_CACHE_DO_QUEUE_DISABLE_SQLITE?: string;
   }
 }
 
diff --git a/packages/cloudflare/src/api/durable-objects/queue.spec.ts b/packages/cloudflare/src/api/durable-objects/queue.spec.ts
@@ -54,7 +54,7 @@ const createDurableObjectQueue = ({
       ),
       connect: vi.fn(),
     },
-    REVALIDATION_DO_DISABLE_SQLITE: disableSQLite ? "true" : undefined,
+    NEXT_CACHE_DO_QUEUE_DISABLE_SQLITE: disableSQLite ? "true" : undefined,
   });
 };
 
diff --git a/packages/cloudflare/src/api/durable-objects/queue.ts b/packages/cloudflare/src/api/durable-objects/queue.ts
@@ -8,10 +8,10 @@ import {
 } from "@opennextjs/aws/utils/error.js";
 import { DurableObject } from "cloudflare:workers";
 
-const DEFAULT_MAX_REVALIDATION_BY_DURABLE_OBJECT = 5;
+const DEFAULT_MAX_REVALIDATION = 5;
 const DEFAULT_REVALIDATION_TIMEOUT_MS = 10_000;
-const DEFAULT_REVALIDATION_RETRY_INTERVAL_MS = 2_000;
-const DEFAULT_MAX_REVALIDATION_ATTEMPTS = 6;
+const DEFAULT_RETRY_INTERVAL_MS = 2_000;
+const DEFAULT_MAX_NUM_REVALIDATIONS = 6;
 
 interface FailedState {
   msg: QueueMessage;
@@ -45,23 +45,23 @@ export class DurableObjectQueueHandler extends DurableObject<CloudflareEnv> {
     if (!this.service) throw new IgnorableError("No service binding for cache revalidation worker");
     this.sql = ctx.storage.sql;
 
-    this.maxRevalidations = env.MAX_REVALIDATION_BY_DURABLE_OBJECT
-      ? parseInt(env.MAX_REVALIDATION_BY_DURABLE_OBJECT)
-      : DEFAULT_MAX_REVALIDATION_BY_DURABLE_OBJECT;
+    this.maxRevalidations = env.NEXT_CACHE_DO_QUEUE_MAX_REVALIDATION
+      ? parseInt(env.NEXT_CACHE_DO_QUEUE_MAX_REVALIDATION)
+      : DEFAULT_MAX_REVALIDATION;
 
-    this.revalidationTimeout = env.REVALIDATION_TIMEOUT_MS
-      ? parseInt(env.REVALIDATION_TIMEOUT_MS)
+    this.revalidationTimeout = env.NEXT_CACHE_DO_QUEUE_REVALIDATION_TIMEOUT_MS
+      ? parseInt(env.NEXT_CACHE_DO_QUEUE_REVALIDATION_TIMEOUT_MS)
       : DEFAULT_REVALIDATION_TIMEOUT_MS;
 
-    this.revalidationRetryInterval = env.REVALIDATION_RETRY_INTERVAL_MS
-      ? parseInt(env.REVALIDATION_RETRY_INTERVAL_MS)
-      : DEFAULT_REVALIDATION_RETRY_INTERVAL_MS;
+    this.revalidationRetryInterval = env.NEXT_CACHE_DO_QUEUE_RETRY_INTERVAL_MS
+      ? parseInt(env.NEXT_CACHE_DO_QUEUE_RETRY_INTERVAL_MS)
+      : DEFAULT_RETRY_INTERVAL_MS;
 
-    this.maxRevalidationAttempts = env.MAX_REVALIDATION_ATTEMPTS
-      ? parseInt(env.MAX_REVALIDATION_ATTEMPTS)
-      : DEFAULT_MAX_REVALIDATION_ATTEMPTS;
+    this.maxRevalidationAttempts = env.NEXT_CACHE_DO_QUEUE_MAX_NUM_REVALIDATIONS
+      ? parseInt(env.NEXT_CACHE_DO_QUEUE_MAX_NUM_REVALIDATIONS)
+      : DEFAULT_MAX_NUM_REVALIDATIONS;
 
-    this.disableSQLite = env.REVALIDATION_DO_DISABLE_SQLITE === "true";
+    this.disableSQLite = env.NEXT_CACHE_DO_QUEUE_DISABLE_SQLITE === "true";
 
     // We restore the state
     ctx.blockConcurrencyWhile(async () => {
diff --git a/packages/cloudflare/src/api/overrides/incremental-cache/kv-cache.ts b/packages/cloudflare/src/api/overrides/incremental-cache/kv-cache.ts
@@ -22,7 +22,7 @@ class Cache implements IncrementalCache {
     isFetch?: IsFetch
   ): Promise<WithLastModified<CacheValue<IsFetch>> | null> {
     const cfEnv = getCloudflareContext().env;
-    const kv = cfEnv.NEXT_CACHE_KV;
+    const kv = cfEnv.NEXT_INC_CACHE_KV;
     const assets = cfEnv.ASSETS;
 
     if (!(kv || assets)) {
@@ -92,7 +92,7 @@ class Cache implements IncrementalCache {
     value: CacheValue<IsFetch>,
     isFetch?: IsFetch
   ): Promise<void> {
-    const kv = getCloudflareContext().env.NEXT_CACHE_KV;
+    const kv = getCloudflareContext().env.NEXT_INC_CACHE_KV;
 
     if (!kv) {
       throw new IgnorableError(`No KVNamespace`);
@@ -120,7 +120,7 @@ class Cache implements IncrementalCache {
   }
 
   async delete(key: string): Promise<void> {
-    const kv = getCloudflareContext().env.NEXT_CACHE_KV;
+    const kv = getCloudflareContext().env.NEXT_INC_CACHE_KV;
 
     if (!kv) {
       throw new IgnorableError(`No KVNamespace`);
diff --git a/packages/cloudflare/src/api/overrides/incremental-cache/r2-incremental-cache.ts b/packages/cloudflare/src/api/overrides/incremental-cache/r2-incremental-cache.ts
@@ -5,10 +5,10 @@ import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 
 /**
- * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_CACHE_R2_BUCKET`) as it's
+ * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_INC_CACHE_R2_BUCKET`) as it's
  * underlying data store.
  *
- * The directory that the cache entries are stored in can be configured with the `NEXT_CACHE_R2_PREFIX`
+ * The directory that the cache entries are stored in can be configured with the `NEXT_INC_CACHE_R2_PREFIX`
  * environment variable, and defaults to `incremental-cache`.
  *
  * The cache uses an instance of the Cache API (`incremental-cache`) to store a local version of the
@@ -21,7 +21,7 @@ class R2IncrementalCache implements IncrementalCache {
     key: string,
     isFetch?: IsFetch
   ): Promise<WithLastModified<CacheValue<IsFetch>> | null> {
-    const r2 = getCloudflareContext().env.NEXT_CACHE_R2_BUCKET;
+    const r2 = getCloudflareContext().env.NEXT_INC_CACHE_R2_BUCKET;
     if (!r2) throw new IgnorableError("No R2 bucket");
 
     debug(`Get ${key}`);
@@ -45,7 +45,7 @@ class R2IncrementalCache implements IncrementalCache {
     value: CacheValue<IsFetch>,
     isFetch?: IsFetch
   ): Promise<void> {
-    const r2 = getCloudflareContext().env.NEXT_CACHE_R2_BUCKET;
+    const r2 = getCloudflareContext().env.NEXT_INC_CACHE_R2_BUCKET;
     if (!r2) throw new IgnorableError("No R2 bucket");
 
     debug(`Set ${key}`);
@@ -58,7 +58,7 @@ class R2IncrementalCache implements IncrementalCache {
   }
 
   async delete(key: string): Promise<void> {
-    const r2 = getCloudflareContext().env.NEXT_CACHE_R2_BUCKET;
+    const r2 = getCloudflareContext().env.NEXT_INC_CACHE_R2_BUCKET;
     if (!r2) throw new IgnorableError("No R2 bucket");
 
     debug(`Delete ${key}`);
@@ -71,7 +71,7 @@ class R2IncrementalCache implements IncrementalCache {
   }
 
   protected getR2Key(key: string, isFetch?: boolean): string {
-    const directory = getCloudflareContext().env.NEXT_CACHE_R2_PREFIX ?? "incremental-cache";
+    const directory = getCloudflareContext().env.NEXT_INC_CACHE_R2_PREFIX ?? "incremental-cache";
 
     return `${directory}/${process.env.NEXT_BUILD_ID ?? "no-build-id"}/${key}.${isFetch ? "fetch" : "cache"}`;
   }
diff --git a/packages/cloudflare/src/api/overrides/queue/do-queue.ts b/packages/cloudflare/src/api/overrides/queue/do-queue.ts
@@ -6,7 +6,7 @@ import { getCloudflareContext } from "../../cloudflare-context";
 export default {
   name: "do-queue",
   send: async (msg: QueueMessage) => {
-    const durableObject = getCloudflareContext().env.NEXT_CACHE_DO_REVALIDATION;
+    const durableObject = getCloudflareContext().env.NEXT_CACHE_DO_QUEUE;
     if (!durableObject) throw new IgnorableError("No durable object binding for cache revalidation");
 
     const id = durableObject.idFromName(msg.MessageGroupId);
diff --git a/packages/cloudflare/src/api/overrides/tag-cache/d1-next-tag-cache.ts b/packages/cloudflare/src/api/overrides/tag-cache/d1-next-tag-cache.ts
@@ -45,7 +45,7 @@ export class D1NextModeTagCache implements NextModeTagCache {
 
   private getConfig() {
     const cfEnv = getCloudflareContext().env;
-    const db = cfEnv.NEXT_CACHE_D1;
+    const db = cfEnv.NEXT_TAG_CACHE_D1;
 
     if (!db) debug("No D1 database found");
 
diff --git a/packages/cloudflare/src/api/overrides/tag-cache/d1-tag-cache.ts b/packages/cloudflare/src/api/overrides/tag-cache/d1-tag-cache.ts
@@ -6,7 +6,7 @@ import { RecoverableError } from "@opennextjs/aws/utils/error.js";
 import { getCloudflareContext } from "../../cloudflare-context.js";
 
 /**
- * An instance of the Tag Cache that uses a D1 binding (`NEXT_CACHE_D1`) as it's underlying data store.
+ * An instance of the Tag Cache that uses a D1 binding (`NEXT_TAG_CACHE_D1`) as it's underlying data store.
  *
  * **Tag/path mappings table**
  *
@@ -134,7 +134,7 @@ class D1TagCache implements OriginalTagCache {
 
   private getConfig() {
     const cfEnv = getCloudflareContext().env;
-    const db = cfEnv.NEXT_CACHE_D1;
+    const db = cfEnv.NEXT_TAG_CACHE_D1;
 
     if (!db) debug("No D1 database found");
 
diff --git a/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.spec.ts b/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.spec.ts
@@ -17,8 +17,8 @@ const sendDLQMock = vi.fn();
 vi.mock("../../cloudflare-context", () => ({
   getCloudflareContext: () => ({
     env: {
-      NEXT_CACHE_DO_SHARDED: { idFromName: idFromNameMock, get: getMock },
-      NEXT_CACHE_DO_SHARDED_DLQ: {
+      NEXT_TAG_CACHE_DO_SHARDED: { idFromName: idFromNameMock, get: getMock },
+      NEXT_TAG_CACHE_DO_SHARDED_DLQ: {
         send: sendDLQMock,
       },
     },
diff --git a/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts b/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts
@@ -102,7 +102,7 @@ class ShardedDOTagCache implements NextModeTagCache {
   }
 
   private getDurableObjectStub(doId: TagCacheDOId) {
-    const durableObject = getCloudflareContext().env.NEXT_CACHE_DO_SHARDED;
+    const durableObject = getCloudflareContext().env.NEXT_TAG_CACHE_DO_SHARDED;
     if (!durableObject) throw new IgnorableError("No durable object binding for cache revalidation");
 
     const id = durableObject.idFromName(doId.key);
@@ -189,7 +189,7 @@ class ShardedDOTagCache implements NextModeTagCache {
 
   private async getConfig() {
     const cfEnv = getCloudflareContext().env;
-    const db = cfEnv.NEXT_CACHE_DO_SHARDED;
+    const db = cfEnv.NEXT_TAG_CACHE_DO_SHARDED;
 
     if (!db) debug("No Durable object found");
     const isDisabled = !!(globalThis as unknown as { openNextConfig: OpenNextConfig }).openNextConfig
@@ -269,7 +269,7 @@ class ShardedDOTagCache implements NextModeTagCache {
       if (retryNumber >= this.maxWriteRetries) {
         error("Error while writing tags, too many retries");
         // Do we want to throw an error here ?
-        await getCloudflareContext().env.NEXT_CACHE_DO_SHARDED_DLQ?.send({
+        await getCloudflareContext().env.NEXT_TAG_CACHE_DO_SHARDED_DLQ?.send({
           failingShardId: doId.key,
           failingTags: tags,
           lastModified,
diff --git a/packages/cloudflare/src/cli/commands/populate-cache.ts b/packages/cloudflare/src/cli/commands/populate-cache.ts
diff --git a/packages/cloudflare/templates/wrangler.jsonc b/packages/cloudflare/templates/wrangler.jsonc

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`},`
`11`	`11`	`"kv_namespaces": [`
`12`	`12`	`{`
`13`		`- "binding": "NEXT_CACHE_KV",`
	`13`	`+ "binding": "NEXT_INC_CACHE_KV",`
`14`	`14`	`"id": "<BINDING_ID>"`
`15`	`15`	`}`
`16`	`16`	`],`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@`
`11`	`11`	`"durable_objects": {`
`12`	`12`	`"bindings": [`
`13`	`13`	`{`
`14`		`- "name": "NEXT_CACHE_DO_REVALIDATION",`
	`14`	`+ "name": "NEXT_CACHE_DO_QUEUE",`
`15`	`15`	`"class_name": "DurableObjectQueueHandler"`
`16`	`16`	`},`
`17`	`17`	`{`
`18`		`- "name": "NEXT_CACHE_DO_SHARDED",`
	`18`	`+ "name": "NEXT_TAG_CACHE_DO_SHARDED",`
`19`	`19`	`"class_name": "DOShardedTagCache"`
`20`	`20`	`}`
`21`	`21`	`]`
`@@ -28,7 +28,7 @@`
`28`	`28`	`],`
`29`	`29`	`"kv_namespaces": [`
`30`	`30`	`{`
`31`		`- "binding": "NEXT_CACHE_KV",`
	`31`	`+ "binding": "NEXT_INC_CACHE_KV",`
`32`	`32`	`"id": "<BINDING_ID>"`
`33`	`33`	`}`
`34`	`34`	`],`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,15 @@`
`13`	`13`	`},`
`14`	`14`	`"kv_namespaces": [`
`15`	`15`	`{`
`16`		`- "binding": "NEXT_CACHE_KV",`
	`16`	`+ "binding": "NEXT_INC_CACHE_KV",`
`17`	`17`	`"id": "<BINDING_ID>"`
`18`	`18`	`}`
`19`	`19`	`],`
`20`	`20`	`"d1_databases": [`
`21`	`21`	`{`
`22`		`- "binding": "NEXT_CACHE_D1",`
`23`		`- "database_id": "NEXT_CACHE_D1",`
`24`		`- "database_name": "NEXT_CACHE_D1"`
	`22`	`+ "binding": "NEXT_TAG_CACHE_D1",`
	`23`	`+ "database_id": "NEXT_TAG_CACHE_D1",`
	`24`	`+ "database_name": "NEXT_TAG_CACHE_D1"`
`25`	`25`	`}`
`26`	`26`	`]`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`"e2e": {`
`13`	`13`	`"d1_databases": [`
`14`	`14`	`{`
`15`		`- "binding": "NEXT_CACHE_D1",`
`16`		`- "database_id": "NEXT_CACHE_D1",`
`17`		`- "database_name": "NEXT_CACHE_D1"`
	`15`	`+ "binding": "NEXT_TAG_CACHE_D1",`
	`16`	`+ "database_id": "NEXT_TAG_CACHE_D1",`
	`17`	`+ "database_name": "NEXT_TAG_CACHE_D1"`
`18`	`18`	`}`
`19`	`19`	`],`
`20`	`20`	`"services": [`
`@@ -25,9 +25,9 @@`
`25`	`25`	`],`
`26`	`26`	`"r2_buckets": [`
`27`	`27`	`{`
`28`		`- "binding": "NEXT_CACHE_R2_BUCKET",`
`29`		`- "bucket_name": "NEXT_CACHE_R2_BUCKET",`
`30`		`- "preview_bucket_name": "NEXT_CACHE_R2_BUCKET"`
	`28`	`+ "binding": "NEXT_INC_CACHE_R2_BUCKET",`
	`29`	`+ "bucket_name": "NEXT_INC_CACHE_R2_BUCKET",`
	`30`	`+ "preview_bucket_name": "NEXT_INC_CACHE_R2_BUCKET"`
`31`	`31`	`}`
`32`	`32`	`]`
`33`	`33`	`},`