incorporate suggestions

Author: james-elicx

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

@@ -3,7 +3,6 @@ import type { CacheValue, IncrementalCache, WithLastModified } from "@opennextjs
 import { IgnorableError } from "@opennextjs/aws/utils/error.js";
 
 import { getCloudflareContext } from "./cloudflare-context.js";
-import { IncrementalCacheEntry } from "./internal/incremental-cache.js";
 
 /**
  * An instance of the Incremental Cache that uses an R2 bucket (`NEXT_CACHE_R2_BUCKET`) as it's
@@ -31,7 +30,10 @@ class R2IncrementalCache implements IncrementalCache {
       const r2Object = await r2.get(this.getR2Key(key, isFetch));
       if (!r2Object) return null;
 
-      return r2Object.json();
+      return {
+        value: await r2Object.json(),
+        lastModified: r2Object.uploaded.getTime(),
+      };
     } catch (e) {
       error("Failed to get from cache", e);
       return null;
@@ -49,14 +51,7 @@ class R2IncrementalCache implements IncrementalCache {
     debug(`Set ${key}`);
 
     try {
-      const entry: IncrementalCacheEntry<IsFetch> = {
-        value,
-        // Note: `Date.now()` returns the time of the last IO rather than the actual time.
-        //       See https://developers.cloudflare.com/workers/reference/security-model/
-        lastModified: Date.now(),
-      };
-
-      await r2.put(this.getR2Key(key, isFetch), JSON.stringify(entry));
+      await r2.put(this.getR2Key(key, isFetch), JSON.stringify(value));
     } catch (e) {
       error("Failed to set to cache", e);
     }

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

@@ -72,24 +72,25 @@ class RegionalCache implements IncrementalCache {
     isFetch?: IsFetch
   ): Promise<void> {
     try {
-      await Promise.all([
-        this.store.set(key, value, isFetch),
-        this.putToCache(this.getCacheKey(key, isFetch), {
-          value,
-          // Note: `Date.now()` returns the time of the last IO rather than the actual time.
-          //       See https://developers.cloudflare.com/workers/reference/security-model/
-          lastModified: Date.now(),
-        }),
-      ]);
+      await this.store.set(key, value, isFetch);
+
+      await this.putToCache(this.getCacheKey(key, isFetch), {
+        value,
+        // Note: `Date.now()` returns the time of the last IO rather than the actual time.
+        //       See https://developers.cloudflare.com/workers/reference/security-model/
+        lastModified: Date.now(),
+      });
     } catch (e) {
       error(`Failed to get from regional cache`, e);
     }
   }
 
   async delete(key: string): Promise<void> {
     try {
+      await this.store.delete(key);
+
       const cache = await this.getCacheInstance();
-      await Promise.all([this.store.delete(key), cache.delete(this.getCacheKey(key))]);
+      await cache.delete(this.getCacheKey(key));
     } catch (e) {
       error("Failed to delete from regional cache", e);
     }

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

@@ -98,7 +98,7 @@ export async function populateCache(opts: BuildOptions, config: OpenNextConfig,
         break;
       }
       default:
-        logger.info("INcremental cache does not need populating");
+        logger.info("Incremental cache does not need populating");
     }
   }