Merge remote-tracking branch 'origin/dev' into tapable

# Conflicts:
#	lib/generate.js
This commit is contained in:
Pooya Parsa 2017-06-13 01:07:34 +04:30
commit 747616e927

View File

@ -53,6 +53,7 @@ var nuxt = module.exports = new Nuxt(options)
nuxt.generate()
.then(() => {
console.log('[nuxt] Generate done') // eslint-disable-line no-console
process.exit(0)
})
.catch((err) => {
console.error(err) // eslint-disable-line no-console