From 5dc8b4a0a50645ee88b56b11f09079b7bc8d468f Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 17:53:14 +0100
Subject: [PATCH 01/12] feat(SidebarNavLink): attributes

---
 src/components/Sidebar/SidebarNav.vue     |  6 ++--
 src/components/Sidebar/SidebarNavLink.vue | 42 +++++++++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/components/Sidebar/SidebarNav.vue b/src/components/Sidebar/SidebarNav.vue
index dd65ac10..94b866ef 100644
--- a/src/components/Sidebar/SidebarNav.vue
+++ b/src/components/Sidebar/SidebarNav.vue
@@ -21,13 +21,13 @@
                     <!-- Second level dropdown -->
                     <SidebarNavDropdown :key="index1" :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
                       <li :key="index2" class="nav-item" v-for="(childL2, index2) in childL1.children">
-                        <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant"/>
+                        <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant" :attributes="item.attributes" />
                       </li>
                     </SidebarNavDropdown>
                   </template>
                   <template v-else>
                     <SidebarNavItem :key="index1" :classes="item.class">
-                      <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant"/>
+                      <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant" :attributes="item.attributes"/>
                     </SidebarNavItem>
                   </template>
                 </template>
@@ -35,7 +35,7 @@
             </template>
             <template v-else>
               <SidebarNavItem :key="index" :classes="item.class">
-                <SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant"/>
+                <SidebarNavLink :name="item.name" :url="item.url" :icon="item.icon" :badge="item.badge" :variant="item.variant" :attributes="item.attributes"/>
               </SidebarNavItem>
             </template>
           </template>
diff --git a/src/components/Sidebar/SidebarNavLink.vue b/src/components/Sidebar/SidebarNavLink.vue
index 94c1d369..aae531cc 100644
--- a/src/components/Sidebar/SidebarNavLink.vue
+++ b/src/components/Sidebar/SidebarNavLink.vue
@@ -1,12 +1,18 @@
 <template>
-  <div v-if="isExternalLink">
-    <a :href="url" :class="classList">
+  <div v-if="isDisabled">
+    <a href :class="classList" v-bind="attributes" tabindex="-1">
+      <i :class="classIcon"></i> {{name}}
+      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+    </a>
+  </div>
+  <div v-else-if="isExternalLink">
+    <a :href="url" :class="classList" v-bind="attributes">
       <i :class="classIcon"></i> {{name}}
       <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
     </a>
   </div>
   <div v-else>
-    <router-link :to="url" :class="classList">
+    <router-link :to="url" :class="classList" v-bind="attributes">
       <i :class="classIcon"></i> {{name}}
       <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
     </router-link>
@@ -38,8 +44,12 @@ export default {
       default: ''
     },
     classes: {
-      type: String,
+      type: [String, Array, Object],
       default: ''
+    },
+    attributes: {
+      type: Object,
+      default: () => { return Object.create(null) }
     }
   },
   computed: {
@@ -47,6 +57,8 @@ export default {
       return [
         'nav-link',
         this.linkVariant,
+        ...this.disabledClasses,
+        ...this.attrClasses,
         ...this.itemClasses
       ]
     },
@@ -60,14 +72,24 @@ export default {
       return this.variant ? `nav-link-${this.variant}` : ''
     },
     itemClasses () {
-      return this.classes ? this.classes.split(' ') : []
+      return this.getClassArray(this.classes)
+    },
+    attrClasses () {
+      return this.getClassArray(this.attributes.class)
+    },
+    disabledClasses () {
+      return this.isDisabled ? 'disabled btn-link'.split(' ') : []
+    },
+    isDisabled () {
+      return Boolean(this.attributes.disabled)
     },
     isExternalLink () {
-      if (this.url.substring(0, 4) === 'http') {
-        return true
-      } else {
-        return false
-      }
+      return Boolean(this.url.substring(0, 4) === 'http')
+    }
+  },
+  methods: {
+    getClassArray(classes) {
+      return !classes ? [] : typeof classes === 'string' || classes instanceof String ? classes.split(' ') : Array.isArray(classes) ? classes : Object.keys(classes).filter(i=>classes[i])
     }
   }
 }

From 4e9859ea26a9c11c9f0ec97a7392f81339b5d8c0 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 18:11:08 +0100
Subject: [PATCH 02/12] refactor(SidebarNav*): classes type [String, Array,
 Object]

---
 src/components/Sidebar/SidebarNavItem.vue  |  9 +++++----
 src/components/Sidebar/SidebarNavLabel.vue | 13 ++++++-------
 src/components/Sidebar/SidebarNavTitle.vue |  5 +++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/Sidebar/SidebarNavItem.vue b/src/components/Sidebar/SidebarNavItem.vue
index 284d1ce0..55d6717e 100644
--- a/src/components/Sidebar/SidebarNavItem.vue
+++ b/src/components/Sidebar/SidebarNavItem.vue
@@ -9,10 +9,10 @@ import { hideMobile } from '../../mixins/hideMobile'
 
 export default {
   name: 'sidebar-nav-item',
-    mixins: [ hideMobile ],
-    props: {
+  mixins: [ hideMobile ],
+  props: {
     classes: {
-      type: String,
+      type: [String, Array, Object],
       default: ''
     }
   },
@@ -24,7 +24,8 @@ export default {
       ]
     },
     itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
+      const classes = this.classes
+      return !classes ? [] : typeof classes === 'string' || classes instanceof String ? classes.split(' ') : Array.isArray(classes) ? classes : Object.keys(classes).filter(i=>classes[i])
     }
   }
 }
diff --git a/src/components/Sidebar/SidebarNavLabel.vue b/src/components/Sidebar/SidebarNavLabel.vue
index 480f1a16..30c456de 100644
--- a/src/components/Sidebar/SidebarNavLabel.vue
+++ b/src/components/Sidebar/SidebarNavLabel.vue
@@ -27,7 +27,7 @@ export default {
       default: 'fa fa-circle'
     },
     classes: {
-      type: String,
+      type: [String, Array, Object],
       default: ''
     },
     label: {
@@ -39,7 +39,7 @@ export default {
   computed: {
     classList () {
       const classes = {
-        navItem: ['hidden-cn', ...this.getClasses(this.classes)].join(' '),
+        navItem: ['hidden-cn', ...this.itemClasses],
         navLink: 'nav-label',
         icon: [
           this.icon ? this.icon : 'fa fa-circle',
@@ -48,12 +48,11 @@ export default {
         ].join(' ')
       }
       return classes
+    },
+    itemClasses () {
+      const classes = this.classes
+      return !classes ? [] : typeof classes === 'string' || classes instanceof String ? classes.split(' ') : Array.isArray(classes) ? classes : Object.keys(classes).filter(i=>classes[i])
     }
   },
-  methods: {
-    getClasses (classes) {
-      return classes ? classes.split(' ') : []
-    }
-  }
 }
 </script>
diff --git a/src/components/Sidebar/SidebarNavTitle.vue b/src/components/Sidebar/SidebarNavTitle.vue
index 6bac6f56..6340a2d9 100644
--- a/src/components/Sidebar/SidebarNavTitle.vue
+++ b/src/components/Sidebar/SidebarNavTitle.vue
@@ -19,7 +19,7 @@ export default {
       default: ''
     },
     classes: {
-      type: String,
+      type: [String, Array, Object],
       default: ''
     },
     wrapper: {
@@ -35,7 +35,8 @@ export default {
       ]
     },
     itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
+      const classes = this.classes
+      return !classes ? [] : typeof classes === 'string' || classes instanceof String ? classes.split(' ') : Array.isArray(classes) ? classes : Object.keys(classes).filter(i=>classes[i])
     }
   }
 }

From 9a4df6ea24aa4dbfed7c42e0f3f57e34f8e425bf Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 18:59:09 +0100
Subject: [PATCH 03/12] test: update

---
 jest.config.js                                              | 1 +
 src/components/__tests__/SidebarNavLabel.js                 | 4 +---
 src/components/__tests__/SidebarNavLink.js                  | 6 ++++++
 .../__tests__/__snapshots__/HeaderDropdown.js.snap          | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 4aee5bf7..393fedfc 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -12,6 +12,7 @@ module.exports = {
   coverageDirectory: "<rootDir>/coverage",
   collectCoverageFrom: [
     "src/**/*.{js,vue}",
+    "!src/components/index.js",
     "!src/index.umd.js",
     "!**/node_modules/**"
   ]
diff --git a/src/components/__tests__/SidebarNavLabel.js b/src/components/__tests__/SidebarNavLabel.js
index 511d1535..11045ad8 100644
--- a/src/components/__tests__/SidebarNavLabel.js
+++ b/src/components/__tests__/SidebarNavLabel.js
@@ -19,9 +19,7 @@ describe("SidebarNavLabel.vue", () => {
   });
   it('has hasSlotDefault computed property', () => {
     expect(typeof SidebarNavLabel.computed.classList).toBe('function')
-  })
-  it('has getClasses method', () => {
-    expect(typeof SidebarNavLabel.methods.getClasses).toBe('function')
+    expect(typeof SidebarNavLabel.computed.itemClasses).toBe('function')
   })
   it('renders correctly', () => {
     const wrapper = mount(SidebarNavLabel, {
diff --git a/src/components/__tests__/SidebarNavLink.js b/src/components/__tests__/SidebarNavLink.js
index 2f9f512f..8d32ef27 100644
--- a/src/components/__tests__/SidebarNavLink.js
+++ b/src/components/__tests__/SidebarNavLink.js
@@ -29,9 +29,15 @@ describe("SidebarNavLink.vue", () => {
     expect(typeof SidebarNavLink.computed.classList).toBe('function')
     expect(typeof SidebarNavLink.computed.classIcon).toBe('function')
     expect(typeof SidebarNavLink.computed.linkVariant).toBe('function')
+    expect(typeof SidebarNavLink.computed.attrClasses).toBe('function')
     expect(typeof SidebarNavLink.computed.itemClasses).toBe('function')
+    expect(typeof SidebarNavLink.computed.disabledClasses).toBe('function')
+    expect(typeof SidebarNavLink.computed.isDisabled).toBe('function')
     expect(typeof SidebarNavLink.computed.isExternalLink).toBe('function')
   })
+  it('has getClassArray method', () => {
+    expect(typeof SidebarNavLink.methods.getClassArray).toBe('function')
+  })
   it('renders correctly', () => {
     const wrapper = shallowMount(SidebarNavLink, { localVue, router })
     expect(wrapper.element).toMatchSnapshot()
diff --git a/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap b/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap
index f62c02d7..46802488 100644
--- a/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap
+++ b/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`HeaderDropdown.vue renders correctly 1`] = `
-<b-nav-item-dropdown>
+<b-nav-item-dropdown-stub>
   <template>
     
       ❔
@@ -17,5 +17,5 @@ exports[`HeaderDropdown.vue renders correctly 1`] = `
       dropdown
     </span>
   </div>
-</b-nav-item-dropdown>
+</b-nav-item-dropdown-stub>
 `;

From 3719d069e6d58b4e614626bf2706d9e11957dca1 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:00:32 +0100
Subject: [PATCH 04/12] refactor: rollup.config.js uglify

---
 rollup.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rollup.config.js b/rollup.config.js
index d4f43d60..3702d43e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -7,7 +7,7 @@ import json from "rollup-plugin-json";
 import license from "rollup-plugin-license";
 import resolve from "rollup-plugin-node-resolve";
 import replace from "rollup-plugin-replace";
-import uglify from "rollup-plugin-uglify";
+import { uglify } from "rollup-plugin-uglify";
 import vue from "rollup-plugin-vue";
 import { minify } from "uglify-es";
 

From 8d4d229869aa64124493aea99f86847265b42519 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:02:16 +0100
Subject: [PATCH 05/12] chore: dependencies update

- update `@vue/test-utils` to `^1.0.0-beta.26`
- update `babel-plugin-dynamic-import-node` to `^2.2.0`
- update `eslint` to `^5.9.0`
- update `eslint-config-prettier` to `^3.3.0`
- update `eslint-plugin-html` to `^5.0.0`
- update `eslint-plugin-jest` to `^22.1.2`
- update `eslint-plugin-vue` to `^5.0.0`
- update `husky` to `^1.2.0`
- update `lint-staged` to `^8.1.0`
- update `node-sass` to `^4.10.0`
- update `prettier` to `^1.15.3`
- update `rollup` to `^0.67.4`
- update `rollup-plugin-commonjs` to `^9.2.0`
- update `rollup-plugin-filesize` to `^5.0.1`
- update `rollup-plugin-replace` to `^2.1.0`
- update `rollup-plugin-uglify` to `^6.0.0`
- update `vue-jest` to `^3.0.1`
- update `vue-router` to `^3.0.2`
- update `@coreui/coreui` to `^2.1.3`
---
 package.json | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index c30bd55d..c28d126a 100644
--- a/package.json
+++ b/package.json
@@ -63,51 +63,51 @@
     "vue-perfect-scrollbar": "^0.1.0"
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.25",
+    "@vue/test-utils": "^1.0.0-beta.26",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^23.6.0",
-    "babel-plugin-dynamic-import-node": "^2.1.0",
+    "babel-plugin-dynamic-import-node": "^2.2.0",
     "babel-plugin-module-resolver": "^3.1.1",
     "babel-preset-vue-app": "^2.0.0",
-    "eslint": "^5.6.1",
-    "eslint-config-prettier": "^3.1.0",
+    "eslint": "^5.9.0",
+    "eslint-config-prettier": "^3.3.0",
     "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-html": "^4.0.6",
+    "eslint-plugin-html": "^5.0.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^21.24.1",
+    "eslint-plugin-jest": "^22.1.2",
     "eslint-plugin-prettier": "^3.0.0",
-    "eslint-plugin-vue": "^5.0.0-beta.3",
-    "husky": "^1.1.0",
+    "eslint-plugin-vue": "^5.0.0",
+    "husky": "^1.2.0",
     "jest": "^23.6.0",
     "jest-serializer-html": "^5.0.0",
     "jest-serializer-vue": "^2.0.2",
     "jest-vue-preprocessor": "^1.4.0",
-    "lint-staged": "^7.3.0",
+    "lint-staged": "^8.1.0",
     "lodash": "^4.17.11",
-    "node-sass": "^4.9.3",
-    "prettier": "^1.14.3",
-    "rollup": "^0.59.4",
+    "node-sass": "^4.10.0",
+    "prettier": "^1.15.3",
+    "rollup": "^0.67.4",
     "rollup-plugin-babel": "^3.0.7",
-    "rollup-plugin-commonjs": "^9.1.8",
-    "rollup-plugin-filesize": "^4.0.1",
+    "rollup-plugin-commonjs": "^9.2.0",
+    "rollup-plugin-filesize": "^5.0.1",
     "rollup-plugin-json": "^3.1.0",
     "rollup-plugin-license": "^0.7.0",
     "rollup-plugin-node-resolve": "^3.4.0",
-    "rollup-plugin-replace": "^2.0.0",
-    "rollup-plugin-uglify": "^3.0.0",
+    "rollup-plugin-replace": "^2.1.0",
+    "rollup-plugin-uglify": "^6.0.0",
     "rollup-plugin-vue": "^4.3.2",
     "sass-loader": "^7.1.0",
     "uglify-es": "^3.3.9",
     "vue": "^2.5.17",
-    "vue-jest": "^2.6.0",
+    "vue-jest": "^3.0.1",
     "vue-loader": "^15.4.2",
-    "vue-router": "^3.0.1",
+    "vue-router": "^3.0.2",
     "vue-server-renderer": "^2.5.17",
     "vue-template-compiler": "^2.5.17"
   },
   "peerDependencies": {
-    "@coreui/coreui": "^2.0.14"
+    "@coreui/coreui": "^2.1.3"
   },
   "lint-staged": {
     "*.{js,vue}": [

From c11599a91d587ca17420be817e9767c45306ca1f Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:23:55 +0100
Subject: [PATCH 06/12] refactor: cleanup

---
 src/components/Breadcrumb/Breadcrumb.vue       | 10 +++++-----
 src/components/Footer/Footer.vue               |  6 +++---
 src/components/Sidebar/SidebarNav.vue          | 14 +++++++-------
 src/components/Sidebar/SidebarNavDivider.vue   |  5 +++--
 src/components/Switch/Switch.vue               | 18 +++++++++---------
 .../__snapshots__/SidebarNavLabel.js.snap      |  1 +
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/components/Breadcrumb/Breadcrumb.vue b/src/components/Breadcrumb/Breadcrumb.vue
index b751c286..0260fdc4 100644
--- a/src/components/Breadcrumb/Breadcrumb.vue
+++ b/src/components/Breadcrumb/Breadcrumb.vue
@@ -16,6 +16,11 @@ export default {
       default: () => []
     }
   },
+  computed: {
+    routeRecords: function () {
+      return this.list.filter((route) => route.name || route.meta.label)
+    }
+  },
   methods: {
     getName (item) {
       return item.meta && item.meta.label ? item.meta.label : item.name || null
@@ -23,11 +28,6 @@ export default {
     isLast (index) {
       return index === this.list.length - 1
     }
-  },
-  computed: {
-    routeRecords: function () {
-      return this.list.filter((route) => route.name || route.meta.label)
-    }
   }
 }
 </script>
diff --git a/src/components/Footer/Footer.vue b/src/components/Footer/Footer.vue
index d80989aa..7d1b0167 100644
--- a/src/components/Footer/Footer.vue
+++ b/src/components/Footer/Footer.vue
@@ -13,9 +13,6 @@ export default {
       default: false
     }
   },
-  mounted: function () {
-    this.isFixed()
-  },
   computed: {
     classList () {
       return [
@@ -23,6 +20,9 @@ export default {
       ]
     }
   },
+  mounted: function () {
+    this.isFixed()
+  },
   methods: {
     isFixed () {
       this.fixed ? document.body.classList.add('footer-fixed') : document.body.classList.remove('footer-fixed')
diff --git a/src/components/Sidebar/SidebarNav.vue b/src/components/Sidebar/SidebarNav.vue
index 94b866ef..9f27d3ba 100644
--- a/src/components/Sidebar/SidebarNav.vue
+++ b/src/components/Sidebar/SidebarNav.vue
@@ -57,13 +57,6 @@ import VuePerfectScrollbar from 'vue-perfect-scrollbar'
 
 export default {
   name: 'SidebarNav',
-  props: {
-    navItems: {
-      type: Array,
-      required: true,
-      default: () => []
-    }
-  },
   components: {
     SidebarNavDivider,
     SidebarNavDropdown,
@@ -73,6 +66,13 @@ export default {
     SidebarNavLabel,
     VuePerfectScrollbar
   },
+  props: {
+    navItems: {
+      type: Array,
+      required: true,
+      default: () => []
+    }
+  },
   data () {
     return {}
   },
diff --git a/src/components/Sidebar/SidebarNavDivider.vue b/src/components/Sidebar/SidebarNavDivider.vue
index ac124f8f..d9d39638 100644
--- a/src/components/Sidebar/SidebarNavDivider.vue
+++ b/src/components/Sidebar/SidebarNavDivider.vue
@@ -7,7 +7,7 @@ export default {
   name: 'sidebar-nav-divider',
   props: {
     classes: {
-      type: String,
+      type: [String, Array, Object],
       default: ''
     }
   },
@@ -19,7 +19,8 @@ export default {
       ]
     },
     itemClasses () {
-      return this.classes ? this.classes.split(' ') : ''
+      const classes = this.classes
+      return !classes ? [] : typeof classes === 'string' || classes instanceof String ? classes.split(' ') : Array.isArray(classes) ? classes : Object.keys(classes).filter(i=>classes[i])
     }
   }
 }
diff --git a/src/components/Switch/Switch.vue b/src/components/Switch/Switch.vue
index 7e14bd71..05692f4f 100644
--- a/src/components/Switch/Switch.vue
+++ b/src/components/Switch/Switch.vue
@@ -7,11 +7,11 @@
       :required="required"
       :name="name"
       :value="value"
-      @change="handleChange"
       class="switch-input form-check-input"
       type="checkbox"
       true-value="value"
       false-value="uncheckedValue"
+      @change="handleChange"
     >
     <template v-if="label">
       <span
@@ -32,11 +32,6 @@ export default {
     prop: 'modelChecked',
     event: 'change'
   },
-  data: function () {
-    return {
-      checkedData: this.isChecked ? this.value : this.uncheckedValue
-    }
-  },
   props: {
     id: {
       type: String,
@@ -108,6 +103,11 @@ export default {
       default: 'Off'
     }
   },
+  data: function () {
+    return {
+      checkedData: this.isChecked ? this.value : this.uncheckedValue
+    }
+  },
   computed: {
     classList () {
       return [
@@ -126,6 +126,9 @@ export default {
       return this.modelChecked === this.value
     }
   },
+  mounted() {
+    this.toggle(this.defaultChecked || this.checked || this.isChecked);
+  },
   methods: {
     handleChange (event) {
       this.toggle(event.target.checked);
@@ -135,8 +138,5 @@ export default {
       this.$emit('change', this.checkedData);
     }
   },
-  mounted() {
-    this.toggle(this.defaultChecked || this.checked || this.isChecked);
-  },
 }
 </script>
diff --git a/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap b/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap
index 661c5445..cdecc14c 100644
--- a/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap
+++ b/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap
@@ -12,6 +12,7 @@ exports[`SidebarNavLabel.vue renders correctly 1`] = `
       class="fa fa-circle text-info "
     />
      
+  
   </a>
 </li>
 `;

From 6ca5b8a7eb93142effd605b2637bab99ba5d9394 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Thu, 6 Dec 2018 19:27:14 +0100
Subject: [PATCH 07/12] refactor: cleanup

---
 src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap b/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap
index cdecc14c..661c5445 100644
--- a/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap
+++ b/src/components/__tests__/__snapshots__/SidebarNavLabel.js.snap
@@ -12,7 +12,6 @@ exports[`SidebarNavLabel.vue renders correctly 1`] = `
       class="fa fa-circle text-info "
     />
      
-  
   </a>
 </li>
 `;

From 3788ff8b5dc5d30cdcbc2b7159b9d97c568e3190 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Fri, 7 Dec 2018 20:25:52 +0100
Subject: [PATCH 08/12] fix: .nav-divider instead of .divider

---
 src/components/Sidebar/SidebarNavDivider.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Sidebar/SidebarNavDivider.vue b/src/components/Sidebar/SidebarNavDivider.vue
index d9d39638..bd13b438 100644
--- a/src/components/Sidebar/SidebarNavDivider.vue
+++ b/src/components/Sidebar/SidebarNavDivider.vue
@@ -1,10 +1,10 @@
 <template>
-  <li :class="classList"></li>
+  <li :class="classList" />
 </template>
 
 <script>
 export default {
-  name: 'sidebar-nav-divider',
+  name: 'SidebarNavDivider',
   props: {
     classes: {
       type: [String, Array, Object],
@@ -14,7 +14,7 @@ export default {
   computed: {
     classList () {
       return [
-        'divider',
+        'nav-divider',
         ...this.itemClasses
       ]
     },

From 06a0f01e9deba703621d2d48063bddb3d797c803 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Fri, 7 Dec 2018 20:29:42 +0100
Subject: [PATCH 09/12] chore: cleanup SidebarNav, SidebarNavLink

---
 src/components/Sidebar/SidebarNav.vue     |  4 +--
 src/components/Sidebar/SidebarNavLink.vue | 32 +++++++++--------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/components/Sidebar/SidebarNav.vue b/src/components/Sidebar/SidebarNav.vue
index 9f27d3ba..2a139398 100644
--- a/src/components/Sidebar/SidebarNav.vue
+++ b/src/components/Sidebar/SidebarNav.vue
@@ -21,13 +21,13 @@
                     <!-- Second level dropdown -->
                     <SidebarNavDropdown :key="index1" :name="childL1.name" :url="childL1.url" :icon="childL1.icon">
                       <li :key="index2" class="nav-item" v-for="(childL2, index2) in childL1.children">
-                        <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="item.variant" :attributes="item.attributes" />
+                        <SidebarNavLink :name="childL2.name" :url="childL2.url" :icon="childL2.icon" :badge="childL2.badge" :variant="childL2.variant" :attributes="childL2.attributes" />
                       </li>
                     </SidebarNavDropdown>
                   </template>
                   <template v-else>
                     <SidebarNavItem :key="index1" :classes="item.class">
-                      <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="item.variant" :attributes="item.attributes"/>
+                      <SidebarNavLink :name="childL1.name" :url="childL1.url" :icon="childL1.icon" :badge="childL1.badge" :variant="childL1.variant" :attributes="childL1.attributes"/>
                     </SidebarNavItem>
                   </template>
                 </template>
diff --git a/src/components/Sidebar/SidebarNavLink.vue b/src/components/Sidebar/SidebarNavLink.vue
index aae531cc..e7a27379 100644
--- a/src/components/Sidebar/SidebarNavLink.vue
+++ b/src/components/Sidebar/SidebarNavLink.vue
@@ -1,22 +1,16 @@
 <template>
-  <div v-if="isDisabled">
-    <a href :class="classList" v-bind="attributes" tabindex="-1">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </a>
-  </div>
-  <div v-else-if="isExternalLink">
-    <a :href="url" :class="classList" v-bind="attributes">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </a>
-  </div>
-  <div v-else>
-    <router-link :to="url" :class="classList" v-bind="attributes">
-      <i :class="classIcon"></i> {{name}}
-      <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
-    </router-link>
-  </div>
+  <a :class="classList" v-bind="attributes" tabindex="-1" v-on:click.stop.prevent v-if="isDisabled">
+    <i :class="classIcon"></i> <span>{{name}}</span>
+    <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+  </a>
+  <a :href="url" :class="classList" v-bind="attributes" v-else-if="isExternalLink">
+    <i :class="classIcon"></i> {{name}}
+    <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+  </a>
+  <router-link :to="url" :class="classList" v-bind="attributes" v-else>
+    <i :class="classIcon"></i> {{name}}
+    <b-badge v-if="badge && badge.text" :variant="badge.variant">{{badge.text}}</b-badge>
+  </router-link>
 </template>
 
 <script>
@@ -78,7 +72,7 @@ export default {
       return this.getClassArray(this.attributes.class)
     },
     disabledClasses () {
-      return this.isDisabled ? 'disabled btn-link'.split(' ') : []
+      return this.isDisabled ? 'disabled'.split(' ') : []
     },
     isDisabled () {
       return Boolean(this.attributes.disabled)

From 8a6a1bc7f9be6b58250a4eb284c80612fdad0507 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Mon, 10 Dec 2018 12:03:54 +0100
Subject: [PATCH 10/12] test: update smome snapshots and tests

---
 src/components/__tests__/SidebarNavDivider.js |  2 +-
 src/components/__tests__/SidebarNavLink.js    |  2 +-
 .../__snapshots__/HeaderDropdown.js.snap      |  4 +--
 .../__snapshots__/SidebarNavDivider.js.snap   |  2 +-
 .../__snapshots__/SidebarNavLink.js.snap      | 28 +++++++++----------
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/components/__tests__/SidebarNavDivider.js b/src/components/__tests__/SidebarNavDivider.js
index 7ab2bebe..357343dd 100644
--- a/src/components/__tests__/SidebarNavDivider.js
+++ b/src/components/__tests__/SidebarNavDivider.js
@@ -10,6 +10,6 @@ describe("SidebarNavDivider.vue", () => {
   it('renders correctly', () => {
     const wrapper = mount(SidebarNavDivider)
     expect(wrapper.element).toMatchSnapshot()
-    expect(wrapper.classes()).toContain('divider')
+    expect(wrapper.classes()).toContain('nav-divider')
   })
 });
diff --git a/src/components/__tests__/SidebarNavLink.js b/src/components/__tests__/SidebarNavLink.js
index 8d32ef27..6d0b63bb 100644
--- a/src/components/__tests__/SidebarNavLink.js
+++ b/src/components/__tests__/SidebarNavLink.js
@@ -41,6 +41,6 @@ describe("SidebarNavLink.vue", () => {
   it('renders correctly', () => {
     const wrapper = shallowMount(SidebarNavLink, { localVue, router })
     expect(wrapper.element).toMatchSnapshot()
-    expect(wrapper.is('div')).toBe(true)
+    expect(wrapper.is('router-link-stub')).toBe(true)
   })
 });
diff --git a/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap b/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap
index 46802488..f62c02d7 100644
--- a/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap
+++ b/src/components/__tests__/__snapshots__/HeaderDropdown.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`HeaderDropdown.vue renders correctly 1`] = `
-<b-nav-item-dropdown-stub>
+<b-nav-item-dropdown>
   <template>
     
       ❔
@@ -17,5 +17,5 @@ exports[`HeaderDropdown.vue renders correctly 1`] = `
       dropdown
     </span>
   </div>
-</b-nav-item-dropdown-stub>
+</b-nav-item-dropdown>
 `;
diff --git a/src/components/__tests__/__snapshots__/SidebarNavDivider.js.snap b/src/components/__tests__/__snapshots__/SidebarNavDivider.js.snap
index 39f46f71..9b931e72 100644
--- a/src/components/__tests__/__snapshots__/SidebarNavDivider.js.snap
+++ b/src/components/__tests__/__snapshots__/SidebarNavDivider.js.snap
@@ -2,6 +2,6 @@
 
 exports[`SidebarNavDivider.vue renders correctly 1`] = `
 <li
-  class="divider"
+  class="nav-divider"
 />
 `;
diff --git a/src/components/__tests__/__snapshots__/SidebarNavLink.js.snap b/src/components/__tests__/__snapshots__/SidebarNavLink.js.snap
index 8f051816..67242f4c 100644
--- a/src/components/__tests__/__snapshots__/SidebarNavLink.js.snap
+++ b/src/components/__tests__/__snapshots__/SidebarNavLink.js.snap
@@ -1,19 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SidebarNavLink.vue renders correctly 1`] = `
-<div>
-  <router-link-stub
-    class="nav-link"
-    event="click"
-    tag="a"
-    to=""
-  >
-    <i
-      class="nav-icon"
-    />
-     
-    
-    <!---->
-  </router-link-stub>
-</div>
+<router-link-stub
+  class="nav-link"
+  event="click"
+  tag="a"
+  to=""
+>
+  <i
+    class="nav-icon"
+  />
+   
+  
+  <!---->
+</router-link-stub>
 `;

From e17509ec2fb2659f8563654ab6c4b97ce1b2b24a Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Mon, 10 Dec 2018 12:19:33 +0100
Subject: [PATCH 11/12] chore: dependencies update

- update `@vue/test-utils` to `^1.0.0-beta.27`
- update `eslint` to `^5.10.0`
- update `node-sass` to `^4.11.0`
- update `vue` to `^2.5.19`
- update `vue-server-renderer` to `^2.5.19`
- update `vue-template-compiler` to `^2.5.19`
- update `@coreui/coreui` to `^2.1.4`
---
 package.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c28d126a..467eb359 100644
--- a/package.json
+++ b/package.json
@@ -63,14 +63,14 @@
     "vue-perfect-scrollbar": "^0.1.0"
   },
   "devDependencies": {
-    "@vue/test-utils": "^1.0.0-beta.26",
+    "@vue/test-utils": "^1.0.0-beta.27",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^23.6.0",
     "babel-plugin-dynamic-import-node": "^2.2.0",
     "babel-plugin-module-resolver": "^3.1.1",
     "babel-preset-vue-app": "^2.0.0",
-    "eslint": "^5.9.0",
+    "eslint": "^5.10.0",
     "eslint-config-prettier": "^3.3.0",
     "eslint-import-resolver-babel-module": "^4.0.0",
     "eslint-plugin-html": "^5.0.0",
@@ -85,7 +85,7 @@
     "jest-vue-preprocessor": "^1.4.0",
     "lint-staged": "^8.1.0",
     "lodash": "^4.17.11",
-    "node-sass": "^4.10.0",
+    "node-sass": "^4.11.0",
     "prettier": "^1.15.3",
     "rollup": "^0.67.4",
     "rollup-plugin-babel": "^3.0.7",
@@ -99,15 +99,15 @@
     "rollup-plugin-vue": "^4.3.2",
     "sass-loader": "^7.1.0",
     "uglify-es": "^3.3.9",
-    "vue": "^2.5.17",
+    "vue": "^2.5.19",
     "vue-jest": "^3.0.1",
     "vue-loader": "^15.4.2",
     "vue-router": "^3.0.2",
-    "vue-server-renderer": "^2.5.17",
-    "vue-template-compiler": "^2.5.17"
+    "vue-server-renderer": "^2.5.19",
+    "vue-template-compiler": "^2.5.19"
   },
   "peerDependencies": {
-    "@coreui/coreui": "^2.1.3"
+    "@coreui/coreui": "^2.1.4"
   },
   "lint-staged": {
     "*.{js,vue}": [

From 22383292127b21dd27ce24987b26476af9cac813 Mon Sep 17 00:00:00 2001
From: xidedix <xidedix@users.noreply.github.com>
Date: Mon, 10 Dec 2018 12:22:25 +0100
Subject: [PATCH 12/12] Ship: v2.1.0

---
 CHANGELOG.md | 29 +++++++++++++++++++++++++++++
 README.md    |  4 ++--
 package.json |  2 +-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caf65dd7..95be6422 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 ### [@coreui/vue](https://coreui.io/) changelog
 
+##### v2.1.0
+- feat(SidebarNavLink): attributes
+- refactor(SidebarNav*): classes type [String, Array, Object]
+- test: update SidebarNavLabel, SidebarNavLink, SidebarNavDivider
+- refactor: rollup.config.js uglify()
+- chore: update jest.config.js 
+- update `@vue/test-utils` to `^1.0.0-beta.27`
+- update `babel-plugin-dynamic-import-node` to `^2.2.0`
+- update `eslint` to `^5.10.0`
+- update `eslint-config-prettier` to `^3.3.0`
+- update `eslint-plugin-html` to `^5.0.0`
+- update `eslint-plugin-jest` to `^22.1.2`
+- update `eslint-plugin-vue` to `^5.0.0`
+- update `husky` to `^1.2.0`
+- update `lint-staged` to `^8.1.0`
+- update `node-sass` to `^4.11.0`
+- update `prettier` to `^1.15.3`
+- update `rollup` to `^0.67.4`
+- update `rollup-plugin-commonjs` to `^9.2.0`
+- update `rollup-plugin-filesize` to `^5.0.1`
+- update `rollup-plugin-replace` to `^2.1.0`
+- update `rollup-plugin-uglify` to `^6.0.0`
+- update `vue` to `^2.5.19`
+- update `vue-server-renderer` to `^2.5.19`
+- update `vue-template-compiler` to `^2.5.19`
+- update `vue-jest` to `^3.0.1`
+- update `vue-router` to `^3.0.2`
+- update `@coreui/coreui` to `^2.1.4`
+
 ##### v2.0.2
 - fix(AsideToggler): add missing `display { default:'lg' }` prop value
 - fix(AsideToggler): add missing `defaultOpen` prop value handling
diff --git a/README.md b/README.md
index 25f3b59c..8f282cbb 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 [![Npm badge](https://img.shields.io/npm/v/@coreui/vue.svg)][npm]
 [![NPM downloads][npm-download]][npm]
-![Rollup badge](https://img.shields.io/badge/Rollup-^0.59.4-ff69b4.svg)
+![Rollup badge](https://img.shields.io/badge/Rollup-^0.67.4-ff69b4.svg)
 ![Jest](https://img.shields.io/badge/Jest-^23.6.0-blue.svg)
-![Vue](https://img.shields.io/badge/Vue-^2.5.17-brightgreen.svg)
+![Vue](https://img.shields.io/badge/Vue-^2.5.19-brightgreen.svg)
 
 [npm]: https://www.npmjs.com/package/@coreui/vue
 [npm-download]: https://img.shields.io/npm/dm/@coreui/vue.svg?style=flat-square
diff --git a/package.json b/package.json
index 467eb359..2848e2ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@coreui/vue",
   "description": "CoreUI Vue Bootstrap 4 layout components",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "license": "MIT",
   "main": "dist/coreui-vue.common.js",
   "module": "dist/coreui-vue.esm.js",