Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-18 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Sebastien Chopin 2017-09-07 14:17:53 +02:00
parent b114717701
commit 9a28b8be25
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/app/client.js
View File

@ -131,9 +131,9 @@ async function loadAsyncComponents (to, from, next) {
} }
} }
function applySSRData(Component) { function applySSRData(Component, ssrData) {
if (NUXT.serverRendered) { if (NUXT.serverRendered) {
applyAsyncData(Component, NUXT.data[index]) applyAsyncData(Component, ssrData)
Component._Ctor = Component Component._Ctor = Component
} }
return Component return Component
@ -146,14 +146,14 @@ function resolveComponents(router) {
return flatMapComponents(router.match(path), (Component, _, match, key, index) => { return flatMapComponents(router.match(path), (Component, _, match, key, index) => {
// If component already resolved // If component already resolved
if (typeof Component !== 'function' || Component.options) { if (typeof Component !== 'function' || Component.options) {
const _Component = applySSRData(sanitizeComponent(Component)) const _Component = applySSRData(sanitizeComponent(Component), NUXT.data[index])
match.components[key] = _Component match.components[key] = _Component
return _Component return _Component
} }
// Resolve component // Resolve component
return Component().then(Component => { return Component().then(Component => {
const _Component = applySSRData(sanitizeComponent(Component)) const _Component = applySSRData(sanitizeComponent(Component), NUXT.data[index])
match.components[key] = _Component match.components[key] = _Component
return _Component return _Component
}) })