fix: merge themeConfig

kermanx · antfu · commit 6d828584bd76 · 2026-04-08T11:36:06.000+09:00
diff --git a/packages/parser/src/config.ts b/packages/parser/src/config.ts
@@ -74,16 +74,24 @@ export function resolveConfig(headmatter: any, themeMeta: SlidevThemeMeta = {},
     ...headmatter.config,
     ...headmatter,
     fonts: resolveFonts({
+      ...defaultConfig.fonts,
       ...themeMeta.defaults?.fonts,
       ...headmatter.config?.fonts,
       ...headmatter?.fonts,
     }),
     drawings: resolveDrawings(headmatter.drawings, filepath),
     htmlAttrs: {
+      ...defaultConfig.htmlAttrs,
       ...themeMeta.defaults?.htmlAttrs,
       ...headmatter.config?.htmlAttrs,
       ...headmatter?.htmlAttrs,
     },
+    themeConfig: {
+      ...defaultConfig.themeConfig,
+      ...themeMeta.defaults?.themeConfig,
+      ...headmatter.config?.themeConfig,
+      ...headmatter?.themeConfig,
+    },
   }
 
   // @ts-expect-error compat
@@ -139,13 +147,13 @@ export function resolveFonts(fonts: FontOptions = {}): ResolvedFontOptions {
     italic = false,
     provider = 'google',
   } = fonts
-  let sans = toArray(fonts.sans).flatMap(i => i.split(/,\s*/g)).map(i => i.trim())
-  let serif = toArray(fonts.serif).flatMap(i => i.split(/,\s*/g)).map(i => i.trim())
-  let mono = toArray(fonts.mono).flatMap(i => i.split(/,\s*/g)).map(i => i.trim())
-  const weights = toArray(fonts.weights || '200,400,600').flatMap(i => i.toString().split(/,\s*/g)).map(i => i.trim())
-  const custom = toArray(fonts.custom).flatMap(i => i.split(/,\s*/g)).map(i => i.trim())
+  let sans = toArray(fonts.sans).flatMap(i => i.split(',')).map(i => i.trim())
+  let serif = toArray(fonts.serif).flatMap(i => i.split(',')).map(i => i.trim())
+  let mono = toArray(fonts.mono).flatMap(i => i.split(',')).map(i => i.trim())
+  const weights = toArray(fonts.weights || '200,400,600').flatMap(i => i.toString().split(',')).map(i => i.trim())
+  const custom = toArray(fonts.custom).flatMap(i => i.split(',')).map(i => i.trim())
 
-  const local = toArray(fonts.local).flatMap(i => i.split(/,\s*/g)).map(i => i.trim())
+  const local = toArray(fonts.local).flatMap(i => i.split(',')).map(i => i.trim())
   const webfonts = fonts.webfonts
     ? fonts.webfonts
     : fallbacks
