fixup! apply default values in computeCacheKey

Author: vicb

packages/cloudflare/src/api/overrides/incremental-cache/kv-incremental-cache.ts

@@ -19,7 +19,10 @@ export type KeyOptions = {
 export function computeCacheKey(key: string, options: KeyOptions) {
   const { isFetch, buildId } = options;
   const hash = createHash("sha256");
-  return `${buildId}/${hash.update(key).digest("hex")}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
+  return `${buildId ?? FALLBACK_BUILD_ID}/${hash.update(key).digest("hex")}.${isFetch ? "fetch" : "cache"}`.replace(
+    /\/+/g,
+    "/"
+  );
 }
 
 /**
@@ -107,7 +110,7 @@ class KVIncrementalCache implements IncrementalCache {
 
   protected getKVKey(key: string, isFetch?: boolean): string {
     return computeCacheKey(key, {
-      buildId: process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID,
+      buildId: process.env.NEXT_BUILD_ID,
       isFetch: Boolean(isFetch),
     });
   }

packages/cloudflare/src/api/overrides/incremental-cache/r2-incremental-cache.ts

@@ -23,7 +23,7 @@ export type KeyOptions = {
 export function computeCacheKey(key: string, options: KeyOptions) {
   const { isFetch, directory, buildId } = options;
   const hash = createHash("sha256");
-  return `${directory}/${buildId}/${hash.update(key).digest("hex")}.${isFetch ? "fetch" : "cache"}`.replace(
+  return `${directory ?? DEFAULT_PREFIX}/${buildId ?? FALLBACK_BUILD_ID}/${hash.update(key).digest("hex")}.${isFetch ? "fetch" : "cache"}`.replace(
     /\/+/g,
     "/"
   );
@@ -94,8 +94,8 @@ class R2IncrementalCache implements IncrementalCache {
 
   protected getR2Key(key: string, isFetch?: boolean): string {
     return computeCacheKey(key, {
-      directory: getCloudflareContext().env[PREFIX_ENV_NAME] ?? DEFAULT_PREFIX,
-      buildId: process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID,
+      directory: getCloudflareContext().env[PREFIX_ENV_NAME],
+      buildId: process.env.NEXT_BUILD_ID,
       isFetch: Boolean(isFetch),
     });
   }

packages/cloudflare/src/cli/commands/populate-cache.ts

@@ -22,7 +22,6 @@ import {
 import {
   BINDING_NAME as R2_CACHE_BINDING_NAME,
   computeCacheKey as computeR2CacheKey,
-  DEFAULT_PREFIX as R2_CACHE_DEFAULT_PREFIX,
   NAME as R2_CACHE_NAME,
   PREFIX_ENV_NAME as R2_CACHE_PREFIX_ENV_NAME,
 } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
@@ -115,7 +114,7 @@ function populateR2IncrementalCache(
 
   for (const { fullPath, key, buildId, isFetch } of tqdm(assets)) {
     const cacheKey = computeR2CacheKey(key, {
-      directory: process.env[R2_CACHE_PREFIX_ENV_NAME] ?? R2_CACHE_DEFAULT_PREFIX,
+      directory: process.env[R2_CACHE_PREFIX_ENV_NAME],
       buildId,
       isFetch,
     });