From 5968b725f4949eb2de34ad7a8f3131c783782af2 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 30 Jun 2023 13:24:48 +0200
Subject: [PATCH 01/12] chore: update dependencies and devDependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@babel/core ^7.20.2 → ^7.22.5
@babel/eslint-parser ^7.19.1 → ^7.22.5
@coreui/chartjs ^3.0.0 → ^3.1.2
@coreui/coreui ^4.2.3 → ^4.2.6
@coreui/icons ^2.1.0 → ^3.0.1
@coreui/utils ^1.3.1 → ^2.0.2
@coreui/vue ^4.5.0 → ^4.8.1
@coreui/vue-chartjs 2.0.1 → 2.1.0
@vue/test-utils ^2.2.4 → ^2.4.0
@vue/vue3-jest ^27.0.0 → ^29.2.4
babel-jest ^27.5.1 → ^29.5.0
core-js ^3.26.1 → ^3.31.0
cypress ^8.7.0 → ^12.16.0
eslint ^7.32.0 → ^8.43.0
eslint-config-prettier ^8.3.0 → ^8.8.0
eslint-plugin-prettier ^4.0.0 → ^4.2.1
eslint-plugin-vue ^8.0.3 → ^9.15.1
jest ^27.5.1 → ^29.5.0
prettier ^2.8.0 → ^2.8.8
sass ^1.56.1 → ^1.63.6
sass-loader ^12.0.0 → ^13.3.2
vue ^3.2.45 → ^3.3.4
vue-router ^4.1.6 → ^4.2.2
---
package.json | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/package.json b/package.json
index 2251e0b0..17b9bd5c 100644
--- a/package.json
+++ b/package.json
@@ -19,21 +19,21 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
- "@coreui/chartjs": "^3.0.0",
- "@coreui/coreui": "^4.2.3",
- "@coreui/icons": "^2.1.0",
+ "@coreui/chartjs": "^3.1.2",
+ "@coreui/coreui": "^4.2.6",
+ "@coreui/icons": "^3.0.1",
"@coreui/icons-vue": "2.0.0",
- "@coreui/utils": "^1.3.1",
- "@coreui/vue": "^4.5.0",
- "@coreui/vue-chartjs": "2.0.1",
- "core-js": "^3.26.1",
- "vue": "^3.2.45",
- "vue-router": "^4.1.6",
+ "@coreui/utils": "^2.0.2",
+ "@coreui/vue": "^4.8.1",
+ "@coreui/vue-chartjs": "2.1.0",
+ "core-js": "^3.31.0",
+ "vue": "^3.3.4",
+ "vue-router": "^4.2.2",
"vuex": "^4.1.0"
},
"devDependencies": {
- "@babel/core": "^7.20.2",
- "@babel/eslint-parser": "^7.19.1",
+ "@babel/core": "^7.22.5",
+ "@babel/eslint-parser": "^7.22.5",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-e2e-cypress": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
@@ -41,17 +41,17 @@
"@vue/cli-plugin-unit-jest": "~5.0.8",
"@vue/cli-plugin-vuex": "~5.0.8",
"@vue/cli-service": "~5.0.8",
- "@vue/test-utils": "^2.2.4",
- "@vue/vue3-jest": "^27.0.0",
- "babel-jest": "^27.5.1",
- "cypress": "^8.7.0",
- "eslint": "^7.32.0",
- "eslint-config-prettier": "^8.3.0",
- "eslint-plugin-prettier": "^4.0.0",
- "eslint-plugin-vue": "^8.0.3",
- "jest": "^27.5.1",
- "prettier": "^2.8.0",
- "sass": "^1.56.1",
- "sass-loader": "^12.0.0"
+ "@vue/test-utils": "^2.4.0",
+ "@vue/vue3-jest": "^29.2.4",
+ "babel-jest": "^29.5.0",
+ "cypress": "^12.16.0",
+ "eslint": "^8.43.0",
+ "eslint-config-prettier": "^8.8.0",
+ "eslint-plugin-prettier": "^4.2.1",
+ "eslint-plugin-vue": "^9.15.1",
+ "jest": "^29.5.0",
+ "prettier": "^2.8.8",
+ "sass": "^1.63.6",
+ "sass-loader": "^13.3.2"
}
}
From e4db1d5674ca2c42405bac1f97798a1712a00fe5 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 30 Jun 2023 13:35:27 +0200
Subject: [PATCH 02/12] chore: clean-up
---
src/views/charts/Charts.vue | 7 -------
src/views/icons/Brands.vue | 5 -----
src/views/icons/CoreUIIcons.vue | 5 -----
3 files changed, 17 deletions(-)
diff --git a/src/views/charts/Charts.vue b/src/views/charts/Charts.vue
index a7fb838f..eff0304f 100644
--- a/src/views/charts/Charts.vue
+++ b/src/views/charts/Charts.vue
@@ -1,12 +1,5 @@
-
-
-
Line Chart
diff --git a/src/views/icons/Brands.vue b/src/views/icons/Brands.vue
index 39e243e2..df35ed2a 100644
--- a/src/views/icons/Brands.vue
+++ b/src/views/icons/Brands.vue
@@ -1,11 +1,6 @@
-
CoreUI Icons - Brand
diff --git a/src/views/icons/CoreUIIcons.vue b/src/views/icons/CoreUIIcons.vue
index daa30f3e..db217630 100644
--- a/src/views/icons/CoreUIIcons.vue
+++ b/src/views/icons/CoreUIIcons.vue
@@ -1,11 +1,6 @@
-
CoreUI Icons Free
From 5e5c3fbfab5d7f19ffa1d09ae0acd018f58f6f6d Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 30 Jun 2023 13:35:54 +0200
Subject: [PATCH 03/12] chore: clean-up
---
src/views/icons/Flags.vue | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/views/icons/Flags.vue b/src/views/icons/Flags.vue
index 0d08d66d..eff0320f 100644
--- a/src/views/icons/Flags.vue
+++ b/src/views/icons/Flags.vue
@@ -1,11 +1,6 @@
-
CoreUI Icons - Flag
From 2bff5fbaf09075c77e8691b8e20a416c0f8ab79f Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 30 Jun 2023 13:36:24 +0200
Subject: [PATCH 04/12] fix: update names
---
src/views/base/Progress.vue | 2 +-
src/views/forms/Select.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/base/Progress.vue b/src/views/base/Progress.vue
index 257cbbe1..363203bc 100644
--- a/src/views/base/Progress.vue
+++ b/src/views/base/Progress.vue
@@ -206,6 +206,6 @@
diff --git a/src/views/forms/Select.vue b/src/views/forms/Select.vue
index d256949a..fa7fc29a 100644
--- a/src/views/forms/Select.vue
+++ b/src/views/forms/Select.vue
@@ -108,6 +108,6 @@
From c394ff1608c0c145a65034c9d43b2b782638b96f Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 30 Jun 2023 13:36:48 +0200
Subject: [PATCH 05/12] fix: change `value` to `:value`
---
src/views/forms/Range.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/forms/Range.vue b/src/views/forms/Range.vue
index cdabaf71..53115f90 100644
--- a/src/views/forms/Range.vue
+++ b/src/views/forms/Range.vue
@@ -47,7 +47,7 @@
Example range
-
+
@@ -71,7 +71,7 @@
:min="0"
:max="5"
:step="0.5"
- value="3"
+ :value="3"
/>
From b357a9736166e3a555982fd8589c62591ff48674 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Fri, 30 Jun 2023 13:37:07 +0200
Subject: [PATCH 06/12] refactor: update imports
---
src/views/charts/MainChartExample.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/charts/MainChartExample.vue b/src/views/charts/MainChartExample.vue
index 1105749f..b1f42cc6 100644
--- a/src/views/charts/MainChartExample.vue
+++ b/src/views/charts/MainChartExample.vue
@@ -11,7 +11,7 @@
+
diff --git a/src/router/index.js b/src/router/index.js
index 0a195eac..30e33cc9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -304,4 +304,13 @@ const router = createRouter({
},
})
+router.beforeResolve(() => {
+ // Google Tag Manager
+ window.dataLayer = window.dataLayer || []
+ window.dataLayer.push({
+ event: 'pageview',
+ page_location: window.location.href,
+ })
+})
+
export default router
From 211531ae7a16f1c367274c7c9ddb964d27c5b27d Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 17 Jul 2023 10:08:15 +0200
Subject: [PATCH 10/12] build: update publicPath
---
vue.config.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/vue.config.js b/vue.config.js
index 523a634b..d9310209 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,6 @@
const { defineConfig } = require('@vue/cli-service')
module.exports = defineConfig({
+ publicPath:
+ process.env.NODE_ENV === 'production' ? '/demos/vue/4.2/free/' : '/',
transpileDependencies: true,
})
From 20de40f82fa08ecd5f2dd4cc9e67acd678feabd7 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 17 Jul 2023 10:09:37 +0200
Subject: [PATCH 11/12] fix: downgrade @vue/vue3-jest, babel-jest, jest
---
package.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 17b9bd5c..1340de0e 100644
--- a/package.json
+++ b/package.json
@@ -42,14 +42,14 @@
"@vue/cli-plugin-vuex": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/test-utils": "^2.4.0",
- "@vue/vue3-jest": "^29.2.4",
- "babel-jest": "^29.5.0",
+ "@vue/vue3-jest": "^27.0.0",
+ "babel-jest": "^27.5.1",
"cypress": "^12.16.0",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.15.1",
- "jest": "^29.5.0",
+ "jest": "^27.5.1",
"prettier": "^2.8.8",
"sass": "^1.63.6",
"sass-loader": "^13.3.2"
From 9ddff61a672cb1e3d77c8531bc24f9c7d9a039d7 Mon Sep 17 00:00:00 2001
From: mrholek
Date: Mon, 17 Jul 2023 10:11:24 +0200
Subject: [PATCH 12/12] chore: update dependencies and devDependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@babel/core ^7.22.5 → ^7.22.9
@babel/eslint-parser ^7.22.5 → ^7.22.9
@coreui/vue ^4.8.1 → ^4.10.0
core-js ^3.31.0 → ^3.31.1
cypress ^12.16.0 → ^12.17.1
eslint ^8.43.0 → ^8.45.0
eslint-plugin-prettier ^4.2.1 → ^5.0.0
prettier ^2.8.8 → ^3.0.0
vue-router ^4.2.2 → ^4.2.4
---
package.json | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/package.json b/package.json
index 1340de0e..3c636940 100644
--- a/package.json
+++ b/package.json
@@ -24,16 +24,16 @@
"@coreui/icons": "^3.0.1",
"@coreui/icons-vue": "2.0.0",
"@coreui/utils": "^2.0.2",
- "@coreui/vue": "^4.8.1",
+ "@coreui/vue": "^4.10.0",
"@coreui/vue-chartjs": "2.1.0",
- "core-js": "^3.31.0",
+ "core-js": "^3.31.1",
"vue": "^3.3.4",
- "vue-router": "^4.2.2",
+ "vue-router": "^4.2.4",
"vuex": "^4.1.0"
},
"devDependencies": {
- "@babel/core": "^7.22.5",
- "@babel/eslint-parser": "^7.22.5",
+ "@babel/core": "^7.22.9",
+ "@babel/eslint-parser": "^7.22.9",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-e2e-cypress": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
@@ -44,13 +44,13 @@
"@vue/test-utils": "^2.4.0",
"@vue/vue3-jest": "^27.0.0",
"babel-jest": "^27.5.1",
- "cypress": "^12.16.0",
- "eslint": "^8.43.0",
+ "cypress": "^12.17.1",
+ "eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
- "eslint-plugin-prettier": "^4.2.1",
+ "eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-vue": "^9.15.1",
"jest": "^27.5.1",
- "prettier": "^2.8.8",
+ "prettier": "^3.0.0",
"sass": "^1.63.6",
"sass-loader": "^13.3.2"
}