fix: apply defaults to sanity config

resolves #1059

Author: danielroe

src/runtime/composables/index.ts

@@ -38,7 +38,7 @@ export const useSanity = (client = 'default'): SanityHelper => {
   nuxtApp._sanity = nuxtApp._sanity || {}
 
   const $config = useRuntimeConfig()
-  const { additionalClients = {}, ...options } = defu($config.sanity, $config.public.sanity)
+  const { additionalClients = {}, ...options } = import.meta.client ? $config.public.sanity : defu($config.sanity, $config.public.sanity)
 
   if (!options.disableSmartCdn && nuxtApp.$preview) {
     options.useCdn = false

src/runtime/composables/visual-editing.ts

@@ -162,12 +162,8 @@ export const useSanity = (client = 'default'): SanityHelper => {
   nuxtApp._sanity = nuxtApp._sanity || {}
 
   const $config = useRuntimeConfig()
-  const { additionalClients = {}, visualEditing, ...options } = import.meta.client
-    ? $config.public.sanity
-    : defu(
-      $config.sanity,
-      $config.public.sanity,
-    )
+  const sanityConfig = import.meta.client ? $config.public.sanity : defu($config.sanity, $config.public.sanity)
+  const { additionalClients = {}, visualEditing, ...options } = sanityConfig
 
   if (client === 'default') {
     nuxtApp._sanity.default = createSanityHelper({

src/runtime/plugins/visual-editing.server.ts

@@ -1,11 +1,12 @@
+import defu from 'defu'
 import { useSanityVisualEditingState } from '../composables/visual-editing'
 import { defineNuxtPlugin, useRuntimeConfig, useCookie } from '#imports'
 
 export default defineNuxtPlugin(() => {
   const visualEditingState = useSanityVisualEditingState()
 
   const $config = useRuntimeConfig()
-  const { visualEditing } = $config.sanity
+  const { visualEditing } = import.meta.client ? $config.public.sanity : defu($config.sanity, $config.public.sanity)
 
   // If preview mode is _configured_ (i.e. `visualEditing.previewMode` is set)
   // check the cookie value against `previewModeId` to determine if visual

src/runtime/server/routes/preview/enable.ts

@@ -1,14 +1,17 @@
 import { createError, defineEventHandler, getRequestURL, setCookie, sendRedirect } from 'h3'
 import { validatePreviewUrl } from '@sanity/preview-url-secret'
+import defu from 'defu'
 
 import { useSanity, useRuntimeConfig } from '#imports'
 
 export default defineEventHandler(async (event) => {
-  const $config = useRuntimeConfig()
+  const $config = useRuntimeConfig(event)
   const sanity = useSanity()
 
+  const sanityConfig = import.meta.client ? $config.public.sanity : defu($config.sanity, $config.public.sanity)
+
   const client = sanity.client.withConfig({
-    token: $config.sanity.visualEditing!.token,
+    token: sanityConfig.visualEditing!.token,
   })
 
   const { isValid, redirectTo = '/' } = await validatePreviewUrl(
@@ -23,7 +26,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  setCookie(event, '__sanity_preview', $config.sanity.visualEditing!.previewModeId, {
+  setCookie(event, '__sanity_preview', sanityConfig.visualEditing!.previewModeId, {
     httpOnly: true,
     sameSite: !import.meta.dev ? 'none' : 'lax',
     secure: !import.meta.dev,

src/runtime/server/routes/proxy.ts

@@ -1,15 +1,16 @@
 import { createError, defineEventHandler, readBody, getCookie } from 'h3'
+import defu from 'defu'
 
 import { useSanity, useRuntimeConfig } from '#imports'
 
 export default defineEventHandler(async (event) => {
-  const $config = useRuntimeConfig()
+  const $config = useRuntimeConfig(event)
   const sanity = useSanity()
 
   const { query, params = {}, options } = await readBody(event)
   const previewModeCookie = getCookie(event, '__sanity_preview')
 
-  const { visualEditing } = $config.sanity
+  const { visualEditing } = import.meta.client ? $config.public.sanity : defu($config.sanity, $config.public.sanity)
 
   if (!visualEditing || previewModeCookie !== visualEditing.previewModeId) {
     throw createError({

src/runtime/server/utils/index.ts

@@ -29,12 +29,12 @@ export const useSanity = (client = 'default'): SanityHelper => {
     return clients[client]
   }
 
+  const sanityConfig = import.meta.client ? $config.public.sanity : defu($config.sanity, $config.public.sanity)
   const {
     additionalClients = {},
-
     visualEditing,
     ...options
-  } = defu($config.sanity, $config.public.sanity)
+  } = sanityConfig
 
   if (client === 'default') {
     clients.default = createSanityHelper(options as ClientConfig) // @todo casting