fixup! use r2 in e2e, drop preview bucket

vicb · vicb · commit fb3c6076ae45 · 2025-04-02T18:27:25.000+02:00
diff --git a/examples/e2e/app-pages-router/open-next.config.ts b/examples/e2e/app-pages-router/open-next.config.ts
@@ -1,8 +1,8 @@
 import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-import kvIncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache";
+import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 import memoryQueue from "@opennextjs/cloudflare/overrides/queue/memory-queue";
 
 export default defineCloudflareConfig({
-  incrementalCache: kvIncrementalCache,
+  incrementalCache: r2IncrementalCache,
   queue: memoryQueue,
 });
diff --git a/examples/e2e/app-pages-router/wrangler.jsonc b/examples/e2e/app-pages-router/wrangler.jsonc
@@ -8,10 +8,10 @@
     "directory": ".open-next/assets",
     "binding": "ASSETS"
   },
-  "kv_namespaces": [
+  "r2_buckets": [
     {
-      "binding": "NEXT_INC_CACHE_KV",
-      "id": "<BINDING_ID>"
+      "binding": "NEXT_INC_CACHE_R2_BUCKET",
+      "bucket_name": "<BUCKET_NAME>"
     }
   ],
   "services": [
diff --git a/examples/e2e/app-router/open-next.config.ts b/examples/e2e/app-router/open-next.config.ts
@@ -1,10 +1,10 @@
 import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-import kvIncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache";
+import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 import shardedTagCache from "@opennextjs/cloudflare/overrides/tag-cache/do-sharded-tag-cache";
 import doQueue from "@opennextjs/cloudflare/overrides/queue/do-queue";
 
 export default defineCloudflareConfig({
-  incrementalCache: kvIncrementalCache,
+  incrementalCache: r2IncrementalCache,
   // With such a configuration, we could have up to 12 * (8 + 2) = 120 Durable Objects instances
   tagCache: shardedTagCache({
     baseShardSize: 12,
diff --git a/examples/e2e/app-router/wrangler.jsonc b/examples/e2e/app-router/wrangler.jsonc
@@ -26,10 +26,10 @@
       "new_sqlite_classes": ["DOQueueHandler", "DOShardedTagCache"]
     }
   ],
-  "kv_namespaces": [
+  "r2_buckets": [
     {
-      "binding": "NEXT_INC_CACHE_KV",
-      "id": "<BINDING_ID>"
+      "binding": "NEXT_INC_CACHE_R2_BUCKET",
+      "bucket_name": "<BUCKET_NAME>"
     }
   ],
   "services": [
diff --git a/examples/e2e/pages-router/open-next.config.ts b/examples/e2e/pages-router/open-next.config.ts
@@ -1,8 +1,8 @@
 import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-import kvIncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/kv-incremental-cache";
+import r2IncrementalCache from "@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache";
 import memoryQueue from "@opennextjs/cloudflare/overrides/queue/memory-queue";
 
 export default defineCloudflareConfig({
-  incrementalCache: kvIncrementalCache,
+  incrementalCache: r2IncrementalCache,
   queue: memoryQueue,
 });
diff --git a/examples/e2e/pages-router/wrangler.jsonc b/examples/e2e/pages-router/wrangler.jsonc
@@ -8,10 +8,10 @@
     "directory": ".open-next/assets",
     "binding": "ASSETS"
   },
-  "kv_namespaces": [
+  "r2_buckets": [
     {
-      "binding": "NEXT_INC_CACHE_KV",
-      "id": "<BINDING_ID>"
+      "binding": "NEXT_INC_CACHE_R2_BUCKET",
+      "bucket_name": "<BUCKET_NAME>"
     }
   ],
   "services": [
diff --git a/examples/overrides/r2-incremental-cache/wrangler.jsonc b/examples/overrides/r2-incremental-cache/wrangler.jsonc
@@ -26,8 +26,7 @@
       "r2_buckets": [
         {
           "binding": "NEXT_INC_CACHE_R2_BUCKET",
-          "bucket_name": "NEXT_INC_CACHE_R2_BUCKET",
-          "preview_bucket_name": "NEXT_INC_CACHE_R2_BUCKET"
+          "bucket_name": "NEXT_INC_CACHE_R2_BUCKET"
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@`
`8`	`8`	`"directory": ".open-next/assets",`
`9`	`9`	`"binding": "ASSETS"`
`10`	`10`	`},`
`11`		`- "kv_namespaces": [`
	`11`	`+ "r2_buckets": [`
`12`	`12`	`{`
`13`		`- "binding": "NEXT_INC_CACHE_KV",`
`14`		`- "id": "<BINDING_ID>"`
	`13`	`+ "binding": "NEXT_INC_CACHE_R2_BUCKET",`
	`14`	`+ "bucket_name": "<BUCKET_NAME>"`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"services": [`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@`
`26`	`26`	`"new_sqlite_classes": ["DOQueueHandler", "DOShardedTagCache"]`
`27`	`27`	`}`
`28`	`28`	`],`
`29`		`- "kv_namespaces": [`
	`29`	`+ "r2_buckets": [`
`30`	`30`	`{`
`31`		`- "binding": "NEXT_INC_CACHE_KV",`
`32`		`- "id": "<BINDING_ID>"`
	`31`	`+ "binding": "NEXT_INC_CACHE_R2_BUCKET",`
	`32`	`+ "bucket_name": "<BUCKET_NAME>"`
`33`	`33`	`}`
`34`	`34`	`],`
`35`	`35`	`"services": [`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@`
`26`	`26`	`"r2_buckets": [`
`27`	`27`	`{`
`28`	`28`	`"binding": "NEXT_INC_CACHE_R2_BUCKET",`
`29`		`- "bucket_name": "NEXT_INC_CACHE_R2_BUCKET",`
`30`		`- "preview_bucket_name": "NEXT_INC_CACHE_R2_BUCKET"`
	`29`	`+ "bucket_name": "NEXT_INC_CACHE_R2_BUCKET"`
`31`	`30`	`}`
`32`	`31`	`]`
`33`	`32`	`},`