Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/web/eslint-plugin-…
Browse files Browse the repository at this point in the history
…vue-9.21.1
  • Loading branch information
Codycody31 authored Feb 6, 2024
2 parents f5afb6b + 6d145b9 commit 17b0a13
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 26 deletions.
32 changes: 16 additions & 16 deletions server/package-lock.json

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

8 changes: 4 additions & 4 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"prettier": "prettier --write ."
},
"dependencies": {
"@elastic/elasticsearch": "^8.11.0",
"@elastic/elasticsearch": "^8.12.1",
"@exceptionless/node": "^3.0.5",
"@rschedule/standard-date-adapter": "1.5.0",
"@scalar/express-api-reference": "^0.2.39",
"@sentry/node": "^7.99.0",
"@types/node": "^20.11.10",
"@types/node": "^20.11.16",
"@vmgware/js-logger": "^1.2.0",
"@vmgware/js-validator": "^1.6.0",
"axios": "^1.6.7",
Expand All @@ -31,7 +31,7 @@
"ical.js": "1.5.0",
"jsonwebtoken": "^9.0.1",
"knex": "^3.1.0",
"moment-timezone": "^0.5.44",
"moment-timezone": "^0.5.45",
"node-forge": "^1.3.1",
"qrcode": "^1.5.3",
"rrule": "^2.8.1",
Expand All @@ -50,7 +50,7 @@
"mocha": "^10.2.0",
"mocha-sonarqube-reporter": "^1.0.2",
"nyc": "^15.1.0",
"prettier": "3.2.4",
"prettier": "3.2.5",
"proxyquire": "^2.1.3",
"sinon": "^17.0.1"
},
Expand Down
11 changes: 6 additions & 5 deletions web/package-lock.json

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

2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@antfu/utils": "^0.7.6",
"@iconify-json/ri": "^1.1.18",
"@iconify/tools": "^3.0.5",
"@iconify/utils": "^2.1.11",
"@iconify/utils": "^2.1.22",
"@iconify/vue": "4.1.1",
"@vitejs/plugin-vue": "^5.0.3",
"@vitejs/plugin-vue-jsx": "^3.0.2",
Expand Down

0 comments on commit 17b0a13

Please sign in to comment.