Merge branch 'dev' of github.com:nuxt/nuxt.js into dev

This commit is contained in:
Sebastien Chopin 2017-09-07 13:40:14 +02:00
commit 4683dc9254
2 changed files with 4 additions and 1 deletions

View File

@ -109,7 +109,7 @@ export function getContext (context, app) {
ctx.beforeNuxtRender = (fn) => context.beforeRenderFns.push(fn)
}
if (ctx.isClient && window.__NUXT__) {
ctx.serverState = window.__NUXT__
ctx.nuxtState = window.__NUXT__
}
return ctx
}

View File

@ -108,6 +108,9 @@ export default class Renderer extends Tapable {
this.resources.loadingHTML = ''
}
// Call resourcesLoaded plugin
await this.applyPluginsAsync('resourcesLoaded', this.resources)
if (updated.length > 0) {
// debug('Updated', updated.join(', '), isServer)
this.createRenderer()