fixup! share names

Author: vicb

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

@@ -7,7 +7,7 @@ export const CACHE_ASSET_DIR = "cdn-cgi/_next_cache";
 
 export const STATUS_DELETED = 1;
 
-export const CACHE_NAME = "cf-kv-incremental-cache";
+export const NAME = "cf-kv-incremental-cache";
 
 /**
  * Open Next cache based on cloudflare KV and Assets.
@@ -17,7 +17,7 @@ export const CACHE_NAME = "cf-kv-incremental-cache";
  * when the constructor is called.
  */
 class KVIncrementalCache implements IncrementalCache {
-  readonly name = CACHE_NAME;
+  readonly name = NAME;
 
   async get<IsFetch extends boolean = false>(
     key: string,

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

@@ -4,6 +4,8 @@ import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "../../cloudflare-context.js";
 
+export const NAME = "cf-r2-incremental-cache";
+
 /**
  * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_INC_CACHE_R2_BUCKET`) as it's
  * underlying data store.
@@ -12,7 +14,7 @@ import { getCloudflareContext } from "../../cloudflare-context.js";
  * environment variable, and defaults to `incremental-cache`.
  */
 class R2IncrementalCache implements IncrementalCache {
-  readonly name = "cf-r2-incremental-cache";
+  readonly name = NAME;
 
   async get<IsFetch extends boolean = false>(
     key: string,

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

@@ -3,7 +3,7 @@ import { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs/aws/
 
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { IncrementalCacheEntry } from "./internal.js";
-import { CACHE_NAME as KV_CACHE_NAME } from "./kv-incremental-cache.js";
+import { NAME as KV_CACHE_NAME } from "./kv-incremental-cache.js";
 
 const ONE_MINUTE_IN_SECONDS = 60;
 const THIRTY_MINUTES_IN_SECONDS = ONE_MINUTE_IN_SECONDS * 30;

packages/cloudflare/src/api/overrides/tag-cache/d1-next-tag-cache.ts

@@ -5,9 +5,11 @@ import { RecoverableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "../../cloudflare-context.js";
 
+export const NAME = "d1-next-mode-tag-cache";
+
 export class D1NextModeTagCache implements NextModeTagCache {
   readonly mode = "nextMode" as const;
-  readonly name = "d1-next-mode-tag-cache";
+  readonly name = NAME;
 
   async hasBeenRevalidated(tags: string[], lastModified?: number): Promise<boolean> {
     const { isDisabled, db } = this.getConfig();

packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts

@@ -6,9 +6,11 @@ import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "../../cloudflare-context";
 
-const SOFT_TAG_PREFIX = "_N_T_/";
 export const DEFAULT_WRITE_RETRIES = 3;
 export const DEFAULT_NUM_SHARDS = 4;
+export const NAME = "do-sharded-tag-cache";
+
+const SOFT_TAG_PREFIX = "_N_T_/";
 
 interface ShardedDOTagCacheOptions {
   /**
@@ -95,7 +97,7 @@ export class TagCacheDOId {
 }
 class ShardedDOTagCache implements NextModeTagCache {
   readonly mode = "nextMode" as const;
-  readonly name = "do-sharded-tag-cache";
+  readonly name = NAME;
   readonly numSoftReplicas: number;
   readonly numHardReplicas: number;
   readonly maxWriteRetries: number;

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

@@ -12,6 +12,8 @@ import type {
 import type { IncrementalCache, TagCache } from "@opennextjs/aws/types/overrides.js";
 import { globSync } from "glob";
 
+import { NAME as R2_CACHE_NAME } from "../../api/overrides/incremental-cache/r2-incremental-cache.js";
+import { NAME as D1_TAG_NAME } from "../../api/overrides/tag-cache/d1-next-tag-cache.js";
 import type { WranglerTarget } from "../utils/run-wrangler.js";
 import { runWrangler } from "../utils/run-wrangler.js";
 
@@ -58,7 +60,7 @@ export async function populateCache(
   if (!config.dangerous?.disableIncrementalCache && incrementalCache) {
     const name = await resolveCacheName(incrementalCache);
     switch (name) {
-      case "r2-incremental-cache": {
+      case R2_CACHE_NAME: {
         logger.info("\nPopulating R2 incremental cache...");
 
         const assets = getCacheAssetPaths(options);
@@ -88,7 +90,7 @@ export async function populateCache(
   if (!config.dangerous?.disableTagCache && !config.dangerous?.disableIncrementalCache && tagCache) {
     const name = await resolveCacheName(tagCache);
     switch (name) {
-      case "d1-next-mode-tag-cache": {
+      case D1_TAG_NAME: {
         logger.info("\nCreating D1 table if necessary...");
 
         runWrangler(
@@ -104,21 +106,6 @@ export async function populateCache(
         logger.info("\nSuccessfully created D1 table");
         break;
       }
-      case "d1-tag-cache": {
-        logger.info("\nPopulating D1 tag cache...");
-
-        runWrangler(
-          options,
-          [
-            "d1 execute",
-            "NEXT_TAG_CACHE_D1",
-            `--file ${JSON.stringify(path.join(options.outputDir, "cloudflare/cache-assets-manifest.sql"))}`,
-          ],
-          { ...populateCacheOptions, logging: "error" }
-        );
-        logger.info("Successfully populated cache");
-        break;
-      }
       default:
         logger.info("Tag cache does not need populating");
     }