Fix prerender tags when notFound is called (#74577) (#74607)

This backports #74577 which ensures we don't lose tags added to a page before notFound() is called.
vercel · Jan 7, 2025 · 6f6766a · 6f6766a
1 parent a46f27f
commit 6f6766a
Show file tree

Hide file tree

Showing 3 changed files with 1,986 additions and 1,850 deletions.
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -3777,7 +3777,7 @@ async function prerenderToStream(
       revalidate: INFINITE_CACHE,
       expire: INFINITE_CACHE,
       stale: INFINITE_CACHE,
-      tags: [...implicitTags],
+      tags: [...(prerenderStore?.tags || implicitTags)],
     })
     const errorRSCPayload = await workUnitAsyncStorage.run(
       prerenderLegacyStore,