adjust history implementations

Author: yyx990803

flow/declarations.js

@@ -5,8 +5,6 @@ declare module 'path-to-regexp' {
   }
 }
 
-declare var __VUE_SSR_CONTEXT__: any;
-
 declare type RouterOptions = {
   routes?: Array<RouteConfig>;
   mode?: string;

src/history/abstract.js

@@ -1,5 +1,4 @@
 /* @flow */
-/* globals __VUE_SSR_CONTEXT__ */
 
 import type VueRouter from '../index'
 import { History } from './base'
@@ -14,10 +13,6 @@ export class AbstractHistory extends History {
     this.index = 0
   }
 
-  onInit () {
-    this.stack = [this.current]
-  }
-
   push (location: RawLocation) {
     super.transitionTo(location, route => {
       this.stack = this.stack.slice(0, this.index + 1).concat(route)
@@ -43,11 +38,4 @@ export class AbstractHistory extends History {
       this.updateRoute(location)
     })
   }
-
-  getLocation () {
-    return (
-      typeof __VUE_SSR_CONTEXT__ !== 'undefined' &&
-      __VUE_SSR_CONTEXT__.url
-    ) || '/'
-  }
 }

src/history/base.js

@@ -17,8 +17,6 @@ export class History {
   go: (n: number) => void;
   push: (loc: RawLocation) => void;
   replace: (loc: RawLocation) => void;
-  onInit: (cb: Function) => void;
-  getLocation: () => string;
 
   constructor (router: VueRouter, base: ?string) {
     this.router = router
@@ -28,9 +26,6 @@ export class History {
       path: '__vue_router_init__'
     })
     this.pending = null
-    this.transitionTo(this.getLocation(), route => {
-      this.onInit(route)
-    })
   }
 
   listen (cb: Function) {

src/history/hash.js

@@ -8,23 +8,25 @@ import { cleanPath } from '../util/path'
 export class HashHistory extends History {
   constructor (router: VueRouter, base: ?string, fallback: boolean) {
     super(router, base)
+
     // check history fallback deeplinking
     if (fallback && this.checkFallback()) {
       return
     }
+
     ensureSlash()
+    this.transitionTo(getHash(), route => {
+      // possible redirect on start
+      if (getHash() !== route.fullPath) {
+        replaceHash(route.fullPath)
+      }
+    })
+
     window.addEventListener('hashchange', () => {
       this.onHashChange()
     })
   }
 
-  onInit () {
-    // possible redirect on start
-    if (getHash() !== this.current.fullPath) {
-      replaceHash(this.current.fullPath)
-    }
-  }
-
   checkFallback () {
     const location = getLocation(this.base)
     if (!/^\/#/.test(location)) {
@@ -39,7 +41,7 @@ export class HashHistory extends History {
     if (!ensureSlash()) {
       return
     }
-    this.transitionTo(this.getLocation(), route => {
+    this.transitionTo(getHash(), route => {
       replaceHash(route.fullPath)
     })
   }
@@ -59,10 +61,6 @@ export class HashHistory extends History {
   go (n: number) {
     window.history.go(n)
   }
-
-  getLocation () {
-    return getHash()
-  }
 }
 
 function ensureSlash (): boolean {

src/history/html5.js

@@ -19,11 +19,20 @@ export class HTML5History extends History {
   constructor (router: VueRouter, base: ?string) {
     super(router, base)
 
+    const initialLocation = getLocation(this.base)
+    this.transitionTo(initialLocation, route => {
+      // possible redirect on start
+      const url = cleanPath(this.base + this.current.fullPath)
+      if (initialLocation !== url) {
+        replaceState(url)
+      }
+    })
+
     const expectScroll = router.options.scrollBehavior
     window.addEventListener('popstate', e => {
       _key = e.state && e.state.key
       const current = this.current
-      this.transitionTo(this.getLocation(), next => {
+      this.transitionTo(getLocation(this.base), next => {
         if (expectScroll) {
           this.handleScroll(next, current, true)
         }
@@ -37,14 +46,6 @@ export class HTML5History extends History {
     }
   }
 
-  onInit () {
-    // possible redirect on start
-    const url = cleanPath(this.base + this.current.fullPath)
-    if (this.getLocation() !== url) {
-      replaceState(url)
-    }
-  }
-
   go (n: number) {
     window.history.go(n)
   }
@@ -65,10 +66,6 @@ export class HTML5History extends History {
     })
   }
 
-  getLocation (): string {
-    return getLocation(this.base)
-  }
-
   handleScroll (to: Route, from: Route, isPop: boolean) {
     const router = this.router
     if (!router.app) {