align with other inc cache changes

Author: james-elicx

packages/cloudflare/src/api/overrides/incremental-cache/static-assets-incremental-cache.ts

@@ -3,6 +3,7 @@ import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "../../cloudflare-context.js";
+import { debugCache, FALLBACK_BUILD_ID } from "../internal.js";
 
 export const CACHE_DIR = "cdn-cgi/_next_cache";
 
@@ -22,7 +23,7 @@ class StaticAssetsIncrementalCache implements IncrementalCache {
     const assets = getCloudflareContext().env.ASSETS;
     if (!assets) throw new IgnorableError("No Static Assets");
 
-    debug(`Get ${key}`);
+    debugCache(`Get ${key}`);
 
     try {
       const response = await assets.fetch(this.getAssetUrl(key, isFetch));
@@ -39,12 +40,16 @@ class StaticAssetsIncrementalCache implements IncrementalCache {
     }
   }
 
-  async set(): Promise<void> {}
+  async set(): Promise<void> {
+    error("Failed to set to read-only cache");
+  }
 
-  async delete(): Promise<void> {}
+  async delete(): Promise<void> {
+    error("Failed to delete from read-only cache");
+  }
 
   protected getAssetUrl(key: string, isFetch?: boolean): string {
-    const buildId = process.env.NEXT_BUILD_ID ?? "no-build-id";
+    const buildId = process.env.NEXT_BUILD_ID ?? FALLBACK_BUILD_ID;
     const name = `${CACHE_DIR}/${buildId}/${key}.${isFetch ? "fetch" : "cache"}`.replace(/\/+/g, "/");
     return `http://assets.local/${name}`;
   }

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

@@ -155,6 +155,18 @@ function populateD1TagCache(
   logger.info("\nSuccessfully created D1 table");
 }
 
+function populateStaticAssetsIncrementalCache(options: BuildOptions) {
+  logger.info("\nPopulating Workers static assets...");
+
+  const assets = getCacheAssetPaths(options);
+  for (const { fsPath, destPath } of tqdm(assets)) {
+    const outputDestPath = path.join(options.outputDir, "assets", STATIC_ASSETS_CACHE_DIR, destPath);
+    mkdirSync(path.dirname(outputDestPath), { recursive: true });
+    cpSync(fsPath, outputDestPath);
+  }
+  logger.info(`Successfully populated static assets cache with ${assets.length} assets`);
+}
+
 export async function populateCache(
   options: BuildOptions,
   config: OpenNextConfig,
@@ -176,18 +188,9 @@ export async function populateCache(
       case KV_CACHE_NAME:
         populateKVIncrementalCache(options, populateCacheOptions);
         break;
-      case STATIC_ASSETS_CACHE_NAME: {
-        logger.info("\nPopulating Workers static assets...");
-
-        const assets = getCacheAssetPaths(options);
-        for (const { fsPath, destPath } of tqdm(assets)) {
-          const outputDestPath = path.join(options.outputDir, "assets", STATIC_ASSETS_CACHE_DIR, destPath);
-          mkdirSync(path.dirname(outputDestPath), { recursive: true });
-          cpSync(fsPath, outputDestPath);
-        }
-        logger.info(`Successfully populated static assets cache with ${assets.length} assets`);
+      case STATIC_ASSETS_CACHE_NAME:
+        populateStaticAssetsIncrementalCache(options);
         break;
-      }
       default:
         logger.info("Incremental cache does not need populating");
     }