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

Merge pull request #1478 from LookinGit/fix-1248

Browse Source 
~ fix asyncData parent + children pages in production build (#1248)
This commit is contained in:
Sébastien Chopin 2017-08-25 12:14:11 +02:00 committed by GitHub
commit 3985c1d684
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app/server.js
View File

@ -171,7 +171,7 @@ export default async context => {
if (Component.options.asyncData && typeof Component.options.asyncData === 'function') {
let promise = promisify(Component.options.asyncData, ctx)
promise.then(asyncDataResult => {
context.asyncData[Component.options.name] = asyncDataResult
context.asyncData[Component.cid] = asyncDataResult
applyAsyncData(Component)
return asyncDataResult
})

2
lib/app/utils.js
View File

@ -21,7 +21,7 @@ export function applyAsyncData (Component, asyncData = {}) {
Component.options.data = function () {
const data = ComponentData.call(this)
if(this.$ssrContext) {
asyncData = this.$ssrContext.asyncData[Component.options.name]
asyncData = this.$ssrContext.asyncData[Component.cid]
}
return { ...data, ...asyncData }
}