Merge branch '2.x' into dev

This commit is contained in:
Clark Du 2019-02-08 12:35:44 +00:00
commit 3c79b4c0d7

View File

@ -528,7 +528,7 @@ const noopFetch = () => {}
// Special hot reload with asyncData(context)
function getNuxtChildComponents($parent, $components = []) {
$parent.$children.forEach(($child) => {
if ($child.$vnode.data.nuxtChild && !$components.find(c =>(c.$options.__file === $child.$options.__file))) {
if ($child.$vnode && $child.$vnode.data.nuxtChild && !$components.find(c =>(c.$options.__file === $child.$options.__file))) {
$components.push($child)
}
if ($child.$children && $child.$children.length) {