rename canActivate/canDeactivate to beforeEnter/beforeLeave

Author: yyx990803

examples/navigation-guards/app.js

@@ -21,7 +21,7 @@ function guardRoute (route, redirect, next) {
   }
 }
 
-// Baz implements an in-component canDeactivate hook
+// Baz implements an in-component beforeRouteLeave hook
 const Baz = {
   data () {
     return { saved: false }
@@ -32,7 +32,7 @@ const Baz = {
       <button @click="saved = true">save</button>
     </div>
   `,
-  routeCanDeactivate (route, redirect, next) {
+  beforeRouteLeave (route, redirect, next) {
     if (this.saved || window.confirm('Not saved, are you sure you want to navigate away?')) {
       next()
     }
@@ -45,8 +45,8 @@ const router = new VueRouter({
   routes: [
     { path: '/', component: Home },
 
-    // inline canActivate
-    { path: '/foo', component: Foo, canActivate: guardRoute },
+    // inline guard
+    { path: '/foo', component: Foo, beforeEnter: guardRoute },
 
     // using meta properties on the route config
     // and check them in a global before hook

flow/declarations.js

@@ -23,8 +23,8 @@ declare type RouteConfig = {
   redirect?: RedirectOption;
   alias?: string | Array<string>;
   children?: Array<RouteConfig>;
-  canActivate?: Function;
-  canDeactivate?: Function;
+  beforeEnter?: Function;
+  beforeLeave?: Function;
   meta?: any;
 }
 
@@ -36,8 +36,8 @@ declare type RouteRecord = {
   parent: ?RouteRecord;
   redirect: ?RedirectOption;
   matchAs: ?string;
-  canActivate: ?Function;
-  canDeactivate: ?Function;
+  beforeEnter: ?Function;
+  beforeLeave: ?Function;
   meta: any;
 }
 

src/create-route-map.js

@@ -38,8 +38,8 @@ function addRouteRecord (
     parent,
     matchAs,
     redirect: route.redirect,
-    canActivate: route.canActivate,
-    canDeactivate: route.canDeactivate,
+    beforeEnter: route.beforeEnter,
+    beforeLeave: route.beforeLeave,
     meta: route.meta || {}
   }
 

src/history/base.js

@@ -142,8 +142,8 @@ function extractRouteGuards (
   matched: Array<RouteRecord>,
   deactivate: boolean
 ): Array<?Function> {
-  const inlineGuardKey = deactivate ? 'canDeactivate' : 'canActivate'
-  const compGuardKey = deactivate ? 'routeCanDeactivate' : 'routeCanActivate'
+  const inlineGuardKey = deactivate ? 'beforeLeave' : 'beforeEnter'
+  const compGuardKey = deactivate ? 'beforeRouteLeave' : 'beforeRouteEnter'
 
   const guards = matched.map(m => {
     const inlineGuard = m[inlineGuardKey]