Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: handle route encoding #8325

Merged
merged 22 commits into from
Nov 30, 2020
Merged

fix: handle route encoding #8325

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a29bffe
update vue-router to 3.4.9
pi0 Nov 9, 2020
3e1b2d7
update yarn.lock
pi0 Nov 9, 2020
b365a93
avoid decoding path
pi0 Nov 9, 2020
cf68806
encode path before return
pi0 Nov 9, 2020
d5061d4
Merge branch 'dev' into vue-router
pi0 Nov 30, 2020
116583a
fix: encode routes in router template
pi0 Nov 30, 2020
daaf592
chore: update yarn.lock
pi0 Nov 30, 2020
1ff986f
fix base encoding and unicode test
pi0 Nov 30, 2020
ad940bf
fix: encode ssrContext.url
pi0 Nov 30, 2020
656a2a7
fix getLocation
pi0 Nov 30, 2020
e076380
remove comment
pi0 Nov 30, 2020
1096da6
fix: ensure router.resolve has encoded uri (fixing csr)
pi0 Nov 30, 2020
cc01a1b
fix redirect preventation
pi0 Nov 30, 2020
176641d
fix: only encode when to is string
pi0 Nov 30, 2020
69c2a2f
fix ensure not doing double encoding
pi0 Nov 30, 2020
4693569
ensure no double encoding for path
pi0 Nov 30, 2020
ca17f5d
update fixture
pi0 Nov 30, 2020
6189c48
unicode base works!
pi0 Nov 30, 2020
804a501
update fixture
pi0 Nov 30, 2020
7ae9fb7
forgive me gh gods for this commit
pi0 Nov 30, 2020
f555b6f
chore: rename test to encoding
pi0 Nov 30, 2020
ac880de
Merge branch 'dev' into vue-router
pi0 Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
encode path before return
  • Loading branch information
@pi0
pi0 committed Nov 9, 2020
commit cf68806cfd6403bf3d31f20a51613b435280d1fc
5 changes: 4 additions & 1 deletion packages/vue-app/template/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,16 @@ export function getLocation (base, mode) {
return window.location.hash.replace(/^#\//, '')
}

let path = window.location.pathname
let path = decodeURI(window.location.pathname)

// To get matched with sanitized router.base add trailing slash
if (base && (path.endsWith('/') ? path : path + '/').startsWith(base)) {
path = path.slice(base.length)
}

// https://github.com/vuejs/vue-router/pull/3350
path = encodeURI(path)

return (path || '/') + window.location.search + window.location.hash
}

Expand Down