mirror of
https://github.com/nuxt/nuxt.git
synced 2025-01-30 23:32:38 +00:00
Merge branch 'dev' of github.com:nuxt/nuxt.js into dev
This commit is contained in:
commit
4683dc9254
@ -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
|
||||
}
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user