From 5a9bbf2a668362b2182f234cfcccc138b8cf3b94 Mon Sep 17 00:00:00 2001 From: Scott Kennedy Date: Thu, 2 Mar 2023 22:46:38 +0000 Subject: [PATCH] Fix bug causing domains notbeing set for @nuxt/image --- nuxt.config.ts | 4 ---- woonuxt-settings-module/woonuxt-settings.ts | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nuxt.config.ts b/nuxt.config.ts index 153e464..4a73f55 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -17,10 +17,6 @@ export default defineNuxtConfig({ '@nuxt/image-edge' ], - image: { - domains: process.env.NUXT_IMAGE_DOMAINS ? process.env.NUXT_IMAGE_DOMAINS.replace(/ /g, '').split(',') : [], - }, - hooks: { 'pages:extend'(pages) { pages.push({ name: 'product-page-pager', path: '/products/page/:pageNumber', file: '~/pages/products.vue' }); diff --git a/woonuxt-settings-module/woonuxt-settings.ts b/woonuxt-settings-module/woonuxt-settings.ts index a793277..98427b0 100644 --- a/woonuxt-settings-module/woonuxt-settings.ts +++ b/woonuxt-settings-module/woonuxt-settings.ts @@ -50,7 +50,11 @@ export default defineNuxtModule({ // Default env variables process.env.PRIMARY_COLOR = data.woonuxtSettings?.primary_color || '#7F54B2'; process.env.PUBLIC_INTROSPECTION_ENABLED = data.woonuxtSettings?.publicIntrospectionEnabled || 'off'; - process.env.NUXT_IMAGE_DOMAINS = data.woonuxtSettings?.domain || null; + const nuxtImageDomains = process.env.NUXT_IMAGE_DOMAINS ? process.env.NUXT_IMAGE_DOMAINS.replace(/ /g, '').split(',') : []; + + nuxt.options.image = { + domains: [...nuxtImageDomains, data.woonuxtSettings?.domain], + } // Default runtimeConfig nuxt.options.runtimeConfig.public.LOGO = data.woonuxtSettings?.logo || null;