Skip to content

Commit b9eedfd

Browse files
authored
Merge pull request #144 from coreui/dev-vnext
v2.1.0
2 parents 12c8aa7 + 1d1df7f commit b9eedfd

35 files changed

+6462
-7173
lines changed

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
11
## [CoreUI for Vue.js](./README.md) version `changelog`
22

3+
##### `v2.1.0`
4+
- feat(SidebarNav): navLink `attributes` - optional JS object with valid JS API naming:
5+
- attributes: `rel`, `target`, `hidden`, `disabled`, etc...
6+
- starting with `@coreui/coreui ^2.1.4`, `@coreui/vue ^2.1.0`
7+
- item example(`./src/_nav.js`):
8+
```
9+
{
10+
name: 'Disabled',
11+
url: '/disabled',
12+
icon: 'icon-ban',
13+
attributes: { disabled: true },
14+
},
15+
{
16+
name: 'Try CoreUI PRO',
17+
url: 'https://coreui.io/pro/react/',
18+
icon: 'cui-layers icons',
19+
variant: 'danger',
20+
attributes: { target: '_blank', rel: "noopener" },
21+
},
22+
```
23+
- test: e2e and snapshots update
24+
- chore: update `@coreui/coreui` to `^2.1.4`
25+
- chore: update `@coreui/vue` to `^2.1.0`
26+
- chore: update `core-js` to `^2.6.0`
27+
- chore: update `css-vars-ponyfill` to `^1.15.3`
28+
- chore: update `vue` to `^2.5.19`
29+
- chore: update `vue-router` to `^3.0.2"
30+
- chore: update `vue-template-compiler` to `^2.5.19`
31+
- chore: update `@vue/cli-plugin-babel` to `^3.2.0`
32+
- chore: update `@vue/cli-plugin-e2e-nightwatch` to `^3.2.0`
33+
- chore: update `@vue/cli-plugin-eslint` to `^3.2.1`
34+
- chore: update `@vue/cli-plugin-unit-jest` to `^3.2.0`
35+
- chore: update `@vue/cli-service` to `^3.2.0`
36+
- chore: update `@vue/test-utils` to `^1.0.0-beta.27`
37+
- chore: update `node-sass` to `^4.11.0`
38+
339
##### `v2.0.3`
440
- test(init): update Tables snapshot
541
- test(e2e): add `aside-menu-*-show` testing

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-vue-admin-template",
3-
"version": "2.0.3",
3+
"version": "2.1.0",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -14,38 +14,38 @@
1414
"test:e2e": "vue-cli-service test:e2e"
1515
},
1616
"dependencies": {
17-
"@coreui/coreui": "^2.1.0",
17+
"@coreui/coreui": "^2.1.4",
1818
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
1919
"@coreui/icons": "0.3.0",
20-
"@coreui/vue": "^2.0.2",
20+
"@coreui/vue": "^2.1.0",
2121
"bootstrap": "^4.1.3",
2222
"bootstrap-vue": "^2.0.0-rc.11",
2323
"chart.js": "^2.7.3",
24-
"core-js": "^2.5.7",
25-
"css-vars-ponyfill": "^1.15.0",
24+
"core-js": "^2.6.0",
25+
"css-vars-ponyfill": "^1.15.3",
2626
"flag-icon-css": "^3.2.0",
2727
"font-awesome": "^4.7.0",
2828
"perfect-scrollbar": "^1.4.0",
2929
"simple-line-icons": "^2.4.1",
30-
"vue": "^2.5.17",
30+
"vue": "^2.5.19",
3131
"vue-chartjs": "^3.4.0",
3232
"vue-perfect-scrollbar": "^0.1.0",
33-
"vue-router": "^3.0.1"
33+
"vue-router": "^3.0.2"
3434
},
3535
"devDependencies": {
36-
"@vue/cli-plugin-babel": "^3.1.1",
37-
"@vue/cli-plugin-e2e-nightwatch": "^3.1.1",
38-
"@vue/cli-plugin-eslint": "^3.1.5",
39-
"@vue/cli-plugin-unit-jest": "^3.1.1",
40-
"@vue/cli-service": "^3.1.4",
41-
"@vue/test-utils": "^1.0.0-beta.25",
36+
"@vue/cli-plugin-babel": "^3.2.0",
37+
"@vue/cli-plugin-e2e-nightwatch": "^3.2.0",
38+
"@vue/cli-plugin-eslint": "^3.2.1",
39+
"@vue/cli-plugin-unit-jest": "^3.2.0",
40+
"@vue/cli-service": "^3.2.0",
41+
"@vue/test-utils": "^1.0.0-beta.27",
4242
"babel-core": "^7.0.0-bridge.0",
4343
"babel-jest": "^23.6.0",
4444
"growl": "^1.10.5",
4545
"https-proxy-agent": "^2.2.1",
46-
"node-sass": "^4.10.0",
46+
"node-sass": "^4.11.0",
4747
"sass-loader": "^7.1.0",
48-
"vue-template-compiler": "^2.5.17"
48+
"vue-template-compiler": "^2.5.19"
4949
},
5050
"browserslist": [
5151
"> 1%",

src/_nav.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,18 +256,30 @@ export default {
256256
}
257257
]
258258
},
259+
{
260+
name: 'Disabled',
261+
url: '/dashboard',
262+
icon: 'icon-ban',
263+
badge: {
264+
variant: 'secondary',
265+
text: 'NEW'
266+
},
267+
attributes: { disabled: true },
268+
},
259269
{
260270
name: 'Download CoreUI',
261271
url: 'http://coreui.io/vue/',
262272
icon: 'icon-cloud-download',
263273
class: 'mt-auto',
264-
variant: 'success'
274+
variant: 'success',
275+
attributes: { target: '_blank', rel: 'noopener' }
265276
},
266277
{
267278
name: 'Try CoreUI PRO',
268279
url: 'http://coreui.io/pro/vue/',
269280
icon: 'icon-layers',
270-
variant: 'danger'
271-
}
281+
variant: 'danger',
282+
attributes: { target: '_blank', rel: 'noopener' }
283+
},
272284
]
273285
}

tests/e2e/specs/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ module.exports = {
9999

100100
browser
101101
.pause(500)
102-
.click('/html/body/div/div/div/nav/section/ul/li[1]/div/a', function (response) {
102+
.click('/html/body/div/div/div/nav/section/ul/li[1]/a', function (response) {
103103
console.log('response', typeof response)
104104
this.assert.cssClassNotPresent('/html/body', 'sidebar-show')
105105
})

0 commit comments

Comments
 (0)