Skip to content

Commit 8f4773c

Browse files
committed
fix(routable): support exactPath
fixes #13132
1 parent a037500 commit 8f4773c

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"vue-analytics": "^5.16.1",
7575
"vue-loader": "^15.7.1",
7676
"vue-meta": "^2.4.0",
77-
"vue-router": "^3.0.1",
77+
"vue-router": "^3.5.1",
7878
"vue-template-compiler": "^2.6.11",
7979
"vuex": "^3.0.1",
8080
"webpack": "^4.39.1",

packages/api-generator/src/locale/en/routable.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"append": "Setting **append** prop always appends the relative path to the current path. You can find more information about the [**append** prop](https://router.vuejs.org/api/#append) on the vue-router documentation.",
55
"disabled": "Removes the ability to click or target the component.",
66
"exact": "Exactly match the link. Without this, '/' will match every route. You can find more information about the [**exact** prop](https://router.vuejs.org/api/#exact) on the vue-router documentation.",
7+
"exactPath": "Exactly match the link, ignoring the `query` and the `hash` sections. You can find more information about the [**exact-path** prop](https://router.vuejs.org/api/#exact-path) on the vue-router documentation.",
78
"exactActiveClass": "Configure the active CSS class applied when the link is active with exact match. You can find more information about the [**exact-active-class** prop](https://router.vuejs.org/api/#exact-active-class) on the vue-router documentation.",
89
"href": "Designates the component as anchor and applies the **href** attribute.",
910
"link": "Designates that the component is a link. This is automatic when using the **href** or **to** prop.",

packages/docs/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"register-service-worker": "^1.7.1",
3131
"vue-i18n": "^8.17.7",
3232
"vue-instantsearch": "^3.4.3",
33-
"vue-router": "^3.1.6",
3433
"vuetify": "^2.5.4",
3534
"vuex": "^3.4.0",
3635
"webpack-node-externals": "^2.5.1"

packages/vuetify/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
"ts-loader": "^8.0.6",
100100
"url-loader": "^2.1.0",
101101
"vue-meta": "^2.4.0",
102-
"vue-router": "^3.0.7",
103102
"vuetify-loader": "^1.3.0",
104103
"webpack-dev-server": "^3.7.2"
105104
},

packages/vuetify/src/mixins/routable/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export default Vue.extend({
2121
type: Boolean as PropType<boolean | undefined>,
2222
default: undefined,
2323
},
24+
exactPath: Boolean,
2425
exactActiveClass: String,
2526
link: Boolean,
2627
href: [String, Object],
@@ -120,6 +121,7 @@ export default Vue.extend({
120121
Object.assign(data.props, {
121122
to: this.to,
122123
exact,
124+
exactPath: this.exactPath,
123125
activeClass,
124126
exactActiveClass,
125127
append: this.append,

yarn.lock

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18670,15 +18670,10 @@ vue-prism-component@^1.2.0:
1867018670
resolved "https://registry.yarnpkg.com/vue-prism-component/-/vue-prism-component-1.2.0.tgz#406252e16979def13b5d28827d95b2b6dc647825"
1867118671
integrity sha512-0N9CNuQu+36CJpdsZHrhdq7d18oBvjVMjawyKdIr8xuzFWLfdxECZQYbFaYoopPBg3SvkEEMtkhYqdgTQl5Y+A==
1867218672

18673-
vue-router@^3.0.1, vue-router@^3.1.6:
18674-
version "3.4.3"
18675-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz#fa93768616ee338aa174f160ac965167fa572ffa"
18676-
integrity sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A==
18677-
18678-
vue-router@^3.0.7:
18679-
version "3.0.7"
18680-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.7.tgz#b36ca107b4acb8ff5bc4ff824584059c23fcb87b"
18681-
integrity sha512-utJ+QR3YlIC/6x6xq17UMXeAfxEvXA0VKD3PiSio7hBOZNusA1jXcbxZxVEfJunLp48oonjTepY8ORoIlRx/EQ==
18673+
vue-router@^3.5.1:
18674+
version "3.5.1"
18675+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9"
18676+
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
1868218677

1868318678
vue-server-renderer@^2.6.11:
1868418679
version "2.6.11"

0 commit comments

Comments
 (0)