Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-30 23:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app/utils.js
View File

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

3
lib/core/renderer.js
View File

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