Skip to content

Commit f968482

Browse files
authored
Merge pull request #1034 from CSCfi/feature/vue3
Migrate to vue3
2 parents 2a01e3c + 85451b5 commit f968482

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1690
-2986
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7979
- (GL #944) Replace buefy notifications with c-toasts from `csc-ui`
8080
- (GL #944) Replace buefy Autocomplete component with c-autocomplete from `csc-ui`
8181
- (GH #982) Migrate from vue-cli to vite
82+
- (GH #1034) Migrate to vue3
8283

8384
### Fixed
8485

swift_browser_ui_frontend/.eslintrc.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
},
88
"extends": [
99
"eslint:recommended",
10-
"plugin:vue/essential",
1110
"plugin:vue/base",
12-
"plugin:vue/strongly-recommended",
13-
"plugin:vue/recommended"
11+
"plugin:vue/vue3-recommended"
1412
],
1513
"globals": {
1614
"Atomics": "readonly",
@@ -60,6 +58,9 @@
6058
"switchCase": 1
6159
}
6260
],
63-
"vue/require-prop-types": [0]
61+
"vue/require-prop-types": [0],
62+
"vue/no-deprecated-slot-attribute": [0],
63+
"vue/v-on-event-hyphenation": [0],
64+
"vue/require-explicit-emits": [0]
6465
}
6566
}

swift_browser_ui_frontend/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ typings/
9292
.dynamodb/
9393

9494
.DS_Store
95-
/dist
95+
dist
9696

9797
# local env files
9898
.env.local

swift_browser_ui_frontend/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@
1414
"docker-build-devel": "vite build --mode development"
1515
},
1616
"dependencies": {
17+
"@intlify/unplugin-vue-i18n": "^0.9.2",
1718
"@mdi/js": "^7.1.96",
18-
"@vueuse/rxjs": "^9.12.0",
19+
"@vitejs/plugin-vue": "^4.0.0",
20+
"@vueuse/rxjs": "^9.13.0",
1921
"bulma": "^0.9.4",
2022
"cli-highlight": "^2.1.11",
2123
"csc-ui": "github:hannyle/csc-ui",
22-
"csc-ui-vue-directive": "^0.0.6",
2324
"dexie": "^3.2.3",
24-
"eslint": "^8.33.0",
25+
"eslint": "^8.36.0",
2526
"eslint-plugin-vue": "^9.9.0",
2627
"eslint-utils": "^3.0.0",
27-
"jest": "^27.5.1",
2828
"lodash": "^4.17.21",
2929
"resumablejs": "^1.1.0",
3030
"rxjs": "^7.8.0",
31-
"sass": "^1.58.3",
32-
"vite": "^4.1.3",
33-
"vite-plugin-vue2": "^2.0.3",
34-
"vue": "^2.7.14",
35-
"vue-i18n": "^8.28.2",
36-
"vue-router": "^3.6.5",
37-
"vue-template-compiler": "^2.7.14",
38-
"vuex": "^3.6.2"
31+
"sass": "^1.59.3",
32+
"vite": "^4.1.4",
33+
"vue": "^3.2.47",
34+
"vue-i18n": "^9.2.2",
35+
"vue-router": "^4.1.6",
36+
"vuex": "^4.1.0"
3937
},
4038
"devDependencies": {
41-
"@testing-library/dom": "^8.20.0",
39+
"@testing-library/dom": "^9.0.1",
4240
"@testing-library/jest-dom": "^5.16.5",
4341
"@testing-library/user-event": "^14.4.3",
44-
"@testing-library/vue": "^5.8.3",
45-
"cypress": "^12.5.1"
42+
"@testing-library/vue": "^7.0.0",
43+
"@vue/compiler-sfc": "^3.2.47",
44+
"cypress": "^12.8.0",
45+
"jest": "^29.5.0"
4646
},
4747
"eslintConfig": {
4848
"root": true,

0 commit comments

Comments
 (0)