comments

Author: james-elicx

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

@@ -8,7 +8,7 @@ import { getCloudflareContext } from "./cloudflare-context.js";
  * 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_PREFIX`
+ * The directory that the cache entries are stored in can be configured 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
@@ -17,6 +17,12 @@ import { getCloudflareContext } from "./cloudflare-context.js";
 class R2IncrementalCache implements IncrementalCache {
   readonly name = "r2-incremental-cache";
 
+  protected directory: string;
+
+  constructor() {
+    this.directory = getCloudflareContext().env.NEXT_CACHE_R2_PREFIX ?? "incremental-cache";
+  }
+
   async get<IsFetch extends boolean = false>(
     key: string,
     isFetch?: IsFetch
@@ -71,9 +77,7 @@ class R2IncrementalCache implements IncrementalCache {
   }
 
   protected getR2Key(key: string, isFetch?: boolean): string {
-    const directory = getCloudflareContext().env.NEXT_CACHE_R2_PREFIX ?? "incremental-cache";
-
-    return `${directory}/${process.env.NEXT_BUILD_ID ?? "no-build-id"}/${key}.${isFetch ? "fetch" : "cache"}`;
+    return `${this.directory}/${process.env.NEXT_BUILD_ID ?? "no-build-id"}/${key}.${isFetch ? "fetch" : "cache"}`;
   }
 }
 

packages/cloudflare/src/api/regional-cache.ts

@@ -12,7 +12,7 @@ type Options = {
    * The mode to use for the regional cache.
    *
    * - `short-lived`: Re-use a cache entry for up to a minute after it has been retrieved.
-   * - `long-lived`: Re-use a fetch cache entry until it is revalidated, or an ISR/SSG entry for up to 30 minutes.
+   * - `long-lived`: Re-use a fetch cache entry until it is revalidated (per-region), or an ISR/SSG entry for up to 30 minutes.
    */
   mode: "short-lived" | "long-lived";
   /**
@@ -156,7 +156,7 @@ class RegionalCache implements IncrementalCache {
  * @param cache - Incremental cache instance.
  * @param opts.mode - The mode to use for the regional cache.
  * - `short-lived`: Re-use a cache entry for up to a minute after it has been retrieved.
- * - `long-lived`: Re-use a fetch cache entry until it is revalidated, or an ISR/SSG entry for up to 30 minutes.
+ * - `long-lived`: Re-use a fetch cache entry until it is revalidated (per-region), or an ISR/SSG entry for up to 30 minutes.
  * @param opts.shouldLazilyUpdateOnCacheHit - Whether the regional cache entry should be updated in
  * the background or not when it experiences a cache hit.
  *

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

@@ -52,7 +52,10 @@ function runWrangler(
 }
 
 function getCacheAssetPaths(opts: BuildOptions) {
-  return globSync(path.join(opts.outputDir, "cache/**/*"), { withFileTypes: true })
+  return globSync(path.join(opts.outputDir, "cache/**/*"), {
+    withFileTypes: true,
+    windowsPathsNoEscape: true,
+  })
     .filter((f) => f.isFile())
     .map((f) => {
       const relativePath = path.relative(path.join(opts.outputDir, "cache"), f.fullpathPosix());