sanity-io · stipsan · Dec 18, 2025 · Dec 19, 2025 · Dec 19, 2025 · Dec 19, 2025
diff --git a/.changeset/better-forks-ring.md b/.changeset/better-forks-ring.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": major
+---
+
+Remove `type DraftPerspective`, `type DraftEnvironment` and `type ClientPerspective` from `import 'next-sanity/hooks'`
diff --git a/.changeset/bright-jokes-stay.md b/.changeset/bright-jokes-stay.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": major
+---
+
+Remove the experimental `<SanityLiveStream>` API
diff --git a/.changeset/fair-rats-sell.md b/.changeset/fair-rats-sell.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": patch
+---
+
+Add temp debug function
diff --git a/.changeset/four-jobs-type.md b/.changeset/four-jobs-type.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": major
+---
+
+Merge `next-sanity/experimental/live` export into `next-sanity/live`
diff --git a/.changeset/free-hoops-marry.md b/.changeset/free-hoops-marry.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": patch
+---
+
+Fix missing server action
diff --git a/.changeset/heavy-doors-ask.md b/.changeset/heavy-doors-ask.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": minor
+---
+
+Add `import {sanity} from 'next-sanity/cache-life'`
diff --git a/.changeset/moody-news-stay.md b/.changeset/moody-news-stay.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": patch
+---
+
+Remove `next-sanity/debug`
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,22 @@
+{
+  "mode": "pre",
+  "tag": "cache-components",
+  "initialVersions": {
+    "next-sanity": "12.0.3"
+  },
+  "changesets": [
+    "better-forks-ring",
+    "bright-jokes-stay",
+    "fair-rats-sell",
+    "four-jobs-type",
+    "free-hoops-marry",
+    "heavy-doors-ask",
+    "moody-news-stay",
+    "some-towns-rush",
+    "tall-flies-sing",
+    "tender-parents-mix",
+    "true-dragons-wink",
+    "twelve-moose-work",
+    "yummy-bears-juggle"
+  ]
+}
diff --git a/.changeset/some-towns-rush.md b/.changeset/some-towns-rush.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": major
+---
+
+`sanityFetch` and `SanityLive` are replaced by `fetch` and `SanityLive`
diff --git a/.changeset/tall-flies-sing.md b/.changeset/tall-flies-sing.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": patch
+---
+
+Dedupe `resolvePerspectiveFromCookies`
diff --git a/.changeset/tender-parents-mix.md b/.changeset/tender-parents-mix.md
@@ -0,0 +1,6 @@
+---
+"next-sanity": patch
+---
+
+Test pre release
+
diff --git a/.changeset/true-dragons-wink.md b/.changeset/true-dragons-wink.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": patch
+---
+
+Use private import for `#isCorsOriginError`
diff --git a/.changeset/twelve-moose-work.md b/.changeset/twelve-moose-work.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": major
+---
+
+Removed `type DefineSanityLiveOptions`, `type DefinedSanityFetchType` and `type DefinedSanityLiveProps` type exports
diff --git a/.changeset/yummy-bears-juggle.md b/.changeset/yummy-bears-juggle.md
@@ -0,0 +1,5 @@
+---
+"next-sanity": minor
+---
+
+Add `resolvePerspectiveFromCookies` export
diff --git a/apps/mvp/app/(website)/PostsLayout.tsx b/apps/mvp/app/(website)/PostsLayout.tsx
@@ -34,7 +34,7 @@ export type PostsLayoutProps = {
 }
 
 export default async function Posts(props: PostsLayoutProps) {
-  'use cache: remote'
+  'use cache'
 
   const posts = postsQuery.parse(props.data)
   // oxlint-disable-next-line no-console

diff --git a/apps/mvp/app/(website)/layout.tsx b/apps/mvp/app/(website)/layout.tsx
@@ -1,18 +1,16 @@
 'use cache'
 
 import '../globals.css'
-import {
-  // cookies,
-  draftMode,
-} from 'next/headers'
+import {resolvePerspectiveFromCookies, type LivePerspective} from 'next-sanity/live'
 import {VisualEditing} from 'next-sanity/visual-editing'
+import {refresh, updateTag} from 'next/cache'
+import {cookies, draftMode} from 'next/headers'
+import {Suspense} from 'react'
 
 import {DebugStatus} from './DebugStatus'
 import {FormStatusLabel} from './FormStatus'
-import {SanityLive} from './live'
+import {Live} from './live'
 import {RefreshButton} from './RefreshButton'
-// import {resolvePerspectiveFromCookies} from 'next-sanity/experimental/live'
-// import {Suspense} from 'react'
 
 async function toggleDraftMode() {
   'use server'
@@ -26,13 +24,50 @@ async function toggleDraftMode() {
   }
 }
 
+async function SanityLive() {
+  let perspective: LivePerspective = 'published'
+  const isDraftMode = (await draftMode()).isEnabled
+  if (isDraftMode) {
+    perspective = await resolvePerspectiveFromCookies({cookies: await cookies()})
+  }
+
+  return <Live perspective={perspective} />
+}
+
 export default async function RootLayout({children}: {children: React.ReactNode}) {
   const isDraftMode = (await draftMode()).isEnabled
   return (
     <html lang="en">
       <head />
       <body className="px-8">
         <div className="mt-8 mb-4 border p-4">
+          <p>Debug: {JSON.stringify({env: 'unknown'})}</p>
+          <form
+            action={async () => {
+              'use server'
+              updateTag('sanity:debug')
+            }}
+          >
+            <button type="submit">updateTag</button>
+          </form>
+          <form
+            action={async () => {
+              'use server'
+              refresh()
+            }}
+          >
+            <button type="submit">refresh</button>
+          </form>
+          <form
+            action={async () => {
+              'use server'
+              updateTag('sanity:debug')
+              refresh()
+            }}
+          >
+            <button type="submit">updateTag + refresh</button>
+          </form>
+
           <p>Draft mode: {isDraftMode ? 'On' : 'Off'}</p>
           {isDraftMode && <DebugStatus />}
           <form action={toggleDraftMode}>
@@ -44,7 +79,9 @@ export default async function RootLayout({children}: {children: React.ReactNode}
         {children}
         <RefreshButton />
         {isDraftMode && <VisualEditing />}
-        <SanityLive />
+        <Suspense>
+          <SanityLive />
+        </Suspense>
       </body>
     </html>
   )

diff --git a/apps/mvp/app/(website)/live.ts b/apps/mvp/app/(website)/live.ts
@@ -1,10 +1,10 @@
-import {defineLive} from 'next-sanity/experimental/live'
+import {defineLive} from 'next-sanity/live'
 
 import {client} from '@/app/sanity.client'
 
 const token = process.env.SANITY_API_READ_TOKEN!
 
-export const {sanityFetch, SanityLive} = defineLive({
+export const {fetch, Live} = defineLive({
   client,
   serverToken: token,
   browserToken: token,

diff --git a/apps/mvp/app/(website)/no-resolve-perspective/page.tsx b/apps/mvp/app/(website)/no-resolve-perspective/page.tsx
@@ -1,20 +1,28 @@
-'use cache'
-
 import {unstable__adapter, unstable__environment} from 'next-sanity'
+import {cacheLife} from 'next/cache'
 import {draftMode} from 'next/headers'
 import Link from 'next/link'
 
 import PostsLayout, {postsQuery} from '@/app/(website)/PostsLayout'
 
-import {sanityFetch} from '../live'
+import {fetch as sanityFetch} from '../live'
+
+async function getPosts(perspective: 'drafts' | 'published') {
+  'use cache: remote'
+
+  cacheLife('sanity')
 
-export default async function IndexPage() {
-  const isDraftMode = (await draftMode()).isEnabled
   const {data} = await sanityFetch({
     query: postsQuery.query,
-    perspective: isDraftMode ? 'drafts' : 'published',
-    stega: isDraftMode,
+    perspective,
+    stega: perspective !== 'published',
   })
+  return data
+}
+
+export default async function IndexPage() {
+  const isDraftMode = (await draftMode()).isEnabled
+  const data = await getPosts(isDraftMode ? 'drafts' : 'published')
 
   return (
     <>

diff --git a/apps/mvp/app/(website)/only-production/page.tsx b/apps/mvp/app/(website)/only-production/page.tsx
@@ -1,18 +1,26 @@
 'use cache'
 
 import {unstable__adapter, unstable__environment} from 'next-sanity'
+import {cacheLife} from 'next/cache'
 import Link from 'next/link'
 
 import PostsLayout, {postsQuery} from '@/app/(website)/PostsLayout'
 
-import {sanityFetch} from '../live'
+import {fetch as sanityFetch} from '../live'
+
+async function getPosts() {
+  'use cache: remote'
+
+  cacheLife('sanity')
 
-export default async function IndexPage() {
   const {data} = await sanityFetch({
     query: postsQuery.query,
-    perspective: 'published',
-    stega: false,
   })
+  return data
+}
+
+export default async function IndexPage() {
+  const data = await getPosts()
 
   return (
     <>

diff --git a/apps/mvp/app/(website)/page.tsx b/apps/mvp/app/(website)/page.tsx
@@ -1,22 +1,34 @@
 import {unstable__adapter, unstable__environment} from 'next-sanity'
-import {resolvePerspectiveFromCookies} from 'next-sanity/experimental/live'
+import {resolvePerspectiveFromCookies, type LivePerspective} from 'next-sanity/live'
+import {cacheLife} from 'next/cache'
 import {cookies, draftMode} from 'next/headers'
 import Link from 'next/link'
 
 import PostsLayout, {postsQuery} from '@/app/(website)/PostsLayout'
 
-import {sanityFetch} from './live'
+import {fetch as sanityFetch} from './live'
+
+async function getPosts(perspective: LivePerspective) {
+  'use cache: remote'
+
+  cacheLife('sanity')
 
-export default async function IndexPage() {
-  const isDraftMode = (await draftMode()).isEnabled
-  const perspective = isDraftMode
-    ? await resolvePerspectiveFromCookies({cookies: await cookies()})
-    : 'published'
   const {data, tags} = await sanityFetch({
     query: postsQuery.query,
     perspective,
-    stega: isDraftMode,
+    stega: perspective !== 'published',
   })
+  return {data, tags}
+}
+
+export default async function IndexPage() {
+  let perspective: LivePerspective = 'published'
+  const isDraftMode = (await draftMode()).isEnabled
+  if (isDraftMode) {
+    perspective = await resolvePerspectiveFromCookies({cookies: await cookies()})
+  }
+
+  const {data, tags} = await getPosts(perspective)
 
   return (
     <>

diff --git a/apps/mvp/app/api/revalidate-tag/route.ts b/apps/mvp/app/api/revalidate-tag/route.ts
diff --git a/apps/mvp/next.config.ts b/apps/mvp/next.config.ts
@@ -1,9 +1,12 @@
 import type {NextConfig} from 'next'
 
+import {sanity} from 'next-sanity/cache-life'
+
 const nextConfig: NextConfig = {
   // basePath: process.env.NEXT_PUBLIC_TEST_BASE_PATH,
   // trailingSlash: true,
   cacheComponents: true,
+  cacheLife: {sanity},
   logging: {
     fetches: {
       fullUrl: false,

diff --git a/fixtures/fail/server-only-live/next.config.ts b/fixtures/fail/server-only-live/next.config.ts
@@ -1,7 +1,7 @@
 import type {NextConfig} from 'next'
 
 const nextConfig: NextConfig = {
-  cacheComponents: true,
+  cacheComponents: false,
 }
 
 export default nextConfig
diff --git a/fixtures/pass/server-only-live/next.config.ts b/fixtures/pass/server-only-live/next.config.ts
@@ -1,7 +1,7 @@
 import type {NextConfig} from 'next'
 
 const nextConfig: NextConfig = {
-  cacheComponents: true,
+  cacheComponents: false,
 }
 
 export default nextConfig