Fix tags cache

examples/app-pages-router/package.json

@@ -8,13 +8,13 @@
     "build": "next build",
     "start": "next start --port 3003",
     "lint": "next lint",
-     "clean": "rm -rf .turbo node_modules .next .open-next"
+    "clean": "rm -rf .turbo node_modules .next .open-next"
   },
   "dependencies": {
-    "open-next": "workspace:*",
     "@example/shared": "workspace:*",
     "@open-next/utils": "workspace:*",
     "next": "latest",
+    "open-next": "workspace:*",
     "react": "latest",
     "react-dom": "latest"
   },

examples/app-router/app/api/revalidate-tag/route.ts

@@ -0,0 +1,7 @@
+import { revalidateTag } from "next/cache";
+
+export async function GET() {
+  revalidateTag("revalidate");
+
+  return new Response("ok");
+}

examples/app-router/app/revalidate-tag/layout.tsx

@@ -0,0 +1,19 @@
+import { unstable_cache } from "next/cache";
+import type { ReactNode } from "react";
+
+export default async function Layout({ children }: { children: ReactNode }) {
+  const fakeFetch = unstable_cache(
+    async () => new Date().getTime(),
+    ["fakeFetch"],
+    {
+      tags: ["revalidate"],
+    },
+  );
+  const fetchedDate = await fakeFetch();
+  return (
+    <div>
+      <div>Fetched time: {new Date(fetchedDate).toISOString()}</div>
+      {children}
+    </div>
+  );
+}

examples/app-router/app/revalidate-tag/nested/page.tsx

@@ -0,0 +1,3 @@
+export default async function Nested() {
+  return <div>Nested</div>;
+}

examples/app-router/app/revalidate-tag/page.tsx

@@ -0,0 +1,8 @@
+async function getTime() {
+  return new Date().toISOString();
+}
+
+export default async function ISR() {
+  const time = getTime();
+  return <div>Time: {time}</div>;
+}

examples/app-router/middleware.ts

@@ -42,6 +42,14 @@ export function middleware(request: NextRequest) {
     );
   }
 
+  // It is so that cloudfront doesn't cache the response
+  if (path.startsWith("/revalidate-tag")) {
+    responseHeaders.set(
+      "cache-control",
+      "private, no-cache, no-store, max-age=0, must-revalidate",
+    );
+  }
+
   const r = NextResponse.next({
     headers: responseHeaders,
     request: {

examples/app-router/package.json

@@ -8,13 +8,13 @@
     "build": "next build",
     "start": "next start --port 3001",
     "lint": "next lint",
-     "clean": "rm -rf .turbo node_modules .next .open-next"
+    "clean": "rm -rf .turbo node_modules .next .open-next"
   },
   "dependencies": {
-    "open-next": "workspace:*",
     "@example/shared": "workspace:*",
     "@open-next/utils": "workspace:*",
     "next": "latest",
+    "open-next": "workspace:*",
     "react": "latest",
     "react-dom": "latest"
   },

examples/pages-router/package.json

@@ -8,7 +8,7 @@
     "build": "next build",
     "start": "next start --port 3002",
     "lint": "next lint",
-     "clean": "rm -rf .turbo node_modules .next .open-next"
+    "clean": "rm -rf .turbo node_modules .next .open-next"
   },
   "dependencies": {
     "@example/shared": "workspace:*",

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

@@ -151,12 +151,22 @@ export default class S3Cache {
     this.buildId = NEXT_BUILD_ID!;
   }
 
-  public async get(key: string, options?: boolean | { fetchCache?: boolean }) {
+  public async get(
+    key: string,
+    // fetchCache is for next 13.5 and above, kindHint is for next 14 and above and boolean is for earlier versions
+    options?:
+      | boolean
+      | { fetchCache?: boolean; kindHint?: "app" | "pages" | "fetch" },
+  ) {
     if (globalThis.disableIncrementalCache) {
       return null;
     }
     const isFetchCache =
-      typeof options === "object" ? options.fetchCache : options;
+      typeof options === "object"
+        ? options.kindHint
+          ? options.kindHint === "fetch"
+          : options.fetchCache
+        : options;
     return isFetchCache
       ? this.getFetchCache(key)
       : this.getIncrementalCache(key);

packages/open-next/src/build.ts

@@ -495,8 +495,6 @@ function createCacheAssets(monorepoRoot: string, disableDynamoDBCache = false) {
     fs.writeFileSync(cacheFilePath, JSON.stringify(cacheFileContent));
   });
 
-  removeFiles(outputPath, (file) => !file.endsWith(".cache"));
-
   if (!disableDynamoDBCache) {
     // Generate dynamodb data
     // We need to traverse the cache to find every .meta file
@@ -583,6 +581,9 @@ function createCacheAssets(monorepoRoot: string, disableDynamoDBCache = false) {
       );
     }
   }
+
+  // We need to remove files later because we need the metafiles for dynamodb tags cache
+  removeFiles(outputPath, (file) => !file.endsWith(".cache"));
 }
 
 /***************************/

packages/tests-e2e/tests/appRouter/revalidateTag.test.ts

@@ -0,0 +1,56 @@
+import { expect, test } from "@playwright/test";
+
+test("Revalidate tag", async ({ page, request }) => {
+  test.setTimeout(45000);
+  let responsePromise = page.waitForResponse((response) => {
+    return response.status() === 200;
+  });
+  await page.goto("/revalidate-tag");
+  let elLayout = page.getByText("Fetched time:");
+  let time = await elLayout.textContent();
+  let newTime;
+
+  let response = await responsePromise;
+  const nextCacheHeader = response.headers()["x-nextjs-cache"];
+  expect(nextCacheHeader).toMatch(/^(HIT|STALE)$/);
+
+  // Send revalidate tag request
+
+  const result = await request.get("/api/revalidate-tag");
+  expect(result.status()).toEqual(200);
+  const text = await result.text();
+  expect(text).toEqual("ok");
+
+  responsePromise = page.waitForResponse((response) => {
+    return response.status() === 200;
+  });
+  await page.reload();
+  elLayout = page.getByText("Fetched time:");
+  newTime = await elLayout.textContent();
+
+  expect(newTime).not.toEqual(time);
+
+  response = await responsePromise;
+  expect(response.headers()["x-nextjs-cache"]).toEqual("MISS");
+
+  //Check if nested page is also a miss
+  responsePromise = page.waitForResponse((response) => {
+    return response.status() === 200;
+  });
+  await page.goto("/revalidate-tag/nested");
+  elLayout = page.getByText("Fetched time:");
+  newTime = await elLayout.textContent();
+  expect(newTime).not.toEqual(time);
+
+  response = await responsePromise;
+  expect(response.headers()["x-nextjs-cache"]).toEqual("MISS");
+
+  // If we hit the page again, it should be a hit
+  responsePromise = page.waitForResponse((response) => {
+    return response.status() === 200;
+  });
+  await page.goto("/revalidate-tag/nested");
+
+  response = await responsePromise;
+  expect(response.headers()["x-nextjs-cache"]).toEqual("HIT");
+});