Merge pull request #832 from epicmaxco/develop

package.json

@@ -24,13 +24,13 @@
     "leaflet-map": "^0.2.1",
     "medium-editor": "^5.23.3",
     "register-service-worker": "^1.7.1",
-    "vue": "^3.0.0",
+    "vue": "^3.2.0",
     "vue-chartjs": "^3.5.1",
     "vue-gtm": "^3.2.1",
     "vue-i18n": "^9.0.0",
     "vue-router": "^4.0.0-0",
     "vue-yandex-maps": "^0.10.9",
-    "vuestic-ui": "^1.1.0",
+    "vuestic-ui": "^1.2.8",
     "vuex": "^4.0.0-0"
   },
   "devDependencies": {
@@ -46,15 +46,15 @@
     "@vue/cli-plugin-unit-jest": "~4.5.0",
     "@vue/cli-plugin-vuex": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.0.0",
+    "@vue/compiler-sfc": "^3.2.0",
     "@vue/eslint-config-typescript": "^5.0.2",
     "@vue/test-utils": "^2.0.0-0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^7.0.0-0",
     "lint-staged": "^9.5.0",
-    "node-sass": "^4.12.0",
-    "sass-loader": "^7.3.1",
-    "typescript": "~3.9.3",
+    "sass": "^1.41.1",
+    "sass-loader": "^8.0.2",
+    "typescript": "^4.3.5",
     "vue-jest": "^5.0.0-0"
   },
   "lint-staged": {

src/components/va-charts/chart-types/BubbleChart.js

@@ -2,5 +2,5 @@ import { Bubble } from 'vue-chartjs'
 import chartMixin from './chartMixin'
 
 export default {
-  mixins: [chartMixin, Bubble],
+  mixins: [Bubble, chartMixin],
 }

src/components/va-charts/chart-types/DonutChart.js

@@ -2,5 +2,5 @@ import { Doughnut } from 'vue-chartjs'
 import chartMixin from './chartMixin'
 
 export default {
-  mixins: [chartMixin, Doughnut],
+  mixins: [Doughnut, chartMixin],
 }

src/components/va-charts/chart-types/HorizontalBarChart.js

@@ -2,5 +2,5 @@ import { HorizontalBar } from 'vue-chartjs'
 import chartMixin from './chartMixin'
 
 export default {
-  mixins: [chartMixin, HorizontalBar],
+  mixins: [HorizontalBar, chartMixin],
 }

src/components/va-charts/chart-types/LineChart.js

@@ -2,5 +2,5 @@ import { Line } from 'vue-chartjs'
 import chartMixin from './chartMixin.js'
 
 export default {
-  mixins: [chartMixin, Line],
+  mixins: [Line, chartMixin],
 }

src/components/va-charts/chart-types/PieChart.js

@@ -2,5 +2,5 @@ import { Pie } from 'vue-chartjs'
 import chartMixin from './chartMixin.js'
 
 export default {
-  mixins: [chartMixin, Pie],
+  mixins: [Pie, chartMixin],
 }

src/components/va-charts/chart-types/VerticalBarChart.js

@@ -2,5 +2,5 @@ import { Bar } from 'vue-chartjs'
 import chartMixin from './chartMixin.js'
 
 export default {
-  mixins: [chartMixin, Bar],
+  mixins: [Bar, chartMixin],
 }