From 8c4698412ebc7dee31b8c4d3549b2a7a6f801864 Mon Sep 17 00:00:00 2001 From: prototypa Date: Thu, 27 Jul 2023 21:51:28 -0400 Subject: [PATCH] Consume data from new config.yaml --- astro.config.mjs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/astro.config.mjs b/astro.config.mjs index 929aef6..19d9c33 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -12,24 +12,24 @@ import partytown from '@astrojs/partytown'; import compress from 'astro-compress'; import { readingTimeRemarkPlugin } from './src/utils/frontmatter.mjs'; -import { SITE } from './src/config.mjs'; +import { SITE_CONFIG, ANALYTICS_CONFIG } from './src/utils/config.ts'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); const whenExternalScripts = (items = []) => - SITE.googleAnalyticsId ? (Array.isArray(items) ? items.map((item) => item()) : [items()]) : []; + ANALYTICS_CONFIG.vendors.googleAnalytics.isEnabled + ? Array.isArray(items) + ? items.map((item) => item()) + : [items()] + : []; export default defineConfig({ - site: SITE.origin, - base: SITE.basePathname, - trailingSlash: SITE.trailingSlash ? 'always' : 'never', + site: SITE_CONFIG.site, + base: SITE_CONFIG.base, + trailingSlash: SITE_CONFIG.trailingSlash ? 'always' : 'never', output: 'static', - markdown: { - remarkPlugins: [readingTimeRemarkPlugin], - }, - integrations: [ tailwind({ config: { @@ -78,6 +78,10 @@ export default defineConfig({ }), ], + markdown: { + remarkPlugins: [readingTimeRemarkPlugin], + }, + vite: { resolve: { alias: {