mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-23 22:25:12 +00:00
rewrote generate.js to async/await instead of coroutines
This commit is contained in:
Johan Roxendal
parent
892543eb1d
commit
40a167258b
174
lib/generate.js
174
lib/generate.js
@ -1,7 +1,6 @@
|
||||
'use strict'
|
||||
|
||||
import fs from 'fs-extra'
|
||||
import co from 'co'
|
||||
import pify from 'pify'
|
||||
import _ from 'lodash'
|
||||
import { resolve, join, dirname, sep } from 'path'
|
||||
@ -39,7 +38,7 @@ const defaults = {
|
||||
}
|
||||
}
|
||||
|
||||
export default function () {
|
||||
export default async function () {
|
||||
const s = Date.now()
|
||||
let errors = []
|
||||
/*
|
||||
@ -51,100 +50,85 @@ export default function () {
|
||||
var srcBuiltPath = resolve(this.dir, '.nuxt', 'dist')
|
||||
var distPath = resolve(this.dir, this.options.generate.dir)
|
||||
var distNuxtPath = join(distPath, (isUrl(this.options.build.publicPath) ? '' : this.options.build.publicPath))
|
||||
return co(function * () {
|
||||
/*
|
||||
** Launch build process
|
||||
*/
|
||||
yield self.build()
|
||||
/*
|
||||
** Clean destination folder
|
||||
*/
|
||||
try {
|
||||
yield remove(distPath)
|
||||
debug('Destination folder cleaned')
|
||||
} catch (e) {}
|
||||
/*
|
||||
** Copy static and built files
|
||||
*/
|
||||
if (fs.existsSync(srcStaticPath)) {
|
||||
yield copy(srcStaticPath, distPath)
|
||||
}
|
||||
yield copy(srcBuiltPath, distNuxtPath)
|
||||
debug('Static & build files copied')
|
||||
})
|
||||
.then(() => {
|
||||
/*
|
||||
** Launch build process
|
||||
*/
|
||||
await self.build()
|
||||
/*
|
||||
** Clean destination folder
|
||||
*/
|
||||
try {
|
||||
await remove(distPath)
|
||||
debug('Destination folder cleaned')
|
||||
} catch (e) {}
|
||||
/*
|
||||
** Copy static and built files
|
||||
*/
|
||||
if (fs.existsSync(srcStaticPath)) {
|
||||
await copy(srcStaticPath, distPath)
|
||||
}
|
||||
await copy(srcBuiltPath, distNuxtPath)
|
||||
debug('Static & build files copied')
|
||||
// Resolve config.generate.routes promises before generating the routes
|
||||
return promisifyRoute(this.options.generate.routes || [])
|
||||
.catch((e) => {
|
||||
console.error('Could not resolve routes') // eslint-disable-line no-console
|
||||
console.error(e) // eslint-disable-line no-console
|
||||
process.exit(1)
|
||||
throw e // eslint-disable-line no-unreachable
|
||||
})
|
||||
})
|
||||
.then((generateRoutes) => {
|
||||
/*
|
||||
** Generate html files from routes
|
||||
*/
|
||||
generateRoutes.forEach((route) => {
|
||||
if (this.routes.indexOf(route) < 0) {
|
||||
this.routes.push(route)
|
||||
}
|
||||
})
|
||||
let routes = this.routes
|
||||
return co(function * () {
|
||||
while (routes.length) {
|
||||
let n = 0
|
||||
yield routes.splice(0, 500).map((route) => {
|
||||
return co(function * () {
|
||||
yield waitFor(n++ * self.options.generate.interval)
|
||||
try {
|
||||
var { html, error } = yield self.renderRoute(route, { _generate: true })
|
||||
if (error) {
|
||||
errors.push({ type: 'handled', route, error })
|
||||
}
|
||||
} catch (err) {
|
||||
errors.push({ type: 'unhandled', route, error: err })
|
||||
return
|
||||
}
|
||||
try {
|
||||
var minifiedHtml = minify(html, self.options.generate.minify)
|
||||
} catch (err) {
|
||||
let minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
|
||||
errors.push({ type: 'unhandled', route, error: minifyErr })
|
||||
return
|
||||
}
|
||||
var path = join(route, sep, 'index.html') // /about -> /about/index.html
|
||||
debug('Generate file: ' + path)
|
||||
path = join(distPath, path)
|
||||
// Make sure the sub folders are created
|
||||
yield mkdirp(dirname(path))
|
||||
yield writeFile(path, minifiedHtml, 'utf8')
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
.then((pages) => {
|
||||
// Add .nojekyll file to let Github Pages add the _nuxt/ folder
|
||||
// https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
|
||||
const nojekyllPath = resolve(distPath, '.nojekyll')
|
||||
return writeFile(nojekyllPath, '')
|
||||
})
|
||||
.then(() => {
|
||||
const duration = Math.round((Date.now() - s) / 100) / 10
|
||||
debug(`HTML Files generated in ${duration}s`)
|
||||
|
||||
if (errors.length) {
|
||||
const report = errors.map(({ type, route, error }) => {
|
||||
if (type === 'unhandled') {
|
||||
return `Route: '${route}'\n${error.stack}`
|
||||
} else {
|
||||
return `Route: '${route}' thrown an error: \n` + JSON.stringify(error)
|
||||
}
|
||||
})
|
||||
console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
|
||||
try {
|
||||
var generateRoutes = await promisifyRoute(this.options.generate.routes || [])
|
||||
} catch(e) {
|
||||
console.error('Could not resolve routes') // eslint-disable-line no-console
|
||||
console.error(e) // eslint-disable-line no-console
|
||||
process.exit(1)
|
||||
throw e // eslint-disable-line no-unreachable
|
||||
}
|
||||
/*
|
||||
** Generate html files from routes
|
||||
*/
|
||||
generateRoutes.forEach((route) => {
|
||||
if (this.routes.indexOf(route) < 0) {
|
||||
this.routes.push(route)
|
||||
}
|
||||
return this
|
||||
})
|
||||
let n = 0
|
||||
for(let route of this.routes) {
|
||||
|
||||
await waitFor(n++ * self.options.generate.interval)
|
||||
try {
|
||||
var { html, error } = await self.renderRoute(route, { _generate: true })
|
||||
if (error) {
|
||||
errors.push({ type: 'handled', route, error })
|
||||
}
|
||||
} catch (err) {
|
||||
errors.push({ type: 'unhandled', route, error: err })
|
||||
continue
|
||||
}
|
||||
try {
|
||||
var minifiedHtml = minify(html, self.options.generate.minify)
|
||||
} catch (err) {
|
||||
let minifyErr = new Error(`HTML minification failed. Make sure the route generates valid HTML. Failed HTML:\n ${html}`)
|
||||
errors.push({ type: 'unhandled', route, error: minifyErr })
|
||||
continue
|
||||
}
|
||||
var path = join(route, sep, 'index.html') // /about -> /about/index.html
|
||||
debug('Generate file: ' + path)
|
||||
path = join(distPath, path)
|
||||
// Make sure the sub folders are created
|
||||
await mkdirp(dirname(path))
|
||||
await writeFile(path, minifiedHtml, 'utf8')
|
||||
}
|
||||
// Add .nojekyll file to let Github Pages add the _nuxt/ folder
|
||||
// https://help.github.com/articles/files-that-start-with-an-underscore-are-missing/
|
||||
const nojekyllPath = resolve(distPath, '.nojekyll')
|
||||
writeFile(nojekyllPath, '')
|
||||
|
||||
const duration = Math.round((Date.now() - s) / 100) / 10
|
||||
debug(`HTML Files generated in ${duration}s`)
|
||||
|
||||
if (errors.length) {
|
||||
const report = errors.map(({ type, route, error }) => {
|
||||
if (type === 'unhandled') {
|
||||
return `Route: '${route}'\n${error.stack}`
|
||||
} else {
|
||||
return `Route: '${route}' thrown an error: \n` + JSON.stringify(error)
|
||||
}
|
||||
})
|
||||
console.error('==== Error report ==== \n' + report.join('\n\n')) // eslint-disable-line no-console
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user