Skip to content

Commit 3ddca88

Browse files
committed
fix eslint
1 parent 7e572b7 commit 3ddca88

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/components/link.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { cleanPath, getFullPath } from '../util/path'
2-
import { normalizeLocation, isSameLocation } from '../util/location'
1+
import { cleanPath } from '../util/path'
2+
import { normalizeLocation } from '../util/location'
33

44
export default {
55
name: 'router-link',

src/create-matcher.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ export function createMatcher (routes) {
8484
}
8585

8686
function alias (record, location) {
87-
const { query, hash, params } = location
8887
const rawPath = resolveRecordPath(record.alias, record)
89-
const aliasedPath = fillParams(rawPath, params, `alias route with path "${rawPath}"`)
88+
const aliasedPath = fillParams(rawPath, location.params, `alias route with path "${rawPath}"`)
9089
const aliasedMatch = match({
9190
_normalized: true,
9291
path: aliasedPath

src/util/location.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ export function normalizeLocation (next, current, append) {
1212
return next
1313
}
1414

15-
let { path, query, hash } = parsePath(next.path || '')
16-
path = resolvePath(path, current && current.path, append)
17-
query = resolveQuery(query, next.query)
15+
const parsedPath = parsePath(next.path || '')
16+
const path = resolvePath(parsedPath.path, current && current.path, append)
17+
const query = resolveQuery(parsedPath.query, next.query)
18+
const hash = parsedPath.hash
1819

1920
return {
2021
_normalized: true,

0 commit comments

Comments
 (0)