|
|
@ -12,8 +12,8 @@ import {
|
|
|
|
import {
|
|
|
|
import {
|
|
|
|
APP_PATH,
|
|
|
|
APP_PATH,
|
|
|
|
DIST_CLIENT_PATH,
|
|
|
|
DIST_CLIENT_PATH,
|
|
|
|
resolveAliases,
|
|
|
|
SITE_DATA_REQUEST_PATH,
|
|
|
|
SITE_DATA_REQUEST_PATH
|
|
|
|
resolveAliases
|
|
|
|
} from './alias'
|
|
|
|
} from './alias'
|
|
|
|
import { resolvePages, type SiteConfig } from './config'
|
|
|
|
import { resolvePages, type SiteConfig } from './config'
|
|
|
|
import { clearCache, createMarkdownToVueRenderFn } from './markdownToVue'
|
|
|
|
import { clearCache, createMarkdownToVueRenderFn } from './markdownToVue'
|
|
|
@ -141,7 +141,7 @@ export async function createVitePressPlugin(
|
|
|
|
vitepress: siteConfig
|
|
|
|
vitepress: siteConfig
|
|
|
|
})
|
|
|
|
})
|
|
|
|
return userViteConfig
|
|
|
|
return userViteConfig
|
|
|
|
? mergeConfig(userViteConfig, baseConfig)
|
|
|
|
? mergeConfig(baseConfig, userViteConfig)
|
|
|
|
: baseConfig
|
|
|
|
: baseConfig
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|