fixup! WORKER_SELF_REFERENCE

Author: vicb

examples/e2e/app-pages-router/wrangler.jsonc

@@ -16,7 +16,7 @@
   ],
   "services": [
     {
-      "binding": "NEXT_CACHE_REVALIDATION_WORKER",
+      "binding": "WORKER_SELF_REFERENCE",
       "service": "app-pages-router"
     }
   ]

examples/e2e/app-router/wrangler.jsonc

@@ -34,7 +34,7 @@
   ],
   "services": [
     {
-      "binding": "NEXT_CACHE_REVALIDATION_WORKER",
+      "binding": "WORKER_SELF_REFERENCE",
       "service": "app-router"
     }
   ]

examples/e2e/pages-router/wrangler.jsonc

@@ -16,7 +16,7 @@
   ],
   "services": [
     {
-      "binding": "NEXT_CACHE_REVALIDATION_WORKER",
+      "binding": "WORKER_SELF_REFERENCE",
       "service": "pages-router"
     }
   ]

examples/overrides/memory-queue/wrangler.jsonc

@@ -16,7 +16,7 @@
   ],
   "services": [
     {
-      "binding": "NEXT_CACHE_REVALIDATION_WORKER",
+      "binding": "WORKER_SELF_REFERENCE",
       "service": "memory-queue"
     }
   ]

examples/overrides/r2-incremental-cache/wrangler.jsonc

@@ -19,7 +19,7 @@
       ],
       "services": [
         {
-          "binding": "NEXT_CACHE_REVALIDATION_WORKER",
+          "binding": "WORKER_SELF_REFERENCE",
           "service": "r2-incremental-cache-e2e"
         }
       ],

packages/cloudflare/src/api/cloudflare-context.ts

@@ -13,7 +13,7 @@ declare global {
     NEXTJS_ENV?: string;
 
     // Service binding for the worker itself to be able to call itself from within the worker
-    NEXT_CACHE_REVALIDATION_WORKER?: Service;
+    WORKER_SELF_REFERENCE?: Service;
 
     // KV used for the incremental cache
     NEXT_CACHE_KV?: KVNamespace;

packages/cloudflare/src/api/durable-objects/queue.spec.ts

@@ -37,7 +37,7 @@ const createDurableObjectQueue = ({
   };
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return new DurableObjectQueueHandler(mockState as any, {
-    NEXT_CACHE_REVALIDATION_WORKER: {
+    WORKER_SELF_REFERENCE: {
       fetch: vi.fn().mockReturnValue(
         new Promise<Response>((res) =>
           setTimeout(

packages/cloudflare/src/api/durable-objects/queue.ts

@@ -29,7 +29,7 @@ export class DurableObjectQueueHandler extends DurableObject<CloudflareEnv> {
 
   routeInFailedState = new Map<string, FailedState>();
 
-  service: NonNullable<CloudflareEnv["NEXT_CACHE_REVALIDATION_WORKER"]>;
+  service: NonNullable<CloudflareEnv["WORKER_SELF_REFERENCE"]>;
 
   // Configurable params
   readonly maxRevalidations: number;
@@ -40,7 +40,7 @@ export class DurableObjectQueueHandler extends DurableObject<CloudflareEnv> {
 
   constructor(ctx: DurableObjectState, env: CloudflareEnv) {
     super(ctx, env);
-    this.service = env.NEXT_CACHE_REVALIDATION_WORKER!;
+    this.service = env.WORKER_SELF_REFERENCE!;
     // If there is no service binding, we throw an error because we can't revalidate without it
     if (!this.service) throw new IgnorableError("No service binding for cache revalidation worker");
     this.sql = ctx.storage.sql;

packages/cloudflare/src/api/overrides/queue/memory-queue.spec.ts

@@ -8,7 +8,7 @@ vi.mock("./.next/prerender-manifest.json", () => Promise.resolve({ preview: { pr
 const mockServiceWorkerFetch = vi.fn();
 vi.mock("../../cloudflare-context", () => ({
   getCloudflareContext: () => ({
-    env: { NEXT_CACHE_REVALIDATION_WORKER: { fetch: mockServiceWorkerFetch } },
+    env: { WORKER_SELF_REFERENCE: { fetch: mockServiceWorkerFetch } },
   }),
 }));
 

packages/cloudflare/src/api/overrides/queue/memory-queue.ts

@@ -11,7 +11,7 @@ export const DEFAULT_REVALIDATION_TIMEOUT_MS = 10_000;
  *
  * It offers basic support for in-memory de-duping per isolate.
  *
- * A service binding called `NEXT_CACHE_REVALIDATION_WORKER` that points to your worker is required.
+ * A service binding called `WORKER_SELF_REFERENCE` that points to your worker is required.
  */
 export class MemoryQueue implements Queue {
   readonly name = "memory-queue";
@@ -21,7 +21,7 @@ export class MemoryQueue implements Queue {
   constructor(private opts = { revalidationTimeoutMs: DEFAULT_REVALIDATION_TIMEOUT_MS }) {}
 
   async send({ MessageBody: { host, url }, MessageDeduplicationId }: QueueMessage): Promise<void> {
-    const service = getCloudflareContext().env.NEXT_CACHE_REVALIDATION_WORKER;
+    const service = getCloudflareContext().env.WORKER_SELF_REFERENCE;
     if (!service) throw new IgnorableError("No service binding for cache revalidation worker");
 
     if (this.revalidatedPaths.has(MessageDeduplicationId)) return;