directory -> prefix

Author: james-elicx

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

@@ -8,7 +8,7 @@ declare global {
     NEXT_CACHE_D1_REVALIDATIONS_TABLE?: string;
     NEXT_CACHE_REVALIDATION_WORKER?: Service;
     NEXT_CACHE_R2_BUCKET?: R2Bucket;
-    NEXT_CACHE_R2_DIRECTORY?: string;
+    NEXT_CACHE_R2_PREFIX?: string;
     ASSETS?: Fetcher;
   }
 }

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

@@ -15,7 +15,7 @@ const ONE_YEAR_IN_SECONDS = 31536000;
  * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_CACHE_R2_BUCKET`) as it's
  * underlying data store.
  *
- * The directory that the cache entries are stored in can be confused with the `NEXT_CACHE_R2_DIRECTORY`
+ * The directory that the cache entries are stored in can be confused with the `NEXT_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
@@ -126,7 +126,7 @@ class R2IncrementalCache implements IncrementalCache {
   }
 
   protected getR2Key(key: string, isFetch?: boolean): string {
-    const directory = getCloudflareContext().env.NEXT_CACHE_R2_DIRECTORY ?? "incremental-cache";
+    const directory = getCloudflareContext().env.NEXT_CACHE_R2_PREFIX ?? "incremental-cache";
     return `${directory}/${this.getBaseCacheKey(key, isFetch)}`;
   }
 

packages/cloudflare/src/cli/build/utils/populate-cache.ts

@@ -84,7 +84,7 @@ export async function populateCache(opts: BuildOptions, config: OpenNextConfig,
         assets.forEach(({ fsPath, destPath }) => {
           const fullDestPath = path.join(
             "NEXT_CACHE_R2_BUCKET",
-            process.env.NEXT_CACHE_R2_DIRECTORY ?? "incremental-cache",
+            process.env.NEXT_CACHE_R2_PREFIX ?? "incremental-cache",
             destPath
           );