fix asset merge logic

Author: yyx990803

src/directives/repeat.js

@@ -58,11 +58,11 @@ module.exports = {
   },
 
   /**
-   * Check if v-ref/ v-el is also present. If yes, evaluate
-   * them and locate owner.
+   * Check if v-ref/ v-el is also present.
    */
 
   checkRef: function () {
+    this.owner = this.vm._owner
     var childId = _.attr(this.el, 'ref')
     this.childId = childId
       ? this.vm.$interpolate(childId)
@@ -71,9 +71,6 @@ module.exports = {
     this.elId = elId
       ? this.vm.$interpolate(elId)
       : null
-    if (this.childId || this.elId) {
-      this.owner = this.vm._owner || this.vm
-    }
   },
 
   /**

src/util/merge-option.js

@@ -107,16 +107,19 @@ strats.filters =
 strats.partials =
 strats.transitions =
 strats.components = function (parentVal, childVal, vm, key) {
-  var ret = Object.create(parentVal || null)
+  var ret = Object.create(
+    vm && vm.$parent
+      ? vm.$parent.$options[key]
+      : _.Vue.options[key]
+  )
   if (childVal) extend(ret, childVal)
-  if (vm && vm.$parent) {
-    var scopeVal = vm.$parent.$options[key]
-    var keys = Object.keys(scopeVal)
+  if (parentVal) {
+    var keys = Object.keys(parentVal)
     var i = keys.length
     var field
     while (i--) {
       field = keys[i]
-      ret[field] = scopeVal[field]
+      ret[field] = parentVal[field]
     }
   }
   return ret