revert beforeHooks/afterHooks

Author: yyx990803

examples/navigation-guards/app.js

@@ -54,13 +54,14 @@ const router = new VueRouter({
 
     // Baz implements an in-component canDeactivate hook
     { path: '/baz', component: Baz }
-  ],
-  beforeEach (route, redirect, next) {
-    if (route.matched.some(m => m.meta.needGuard)) {
-      guardRoute(route, redirect, next)
-    } else {
-      next()
-    }
+  ]
+})
+
+router.beforeEach((route, redirect, next) => {
+  if (route.matched.some(m => m.meta.needGuard)) {
+    guardRoute(route, redirect, next)
+  } else {
+    next()
   }
 })
 

flow/declarations.js

@@ -11,8 +11,6 @@ declare type RouterOptions = {
   base?: string;
   linkActiveClass?: string;
   scrollBehavior?: Function;
-  beforeEach?: Function | Array<?Function>;
-  afterEach?: Function | Array<?Function>;
 }
 
 declare type RedirectOption = string | { name: string }

src/history/base.js

@@ -51,7 +51,7 @@ export class History {
       // deactivate guards
       extractLeaveGuards(deactivated),
       // global before hooks
-      nomralizeGuards(this.router.options.beforeEach),
+      this.router.beforeHooks,
       // activate guards
       activated.map(m => m.beforeEnter)
     ).filter(_ => _)
@@ -74,7 +74,7 @@ export class History {
   updateRoute (route: Route) {
     this.current = route
     this.cb && this.cb(route)
-    nomralizeGuards(this.router.options.afterEach).forEach(hook => {
+    this.router.afterHooks.forEach(hook => {
       hook && hook(route)
     })
   }
@@ -122,16 +122,6 @@ function resolveQueue (
   }
 }
 
-function nomralizeGuards (guards?: Function | Array<?Function>): Array<?Function> {
-  if (!guards) {
-    return []
-  }
-  if (typeof guards === 'function') {
-    return [guards]
-  }
-  return guards
-}
-
 function extractLeaveGuards (matched: Array<RouteRecord>): Array<?Function> {
   return Array.prototype.concat.apply([], matched.map(m => {
     return Object.keys(m.components).map(key => {

src/index.js

@@ -17,10 +17,14 @@ export default class VueRouter {
   history: HashHistory | HTML5History | AbstractHistory;
   match: Matcher;
   fallback: boolean;
+  beforeHooks: Array<?Function>;
+  afterHooks: Array<?Function>;
 
   constructor (options: RouterOptions = {}) {
     this.app = null
     this.options = options
+    this.beforeHooks = []
+    this.afterHooks = []
     this.match = createMatcher(options.routes || [])
 
     let mode = options.mode || 'hash'
@@ -62,6 +66,14 @@ export default class VueRouter {
     })
   }
 
+  beforeEach (fn: Function) {
+    this.beforeHooks.push(fn)
+  }
+
+  afterEach (fn: Function) {
+    this.afterHooks.push(fn)
+  }
+
   push (location: RawLocation) {
     this.history.push(location)
   }