From 8241871bcf3dfa41286a1e6e2c206b914b981222 Mon Sep 17 00:00:00 2001
From: Maksim Hodasevich <maksim.hodasevich@gmail.com>
Date: Wed, 28 Oct 2026 16:00:31 +0100
Subject: [PATCH] fix(cms): revalidate every locale when a page or post is
 published, unpublished or deleted

`_status` is not localized, but the page and post revalidation hooks only invalidated the locale from the
request's ?locale= (default en). Deleting or unpublishing a document left its other locales served from the
data cache, so /es/<slug> kept returning 200 after the page was deleted.

Status changes and deletes now invalidate all locales; content edits of a published document still
invalidate only the edited locale. revalidatePageCache takes a list of locales.

Scopes: apps/cms Page and Posts revalidation hooks, Header/Footer/GlobalBlock callers, lib/config/i18n, lib/utils/revalidatePageCache, tests/int.
---
 .../hooks/revalidateResourcesUsingFooter.ts   |  2 +-
 .../hooks/revalidatePagesUsingGlobalBlock.ts  |  2 +-
 .../hooks/revalidateResourcesUsingHeader.ts   |  2 +-
 .../collections/Page/hooks/revalidatePage.ts  | 11 ++--
 .../collections/Posts/hooks/revalidatePost.ts | 19 +++---
 apps/cms/src/lib/config/i18n.ts               |  2 +
 apps/cms/src/lib/utils/revalidatePageCache.ts |  6 +-
 apps/cms/tests/int/revalidatePage.int.spec.ts | 58 +++++++++++++++++++
 8 files changed, 85 insertions(+), 17 deletions(-)
 create mode 100644 apps/cms/tests/int/revalidatePage.int.spec.ts

diff --git a/apps/cms/src/collections/Footer/hooks/revalidateResourcesUsingFooter.ts b/apps/cms/src/collections/Footer/hooks/revalidateResourcesUsingFooter.ts
index f4bbc0136..afc437bd5 100644
--- a/apps/cms/src/collections/Footer/hooks/revalidateResourcesUsingFooter.ts
+++ b/apps/cms/src/collections/Footer/hooks/revalidateResourcesUsingFooter.ts
@@ -44,7 +44,7 @@ export const revalidateResourcesUsingFooter: CollectionAfterChangeHook<Footer> =
     });
 
     for (const page of pages.docs) {
-      revalidatePageCache({ doc: page, locale, payload });
+      revalidatePageCache({ doc: page, locales: [locale], payload });
     }
   }
 
diff --git a/apps/cms/src/collections/GlobalBlock/hooks/revalidatePagesUsingGlobalBlock.ts b/apps/cms/src/collections/GlobalBlock/hooks/revalidatePagesUsingGlobalBlock.ts
index dc3c9a23c..cf1379eaf 100644
--- a/apps/cms/src/collections/GlobalBlock/hooks/revalidatePagesUsingGlobalBlock.ts
+++ b/apps/cms/src/collections/GlobalBlock/hooks/revalidatePagesUsingGlobalBlock.ts
@@ -60,7 +60,7 @@ export const revalidatePagesUsingGlobalBlock: CollectionAfterChangeHook<GlobalBl
     });
 
     for (const page of publishedPages) {
-      revalidatePageCache({ doc: page, locale, payload });
+      revalidatePageCache({ doc: page, locales: [locale], payload });
     }
   }
 
diff --git a/apps/cms/src/collections/Header/hooks/revalidateResourcesUsingHeader.ts b/apps/cms/src/collections/Header/hooks/revalidateResourcesUsingHeader.ts
index 458b74633..83b062e59 100644
--- a/apps/cms/src/collections/Header/hooks/revalidateResourcesUsingHeader.ts
+++ b/apps/cms/src/collections/Header/hooks/revalidateResourcesUsingHeader.ts
@@ -44,7 +44,7 @@ export const revalidateResourcesUsingHeader: CollectionAfterChangeHook<Header> =
     });
 
     for (const page of pages.docs) {
-      revalidatePageCache({ doc: page, locale, payload });
+      revalidatePageCache({ doc: page, locales: [locale], payload });
     }
   }
 
diff --git a/apps/cms/src/collections/Page/hooks/revalidatePage.ts b/apps/cms/src/collections/Page/hooks/revalidatePage.ts
index dba10678c..6577abdb1 100644
--- a/apps/cms/src/collections/Page/hooks/revalidatePage.ts
+++ b/apps/cms/src/collections/Page/hooks/revalidatePage.ts
@@ -1,9 +1,11 @@
 import type { CollectionAfterChangeHook, CollectionAfterDeleteHook } from "payload";
 
+import { ALL_LOCALES } from "@/lib/config/i18n";
 import { getLocaleFromRequest } from "@/lib/utils/getLocaleFromRequest";
 import { revalidatePageCache } from "@/lib/utils/revalidatePageCache";
 import type { Page } from "@/payload-types";
 
+// `_status` is not localized: publishing, unpublishing or deleting changes the page in every locale.
 export const revalidatePage: CollectionAfterChangeHook<Page> = async ({
   doc,
   previousDoc,
@@ -13,12 +15,14 @@ export const revalidatePage: CollectionAfterChangeHook<Page> = async ({
   const locale = getLocaleFromRequest(req);
 
   if (!context.disableRevalidate) {
+    const statusChanged = previousDoc?._status !== doc._status;
+
     if (doc._status === "published") {
-      revalidatePageCache({ doc, locale, payload });
+      revalidatePageCache({ doc, locales: statusChanged ? ALL_LOCALES : [locale], payload });
     }
 
     if (previousDoc?._status === "published" && doc._status !== "published") {
-      revalidatePageCache({ doc: previousDoc, locale, payload });
+      revalidatePageCache({ doc: previousDoc, locales: ALL_LOCALES, payload });
     }
   }
 
@@ -28,8 +32,7 @@ export const revalidatePage: CollectionAfterChangeHook<Page> = async ({
 export const revalidateDelete: CollectionAfterDeleteHook<Page> = async ({ doc, req }) => {
   const { payload, context } = req;
   if (!context.disableRevalidate) {
-    const locale = getLocaleFromRequest(req);
-    revalidatePageCache({ doc, locale, payload });
+    revalidatePageCache({ doc, locales: ALL_LOCALES, payload });
   }
   return doc;
 };
diff --git a/apps/cms/src/collections/Posts/hooks/revalidatePost.ts b/apps/cms/src/collections/Posts/hooks/revalidatePost.ts
index bf1cb0b48..01d3c2775 100644
--- a/apps/cms/src/collections/Posts/hooks/revalidatePost.ts
+++ b/apps/cms/src/collections/Posts/hooks/revalidatePost.ts
@@ -1,18 +1,21 @@
 import type { CollectionAfterChangeHook, CollectionAfterDeleteHook, Payload } from "payload";
 
+import { ALL_LOCALES } from "@/lib/config/i18n";
 import { cacheTag } from "@/lib/utils/cacheTags";
 import { revalidateScopedTag } from "@/lib/utils/scopedCache";
 import { getLocaleFromRequest } from "@/lib/utils/getLocaleFromRequest";
 import type { Locale } from "@/lib/types";
 import type { Post } from "@/payload-types";
 
-function revalidatePostTags(slug: string, locale: Locale, payload: Payload) {
+function revalidatePostTags(slug: string, locales: readonly Locale[], payload: Payload) {
   payload.logger?.info?.(`Revalidating post with slug: ${slug}`);
 
   // Revalidates this post AND all other posts (via postsList tag),
   // ensuring related articles sections on other posts stay up to date.
-  revalidateScopedTag(cacheTag({ locale, slug, type: "post" }), "max");
-  revalidateScopedTag(cacheTag({ locale, type: "postsList" }), "max");
+  for (const locale of locales) {
+    revalidateScopedTag(cacheTag({ locale, slug, type: "post" }), "max");
+    revalidateScopedTag(cacheTag({ locale, type: "postsList" }), "max");
+  }
 }
 
 export const revalidatePost: CollectionAfterChangeHook<Post> = async ({
@@ -25,13 +28,15 @@ export const revalidatePost: CollectionAfterChangeHook<Post> = async ({
   if (!context.disableRevalidate) {
     const locale = getLocaleFromRequest(req);
 
+    // `_status` is not localized: a status change or a delete affects every locale.
     if (doc._status === "published") {
-      revalidatePostTags(doc?.slug ?? "", locale, payload);
+      const statusChanged = previousDoc?._status !== doc._status;
+      revalidatePostTags(doc?.slug ?? "", statusChanged ? ALL_LOCALES : [locale], payload);
       revalidateScopedTag(cacheTag({ type: "sitemap" }), "max");
     }
 
     if (previousDoc?._status === "published" && doc._status !== "published") {
-      revalidatePostTags(previousDoc?.slug ?? "", locale, payload);
+      revalidatePostTags(previousDoc?.slug ?? "", ALL_LOCALES, payload);
       revalidateScopedTag(cacheTag({ type: "sitemap" }), "max");
     }
   }
@@ -42,9 +47,7 @@ export const revalidateDelete: CollectionAfterDeleteHook<Post> = async ({ doc, r
   const { payload, context } = req;
 
   if (!context.disableRevalidate) {
-    const locale = getLocaleFromRequest(req);
-
-    revalidatePostTags(doc?.slug ?? "", locale, payload);
+    revalidatePostTags(doc?.slug ?? "", ALL_LOCALES, payload);
     revalidateScopedTag(cacheTag({ type: "sitemap" }), "max");
   }
 
diff --git a/apps/cms/src/lib/config/i18n.ts b/apps/cms/src/lib/config/i18n.ts
index a872ac95b..a2bfd8dce 100644
--- a/apps/cms/src/lib/config/i18n.ts
+++ b/apps/cms/src/lib/config/i18n.ts
@@ -25,3 +25,5 @@ export const I18N_CONFIG: {
     es: "es_ES",
   },
 };
+
+export const ALL_LOCALES: readonly Locale[] = I18N_CONFIG.locales.map(({ code }) => code);
diff --git a/apps/cms/src/lib/utils/revalidatePageCache.ts b/apps/cms/src/lib/utils/revalidatePageCache.ts
index 62a095e45..ef45222bf 100644
--- a/apps/cms/src/lib/utils/revalidatePageCache.ts
+++ b/apps/cms/src/lib/utils/revalidatePageCache.ts
@@ -9,11 +9,13 @@ import { revalidateScopedTag } from "./scopedCache";
 
 export function revalidatePageCache(params: {
   doc: Pick<Page, "breadcrumbs" | "slug">;
-  locale: Locale;
+  locales: readonly Locale[];
   payload: Payload;
 }): void {
   const path = getPathFromBreadcrumbs(params.doc.breadcrumbs) ?? "home";
   params.payload.logger?.info?.(`Revalidating page with slug: ${params.doc.slug}`);
-  revalidateScopedTag(cacheTag({ locale: params.locale, path, type: "page" }), "max");
+  for (const locale of params.locales) {
+    revalidateScopedTag(cacheTag({ locale, path, type: "page" }), "max");
+  }
   revalidateScopedTag(cacheTag({ type: "sitemap" }), "max");
 }
diff --git a/apps/cms/tests/int/revalidatePage.int.spec.ts b/apps/cms/tests/int/revalidatePage.int.spec.ts
new file mode 100644
index 000000000..7e6131dd4
--- /dev/null
+++ b/apps/cms/tests/int/revalidatePage.int.spec.ts
@@ -0,0 +1,58 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { revalidateScopedTag } from "@/lib/utils/scopedCache";
+import { revalidateDelete, revalidatePage } from "@/collections/Page/hooks/revalidatePage";
+
+vi.mock("@/lib/utils/scopedCache", () => ({ revalidateScopedTag: vi.fn() }));
+
+const page = { breadcrumbs: [{ url: "/about" }], slug: "about" };
+
+function args(doc: object, previousDoc: object | undefined, locale?: string) {
+  return {
+    doc,
+    previousDoc,
+    req: {
+      context: {},
+      payload: { logger: { info: vi.fn() } },
+      searchParams: new URLSearchParams(locale ? { locale } : {}),
+    },
+  } as never;
+}
+
+function revalidatedTags() {
+  return vi.mocked(revalidateScopedTag).mock.calls.map(([tag]) => tag);
+}
+
+describe("page cache revalidation", () => {
+  beforeEach(() => {
+    vi.mocked(revalidateScopedTag).mockClear();
+  });
+
+  it("revalidates every locale when a page is deleted from one locale", async () => {
+    await revalidateDelete(args(page, undefined, "en"));
+    expect(revalidatedTags()).toEqual(expect.arrayContaining(["page_about_en", "page_about_es"]));
+  });
+
+  it("revalidates every locale when a page is unpublished", async () => {
+    await revalidatePage(
+      args({ ...page, _status: "draft" }, { ...page, _status: "published" }, "en")
+    );
+    expect(revalidatedTags()).toEqual(expect.arrayContaining(["page_about_en", "page_about_es"]));
+  });
+
+  it("revalidates every locale when a page is published", async () => {
+    await revalidatePage(
+      args({ ...page, _status: "published" }, { ...page, _status: "draft" }, "es")
+    );
+    expect(revalidatedTags()).toEqual(expect.arrayContaining(["page_about_en", "page_about_es"]));
+  });
+
+  it("revalidates only the edited locale when a published page changes content", async () => {
+    await revalidatePage(
+      args({ ...page, _status: "published" }, { ...page, _status: "published" }, "es")
+    );
+    const tags = revalidatedTags();
+    expect(tags).toContain("page_about_es");
+    expect(tags).not.toContain("page_about_en");
+  });
+});