next-sanity 11.4.0 → 11.4.1

package/dist/constants.d.ts

@@ -0,0 +1,6 @@
+//#region src/experimental/constants.d.ts
+declare const PUBLISHED_SYNC_TAG_PREFIX = "sp:";
+declare const DRAFT_SYNC_TAG_PREFIX = "sd:";
+//#endregion
+export { DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX };
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.js

@@ -0,0 +1,5 @@
+const PUBLISHED_SYNC_TAG_PREFIX = "sp:";
+const DRAFT_SYNC_TAG_PREFIX = "sd:";
+export { DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX };
+
+//# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","names":[],"sources":["../src/experimental/constants.ts"],"sourcesContent":["export const PUBLISHED_SYNC_TAG_PREFIX = 'sp:'\nexport const DRAFT_SYNC_TAG_PREFIX = 'sd:'\n"],"mappings":"AAAA,MAAa,4BAA4B;AACzC,MAAa,wBAAwB"}

package/dist/experimental/client-components/live.d.ts

@@ -1,3 +1,4 @@
+import { DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX } from "../../constants.js";
 import { ClientPerspective, InitializedClientConfig, LiveEventGoAway, SyncTag } from "@sanity/client";
 
 //#region src/experimental/types.d.ts
@@ -21,7 +22,7 @@ interface SanityLiveProps {
   onError?: (error: unknown) => void;
   intervalOnGoAway?: number | false;
   onGoAway?: (event: LiveEventGoAway, intervalOnGoAway: number | false) => void;
-  revalidateSyncTags?: (tags: SyncTag[]) => Promise<void | "refresh">;
+  revalidateSyncTags: (tags: `${typeof PUBLISHED_SYNC_TAG_PREFIX | typeof DRAFT_SYNC_TAG_PREFIX}${SyncTag}`[]) => Promise<void | "refresh">;
   resolveDraftModePerspective: () => Promise<ClientPerspective>;
 }
 /**

package/dist/experimental/client-components/live.js

@@ -1,6 +1,7 @@
 "use client";
 import { isCorsOriginError } from "../../isCorsOriginError.js";
 import { sanitizePerspective } from "../../utils.js";
+import { PUBLISHED_SYNC_TAG_PREFIX } from "../../constants.js";
 import { setEnvironment, setPerspective } from "../../context.js";
 import { createClient } from "@sanity/client";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -8,7 +9,6 @@ import { useRouter } from "next/navigation";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { isMaybePresentation, isMaybePreviewWindow } from "@sanity/presentation-comlink";
 import { useEffectEvent } from "use-effect-event";
-import { revalidateSyncTags } from "next-sanity/live/server-actions";
 import dynamic from "next/dynamic";
 const PresentationComlink = dynamic(() => import("../../PresentationComlink.js"), { ssr: false });
 const RefreshOnMount = dynamic(() => import("../../RefreshOnMount.js"), { ssr: false });
@@ -23,7 +23,7 @@ function handleOnGoAway(event, intervalOnGoAway) {
 	else console.error("Sanity Live connection closed, automatic revalidation is disabled, the server gave this reason:", event.reason);
 }
 function SanityLive(props) {
-	const { config, draftModeEnabled, refreshOnMount = false, refreshOnFocus = draftModeEnabled ? false : typeof window === "undefined" ? true : window.self === window.top, refreshOnReconnect = true, intervalOnGoAway = 3e4, requestTag = "next-loader.live", onError = handleError, onGoAway = handleOnGoAway, revalidateSyncTags: revalidateSyncTags$1 = revalidateSyncTags, resolveDraftModePerspective } = props;
+	const { config, draftModeEnabled, refreshOnMount = false, refreshOnFocus = draftModeEnabled ? false : typeof window === "undefined" ? true : window.self === window.top, refreshOnReconnect = true, intervalOnGoAway = 3e4, requestTag = "next-loader.live", onError = handleError, onGoAway = handleOnGoAway, revalidateSyncTags, resolveDraftModePerspective } = props;
 	const { projectId, dataset, apiHost, apiVersion, useProjectHostname, token, requestTagPrefix } = config;
 	const client = useMemo(() => createClient({
 		projectId,
@@ -51,7 +51,7 @@ function SanityLive(props) {
 		if (process.env.NODE_ENV !== "production" && event.type === "welcome") {
 			console.info("Sanity is live with", token ? "automatic revalidation for draft content changes as well as published content" : draftModeEnabled ? "automatic revalidation for only published content. Provide a `browserToken` to `defineLive` to support draft content outside of Presentation Tool." : "automatic revalidation of published content");
 			setLongPollingInterval(false);
-		} else if (event.type === "message") revalidateSyncTags$1(event.tags).then((result) => {
+		} else if (event.type === "message") revalidateSyncTags(event.tags.map((tag) => `${PUBLISHED_SYNC_TAG_PREFIX}${tag}`)).then((result) => {
 			if (result === "refresh") router.refresh();
 		});
 		else if (event.type === "restart" || event.type === "reconnect") router.refresh();
@@ -61,11 +61,29 @@ function SanityLive(props) {
 		}
 	});
 	useEffect(() => {
+		const subscription = client.live.events({ tag: requestTag }).subscribe({
+			next: handleLiveEvent,
+			error: (err) => {
+				onError(err);
+			}
+		});
+		return () => subscription.unsubscribe();
+	}, [
+		client.live,
+		onError,
+		requestTag,
+		token
+	]);
+	const handleLiveDraftEvent = useEffectEvent((event) => {
+		if (event.type === "message") router.refresh();
+	});
+	useEffect(() => {
+		if (!token) return;
 		const subscription = client.live.events({
 			includeDrafts: !!token,
 			tag: requestTag
 		}).subscribe({
-			next: handleLiveEvent,
+			next: handleLiveDraftEvent,
 			error: (err) => {
 				onError(err);
 			}

package/dist/experimental/client-components/live.js.map

@@ -1 +1 @@
-{"version":3,"file":"live.js","names":["defaultRevalidateSyncTags"],"sources":["../../../src/experimental/client-components/live.tsx"],"sourcesContent":["'use client'\n\nimport {\n  createClient,\n  type ClientPerspective,\n  type LiveEvent,\n  type LiveEventGoAway,\n  type SyncTag,\n} from '@sanity/client'\nimport {revalidateSyncTags as defaultRevalidateSyncTags} from 'next-sanity/live/server-actions'\nimport {isMaybePresentation, isMaybePreviewWindow} from '@sanity/presentation-comlink'\nimport dynamic from 'next/dynamic'\nimport {useRouter} from 'next/navigation'\nimport {useEffect, useMemo, useRef, useState} from 'react'\nimport {useEffectEvent} from 'use-effect-event'\nimport {setEnvironment, setPerspective} from '../../live/hooks/context'\nimport {isCorsOriginError} from '../../isCorsOriginError'\nimport type {SanityClientConfig} from '../types'\nimport {sanitizePerspective} from '../../live/utils'\n\nconst PresentationComlink = dynamic(() => import('./PresentationComlink'), {ssr: false})\nconst RefreshOnMount = dynamic(() => import('../../live/client-components/live/RefreshOnMount'), {\n  ssr: false,\n})\nconst RefreshOnFocus = dynamic(() => import('../../live/client-components/live/RefreshOnFocus'), {\n  ssr: false,\n})\nconst RefreshOnReconnect = dynamic(\n  () => import('../../live/client-components/live/RefreshOnReconnect'),\n  {ssr: false},\n)\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport interface SanityLiveProps {\n  config: SanityClientConfig\n  draftModeEnabled: boolean\n  refreshOnMount?: boolean\n  refreshOnFocus?: boolean\n  refreshOnReconnect?: boolean\n  requestTag: string | undefined\n  /**\n   * Handle errors from the Live Events subscription.\n   * By default it's reported using `console.error`, you can override this prop to handle it in your own way.\n   */\n  onError?: (error: unknown) => void\n  intervalOnGoAway?: number | false\n  onGoAway?: (event: LiveEventGoAway, intervalOnGoAway: number | false) => void\n  revalidateSyncTags?: (tags: SyncTag[]) => Promise<void | 'refresh'>\n  resolveDraftModePerspective: () => Promise<ClientPerspective>\n}\n\nfunction handleError(error: unknown) {\n  /* eslint-disable no-console */\n  if (isCorsOriginError(error)) {\n    console.warn(\n      `Sanity Live is unable to connect to the Sanity API as the current origin - ${window.origin} - is not in the list of allowed CORS origins for this Sanity Project.`,\n      error.addOriginUrl && `Add it here:`,\n      error.addOriginUrl?.toString(),\n    )\n  } else {\n    console.error(error)\n  }\n  /* eslint-enable no-console */\n}\n\nfunction handleOnGoAway(event: LiveEventGoAway, intervalOnGoAway: number | false) {\n  /* eslint-disable no-console */\n  if (intervalOnGoAway) {\n    console.warn(\n      'Sanity Live connection closed, switching to long polling set to a interval of',\n      intervalOnGoAway / 1000,\n      'seconds and the server gave this reason:',\n      event.reason,\n    )\n  } else {\n    console.error(\n      'Sanity Live connection closed, automatic revalidation is disabled, the server gave this reason:',\n      event.reason,\n    )\n  }\n  /* eslint-enable no-console */\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport default function SanityLive(props: SanityLiveProps): React.JSX.Element | null {\n  const {\n    config,\n    draftModeEnabled,\n    refreshOnMount = false,\n    refreshOnFocus = draftModeEnabled\n      ? false\n      : typeof window === 'undefined'\n        ? true\n        : window.self === window.top,\n    refreshOnReconnect = true,\n    intervalOnGoAway = 30_000,\n    requestTag = 'next-loader.live',\n    onError = handleError,\n    onGoAway = handleOnGoAway,\n    revalidateSyncTags = defaultRevalidateSyncTags,\n    resolveDraftModePerspective,\n  } = props\n  const {projectId, dataset, apiHost, apiVersion, useProjectHostname, token, requestTagPrefix} =\n    config\n\n  const client = useMemo(\n    () =>\n      createClient({\n        projectId,\n        dataset,\n        apiHost,\n        apiVersion,\n        useProjectHostname,\n        ignoreBrowserTokenWarning: true,\n        token,\n        useCdn: false,\n        requestTagPrefix,\n      }),\n    [apiHost, apiVersion, dataset, projectId, requestTagPrefix, token, useProjectHostname],\n  )\n  const [longPollingInterval, setLongPollingInterval] = useState<number | false>(false)\n  const [resolvedInitialPerspective, setResolvedInitialPerspective] = useState(false)\n\n  /**\n   * 1. Handle Live Events and call revalidateTag or router.refresh when needed\n   */\n  const router = useRouter()\n  const handleLiveEvent = useEffectEvent((event: LiveEvent) => {\n    if (process.env.NODE_ENV !== 'production' && event.type === 'welcome') {\n      // eslint-disable-next-line no-console\n      console.info(\n        'Sanity is live with',\n        token\n          ? 'automatic revalidation for draft content changes as well as published content'\n          : draftModeEnabled\n            ? 'automatic revalidation for only published content. Provide a `browserToken` to `defineLive` to support draft content outside of Presentation Tool.'\n            : 'automatic revalidation of published content',\n      )\n      // Disable long polling when welcome event is received, this is a no-op if long polling is already disabled\n      setLongPollingInterval(false)\n    } else if (event.type === 'message') {\n      revalidateSyncTags(event.tags).then((result) => {\n        if (result === 'refresh') router.refresh()\n      })\n    } else if (event.type === 'restart' || event.type === 'reconnect') {\n      router.refresh()\n    } else if (event.type === 'goaway') {\n      onGoAway(event, intervalOnGoAway)\n      setLongPollingInterval(intervalOnGoAway)\n    }\n  })\n  useEffect(() => {\n    const subscription = client.live.events({includeDrafts: !!token, tag: requestTag}).subscribe({\n      next: handleLiveEvent,\n      error: (err: unknown) => {\n        onError(err)\n      },\n    })\n    return () => subscription.unsubscribe()\n  }, [client.live, onError, requestTag, token])\n\n  /**\n   * 2. Notify what perspective we're in, when in Draft Mode\n   */\n  useEffect(() => {\n    if (resolvedInitialPerspective) return undefined\n\n    if (!draftModeEnabled) {\n      setResolvedInitialPerspective(true)\n      setPerspective('unknown')\n      return undefined\n    }\n\n    const controller = new AbortController()\n    resolveDraftModePerspective()\n      .then((perspective) => {\n        if (controller.signal.aborted) return\n        setResolvedInitialPerspective(true)\n        setPerspective(sanitizePerspective(perspective, 'drafts'))\n      })\n      .catch((err) => {\n        if (controller.signal.aborted) return\n        console.error('Failed to resolve draft mode perspective', err)\n        setResolvedInitialPerspective(true)\n        setPerspective('unknown')\n      })\n    return () => controller.abort()\n  }, [draftModeEnabled, resolveDraftModePerspective, resolvedInitialPerspective])\n\n  const [loadComlink, setLoadComlink] = useState(false)\n  /**\n   * 3. Notify what environment we're in, when in Draft Mode\n   */\n  useEffect(() => {\n    // If we might be in Presentation Tool, then skip detecting here as it's handled later\n    if (isMaybePresentation()) return\n\n    // If we're definitely not in Presentation Tool, then we can set the environment as stand-alone live preview\n    // if we have both a browser token, and draft mode is enabled\n    if (draftModeEnabled && token) {\n      setEnvironment('live')\n      return\n    }\n    // If we're in draft mode, but don't have a browser token, then we're in static mode\n    // which means that published content is still live, but draft changes likely need manual refresh\n    if (draftModeEnabled) {\n      setEnvironment('static')\n      return\n    }\n\n    // Fallback to `unknown` otherwise, as we simply don't know how it's setup\n    setEnvironment('unknown')\n    return\n  }, [draftModeEnabled, token])\n\n  /**\n   * 4. If Presentation Tool is detected, load up the comlink and integrate with it\n   */\n  useEffect(() => {\n    if (!isMaybePresentation()) return\n    const controller = new AbortController()\n    // Wait for a while to see if Presentation Tool is detected, before assuming the env to be stand-alone live preview\n    const timeout = setTimeout(() => setEnvironment('live'), 3_000)\n    window.addEventListener(\n      'message',\n      ({data}: MessageEvent<unknown>) => {\n        if (\n          data &&\n          typeof data === 'object' &&\n          'domain' in data &&\n          data.domain === 'sanity/channels' &&\n          'from' in data &&\n          data.from === 'presentation'\n        ) {\n          clearTimeout(timeout)\n          setEnvironment(isMaybePreviewWindow() ? 'presentation-window' : 'presentation-iframe')\n          setLoadComlink(true)\n          controller.abort()\n        }\n      },\n      {signal: controller.signal},\n    )\n    return () => {\n      clearTimeout(timeout)\n      controller.abort()\n    }\n  }, [])\n\n  /**\n   * 5. Warn if draft mode is being disabled\n   * @TODO move logic into PresentationComlink, or maybe VisualEditing?\n   */\n  const draftModeEnabledWarnRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)\n  useEffect(() => {\n    if (!draftModeEnabled) return\n    clearTimeout(draftModeEnabledWarnRef.current)\n    return () => {\n      draftModeEnabledWarnRef.current = setTimeout(() => {\n        // eslint-disable-next-line no-console\n        console.warn('Sanity Live: Draft mode was enabled, but is now being disabled')\n      })\n    }\n  }, [draftModeEnabled])\n\n  /**\n   * 6. Handle switching to long polling when needed\n   */\n  useEffect(() => {\n    if (!longPollingInterval) return\n    const interval = setInterval(() => router.refresh(), longPollingInterval)\n    return () => clearInterval(interval)\n  }, [longPollingInterval, router])\n\n  return (\n    <>\n      {draftModeEnabled && loadComlink && resolvedInitialPerspective && (\n        <PresentationComlink\n          projectId={projectId!}\n          dataset={dataset!}\n          draftModeEnabled={draftModeEnabled}\n        />\n      )}\n      {!draftModeEnabled && refreshOnMount && <RefreshOnMount />}\n      {!draftModeEnabled && refreshOnFocus && <RefreshOnFocus />}\n      {!draftModeEnabled && refreshOnReconnect && <RefreshOnReconnect />}\n    </>\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"live.js","names":[],"sources":["../../../src/experimental/client-components/live.tsx"],"sourcesContent":["'use client'\n\nimport {\n  createClient,\n  type ClientPerspective,\n  type LiveEvent,\n  type LiveEventGoAway,\n  type SyncTag,\n} from '@sanity/client'\nimport {isMaybePresentation, isMaybePreviewWindow} from '@sanity/presentation-comlink'\nimport dynamic from 'next/dynamic'\nimport {useRouter} from 'next/navigation'\nimport {useEffect, useMemo, useRef, useState} from 'react'\nimport {useEffectEvent} from 'use-effect-event'\nimport {setEnvironment, setPerspective} from '../../live/hooks/context'\nimport {isCorsOriginError} from '../../isCorsOriginError'\nimport type {SanityClientConfig} from '../types'\nimport {sanitizePerspective} from '../../live/utils'\nimport {PUBLISHED_SYNC_TAG_PREFIX, type DRAFT_SYNC_TAG_PREFIX} from '../constants'\n\nconst PresentationComlink = dynamic(() => import('./PresentationComlink'), {ssr: false})\nconst RefreshOnMount = dynamic(() => import('../../live/client-components/live/RefreshOnMount'), {\n  ssr: false,\n})\nconst RefreshOnFocus = dynamic(() => import('../../live/client-components/live/RefreshOnFocus'), {\n  ssr: false,\n})\nconst RefreshOnReconnect = dynamic(\n  () => import('../../live/client-components/live/RefreshOnReconnect'),\n  {ssr: false},\n)\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport interface SanityLiveProps {\n  config: SanityClientConfig\n  draftModeEnabled: boolean\n  refreshOnMount?: boolean\n  refreshOnFocus?: boolean\n  refreshOnReconnect?: boolean\n  requestTag: string | undefined\n  /**\n   * Handle errors from the Live Events subscription.\n   * By default it's reported using `console.error`, you can override this prop to handle it in your own way.\n   */\n  onError?: (error: unknown) => void\n  intervalOnGoAway?: number | false\n  onGoAway?: (event: LiveEventGoAway, intervalOnGoAway: number | false) => void\n  revalidateSyncTags: (\n    tags: `${typeof PUBLISHED_SYNC_TAG_PREFIX | typeof DRAFT_SYNC_TAG_PREFIX}${SyncTag}`[],\n  ) => Promise<void | 'refresh'>\n  resolveDraftModePerspective: () => Promise<ClientPerspective>\n}\n\nfunction handleError(error: unknown) {\n  /* eslint-disable no-console */\n  if (isCorsOriginError(error)) {\n    console.warn(\n      `Sanity Live is unable to connect to the Sanity API as the current origin - ${window.origin} - is not in the list of allowed CORS origins for this Sanity Project.`,\n      error.addOriginUrl && `Add it here:`,\n      error.addOriginUrl?.toString(),\n    )\n  } else {\n    console.error(error)\n  }\n  /* eslint-enable no-console */\n}\n\nfunction handleOnGoAway(event: LiveEventGoAway, intervalOnGoAway: number | false) {\n  /* eslint-disable no-console */\n  if (intervalOnGoAway) {\n    console.warn(\n      'Sanity Live connection closed, switching to long polling set to a interval of',\n      intervalOnGoAway / 1000,\n      'seconds and the server gave this reason:',\n      event.reason,\n    )\n  } else {\n    console.error(\n      'Sanity Live connection closed, automatic revalidation is disabled, the server gave this reason:',\n      event.reason,\n    )\n  }\n  /* eslint-enable no-console */\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport default function SanityLive(props: SanityLiveProps): React.JSX.Element | null {\n  const {\n    config,\n    draftModeEnabled,\n    refreshOnMount = false,\n    refreshOnFocus = draftModeEnabled\n      ? false\n      : typeof window === 'undefined'\n        ? true\n        : window.self === window.top,\n    refreshOnReconnect = true,\n    intervalOnGoAway = 30_000,\n    requestTag = 'next-loader.live',\n    onError = handleError,\n    onGoAway = handleOnGoAway,\n    revalidateSyncTags,\n    resolveDraftModePerspective,\n  } = props\n  const {projectId, dataset, apiHost, apiVersion, useProjectHostname, token, requestTagPrefix} =\n    config\n\n  const client = useMemo(\n    () =>\n      createClient({\n        projectId,\n        dataset,\n        apiHost,\n        apiVersion,\n        useProjectHostname,\n        ignoreBrowserTokenWarning: true,\n        token,\n        useCdn: false,\n        requestTagPrefix,\n      }),\n    [apiHost, apiVersion, dataset, projectId, requestTagPrefix, token, useProjectHostname],\n  )\n  const [longPollingInterval, setLongPollingInterval] = useState<number | false>(false)\n  const [resolvedInitialPerspective, setResolvedInitialPerspective] = useState(false)\n\n  /**\n   * 1. Handle Live Events and call revalidateTag or router.refresh when needed\n   */\n  const router = useRouter()\n  const handleLiveEvent = useEffectEvent((event: LiveEvent) => {\n    if (process.env.NODE_ENV !== 'production' && event.type === 'welcome') {\n      // eslint-disable-next-line no-console\n      console.info(\n        'Sanity is live with',\n        token\n          ? 'automatic revalidation for draft content changes as well as published content'\n          : draftModeEnabled\n            ? 'automatic revalidation for only published content. Provide a `browserToken` to `defineLive` to support draft content outside of Presentation Tool.'\n            : 'automatic revalidation of published content',\n      )\n      // Disable long polling when welcome event is received, this is a no-op if long polling is already disabled\n      setLongPollingInterval(false)\n    } else if (event.type === 'message') {\n      revalidateSyncTags(\n        event.tags.map((tag: SyncTag) => `${PUBLISHED_SYNC_TAG_PREFIX}${tag}` as const),\n      ).then((result) => {\n        if (result === 'refresh') router.refresh()\n      })\n    } else if (event.type === 'restart' || event.type === 'reconnect') {\n      router.refresh()\n    } else if (event.type === 'goaway') {\n      onGoAway(event, intervalOnGoAway)\n      setLongPollingInterval(intervalOnGoAway)\n    }\n  })\n  // @TODO previous version that handle both published and draft events\n  // useEffect(() => {\n  //   const subscription = client.live.events({includeDrafts: !!token, tag: requestTag}).subscribe({\n  //     next: handleLiveEvent,\n  //     error: (err: unknown) => {\n  //       onError(err)\n  //     },\n  //   })\n  //   return () => subscription.unsubscribe()\n  // }, [client.live, onError, requestTag, token])\n  useEffect(() => {\n    const subscription = client.live.events({tag: requestTag}).subscribe({\n      next: handleLiveEvent,\n      error: (err: unknown) => {\n        onError(err)\n      },\n    })\n    return () => subscription.unsubscribe()\n  }, [client.live, onError, requestTag, token])\n\n  /**\n   * Handle live events for drafts differently, only use it to trigger refreshes, don't expire the cache\n   */\n  const handleLiveDraftEvent = useEffectEvent((event: LiveEvent) => {\n    if (event.type === 'message') {\n      // Just refresh, due to cache bypass in draft mode it'll fetch fresh content (though we wish cache worked as in production)\n      // @TODO if draft content is published, then this extra refresh is unnecessary, it's tricky to check since `event.id` are different on the two EventSource connections\n      router.refresh()\n    }\n  })\n  useEffect(() => {\n    if (!token) return\n    const subscription = client.live.events({includeDrafts: !!token, tag: requestTag}).subscribe({\n      next: handleLiveDraftEvent,\n      error: (err: unknown) => {\n        onError(err)\n      },\n    })\n    return () => subscription.unsubscribe()\n  }, [client.live, onError, requestTag, token])\n\n  /**\n   * 2. Notify what perspective we're in, when in Draft Mode\n   */\n  useEffect(() => {\n    if (resolvedInitialPerspective) return undefined\n\n    if (!draftModeEnabled) {\n      setResolvedInitialPerspective(true)\n      setPerspective('unknown')\n      return undefined\n    }\n\n    const controller = new AbortController()\n    resolveDraftModePerspective()\n      .then((perspective) => {\n        if (controller.signal.aborted) return\n        setResolvedInitialPerspective(true)\n        setPerspective(sanitizePerspective(perspective, 'drafts'))\n      })\n      .catch((err) => {\n        if (controller.signal.aborted) return\n        console.error('Failed to resolve draft mode perspective', err)\n        setResolvedInitialPerspective(true)\n        setPerspective('unknown')\n      })\n    return () => controller.abort()\n  }, [draftModeEnabled, resolveDraftModePerspective, resolvedInitialPerspective])\n\n  const [loadComlink, setLoadComlink] = useState(false)\n  /**\n   * 3. Notify what environment we're in, when in Draft Mode\n   */\n  useEffect(() => {\n    // If we might be in Presentation Tool, then skip detecting here as it's handled later\n    if (isMaybePresentation()) return\n\n    // If we're definitely not in Presentation Tool, then we can set the environment as stand-alone live preview\n    // if we have both a browser token, and draft mode is enabled\n    if (draftModeEnabled && token) {\n      setEnvironment('live')\n      return\n    }\n    // If we're in draft mode, but don't have a browser token, then we're in static mode\n    // which means that published content is still live, but draft changes likely need manual refresh\n    if (draftModeEnabled) {\n      setEnvironment('static')\n      return\n    }\n\n    // Fallback to `unknown` otherwise, as we simply don't know how it's setup\n    setEnvironment('unknown')\n    return\n  }, [draftModeEnabled, token])\n\n  /**\n   * 4. If Presentation Tool is detected, load up the comlink and integrate with it\n   */\n  useEffect(() => {\n    if (!isMaybePresentation()) return\n    const controller = new AbortController()\n    // Wait for a while to see if Presentation Tool is detected, before assuming the env to be stand-alone live preview\n    const timeout = setTimeout(() => setEnvironment('live'), 3_000)\n    window.addEventListener(\n      'message',\n      ({data}: MessageEvent<unknown>) => {\n        if (\n          data &&\n          typeof data === 'object' &&\n          'domain' in data &&\n          data.domain === 'sanity/channels' &&\n          'from' in data &&\n          data.from === 'presentation'\n        ) {\n          clearTimeout(timeout)\n          setEnvironment(isMaybePreviewWindow() ? 'presentation-window' : 'presentation-iframe')\n          setLoadComlink(true)\n          controller.abort()\n        }\n      },\n      {signal: controller.signal},\n    )\n    return () => {\n      clearTimeout(timeout)\n      controller.abort()\n    }\n  }, [])\n\n  /**\n   * 5. Warn if draft mode is being disabled\n   * @TODO move logic into PresentationComlink, or maybe VisualEditing?\n   */\n  const draftModeEnabledWarnRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined)\n  useEffect(() => {\n    if (!draftModeEnabled) return\n    clearTimeout(draftModeEnabledWarnRef.current)\n    return () => {\n      draftModeEnabledWarnRef.current = setTimeout(() => {\n        // eslint-disable-next-line no-console\n        console.warn('Sanity Live: Draft mode was enabled, but is now being disabled')\n      })\n    }\n  }, [draftModeEnabled])\n\n  /**\n   * 6. Handle switching to long polling when needed\n   */\n  useEffect(() => {\n    if (!longPollingInterval) return\n    const interval = setInterval(() => router.refresh(), longPollingInterval)\n    return () => clearInterval(interval)\n  }, [longPollingInterval, router])\n\n  return (\n    <>\n      {draftModeEnabled && loadComlink && resolvedInitialPerspective && (\n        <PresentationComlink\n          projectId={projectId!}\n          dataset={dataset!}\n          draftModeEnabled={draftModeEnabled}\n        />\n      )}\n      {!draftModeEnabled && refreshOnMount && <RefreshOnMount />}\n      {!draftModeEnabled && refreshOnFocus && <RefreshOnFocus />}\n      {!draftModeEnabled && refreshOnReconnect && <RefreshOnReconnect />}\n    </>\n  )\n}\n"],"mappings":"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"}

package/dist/experimental/live.d.ts

@@ -1,3 +1,4 @@
+import { DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX } from "../constants.js";
 import { cookies } from "next/headers";
 import "server-only";
 import { ClientPerspective, ClientReturn, ContentSourceMap, LiveEventGoAway, QueryParams, SanityClient, SyncTag } from "next-sanity";
@@ -100,7 +101,7 @@ interface DefinedSanityLiveProps {
   * Override how cache tags are invalidated, you need to pass a server action here.
   * You can also pass a `use client` function here, and have `router.refresh()` be called if the promise resolves to `'refresh'`.
   */
-  revalidateSyncTags?: (tags: SyncTag[]) => Promise<void | "refresh">;
+  revalidateSyncTags?: (tags: `${typeof PUBLISHED_SYNC_TAG_PREFIX | typeof DRAFT_SYNC_TAG_PREFIX}${SyncTag}`[]) => Promise<void | "refresh">;
   /**
   * Control how the draft mode perspective is resolved, by default it resolves from the `sanity-preview-perspective` cookie.
   */

package/dist/experimental/live.js

@@ -1,4 +1,5 @@
 import { sanitizePerspective } from "../utils.js";
+import { DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX } from "../constants.js";
 import { stegaEncodeSourceMap } from "@sanity/client/stega";
 import { preconnect } from "react-dom";
 import { cookies, draftMode } from "next/headers";
@@ -28,7 +29,7 @@ async function sanityCachedFetch(config, { query, params = {}, perspective, steg
 		tag: requestTag,
 		token: perspective === "published" ? config.token : draftToken || config.token
 	});
-	const tags = [...customCacheTags, ...(syncTags || []).map((tag) => `${perspective === "published" ? "sanity" : "drafts"}:${tag}`)];
+	const tags = [...customCacheTags, ...(syncTags || []).map((tag) => `${perspective === "published" ? PUBLISHED_SYNC_TAG_PREFIX : DRAFT_SYNC_TAG_PREFIX}${tag}`)];
 	unstable_cacheTag(...tags);
 	return {
 		data: result,
@@ -131,8 +132,15 @@ const SanityLiveServerComponent = async function SanityLiveServerComponent$1(pro
 };
 async function expireTags(_tags) {
 	"use server";
-	const isDraftMode = (await draftMode()).isEnabled;
-	const tags = _tags.map((tag) => `${isDraftMode ? "drafts" : "sanity"}:${tag}`);
+	if (!Array.isArray(_tags)) {
+		console.warn("<SanityLive /> `expireTags` called with non-array tags", _tags);
+		return;
+	}
+	const tags = _tags.filter((tag) => typeof tag === "string" && tag.startsWith(PUBLISHED_SYNC_TAG_PREFIX));
+	if (!tags.length) {
+		console.warn("<SanityLive /> `expireTags` called with no valid tags", _tags);
+		return;
+	}
 	unstable_expireTag(...tags);
 	console.log(`<SanityLive /> expired tags: ${tags.join(", ")}`);
 }

package/dist/experimental/live.js.map

@@ -1 +1 @@
-{"version":3,"file":"live.js","names":["SanityLiveServerComponent: React.ComponentType<SanityLiveServerComponentProps>","SanityLiveServerComponent","resolveDraftModePerspective"],"sources":["../../src/experimental/live.tsx"],"sourcesContent":["// oxlint-disable-next-line no-unassigned-import\nimport 'server-only'\nimport {\n  createClient,\n  type ClientPerspective,\n  type ClientReturn,\n  type ContentSourceMap,\n  type LiveEventGoAway,\n  type QueryParams,\n  type SanityClient,\n  type SyncTag,\n} from 'next-sanity'\nimport {stegaEncodeSourceMap} from '@sanity/client/stega'\nimport SanityLiveClientComponent, {\n  type SanityLiveProps,\n} from 'next-sanity/experimental/client-components/live'\nimport {unstable_cacheTag as cacheTag, unstable_expireTag as expireTag} from 'next/cache'\nimport {draftMode, cookies} from 'next/headers'\nimport {preconnect} from 'react-dom'\nimport {perspectiveCookieName} from '@sanity/preview-url-secret/constants'\nimport {sanitizePerspective} from '../live/utils'\nimport type {SanityClientConfig} from './types'\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport async function resolvePerspectiveFromCookie({\n  cookies: jar,\n}: {\n  cookies: Awaited<ReturnType<typeof cookies>>\n}): Promise<Exclude<ClientPerspective, 'raw'>> {\n  return jar.has(perspectiveCookieName)\n    ? sanitizePerspective(jar.get(perspectiveCookieName)?.value, 'drafts')\n    : 'drafts'\n}\n\nasync function sanityCachedFetch<const QueryString extends string>(\n  config: SanityClientConfig,\n  {\n    query,\n    params = {},\n    perspective,\n    stega,\n    requestTag,\n    draftToken,\n    customCacheTags = [],\n  }: {\n    query: QueryString\n    params?: QueryParams\n    perspective: Exclude<ClientPerspective, 'raw'>\n    stega: boolean\n    requestTag: string\n    draftToken?: string | false | undefined\n    customCacheTags?: string[]\n  },\n): Promise<{\n  data: ClientReturn<QueryString, unknown>\n  sourceMap: ContentSourceMap | null\n  tags: string[]\n}> {\n  'use cache'\n\n  const client = createClient({...config, useCdn: true})\n  const useCdn = perspective === 'published'\n  /**\n   * The default cache profile isn't ideal for live content, as it has unnecessary time based background validation, as well as a too lazy client stale value\n   * https://github.com/vercel/next.js/blob/8dd358002baf4244c0b2e38b5bda496daf60dacb/packages/next/cache.d.ts#L14-L26\n   */\n  // cacheLife({\n  //   stale: Infinity,\n  //   revalidate: Infinity,\n  //   expire: Infinity,\n  // })\n\n  const {result, resultSourceMap, syncTags} = await client.fetch(query, params, {\n    filterResponse: false,\n    returnQuery: false,\n    perspective,\n    useCdn,\n    resultSourceMap: stega ? 'withKeyArraySelector' : undefined, // @TODO allow passing csm for non-stega use\n    cacheMode: useCdn ? 'noStale' : undefined,\n    tag: requestTag,\n    token: perspective === 'published' ? config.token : draftToken || config.token, // @TODO can pass undefined instead of config.token here?\n  })\n  const tags = [\n    ...customCacheTags,\n    ...(syncTags || []).map((tag) => `${perspective === 'published' ? 'sanity' : 'drafts'}:${tag}`),\n  ]\n  /**\n   * The tags used here, are expired later on in the `expireTags` Server Action with the `expireTag` function from `next/cache`\n   */\n  cacheTag(...tags)\n\n  return {data: result, sourceMap: resultSourceMap || null, tags}\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport type DefinedSanityFetchType = <const QueryString extends string>(options: {\n  query: QueryString\n  params?: QueryParams | Promise<QueryParams>\n  perspective?: Exclude<ClientPerspective, 'raw'>\n  /**\n   * Enables stega encoding of the data, this is typically only used in draft mode.\n   * If `defineLive({..., stega: true})` is provided, then it defaults to `true` in Draft Mode.\n   * If `defineLive({..., stega: false})` then it defaults to `false`.\n   */\n  stega?: boolean\n  /**\n   * This request tag is used to identify the request when viewing request logs from your Sanity Content Lake.\n   * @see https://www.sanity.io/docs/reference-api-request-tags\n   * @defaultValue 'next-loader.fetch'\n   */\n  requestTag?: string\n  /**\n   * Custom cache tags that can be used with next's `revalidateTag` function for custom webhook on-demand revalidation.\n   */\n  tags?: string[]\n}) => Promise<{\n  data: ClientReturn<QueryString, unknown>\n  /**\n   * The Content Source Map can be used for custom setups like `encodeSourceMap` for `data-sanity` attributes, or `stegaEncodeSourceMap` for stega encoding in your own way.\n   * The Content Source Map is only fetched by default in draft mode, if `stega` is `true`. Otherwise your client configuration will need to have `resultSourceMap: 'withKeyArraySelector' | true`\n   */\n  sourceMap: ContentSourceMap | null\n  /**\n   * The perspective used to fetch the data, useful for debugging.\n   */\n  perspective: Exclude<ClientPerspective, 'raw'>\n  /**\n   * The cache tags used with `next/cache`, useful for debugging.\n   */\n  tags: string[]\n}>\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport interface DefinedSanityLiveProps {\n  /**\n   * Automatic refresh of RSC when the component <SanityLive /> is mounted.\n   * @defaultValue `false`\n   */\n  refreshOnMount?: boolean\n  /**\n   * Automatically refresh when window gets focused\n   * @defaultValue `false`\n   */\n  refreshOnFocus?: boolean\n  /**\n   * Automatically refresh when the browser regains a network connection (via navigator.onLine)\n   * @defaultValue `false`\n   */\n  refreshOnReconnect?: boolean\n  /**\n   * Automatically refresh on an interval when the Live Event API emits a `goaway` event, which indicates that the connection is rejected or closed.\n   * This typically happens if the connection limit is reached, or if the connection is idle for too long.\n   * To disable this long polling fallback behavior set `intervalOnGoAway` to `false` or `0`.\n   * You can also use `onGoAway` to handle the `goaway` event in your own way, and read the reason why the event was emitted.\n   * @defaultValue `30_000` 30 seconds interval\n   */\n  intervalOnGoAway?: number | false\n\n  /**\n   * This request tag is used to identify the request when viewing request logs from your Sanity Content Lake.\n   * @see https://www.sanity.io/docs/reference-api-request-tags\n   * @defaultValue 'next-loader.live'\n   */\n  requestTag?: string\n\n  /**\n   * Handle errors from the Live Events subscription.\n   * By default it's reported using `console.error`, you can override this prop to handle it in your own way.\n   */\n  onError?: (error: unknown) => void\n\n  /**\n   * Handle the `goaway` event if the connection is rejected/closed.\n   * `event.reason` will be a string of why the event was emitted, for example `'connection limit reached'`.\n   * When this happens the `<SanityLive />` will fallback to long polling with a default interval of 30 seconds, providing your own `onGoAway` handler does not change this behavior.\n   * If you want to disable long polling set `intervalOnGoAway` to `false` or `0`.\n   */\n  onGoAway?: (event: LiveEventGoAway, intervalOnGoAway: number | false) => void\n\n  /**\n   * Override how cache tags are invalidated, you need to pass a server action here.\n   * You can also pass a `use client` function here, and have `router.refresh()` be called if the promise resolves to `'refresh'`.\n   */\n  // @TODO remove, replace with onLiveEvent\n  revalidateSyncTags?: (tags: SyncTag[]) => Promise<void | 'refresh'>\n\n  // @TODO add\n  // decide how to handle a live event coming in\n  // onLiveEvent?: (event: LiveEvent, mode: 'production' | 'preview) => void\n\n  /**\n   * Control how the draft mode perspective is resolved, by default it resolves from the `sanity-preview-perspective` cookie.\n   */\n  resolveDraftModePerspective?: () => Promise<ClientPerspective>\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport interface DefineSanityLiveOptions {\n  /**\n   * Required for `sanityFetch` and `SanityLive` to work\n   */\n  client: SanityClient\n  /**\n   * Optional. If provided then the token needs to have permissions to query documents with `drafts.` prefixes in order for `perspective: 'drafts'` to work.\n   * This token is not shared with the browser.\n   */\n  serverToken?: string | false\n  /**\n   * Optional. This token is shared with the browser, and should only have access to query published documents.\n   * It is used to setup a `Live Draft Content` EventSource connection, and enables live previewing drafts stand-alone, outside of Presentation Tool.\n   */\n  browserToken?: string | false\n  /**\n   * Optional. Include stega encoding when draft mode is enabled.\n   *  @defaultValue `true` if the client configuration has the `stega.studioUrl` property set, otherwise `false`\n   */\n  stega?: boolean\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport function defineLive(config: DefineSanityLiveOptions): {\n  /**\n   * Use this function to fetch data from Sanity in your React Server Components.\n   */\n  sanityFetch: DefinedSanityFetchType\n  /**\n   * Render this in your root layout.tsx to make your page revalidate on new content live, automatically.\n   */\n  SanityLive: React.ComponentType<DefinedSanityLiveProps>\n} {\n  const {client: _client, serverToken, browserToken} = config\n\n  if (!_client) {\n    throw new Error('`client` is required for `defineLive` to function')\n  }\n\n  if (process.env.NODE_ENV !== 'production' && !serverToken && serverToken !== false) {\n    // eslint-disable-next-line no-console\n    console.warn(\n      'No `serverToken` provided to `defineLive`. This means that only published content will be fetched and respond to live events. You can silence this warning by setting `serverToken: false`.',\n    )\n  }\n\n  if (process.env.NODE_ENV !== 'production' && !browserToken && browserToken !== false) {\n    // eslint-disable-next-line no-console\n    console.warn(\n      'No `browserToken` provided to `defineLive`. This means that live previewing drafts will only work when using the Presentation Tool in your Sanity Studio. To support live previewing drafts stand-alone, provide a `browserToken`. It is shared with the browser so it should only have Viewer rights or lower. You can silence this warning by setting `browserToken: false`.',\n    )\n  }\n\n  const client = _client.withConfig({allowReconfigure: false, useCdn: false})\n  const {token: originalToken, stega: stegaConfig} = client.config()\n  const studioUrlDefined = typeof client.config().stega.studioUrl !== 'undefined'\n  const {stega: stegaEnabled = typeof client.config().stega.studioUrl !== 'undefined'} = config\n\n  const sanityFetch: DefinedSanityFetchType = async function sanityFetch<\n    const QueryString extends string,\n  >({\n    query,\n    params = {},\n    stega: _stega,\n    tags: customCacheTags = [],\n    perspective: _perspective,\n    requestTag = 'next-loader.fetch',\n  }: {\n    query: QueryString\n    params?: QueryParams | Promise<QueryParams>\n    stega?: boolean\n    tags?: string[]\n    perspective?: Exclude<ClientPerspective, 'raw'>\n    requestTag?: string\n  }) {\n    const stega = _stega ?? (stegaEnabled && studioUrlDefined && (await draftMode()).isEnabled)\n    const perspective = _perspective ?? ((await draftMode()).isEnabled ? 'drafts' : 'published')\n\n    const {apiHost, apiVersion, useProjectHostname, dataset, projectId, requestTagPrefix} =\n      client.config()\n    const {\n      data: _data,\n      sourceMap,\n      tags,\n    } = await sanityCachedFetch(\n      {\n        apiHost,\n        apiVersion,\n        useProjectHostname,\n        dataset,\n        projectId,\n        requestTagPrefix,\n        token: originalToken,\n      },\n      {\n        query,\n        params: await params,\n        perspective,\n        stega,\n        requestTag,\n        draftToken: serverToken,\n        customCacheTags,\n      },\n    )\n\n    const data =\n      stega && sourceMap\n        ? stegaEncodeSourceMap(_data, sourceMap, {...stegaConfig, enabled: true})\n        : _data\n\n    return {data, sourceMap, tags, perspective}\n  }\n\n  const SanityLive: React.ComponentType<DefinedSanityLiveProps> = function SanityLive(props) {\n    const {\n      // perspective,\n      refreshOnMount = false,\n      refreshOnFocus = false,\n      refreshOnReconnect = false,\n      requestTag,\n      onError,\n      onGoAway,\n      intervalOnGoAway,\n      revalidateSyncTags = expireTags,\n    } = props\n\n    const {projectId, dataset, apiHost, apiVersion, useProjectHostname, requestTagPrefix} =\n      client.config()\n    const {origin} = new URL(client.getUrl('', false))\n\n    // Preconnect to the Live Event API origin early, as the Sanity API is almost always on a different origin than the app\n    preconnect(origin)\n\n    return (\n      <SanityLiveServerComponent\n        config={{projectId, dataset, apiHost, apiVersion, useProjectHostname, requestTagPrefix}}\n        requestTag={requestTag}\n        browserToken={browserToken}\n        // origin={origin}\n        refreshOnMount={refreshOnMount}\n        refreshOnFocus={refreshOnFocus}\n        refreshOnReconnect={refreshOnReconnect}\n        onError={onError}\n        onGoAway={onGoAway}\n        intervalOnGoAway={intervalOnGoAway}\n        revalidateSyncTags={revalidateSyncTags}\n        resolveDraftModePerspective={\n          props.resolveDraftModePerspective ?? resolveDraftModePerspective\n        }\n      />\n    )\n  }\n\n  return {sanityFetch, SanityLive}\n}\n\ninterface SanityLiveServerComponentProps\n  extends Omit<SanityLiveProps, 'draftModeEnabled' | 'token' | 'draftModePerspective'> {\n  browserToken: string | false | undefined\n  // origin: string\n  // perspective?: Exclude<ClientPerspective, 'raw'>\n}\n\nconst SanityLiveServerComponent: React.ComponentType<SanityLiveServerComponentProps> =\n  async function SanityLiveServerComponent(props) {\n    'use cache'\n    // @TODO should this be 'max' instead?, or configured by changing the default cache profile?\n    // cacheLife({\n    //   stale: Infinity,\n    //   revalidate: Infinity,\n    //   expire: Infinity,\n    // })\n    const {\n      config,\n      requestTag,\n      intervalOnGoAway,\n      onError,\n      onGoAway,\n      refreshOnFocus,\n      refreshOnMount,\n      refreshOnReconnect,\n      revalidateSyncTags,\n      browserToken,\n      // origin,\n      // perspective,\n      resolveDraftModePerspective,\n    } = props\n\n    const {isEnabled: isDraftModeEnabled} = await draftMode()\n\n    // // Preconnect to the Live Event API origin early, as the Sanity API is almost always on a different origin than the app\n    // preconnect(origin)\n\n    return (\n      <SanityLiveClientComponent\n        config={{\n          ...config,\n          token: typeof browserToken === 'string' && isDraftModeEnabled ? browserToken : undefined,\n        }}\n        requestTag={requestTag}\n        draftModeEnabled={isDraftModeEnabled}\n        refreshOnMount={refreshOnMount}\n        refreshOnFocus={refreshOnFocus}\n        refreshOnReconnect={refreshOnReconnect}\n        onError={onError}\n        onGoAway={onGoAway}\n        intervalOnGoAway={intervalOnGoAway}\n        revalidateSyncTags={revalidateSyncTags}\n        resolveDraftModePerspective={resolveDraftModePerspective}\n      />\n    )\n  }\n\n// @TODO expose parseTags function that returns the correct array of tags\n// we already have s1: prefixes, but they could change\n// use sp: for prod, sd: for draft, keep em short\nasync function expireTags(_tags: SyncTag[]): Promise<void> {\n  'use server'\n  const isDraftMode = (await draftMode()).isEnabled\n  const tags = _tags.map((tag) => `${isDraftMode ? 'drafts' : 'sanity'}:${tag}`)\n  expireTag(...tags)\n  console.log(`<SanityLive /> expired tags: ${tags.join(', ')}`)\n}\n\nasync function resolveDraftModePerspective(): Promise<ClientPerspective> {\n  'use server'\n  if ((await draftMode()).isEnabled) {\n    const jar = await cookies()\n    return resolvePerspectiveFromCookie({cookies: jar})\n  }\n  return 'published'\n}\n\n/**\n * Add more stuff:\n * - sanityFetchMetadata: sanityFetch({query, params, stega: false, perspective: 'auto'})\n * - sanityFetchStaticParams: sanityFetch({query, params, stega: false, perspective: 'published', cacheMode: undefined})\n * - sanityFetchCached: sanityFetch({query, params, stega: 'opt-in',perspective: 'opt-in'}) useful for 'use cache' components, no unexpected magic, maybe this will be `sanityFetch` instead\n * - sanityFetchDynamic: sanityFetch({query, params, stega: 'auto', perspective: 'auto'}) just like sanityFetch of old, since `sanityFetch` will likely become opt-in\n */\n"],"mappings":"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"}
+{"version":3,"file":"live.js","names":["SanityLiveServerComponent: React.ComponentType<SanityLiveServerComponentProps>","SanityLiveServerComponent","resolveDraftModePerspective"],"sources":["../../src/experimental/live.tsx"],"sourcesContent":["// oxlint-disable-next-line no-unassigned-import\nimport 'server-only'\nimport {\n  createClient,\n  type ClientPerspective,\n  type ClientReturn,\n  type ContentSourceMap,\n  type LiveEventGoAway,\n  type QueryParams,\n  type SanityClient,\n  type SyncTag,\n} from 'next-sanity'\nimport {stegaEncodeSourceMap} from '@sanity/client/stega'\nimport SanityLiveClientComponent, {\n  type SanityLiveProps,\n} from 'next-sanity/experimental/client-components/live'\nimport {unstable_cacheTag as cacheTag, unstable_expireTag as expireTag} from 'next/cache'\nimport {draftMode, cookies} from 'next/headers'\nimport {preconnect} from 'react-dom'\nimport {perspectiveCookieName} from '@sanity/preview-url-secret/constants'\nimport {sanitizePerspective} from '../live/utils'\nimport type {SanityClientConfig} from './types'\nimport {DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX} from './constants'\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport async function resolvePerspectiveFromCookie({\n  cookies: jar,\n}: {\n  cookies: Awaited<ReturnType<typeof cookies>>\n}): Promise<Exclude<ClientPerspective, 'raw'>> {\n  return jar.has(perspectiveCookieName)\n    ? sanitizePerspective(jar.get(perspectiveCookieName)?.value, 'drafts')\n    : 'drafts'\n}\n\nasync function sanityCachedFetch<const QueryString extends string>(\n  config: SanityClientConfig,\n  {\n    query,\n    params = {},\n    perspective,\n    stega,\n    requestTag,\n    draftToken,\n    customCacheTags = [],\n  }: {\n    query: QueryString\n    params?: QueryParams\n    perspective: Exclude<ClientPerspective, 'raw'>\n    stega: boolean\n    requestTag: string\n    draftToken?: string | false | undefined\n    customCacheTags?: string[]\n  },\n): Promise<{\n  data: ClientReturn<QueryString, unknown>\n  sourceMap: ContentSourceMap | null\n  tags: string[]\n}> {\n  'use cache'\n\n  const client = createClient({...config, useCdn: true})\n  const useCdn = perspective === 'published'\n  /**\n   * The default cache profile isn't ideal for live content, as it has unnecessary time based background validation, as well as a too lazy client stale value\n   * https://github.com/vercel/next.js/blob/8dd358002baf4244c0b2e38b5bda496daf60dacb/packages/next/cache.d.ts#L14-L26\n   */\n  // cacheLife({\n  //   stale: Infinity,\n  //   revalidate: Infinity,\n  //   expire: Infinity,\n  // })\n\n  const {result, resultSourceMap, syncTags} = await client.fetch(query, params, {\n    filterResponse: false,\n    returnQuery: false,\n    perspective,\n    useCdn,\n    resultSourceMap: stega ? 'withKeyArraySelector' : undefined, // @TODO allow passing csm for non-stega use\n    cacheMode: useCdn ? 'noStale' : undefined,\n    tag: requestTag,\n    token: perspective === 'published' ? config.token : draftToken || config.token, // @TODO can pass undefined instead of config.token here?\n  })\n  const tags = [\n    ...customCacheTags,\n    ...(syncTags || []).map(\n      (tag) =>\n        `${perspective === 'published' ? PUBLISHED_SYNC_TAG_PREFIX : DRAFT_SYNC_TAG_PREFIX}${tag}`,\n    ),\n  ]\n  /**\n   * The tags used here, are expired later on in the `expireTags` Server Action with the `expireTag` function from `next/cache`\n   */\n  cacheTag(...tags)\n\n  return {data: result, sourceMap: resultSourceMap || null, tags}\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport type DefinedSanityFetchType = <const QueryString extends string>(options: {\n  query: QueryString\n  params?: QueryParams | Promise<QueryParams>\n  perspective?: Exclude<ClientPerspective, 'raw'>\n  /**\n   * Enables stega encoding of the data, this is typically only used in draft mode.\n   * If `defineLive({..., stega: true})` is provided, then it defaults to `true` in Draft Mode.\n   * If `defineLive({..., stega: false})` then it defaults to `false`.\n   */\n  stega?: boolean\n  /**\n   * This request tag is used to identify the request when viewing request logs from your Sanity Content Lake.\n   * @see https://www.sanity.io/docs/reference-api-request-tags\n   * @defaultValue 'next-loader.fetch'\n   */\n  requestTag?: string\n  /**\n   * Custom cache tags that can be used with next's `revalidateTag` function for custom webhook on-demand revalidation.\n   */\n  tags?: string[]\n}) => Promise<{\n  data: ClientReturn<QueryString, unknown>\n  /**\n   * The Content Source Map can be used for custom setups like `encodeSourceMap` for `data-sanity` attributes, or `stegaEncodeSourceMap` for stega encoding in your own way.\n   * The Content Source Map is only fetched by default in draft mode, if `stega` is `true`. Otherwise your client configuration will need to have `resultSourceMap: 'withKeyArraySelector' | true`\n   */\n  sourceMap: ContentSourceMap | null\n  /**\n   * The perspective used to fetch the data, useful for debugging.\n   */\n  perspective: Exclude<ClientPerspective, 'raw'>\n  /**\n   * The cache tags used with `next/cache`, useful for debugging.\n   */\n  tags: string[]\n}>\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport interface DefinedSanityLiveProps {\n  /**\n   * Automatic refresh of RSC when the component <SanityLive /> is mounted.\n   * @defaultValue `false`\n   */\n  refreshOnMount?: boolean\n  /**\n   * Automatically refresh when window gets focused\n   * @defaultValue `false`\n   */\n  refreshOnFocus?: boolean\n  /**\n   * Automatically refresh when the browser regains a network connection (via navigator.onLine)\n   * @defaultValue `false`\n   */\n  refreshOnReconnect?: boolean\n  /**\n   * Automatically refresh on an interval when the Live Event API emits a `goaway` event, which indicates that the connection is rejected or closed.\n   * This typically happens if the connection limit is reached, or if the connection is idle for too long.\n   * To disable this long polling fallback behavior set `intervalOnGoAway` to `false` or `0`.\n   * You can also use `onGoAway` to handle the `goaway` event in your own way, and read the reason why the event was emitted.\n   * @defaultValue `30_000` 30 seconds interval\n   */\n  intervalOnGoAway?: number | false\n\n  /**\n   * This request tag is used to identify the request when viewing request logs from your Sanity Content Lake.\n   * @see https://www.sanity.io/docs/reference-api-request-tags\n   * @defaultValue 'next-loader.live'\n   */\n  requestTag?: string\n\n  /**\n   * Handle errors from the Live Events subscription.\n   * By default it's reported using `console.error`, you can override this prop to handle it in your own way.\n   */\n  onError?: (error: unknown) => void\n\n  /**\n   * Handle the `goaway` event if the connection is rejected/closed.\n   * `event.reason` will be a string of why the event was emitted, for example `'connection limit reached'`.\n   * When this happens the `<SanityLive />` will fallback to long polling with a default interval of 30 seconds, providing your own `onGoAway` handler does not change this behavior.\n   * If you want to disable long polling set `intervalOnGoAway` to `false` or `0`.\n   */\n  onGoAway?: (event: LiveEventGoAway, intervalOnGoAway: number | false) => void\n\n  /**\n   * Override how cache tags are invalidated, you need to pass a server action here.\n   * You can also pass a `use client` function here, and have `router.refresh()` be called if the promise resolves to `'refresh'`.\n   */\n  // @TODO remove, replace with onLiveEvent\n  revalidateSyncTags?: (\n    tags: `${typeof PUBLISHED_SYNC_TAG_PREFIX | typeof DRAFT_SYNC_TAG_PREFIX}${SyncTag}`[],\n  ) => Promise<void | 'refresh'>\n\n  // @TODO add\n  // decide how to handle a live event coming in\n  // onLiveEvent?: (event: LiveEvent, mode: 'production' | 'preview) => void\n\n  /**\n   * Control how the draft mode perspective is resolved, by default it resolves from the `sanity-preview-perspective` cookie.\n   */\n  resolveDraftModePerspective?: () => Promise<ClientPerspective>\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport interface DefineSanityLiveOptions {\n  /**\n   * Required for `sanityFetch` and `SanityLive` to work\n   */\n  client: SanityClient\n  /**\n   * Optional. If provided then the token needs to have permissions to query documents with `drafts.` prefixes in order for `perspective: 'drafts'` to work.\n   * This token is not shared with the browser.\n   */\n  serverToken?: string | false\n  /**\n   * Optional. This token is shared with the browser, and should only have access to query published documents.\n   * It is used to setup a `Live Draft Content` EventSource connection, and enables live previewing drafts stand-alone, outside of Presentation Tool.\n   */\n  browserToken?: string | false\n  /**\n   * Optional. Include stega encoding when draft mode is enabled.\n   *  @defaultValue `true` if the client configuration has the `stega.studioUrl` property set, otherwise `false`\n   */\n  stega?: boolean\n}\n\n/**\n * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.\n */\nexport function defineLive(config: DefineSanityLiveOptions): {\n  /**\n   * Use this function to fetch data from Sanity in your React Server Components.\n   */\n  sanityFetch: DefinedSanityFetchType\n  /**\n   * Render this in your root layout.tsx to make your page revalidate on new content live, automatically.\n   */\n  SanityLive: React.ComponentType<DefinedSanityLiveProps>\n} {\n  const {client: _client, serverToken, browserToken} = config\n\n  if (!_client) {\n    throw new Error('`client` is required for `defineLive` to function')\n  }\n\n  if (process.env.NODE_ENV !== 'production' && !serverToken && serverToken !== false) {\n    // eslint-disable-next-line no-console\n    console.warn(\n      'No `serverToken` provided to `defineLive`. This means that only published content will be fetched and respond to live events. You can silence this warning by setting `serverToken: false`.',\n    )\n  }\n\n  if (process.env.NODE_ENV !== 'production' && !browserToken && browserToken !== false) {\n    // eslint-disable-next-line no-console\n    console.warn(\n      'No `browserToken` provided to `defineLive`. This means that live previewing drafts will only work when using the Presentation Tool in your Sanity Studio. To support live previewing drafts stand-alone, provide a `browserToken`. It is shared with the browser so it should only have Viewer rights or lower. You can silence this warning by setting `browserToken: false`.',\n    )\n  }\n\n  const client = _client.withConfig({allowReconfigure: false, useCdn: false})\n  const {token: originalToken, stega: stegaConfig} = client.config()\n  const studioUrlDefined = typeof client.config().stega.studioUrl !== 'undefined'\n  const {stega: stegaEnabled = typeof client.config().stega.studioUrl !== 'undefined'} = config\n\n  const sanityFetch: DefinedSanityFetchType = async function sanityFetch<\n    const QueryString extends string,\n  >({\n    query,\n    params = {},\n    stega: _stega,\n    tags: customCacheTags = [],\n    perspective: _perspective,\n    requestTag = 'next-loader.fetch',\n  }: {\n    query: QueryString\n    params?: QueryParams | Promise<QueryParams>\n    stega?: boolean\n    tags?: string[]\n    perspective?: Exclude<ClientPerspective, 'raw'>\n    requestTag?: string\n  }) {\n    const stega = _stega ?? (stegaEnabled && studioUrlDefined && (await draftMode()).isEnabled)\n    const perspective = _perspective ?? ((await draftMode()).isEnabled ? 'drafts' : 'published')\n\n    const {apiHost, apiVersion, useProjectHostname, dataset, projectId, requestTagPrefix} =\n      client.config()\n    const {\n      data: _data,\n      sourceMap,\n      tags,\n    } = await sanityCachedFetch(\n      {\n        apiHost,\n        apiVersion,\n        useProjectHostname,\n        dataset,\n        projectId,\n        requestTagPrefix,\n        token: originalToken,\n      },\n      {\n        query,\n        params: await params,\n        perspective,\n        stega,\n        requestTag,\n        draftToken: serverToken,\n        customCacheTags,\n      },\n    )\n\n    const data =\n      stega && sourceMap\n        ? stegaEncodeSourceMap(_data, sourceMap, {...stegaConfig, enabled: true})\n        : _data\n\n    return {data, sourceMap, tags, perspective}\n  }\n\n  const SanityLive: React.ComponentType<DefinedSanityLiveProps> = function SanityLive(props) {\n    const {\n      // perspective,\n      refreshOnMount = false,\n      refreshOnFocus = false,\n      refreshOnReconnect = false,\n      requestTag,\n      onError,\n      onGoAway,\n      intervalOnGoAway,\n      revalidateSyncTags = expireTags,\n    } = props\n\n    const {projectId, dataset, apiHost, apiVersion, useProjectHostname, requestTagPrefix} =\n      client.config()\n    const {origin} = new URL(client.getUrl('', false))\n\n    // Preconnect to the Live Event API origin early, as the Sanity API is almost always on a different origin than the app\n    preconnect(origin)\n\n    return (\n      <SanityLiveServerComponent\n        config={{projectId, dataset, apiHost, apiVersion, useProjectHostname, requestTagPrefix}}\n        requestTag={requestTag}\n        browserToken={browserToken}\n        // origin={origin}\n        refreshOnMount={refreshOnMount}\n        refreshOnFocus={refreshOnFocus}\n        refreshOnReconnect={refreshOnReconnect}\n        onError={onError}\n        onGoAway={onGoAway}\n        intervalOnGoAway={intervalOnGoAway}\n        revalidateSyncTags={revalidateSyncTags}\n        resolveDraftModePerspective={\n          props.resolveDraftModePerspective ?? resolveDraftModePerspective\n        }\n      />\n    )\n  }\n\n  return {sanityFetch, SanityLive}\n}\n\ninterface SanityLiveServerComponentProps\n  extends Omit<SanityLiveProps, 'draftModeEnabled' | 'token' | 'draftModePerspective'> {\n  browserToken: string | false | undefined\n  // origin: string\n  // perspective?: Exclude<ClientPerspective, 'raw'>\n}\n\nconst SanityLiveServerComponent: React.ComponentType<SanityLiveServerComponentProps> =\n  async function SanityLiveServerComponent(props) {\n    'use cache'\n    // @TODO should this be 'max' instead?, or configured by changing the default cache profile?\n    // cacheLife({\n    //   stale: Infinity,\n    //   revalidate: Infinity,\n    //   expire: Infinity,\n    // })\n    const {\n      config,\n      requestTag,\n      intervalOnGoAway,\n      onError,\n      onGoAway,\n      refreshOnFocus,\n      refreshOnMount,\n      refreshOnReconnect,\n      revalidateSyncTags,\n      browserToken,\n      // origin,\n      // perspective,\n      resolveDraftModePerspective,\n    } = props\n\n    const {isEnabled: isDraftModeEnabled} = await draftMode()\n\n    // // Preconnect to the Live Event API origin early, as the Sanity API is almost always on a different origin than the app\n    // preconnect(origin)\n\n    return (\n      <SanityLiveClientComponent\n        config={{\n          ...config,\n          token: typeof browserToken === 'string' && isDraftModeEnabled ? browserToken : undefined,\n        }}\n        requestTag={requestTag}\n        draftModeEnabled={isDraftModeEnabled}\n        refreshOnMount={refreshOnMount}\n        refreshOnFocus={refreshOnFocus}\n        refreshOnReconnect={refreshOnReconnect}\n        onError={onError}\n        onGoAway={onGoAway}\n        intervalOnGoAway={intervalOnGoAway}\n        revalidateSyncTags={revalidateSyncTags}\n        resolveDraftModePerspective={resolveDraftModePerspective}\n      />\n    )\n  }\n\n// @TODO expose parseTags function that returns the correct array of tags\n// we already have s1: prefixes, but they could change\n// use sp: for prod, sd: for draft, keep em short\nasync function expireTags(_tags: unknown): Promise<void> {\n  'use server'\n  // @TODO Draft Mode bypasses cache anyway so we don't bother with expiring tags for draft content\n  // const isDraftMode = (await draftMode()).isEnabled\n  // const tags = _tags.map((tag) => `${isDraftMode ? 'drafts' : 'sanity'}:${tag}`)\n  if (!Array.isArray(_tags)) {\n    console.warn('<SanityLive /> `expireTags` called with non-array tags', _tags)\n    return undefined\n  }\n  const tags = _tags.filter(\n    (tag) => typeof tag === 'string' && tag.startsWith(PUBLISHED_SYNC_TAG_PREFIX),\n  )\n  if (!tags.length) {\n    console.warn('<SanityLive /> `expireTags` called with no valid tags', _tags)\n    return undefined\n  }\n  expireTag(...tags)\n  console.log(`<SanityLive /> expired tags: ${tags.join(', ')}`)\n}\n\nasync function resolveDraftModePerspective(): Promise<ClientPerspective> {\n  'use server'\n  if ((await draftMode()).isEnabled) {\n    const jar = await cookies()\n    return resolvePerspectiveFromCookie({cookies: jar})\n  }\n  return 'published'\n}\n\n/**\n * Add more stuff:\n * - sanityFetchMetadata: sanityFetch({query, params, stega: false, perspective: 'auto'})\n * - sanityFetchStaticParams: sanityFetch({query, params, stega: false, perspective: 'published', cacheMode: undefined})\n * - sanityFetchCached: sanityFetch({query, params, stega: 'opt-in',perspective: 'opt-in'}) useful for 'use cache' components, no unexpected magic, maybe this will be `sanityFetch` instead\n * - sanityFetchDynamic: sanityFetch({query, params, stega: 'auto', perspective: 'auto'}) just like sanityFetch of old, since `sanityFetch` will likely become opt-in\n */\n"],"mappings":"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"}

package/dist/live/client-components/live/index.js

@@ -7,8 +7,8 @@ import { useRouter } from "next/navigation";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { isMaybePresentation, isMaybePreviewWindow } from "@sanity/presentation-comlink";
 import { useEffectEvent } from "use-effect-event";
-import { revalidateSyncTags } from "next-sanity/live/server-actions";
 import dynamic from "next/dynamic";
+import { revalidateSyncTags } from "next-sanity/live/server-actions";
 const PresentationComlink = dynamic(() => import("../../../PresentationComlink2.js"), { ssr: false });
 const RefreshOnMount = dynamic(() => import("../../../RefreshOnMount.js"), { ssr: false });
 const RefreshOnFocus = dynamic(() => import("../../../RefreshOnFocus.js"), { ssr: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-sanity",
-  "version": "11.4.0",
+  "version": "11.4.1",
   "description": "Sanity.io toolkit for Next.js",
   "keywords": [
     "sanity",

package/src/experimental/client-components/live.tsx

@@ -7,7 +7,6 @@ import {
   type LiveEventGoAway,
   type SyncTag,
 } from '@sanity/client'
-import {revalidateSyncTags as defaultRevalidateSyncTags} from 'next-sanity/live/server-actions'
 import {isMaybePresentation, isMaybePreviewWindow} from '@sanity/presentation-comlink'
 import dynamic from 'next/dynamic'
 import {useRouter} from 'next/navigation'
@@ -17,6 +16,7 @@ import {setEnvironment, setPerspective} from '../../live/hooks/context'
 import {isCorsOriginError} from '../../isCorsOriginError'
 import type {SanityClientConfig} from '../types'
 import {sanitizePerspective} from '../../live/utils'
+import {PUBLISHED_SYNC_TAG_PREFIX, type DRAFT_SYNC_TAG_PREFIX} from '../constants'
 
 const PresentationComlink = dynamic(() => import('./PresentationComlink'), {ssr: false})
 const RefreshOnMount = dynamic(() => import('../../live/client-components/live/RefreshOnMount'), {
@@ -47,7 +47,9 @@ export interface SanityLiveProps {
   onError?: (error: unknown) => void
   intervalOnGoAway?: number | false
   onGoAway?: (event: LiveEventGoAway, intervalOnGoAway: number | false) => void
-  revalidateSyncTags?: (tags: SyncTag[]) => Promise<void | 'refresh'>
+  revalidateSyncTags: (
+    tags: `${typeof PUBLISHED_SYNC_TAG_PREFIX | typeof DRAFT_SYNC_TAG_PREFIX}${SyncTag}`[],
+  ) => Promise<void | 'refresh'>
   resolveDraftModePerspective: () => Promise<ClientPerspective>
 }
 
@@ -101,7 +103,7 @@ export default function SanityLive(props: SanityLiveProps): React.JSX.Element |
     requestTag = 'next-loader.live',
     onError = handleError,
     onGoAway = handleOnGoAway,
-    revalidateSyncTags = defaultRevalidateSyncTags,
+    revalidateSyncTags,
     resolveDraftModePerspective,
   } = props
   const {projectId, dataset, apiHost, apiVersion, useProjectHostname, token, requestTagPrefix} =
@@ -143,7 +145,9 @@ export default function SanityLive(props: SanityLiveProps): React.JSX.Element |
       // Disable long polling when welcome event is received, this is a no-op if long polling is already disabled
       setLongPollingInterval(false)
     } else if (event.type === 'message') {
-      revalidateSyncTags(event.tags).then((result) => {
+      revalidateSyncTags(
+        event.tags.map((tag: SyncTag) => `${PUBLISHED_SYNC_TAG_PREFIX}${tag}` as const),
+      ).then((result) => {
         if (result === 'refresh') router.refresh()
       })
     } else if (event.type === 'restart' || event.type === 'reconnect') {
@@ -153,8 +157,18 @@ export default function SanityLive(props: SanityLiveProps): React.JSX.Element |
       setLongPollingInterval(intervalOnGoAway)
     }
   })
+  // @TODO previous version that handle both published and draft events
+  // useEffect(() => {
+  //   const subscription = client.live.events({includeDrafts: !!token, tag: requestTag}).subscribe({
+  //     next: handleLiveEvent,
+  //     error: (err: unknown) => {
+  //       onError(err)
+  //     },
+  //   })
+  //   return () => subscription.unsubscribe()
+  // }, [client.live, onError, requestTag, token])
   useEffect(() => {
-    const subscription = client.live.events({includeDrafts: !!token, tag: requestTag}).subscribe({
+    const subscription = client.live.events({tag: requestTag}).subscribe({
       next: handleLiveEvent,
       error: (err: unknown) => {
         onError(err)
@@ -163,6 +177,27 @@ export default function SanityLive(props: SanityLiveProps): React.JSX.Element |
     return () => subscription.unsubscribe()
   }, [client.live, onError, requestTag, token])
 
+  /**
+   * Handle live events for drafts differently, only use it to trigger refreshes, don't expire the cache
+   */
+  const handleLiveDraftEvent = useEffectEvent((event: LiveEvent) => {
+    if (event.type === 'message') {
+      // Just refresh, due to cache bypass in draft mode it'll fetch fresh content (though we wish cache worked as in production)
+      // @TODO if draft content is published, then this extra refresh is unnecessary, it's tricky to check since `event.id` are different on the two EventSource connections
+      router.refresh()
+    }
+  })
+  useEffect(() => {
+    if (!token) return
+    const subscription = client.live.events({includeDrafts: !!token, tag: requestTag}).subscribe({
+      next: handleLiveDraftEvent,
+      error: (err: unknown) => {
+        onError(err)
+      },
+    })
+    return () => subscription.unsubscribe()
+  }, [client.live, onError, requestTag, token])
+
   /**
    * 2. Notify what perspective we're in, when in Draft Mode
    */

package/src/experimental/constants.ts

@@ -0,0 +1,2 @@
+export const PUBLISHED_SYNC_TAG_PREFIX = 'sp:'
+export const DRAFT_SYNC_TAG_PREFIX = 'sd:'

package/src/experimental/live.tsx

@@ -20,6 +20,7 @@ import {preconnect} from 'react-dom'
 import {perspectiveCookieName} from '@sanity/preview-url-secret/constants'
 import {sanitizePerspective} from '../live/utils'
 import type {SanityClientConfig} from './types'
+import {DRAFT_SYNC_TAG_PREFIX, PUBLISHED_SYNC_TAG_PREFIX} from './constants'
 
 /**
  * @alpha CAUTION: This API does not follow semver and could have breaking changes in future minor releases.
@@ -84,7 +85,10 @@ async function sanityCachedFetch<const QueryString extends string>(
   })
   const tags = [
     ...customCacheTags,
-    ...(syncTags || []).map((tag) => `${perspective === 'published' ? 'sanity' : 'drafts'}:${tag}`),
+    ...(syncTags || []).map(
+      (tag) =>
+        `${perspective === 'published' ? PUBLISHED_SYNC_TAG_PREFIX : DRAFT_SYNC_TAG_PREFIX}${tag}`,
+    ),
   ]
   /**
    * The tags used here, are expired later on in the `expireTags` Server Action with the `expireTag` function from `next/cache`
@@ -188,7 +192,9 @@ export interface DefinedSanityLiveProps {
    * You can also pass a `use client` function here, and have `router.refresh()` be called if the promise resolves to `'refresh'`.
    */
   // @TODO remove, replace with onLiveEvent
-  revalidateSyncTags?: (tags: SyncTag[]) => Promise<void | 'refresh'>
+  revalidateSyncTags?: (
+    tags: `${typeof PUBLISHED_SYNC_TAG_PREFIX | typeof DRAFT_SYNC_TAG_PREFIX}${SyncTag}`[],
+  ) => Promise<void | 'refresh'>
 
   // @TODO add
   // decide how to handle a live event coming in
@@ -421,10 +427,22 @@ const SanityLiveServerComponent: React.ComponentType<SanityLiveServerComponentPr
 // @TODO expose parseTags function that returns the correct array of tags
 // we already have s1: prefixes, but they could change
 // use sp: for prod, sd: for draft, keep em short
-async function expireTags(_tags: SyncTag[]): Promise<void> {
+async function expireTags(_tags: unknown): Promise<void> {
   'use server'
-  const isDraftMode = (await draftMode()).isEnabled
-  const tags = _tags.map((tag) => `${isDraftMode ? 'drafts' : 'sanity'}:${tag}`)
+  // @TODO Draft Mode bypasses cache anyway so we don't bother with expiring tags for draft content
+  // const isDraftMode = (await draftMode()).isEnabled
+  // const tags = _tags.map((tag) => `${isDraftMode ? 'drafts' : 'sanity'}:${tag}`)
+  if (!Array.isArray(_tags)) {
+    console.warn('<SanityLive /> `expireTags` called with non-array tags', _tags)
+    return undefined
+  }
+  const tags = _tags.filter(
+    (tag) => typeof tag === 'string' && tag.startsWith(PUBLISHED_SYNC_TAG_PREFIX),
+  )
+  if (!tags.length) {
+    console.warn('<SanityLive /> `expireTags` called with no valid tags', _tags)
+    return undefined
+  }
   expireTag(...tags)
   console.log(`<SanityLive /> expired tags: ${tags.join(', ')}`)
 }