remove build id from cache keys in overrides

Author: Nicolas Dorseuil

packages/open-next/src/overrides/incrementalCache/fs-dev.ts

@@ -4,8 +4,7 @@ import path from "node:path";
 import type { IncrementalCache } from "types/overrides.js";
 import { getMonorepoRelativePath } from "utils/normalize-path";
 
-const buildId = process.env.NEXT_BUILD_ID;
-const basePath = path.join(getMonorepoRelativePath(), `cache/${buildId}`);
+const basePath = path.join(getMonorepoRelativePath(), "cache");
 
 const getCacheKey = (key: string) => {
   return path.join(basePath, `${key}.cache`);

packages/open-next/src/overrides/incrementalCache/multi-tier-ddb-s3.ts

@@ -41,8 +41,7 @@ const awsFetch = (body: RequestInit["body"], type: "get" | "set" = "get") => {
 };
 
 const buildDynamoKey = (key: string) => {
-  const { NEXT_BUILD_ID } = process.env;
-  return `__meta_${NEXT_BUILD_ID}_${key}`;
+  return `__meta_${key}`;
 };
 
 /**

packages/open-next/src/overrides/incrementalCache/s3-lite.ts

@@ -34,11 +34,10 @@ const awsFetch = async (key: string, options: RequestInit) => {
 };
 
 function buildS3Key(key: string, extension: Extension) {
-  const { CACHE_BUCKET_KEY_PREFIX, NEXT_BUILD_ID } = process.env;
+  const { CACHE_BUCKET_KEY_PREFIX } = process.env;
   return path.posix.join(
     CACHE_BUCKET_KEY_PREFIX ?? "",
     extension === "fetch" ? "__fetch" : "",
-    NEXT_BUILD_ID ?? "",
     extension === "fetch" ? key : `${key}.${extension}`,
   );
 }

packages/open-next/src/overrides/incrementalCache/s3.ts

@@ -13,12 +13,8 @@ import type { IncrementalCache } from "types/overrides";
 import { awsLogger } from "../../adapters/logger";
 import { parseNumberFromEnv } from "../../adapters/util";
 
-const {
-  CACHE_BUCKET_REGION,
-  CACHE_BUCKET_KEY_PREFIX,
-  NEXT_BUILD_ID,
-  CACHE_BUCKET_NAME,
-} = process.env;
+const { CACHE_BUCKET_REGION, CACHE_BUCKET_KEY_PREFIX, CACHE_BUCKET_NAME } =
+  process.env;
 
 function parseS3ClientConfigFromEnv(): S3ClientConfig {
   return {
@@ -34,7 +30,6 @@ function buildS3Key(key: string, extension: Extension) {
   return path.posix.join(
     CACHE_BUCKET_KEY_PREFIX ?? "",
     extension === "fetch" ? "__fetch" : "",
-    NEXT_BUILD_ID ?? "",
     extension === "fetch" ? key : `${key}.${extension}`,
   );
 }