From 03eff3c3c8cb6b2de7a676184d25346f1184c7c6 Mon Sep 17 00:00:00 2001
From: Kia Ishii <kia.king.08@gmail.com>
Date: Tue, 17 Nov 2020 16:29:28 +0900
Subject: [PATCH] fix: page not loading correctly

---
 src/node/config.ts |  4 +++-
 src/node/server.ts | 13 ++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/node/config.ts b/src/node/config.ts
index 0c045397..f59cefda 100644
--- a/src/node/config.ts
+++ b/src/node/config.ts
@@ -32,6 +32,7 @@ export interface SiteConfig<ThemeConfig = any> {
   tempDir: string
   resolver: Resolver
   pages: string[]
+  markdown?: MarkdownOptions
 }
 
 const resolve = (root: string, file: string) =>
@@ -57,7 +58,8 @@ export async function resolveConfig(
     configPath: resolve(root, 'config.js'),
     outDir: resolve(root, 'dist'),
     tempDir: path.resolve(APP_PATH, 'temp'),
-    resolver: createResolver(themeDir, userConfig)
+    resolver: createResolver(themeDir, userConfig),
+    markdown: userConfig.markdown
   }
 
   return config
diff --git a/src/node/server.ts b/src/node/server.ts
index 3e281453..bc3fb3fe 100644
--- a/src/node/server.ts
+++ b/src/node/server.ts
@@ -5,12 +5,7 @@ import {
   ServerConfig,
   ServerPlugin
 } from 'vite'
-import {
-  resolveConfig,
-  SiteConfig,
-  resolveSiteData,
-  resolveUserConfig
-} from './config'
+import { resolveConfig, SiteConfig, resolveSiteData } from './config'
 import { createMarkdownToVueRenderFn } from './markdownToVue'
 import { APP_PATH, SITE_DATA_REQUEST_PATH } from './resolver'
 import { existsSync } from 'fs'
@@ -20,11 +15,11 @@ const debugHmr = require('debug')('vitepress:hmr')
 
 function createVitePressPlugin({
   configPath,
+  markdown,
   site: initialSiteData
 }: SiteConfig): ServerPlugin {
-  return async ({ app, root, watcher, resolver }) => {
-    const userConfig = await resolveUserConfig(root)
-    const markdownToVue = createMarkdownToVueRenderFn(root, userConfig.markdown)
+  return ({ app, root, watcher, resolver }) => {
+    const markdownToVue = createMarkdownToVueRenderFn(root, markdown)
 
     // hot reload .md files as .vue files
     watcher.on('change', async (file) => {