allow redirect to explicitly drop query/hash

Author: yyx990803

examples/redirect/app.js

@@ -32,12 +32,10 @@ const router = new VueRouter({
       redirect: to => {
         const { hash, params, query } = to
         if (query.to === 'foo') {
-          return '/foo'
+          return { path: '/foo', query: null }
         }
         if (hash === '#baz') {
-          return {
-            name: 'baz'
-          }
+          return { name: 'baz', hash: '' }
         }
         if (params.id) {
           return '/with-params/:id'
@@ -74,19 +72,19 @@ new Vue({
         <li><router-link to="/absolute-redirect">
           /absolute-redirect (redirects to /bar)
         </router-link></li>
-        
+
         <li><router-link to="/dynamic-redirect">
           /dynamic-redirect (redirects to /bar)
         </router-link></li>
-        
+
         <li><router-link to="/dynamic-redirect/123">
           /dynamic-redirect/123 (redirects to /with-params/123)
         </router-link></li>
-        
+
         <li><router-link to="/dynamic-redirect?to=foo">
           /dynamic-redirect?to=foo (redirects to /foo)
         </router-link></li>
-        
+
         <li><router-link to="/dynamic-redirect#baz">
           /dynamic-redirect#baz (redirects to /baz)
         </router-link></li>

src/create-matcher.js

@@ -51,12 +51,27 @@ export function createMatcher (routes: Array<RouteConfig>): Matcher {
     record: RouteRecord,
     location: Location
   ): Route {
-    const { query, hash, params } = location
-    const { redirect: originalRedirect } = record
-    const redirect = typeof originalRedirect === 'function'
+    const originalRedirect = record.redirect
+    let redirect = typeof originalRedirect === 'function'
         ? originalRedirect(createRoute(record, location))
         : originalRedirect
-    const name = redirect && typeof redirect === 'object' && redirect.name
+
+    if (typeof redirect === 'string') {
+      redirect = { path: redirect }
+    }
+
+    if (!redirect || typeof redirect !== 'object') {
+      warn(false, `invalid redirect option: ${JSON.stringify(redirect)}`)
+      return _createRoute(null, location)
+    }
+
+    const re: Object = redirect
+    const { name, path } = re
+    let { query, hash, params } = location
+    query = re.hasOwnProperty('query') ? re.query : query
+    hash = re.hasOwnProperty('hash') ? re.hash : hash
+    params = re.hasOwnProperty('params') ? re.params : params
+
     if (name) {
       // resolved named direct
       const targetRecord = nameMap[name]
@@ -68,15 +83,15 @@ export function createMatcher (routes: Array<RouteConfig>): Matcher {
         hash,
         params
       }, undefined, location)
-    } else if (typeof redirect === 'string') {
+    } else if (path) {
       // 1. resolve relative redirect
-      const rawPath = resolveRecordPath(redirect, record)
+      const rawPath = resolveRecordPath(path, record)
       // 2. resolve params
-      const path = fillParams(rawPath, params, `redirect route with path "${rawPath}"`)
+      const resolvedPath = fillParams(rawPath, params, `redirect route with path "${rawPath}"`)
       // 3. rematch with existing query and hash
       return match({
         _normalized: true,
-        path,
+        path: resolvedPath,
         query,
         hash
       }, undefined, location)