Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-30 17:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #768 from jroxendal/feature-routepayload

Browse Source 
[Feature: generate] optimize rendering step in generate
This commit is contained in:
Sébastien Chopin 2017-05-28 12:44:05 +02:00 committed by GitHub
commit c2592a2663
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/app/utils.js
View File

@ -61,6 +61,7 @@ export function getContext (context, app) {
app: app, app: app,
<%= (store ? 'store: context.store,' : '') %> <%= (store ? 'store: context.store,' : '') %>
route: (context.to ? context.to : context.route), route: (context.to ? context.to : context.route),
payload : context.payload,
error: context.error, error: context.error,
base: '<%= router.base %>', base: '<%= router.base %>',
env: <%= JSON.stringify(env) %> env: <%= JSON.stringify(env) %>

22
lib/generate.js
View File

@ -78,26 +78,32 @@ export default async function () {
process.exit(1) process.exit(1)
throw e // eslint-disable-line no-unreachable throw e // eslint-disable-line no-unreachable
} }
/* }
** Generate html files from routes function decorateWithPayloads (routes) {
*/ let routeMap = _(routes).map((route) => {
return [route, {route, payload: {}}]
}).fromPairs().value()
generateRoutes.forEach((route) => { generateRoutes.forEach((route) => {
if (this.routes.indexOf(route) < 0) { // route argument is either a string or like {route : "/my_route/1"}
this.routes.push(route) route = _.isString(route) ? route : route.route
if (!routeMap[route]) {
routeMap[route] = {route, payload: route.payload}
} }
}) })
return _.values(routeMap)
} }
/* /*
** Generate only index.html for router.mode = 'hash' ** Generate only index.html for router.mode = 'hash'
*/ */
let routes = (this.options.router.mode === 'hash') ? ['/'] : this.routes let routes = (this.options.router.mode === 'hash') ? [{route: '/'}] : decorateWithPayloads(this.routes)
while (routes.length) { while (routes.length) {
let n = 0 let n = 0
await Promise.all(routes.splice(0, 500).map(async (route) => { await Promise.all(routes.splice(0, 500).map(async ({route, payload}) => {
await waitFor(n++ * this.options.generate.interval) await waitFor(n++ * this.options.generate.interval)
let html let html
try { try {
const res = await this.renderRoute(route, { _generate: true }) const res = await this.renderRoute(route, { _generate: true, payload })
html = res.html html = res.html
if (res.error) { if (res.error) {
errors.push({ type: 'handled', route, error: res.error }) errors.push({ type: 'handled', route, error: res.error })