fix: discard params in path redirect

posva · posva · commit 8d12db4ffd24 · 2022-06-30T09:59:00.000+02:00
Fix #1401
diff --git a/__tests__/warnings.spec.ts b/__tests__/warnings.spec.ts
@@ -32,7 +32,7 @@ describe('warnings', () => {
       history,
       routes: [{ path: '/:p', name: 'p', component }],
     })
-    router.resolve({ path: '/p', params: { p: 'p' } })
+    router.push({ path: '/p', params: { p: 'p' } })
     expect('Path "/p" was passed with params').toHaveBeenWarned()
   })
 
@@ -42,10 +42,26 @@ describe('warnings', () => {
       history,
       routes: [{ path: '/:p', name: 'p', component }],
     })
-    router.resolve({ path: '/p', name: 'p', params: { p: 'p' } })
+    router.push({ path: '/p', name: 'p', params: { p: 'p' } })
     expect('Path "/" was passed with params').not.toHaveBeenWarned()
   })
 
+  it('does not warn when redirecting from params', async () => {
+    const history = createMemoryHistory()
+    const router = createRouter({
+      history,
+      routes: [
+        {
+          path: '/p/:p',
+          redirect: to => ({ path: '/s', query: { p: to.params.p } }),
+        },
+        { path: '/s', component },
+      ],
+    })
+    router.push({ path: '/p/abc' })
+    expect('was passed with params').not.toHaveBeenWarned()
+  })
+
   it('warns if an alias is missing params', async () => {
     createRouter({
       history: createMemoryHistory(),
diff --git a/src/router.ts b/src/router.ts
@@ -650,7 +650,8 @@ export function createRouter<Options extends RouterOptions>(
         {
           query: to.query,
           hash: to.hash,
-          params: to.params,
+          // avoid transferring params if the redirect has a path
+          params: 'path' in newTargetLocation ? {} : to.params,
         },
         newTargetLocation
       )

Original file line number	Diff line number	Diff line change
`@@ -650,7 +650,8 @@ export function createRouter<Options extends RouterOptions>(`
`650`	`650`	`{`
`651`	`651`	`query: to.query,`
`652`	`652`	`hash: to.hash,`
`653`		`- params: to.params,`
	`653`	`+ // avoid transferring params if the redirect has a path`
	`654`	`+ params: 'path' in newTargetLocation ? {} : to.params,`
`654`	`655`	`},`
`655`	`656`	`newTargetLocation`
`656`	`657`	`)`