fix guards on initial load and guard redirect

Author: yyx990803

src/history/abstract.js

@@ -14,14 +14,14 @@ export class AbstractHistory extends History {
   }
 
   push (location: RawLocation) {
-    super.push(location, route => {
+    super.transitionTo(location, route => {
       this.stack = this.stack.slice(0, this.index + 1).concat(route)
       this.index++
     })
   }
 
   replace (location: RawLocation) {
-    super.replace(location, route => {
+    super.transitionTo(location, route => {
       this.stack = this.stack.slice(0, this.index).concat(route)
     })
   }

src/history/base.js

@@ -14,13 +14,19 @@ export class History {
   afterHooks: Array<?Function>;
   cb: Function;
 
+  // implemented by sub-classes
+  go: Function;
+  push: Function;
+  replace: Function;
+
   constructor (router: VueRouter, base: ?string) {
     this.router = router
     this.base = normalizeBae(base)
-    this.current = router.match(this.getLocation())
+    this.current = router.match('/')
     this.pending = null
     this.beforeHooks = []
     this.afterHooks = []
+    this.transitionTo(this.getLocation())
   }
 
   listen (cb: Function) {
@@ -35,23 +41,15 @@ export class History {
     this.afterHooks.push(fn)
   }
 
-  push (location: RawLocation, cb?: Function) {
-    this.transitionTo(location, cb)
-  }
-
-  replace (location: RawLocation, cb?: Function) {
-    this.transitionTo(location, cb, true)
-  }
-
-  transitionTo (location: RawLocation, cb?: Function, replace?: boolean) {
+  transitionTo (location: RawLocation, cb?: Function) {
     const route = this.router.match(location, this.current)
     this.confirmTransition(route, () => {
       this.updateRoute(route)
       cb && cb(route)
-    }, replace)
+    })
   }
 
-  confirmTransition (route: Route, cb: Function, replace?: boolean) {
+  confirmTransition (route: Route, cb: Function) {
     if (isSameRoute(route, this.current)) {
       return
     }
@@ -71,9 +69,7 @@ export class History {
     ).filter(_ => _)
 
     this.pending = route
-    const redirect = replace
-      ? location => this.replace(location)
-      : location => this.push(location)
+    const redirect = location => this.push(location)
 
     runQueue(
       queue,

src/history/hash.js

@@ -42,13 +42,13 @@ export class HashHistory extends History {
   }
 
   push (location: RawLocation) {
-    super.push(location, route => {
+    super.transitionTo(location, route => {
       pushHash(route.fullPath)
     })
   }
 
   replace (location: RawLocation) {
-    super.replace(location, route => {
+    super.transitionTo(location, route => {
       replaceHash(route.fullPath)
     })
   }

src/history/html5.js

@@ -41,15 +41,15 @@ export class HTML5History extends History {
 
   push (location: RawLocation) {
     const current = this.current
-    super.push(location, route => {
+    super.transitionTo(location, route => {
       pushState(cleanPath(this.base + route.fullPath))
       this.handleScroll(route, current, false)
     })
   }
 
   replace (location: RawLocation) {
     const current = this.current
-    super.replace(location, route => {
+    super.transitionTo(location, route => {
       replaceState(cleanPath(this.base + route.fullPath))
       this.handleScroll(route, current, false)
     })