fix enter/leave hook vm context with rc6

Author: yyx990803

package.json

@@ -57,7 +57,7 @@
     "rollup-watch": "^2.4.0",
     "selenium-server": "^2.53.1",
     "uglify-js": "^2.7.0",
-    "vue": "^2.0.0-rc.3",
+    "vue": "^2.0.0-rc.6",
     "vue-loader": "^9.4.0",
     "webpack": "^1.13.1",
     "webpack-dev-middleware": "^1.6.1"

src/components/view.js

@@ -35,11 +35,12 @@ export default {
       ? cache[props.name]
       : (cache[props.name] = matched.components[props.name])
 
-    const vnode = h(component, data, children)
     if (!inactive) {
-      matched.instances[props.name] = vnode
+      (data.hook || (data.hook = {})).init = vnode => {
+        matched.instances[props.name] = vnode.child
+      }
     }
 
-    return vnode
+    return h(component, data, children)
   }
 }

src/history/base.js

@@ -148,7 +148,7 @@ function extractEnterGuards (matched: Array<RouteRecord>, cbs: Array<Function>):
         return guard(route, redirect, cb => {
           next()
           cb && cbs.push(() => {
-            cb(match.instances[key] && match.instances[key].child)
+            cb(match.instances[key])
           })
         })
       }
@@ -190,7 +190,7 @@ function flatMapComponents (
   return Array.prototype.concat.apply([], matched.map(m => {
     return Object.keys(m.components).map(key => fn(
       m.components[key],
-      m.instances[key] && m.instances[key].child,
+      m.instances[key],
       m, key
     ))
   }))