From bdb7e98a576a71a3d1e0ef56b0aff19fc3c814e9 Mon Sep 17 00:00:00 2001
From: mathisobadia <mathis.obadia@gmail.com>
Date: Fri, 3 Nov 2023 21:25:25 +0100
Subject: [PATCH] fix: get tag values for fetch cache

---
 packages/open-next/src/adapters/cache.ts | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/open-next/src/adapters/cache.ts b/packages/open-next/src/adapters/cache.ts
index 3318de00..4ade59bb 100644
--- a/packages/open-next/src/adapters/cache.ts
+++ b/packages/open-next/src/adapters/cache.ts
@@ -70,6 +70,14 @@ type IncrementalCacheValue =
   | CachedFetchValue
   | CachedRouteValue;
 
+type IncrementalCacheContext = {
+  revalidate?: number | false | undefined;
+  fetchCache?: boolean | undefined;
+  fetchUrl?: string | undefined;
+  fetchIdx?: number | undefined;
+  tags?: string[] | undefined;
+};
+
 interface CacheHandlerContext {
   fs?: never;
   dev?: boolean;
@@ -254,7 +262,11 @@ export default class S3Cache {
     return null;
   }
 
-  async set(key: string, data?: IncrementalCacheValue): Promise<void> {
+  async set(
+    key: string,
+    data?: IncrementalCacheValue,
+    ctx?: IncrementalCacheContext,
+  ): Promise<void> {
     if (globalThis.disableIncrementalCache) {
       return;
     }
@@ -298,7 +310,7 @@ export default class S3Cache {
     // If we use an in house version of getDerivedTags in build we should use it here instead of next's one
     const derivedTags: string[] =
       data?.kind === "FETCH"
-        ? data.data.tags ?? []
+        ? ctx?.tags ?? []
         : data?.kind === "PAGE"
         ? data.headers?.["x-next-cache-tags"]?.split(",") ?? []
         : [];