Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/mui/material-6.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
RobinTail committed Dec 19, 2024
2 parents 1732715 + 8d12d3e commit d592970
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 134 deletions.
6 changes: 3 additions & 3 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"@octokit/core": "^6.1.2",
"compression": "^1.7.5",
"express": "^5.0.1",
"express-zod-api": "^21.7.0-beta.1",
"express-zod-api": "^21.7.0",
"fast-memory-cache": "^2.0.4",
"http-errors": "^2.0.0",
"mongoose": "^8.8.4",
"mongoose": "^8.9.0",
"pm2": "^5.4.3",
"telegraf": "^4.16.3",
"zod": "^3.23.8"
"zod": "^3.24.1"
}
}
6 changes: 3 additions & 3 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"vite-plugin-material-symbols": "^0.2.2"
},
"dependencies": {
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@mui/lab": "^6.0.0-beta.17",
"@mui/material": "^6.2.0",
"react": "^18.3.1",
Expand All @@ -24,7 +24,7 @@
"react-syntax-highlighter": "^15.6.1",
"react-telegram-auth": "^1.0.3",
"use-local-storage-state": "^19.5.0",
"zod": "^3.23.8"
"zod": "^3.24.1"
},
"scripts": {
"build": "yarn build:client && yarn build:app",
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"workspaces": ["backend", "frontend"],
"type": "module",
"devDependencies": {
"@types/node": "^22.10.1",
"eslint": "^9.16.0",
"@types/node": "^22.10.2",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-allowed-dependencies": "^1.0.1",
"eslint-plugin-prettier": "^5.1.3",
Expand All @@ -16,7 +16,7 @@
"globals": "^15.13.0",
"prettier": "3.4.2",
"typescript": "^5.7.2",
"typescript-eslint": "^8.17.0"
"typescript-eslint": "^8.18.0"
},
"resolutions": {
"**/vite": "^6",
Expand Down
Loading

0 comments on commit d592970

Please sign in to comment.