Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
marvin-wtt committed Dec 18, 2024
2 parents 3f815f2 + c7c6c8b commit 93c6316
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 64 deletions.
122 changes: 63 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
"test:unit:ci": "vitest run"
},
"dependencies": {
"@quasar/extras": "^1.16.11",
"@quasar/extras": "^1.16.15",
"electron-log": "^5.1.5",
"electron-updater": "^6.3.0",
"events": "^3.3.0",
"pinia": "^2.1.7",
"quasar": "^2.16.4",
"vue": "^3.4.29",
"vue-i18n": "^9.13.1",
"vue-i18n": "^9.14.2",
"vue-router": "^4.4.0"
},
"devDependencies": {
"@intlify/unplugin-vue-i18n": "^4.0.0",
"@pinia/testing": "^0.1.3",
"@quasar/app-vite": "^2.0.0-beta.15",
"@quasar/cli": "^2.4.1",
"@quasar/quasar-app-extension-testing-unit-vitest": "^1.0.0",
"@quasar/quasar-app-extension-testing-unit-vitest": "^1.1.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^20.14.10",
"@types/w3c-web-hid": "^1.0.6",
Expand All @@ -52,11 +52,11 @@
"@vitest/ui": "^1.6.0",
"@vue/test-utils": "^2.4.6",
"autoprefixer": "^10.4.19",
"electron": "^31.0.2",
"electron": "^33.2.1",
"electron-builder": "^24.13.3",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-vue": "^9.26.0",
"eslint-plugin-vue": "^9.32.0",
"lodash-es": "^4.17.21",
"prettier": "^3.3.2",
"typed-emitter": "^2.1.0",
Expand Down

0 comments on commit 93c6316

Please sign in to comment.