refactor: drop global disableDynamoDBCache and disableIncrementalCache

Author: vicb

packages/open-next/src/adapters/cache.ts

@@ -116,7 +116,7 @@ export default class Cache {
           kind?: "FETCH";
         },
   ) {
-    if (globalThis.disableIncrementalCache) {
+    if (globalThis.openNextConfig.dangerous?.disableIncrementalCache) {
       return null;
     }
 
@@ -260,7 +260,7 @@ export default class Cache {
     data?: IncrementalCacheValue,
     ctx?: IncrementalCacheContext,
   ): Promise<void> {
-    if (globalThis.disableIncrementalCache) {
+    if (globalThis.openNextConfig.dangerous?.disableIncrementalCache) {
       return;
     }
     // This one might not even be necessary anymore
@@ -396,7 +396,8 @@ export default class Cache {
   }
 
   public async revalidateTag(tags: string | string[]) {
-    if (globalThis.disableDynamoDBCache || globalThis.disableIncrementalCache) {
+    const config = globalThis.openNextConfig.dangerous;
+    if (config?.disableTagCache || config?.disableIncrementalCache) {
       return;
     }
     try {

packages/open-next/src/build/compileCache.ts

@@ -28,15 +28,7 @@ export function compileCache(
       target: ["node18"],
       format,
       banner: {
-        js: [
-          `globalThis.disableIncrementalCache = ${
-            config.dangerous?.disableIncrementalCache ?? false
-          };`,
-          `globalThis.disableDynamoDBCache = ${
-            config.dangerous?.disableTagCache ?? false
-          };`,
-          `globalThis.isNextAfter15 = ${isAfter15};`,
-        ].join(""),
+        js: `globalThis.isNextAfter15 = ${isAfter15};`,
       },
     },
     options,

packages/open-next/src/overrides/tagCache/dynamodb-lite.ts

@@ -68,7 +68,9 @@ function buildDynamoObject(path: string, tags: string, revalidatedAt?: number) {
 const tagCache: TagCache = {
   async getByPath(path) {
     try {
-      if (globalThis.disableDynamoDBCache) return [];
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return [];
+      }
       const { CACHE_DYNAMO_TABLE, NEXT_BUILD_ID } = process.env;
       const result = await awsFetch(
         JSON.stringify({
@@ -101,7 +103,9 @@ const tagCache: TagCache = {
   },
   async getByTag(tag) {
     try {
-      if (globalThis.disableDynamoDBCache) return [];
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return [];
+      }
       const { CACHE_DYNAMO_TABLE, NEXT_BUILD_ID } = process.env;
       const result = await awsFetch(
         JSON.stringify({
@@ -133,7 +137,9 @@ const tagCache: TagCache = {
   },
   async getLastModified(key, lastModified) {
     try {
-      if (globalThis.disableDynamoDBCache) return lastModified ?? Date.now();
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return lastModified ?? Date.now();
+      }
       const { CACHE_DYNAMO_TABLE } = process.env;
       const result = await awsFetch(
         JSON.stringify({
@@ -168,7 +174,9 @@ const tagCache: TagCache = {
   async writeTags(tags) {
     try {
       const { CACHE_DYNAMO_TABLE } = process.env;
-      if (globalThis.disableDynamoDBCache) return;
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return;
+      }
       const dataChunks = chunk(tags, MAX_DYNAMO_BATCH_WRITE_ITEM_COUNT).map(
         (Items) => ({
           RequestItems: {

packages/open-next/src/overrides/tagCache/dynamodb.ts

@@ -44,7 +44,9 @@ function buildDynamoObject(path: string, tags: string, revalidatedAt?: number) {
 const tagCache: TagCache = {
   async getByPath(path) {
     try {
-      if (globalThis.disableDynamoDBCache) return [];
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return [];
+      }
       const result = await dynamoClient.send(
         new QueryCommand({
           TableName: CACHE_DYNAMO_TABLE,
@@ -69,7 +71,9 @@ const tagCache: TagCache = {
   },
   async getByTag(tag) {
     try {
-      if (globalThis.disableDynamoDBCache) return [];
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return [];
+      }
       const { Items } = await dynamoClient.send(
         new QueryCommand({
           TableName: CACHE_DYNAMO_TABLE,
@@ -95,7 +99,9 @@ const tagCache: TagCache = {
   },
   async getLastModified(key, lastModified) {
     try {
-      if (globalThis.disableDynamoDBCache) return lastModified ?? Date.now();
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return lastModified ?? Date.now();
+      }
       const result = await dynamoClient.send(
         new QueryCommand({
           TableName: CACHE_DYNAMO_TABLE,
@@ -123,7 +129,9 @@ const tagCache: TagCache = {
   },
   async writeTags(tags) {
     try {
-      if (globalThis.disableDynamoDBCache) return;
+      if (globalThis.openNextConfig.dangerous?.disableTagCache) {
+        return;
+      }
       const dataChunks = chunk(tags, MAX_DYNAMO_BATCH_WRITE_ITEM_COUNT).map(
         (Items) => ({
           RequestItems: {

packages/open-next/src/types/global.ts

@@ -73,18 +73,6 @@ declare global {
    * Defined in `createMainHandler` or in `adapter/middleware.ts`.
    */
   var tagCache: TagCache;
-  /**
-   * A boolean that indicates if the DynamoDB cache is disabled.
-   * TODO: Remove this, we already have access to the config file
-   * Defined in esbuild banner for the cache adapter.
-   */
-  var disableDynamoDBCache: boolean;
-  /**
-   * A boolean that indicates if the incremental cache is disabled.
-   * TODO: Remove this, we already have access to the config file
-   * Defined in esbuild banner for the cache adapter.
-   */
-  var disableIncrementalCache: boolean;
 
   /**
    * An object that contains the last modified time of the pages.