fix: reload check, close #152

slidevjs · Jun 8, 2021 · 88c614b · 88c614b
1 parent 888832d
commit 88c614b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/client/logic/note.ts b/packages/client/logic/note.ts
@@ -15,7 +15,7 @@ export function useSlideInfo(id: number | undefined): UseSlideInfo {
     }
   }
   const url = `/@slidev/slide/${id}.json`
-  const { data: info, execute } = useFetch(url).get().json()
+  const { data: info, execute } = useFetch(url).json().get()
 
   execute()
 

diff --git a/packages/parser/src/core.ts b/packages/parser/src/core.ts
@@ -248,8 +248,8 @@ export function resolveConfig(headmatter: any, themeMeta: SlidevThemeMeta = {})
   }
   const config: SlidevConfig = {
     ...defaultConfig,
-    ...themeMeta.defaults || {},
-    ...headmatter.config || {},
+    ...themeMeta.defaults,
+    ...headmatter.config,
     ...headmatter,
     fonts: resolveFonts({
       ...themeMeta.defaults?.fonts,

diff --git a/packages/slidev/node/options.ts b/packages/slidev/node/options.ts
@@ -118,6 +118,7 @@ export async function resolveOptions(
 
   if (themeRoots.length) {
     const themeMeta = await getThemeMeta(theme, join(themeRoots[0], 'package.json'))
+    data.themeMeta = themeMeta
     if (themeMeta)
       data.config = parser.resolveConfig(data.headmatter, themeMeta)
   }