diff --git a/src/defaults.ts b/src/defaults.ts index 6ead181e..8deb7b8b 100644 --- a/src/defaults.ts +++ b/src/defaults.ts @@ -2,7 +2,7 @@ import icons from './theme/icons' import { pick } from './runtime/utils' -export const getDefaultUiConfig = (colors?: string[]) => ({ +export const getDefaultUiConfig = (colors?: string[], csp?: { nonce?: string }) => ({ colors: pick({ primary: 'green', secondary: 'blue', @@ -13,7 +13,7 @@ export const getDefaultUiConfig = (colors?: string[]) => ({ neutral: 'slate' }, [...(colors || []), 'neutral' as any]), icons, - csp: { + csp: csp || { nonce: '' } }) diff --git a/src/module.ts b/src/module.ts index e70fb3ba..e49b5162 100644 --- a/src/module.ts +++ b/src/module.ts @@ -83,8 +83,7 @@ export default defineNuxtModule({ nuxt.options.alias['#ui'] = resolve('./runtime') - nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui || {}, getDefaultUiConfig(options.theme.colors)) - nuxt.options.appConfig.ui.csp = defu(nuxt.options.appConfig.ui.csp || {}, options.csp) + nuxt.options.appConfig.ui = defu(nuxt.options.appConfig.ui || {}, getDefaultUiConfig(options.theme.colors, options.csp)) // Isolate root node from portaled components nuxt.options.app.rootAttrs = nuxt.options.app.rootAttrs || {} diff --git a/src/runtime/plugins/colors.ts b/src/runtime/plugins/colors.ts index f5210a9a..8c489f05 100644 --- a/src/runtime/plugins/colors.ts +++ b/src/runtime/plugins/colors.ts @@ -23,7 +23,7 @@ export default defineNuxtPlugin(() => { const appConfig = useAppConfig() const nuxtApp = useNuxtApp() - const nonce = computed(() => (appConfig.ui as any)?.csp?.nonce as string | undefined) + const nonce = computed(() => appConfig.ui?.csp?.nonce) const root = computed(() => { const { neutral, ...colors } = appConfig.ui.colors @@ -42,7 +42,6 @@ export default defineNuxtPlugin(() => { }) // Head - console.log('head nonce', nonce.value) const headData: UseHeadInput = { style: [{ innerHTML: () => root.value, @@ -59,7 +58,6 @@ export default defineNuxtPlugin(() => { style.innerHTML = root.value style.setAttribute('data-nuxt-ui-colors', '') - console.log('SPA nonce', nonce.value) if (nonce.value) { style.setAttribute('nonce', nonce.value) }