fix: theme ejection (#2085)

kermanx · web-flow · commit f3fafaaddc88 · 2025-02-23T01:47:48.000+08:00
diff --git a/packages/slidev/node/cli.ts b/packages/slidev/node/cli.ts
@@ -20,6 +20,7 @@ import { resolveOptions } from './options'
 import { parser } from './parser'
 import { getRoots, isInstalledGlobally, resolveEntry } from './resolver'
 import setupPreparser from './setups/preparser'
+import { updateFrontmatterPatch } from './utils'
 
 const CONFIG_RESTART_FIELDS: (keyof SlidevConfig)[] = [
   'monaco',
@@ -420,17 +421,19 @@ cli.command(
           }
           const [name, root] = (await resolveTheme(themeRaw, entry)) as [string, string]
 
+          await fs.mkdir(path.resolve(dir), { recursive: true })
           await fs.cp(
             root,
             path.resolve(dir),
             {
-              filter: i => !/node_modules|.git/.test(path.relative(root, i)),
+              recursive: true,
+              filter: i => !/node_modules|\.git/.test(path.relative(root, i)),
             },
           )
 
           const dirPath = `./${dir}`
           const firstSlide = data.entry.slides[0]
-          firstSlide.frontmatter.theme = dirPath
+          updateFrontmatterPatch(firstSlide, { theme: dirPath })
           parser.prettifySlide(firstSlide)
           await parser.save(data.entry)
 
diff --git a/packages/slidev/node/utils.ts b/packages/slidev/node/utils.ts
@@ -1,4 +1,4 @@
-import type { ResolvedFontOptions, SlideInfo } from '@slidev/types'
+import type { ResolvedFontOptions, SourceSlideInfo } from '@slidev/types'
 import type MarkdownIt from 'markdown-it'
 import type { Connect } from 'vite'
 import { fileURLToPath } from 'node:url'
@@ -48,15 +48,14 @@ export function generateCoollabsFontsUrl(options: ResolvedFontOptions) {
 /**
  * Update frontmatter patch and preserve the comments
  */
-export function updateFrontmatterPatch(slide: SlideInfo, frontmatter: Record<string, any>) {
-  const source = slide.source
+export function updateFrontmatterPatch(source: SourceSlideInfo, frontmatter: Record<string, any>) {
   let doc = source.frontmatterDoc
   if (!doc) {
     source.frontmatterStyle = 'frontmatter'
     source.frontmatterDoc = doc = new YAML.Document({})
   }
   for (const [key, value] of Object.entries(frontmatter)) {
-    slide.frontmatter[key] = source.frontmatter[key] = value
+    source.frontmatter[key] = value
     if (value == null) {
       doc.delete(key)
     }
diff --git a/packages/slidev/node/vite/loaders.ts b/packages/slidev/node/vite/loaders.ts
@@ -107,8 +107,10 @@ export function createSlidesLoader(
           }
           if (body.note)
             slide.note = slide.source.note = body.note
-          if (body.frontmatter)
-            updateFrontmatterPatch(slide, body.frontmatter)
+          if (body.frontmatter) {
+            updateFrontmatterPatch(slide.source, body.frontmatter)
+            Object.assign(slide.frontmatter, body.frontmatter)
+          }
 
           parser.prettifySlide(slide.source)
           const fileContent = await parser.save(data.markdownFiles[slide.source.filepath])
