Skip to content

Commit

Permalink
fix($core): temp option in siteConfig has not effect (fix #2038) (#2040)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sun Haoran authored and meteorlxy committed Nov 27, 2019
1 parent fc48e21 commit 0bb85a4
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions packages/@vuepress/core/lib/node/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ module.exports = class App {
logger.warn(`Source directory doesn't exist: ${chalk.yellow(this.sourceDir)}`)
}

const { tempPath, writeTemp } = createTemp(options.temp)
this.tempPath = tempPath
this.writeTemp = writeTemp

this.vuepressDir = path.resolve(this.sourceDir, '.vuepress')
this.libDir = path.join(__dirname, '../')
}
Expand Down Expand Up @@ -78,10 +74,18 @@ module.exports = class App {
this.base = this.siteConfig.base || '/'
this.themeConfig = this.siteConfig.themeConfig || {}

// resolve tempPath
const rawTemp = this.options.temp || this.siteConfig.temp
const { tempPath, writeTemp } = createTemp(rawTemp)
this.tempPath = tempPath
this.writeTemp = writeTemp

// resolve outDir
const rawOutDir = this.options.dest || this.siteConfig.dest
this.outDir = rawOutDir
? require('path').resolve(this.cwd, rawOutDir)
: require('path').resolve(this.sourceDir, '.vuepress/dist')

this.pages = [] // Array<Page>
this.pluginAPI = new PluginAPI(this)
this.ClientComputedMixinConstructor = ClientComputedMixin(this.getSiteData())
Expand Down

0 comments on commit 0bb85a4

Please sign in to comment.