Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix 1185, feat: support async function exported in vuepress config #1925

Merged
merged 2 commits into from
Oct 11, 2019
Merged

fix 1185, feat: support async function exported in vuepress config #1925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3777845
feat: support async function exported in vuepress config
Oct 8, 2019
2c49e33
chore: update inline code documentation for resolveConfigAndInitialize
Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/@vuepress/core/lib/node/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ module.exports = class App {
/**
* Resolve user config and initialize.
*
* @returns {void}
* @returns {Promise<void>}
* @api private
*/

resolveConfigAndInitialize () {
async resolveConfigAndInitialize () {
if (this.options.siteConfig) {
this.siteConfig = this.options.siteConfig
} else {
let siteConfig = loadConfig(this.vuepressDir)
if (isFunction(siteConfig)) {
siteConfig = siteConfig(this)
siteConfig = await siteConfig(this)
}
this.siteConfig = siteConfig
}
Expand Down Expand Up @@ -95,7 +95,7 @@ module.exports = class App {
*/

async process () {
this.resolveConfigAndInitialize()
await this.resolveConfigAndInitialize()
this.normalizeHeadTagUrls()
this.themeAPI = loadTheme(this)
this.resolveTemplates()
Expand Down