Skip to content

Commit

Permalink
Merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmacdonald committed Jan 3, 2025
1 parent 08c6eba commit 3061f12
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 138 deletions.
20 changes: 10 additions & 10 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@eslint/js": "^8.57.1",
"@fontsource/roboto": "^5.1.0",
"@fontsource/roboto": "^5.1.1",
"@mdxeditor/editor": "^3.20.0",
"@mui/icons-material": "^5.16.13",
"@mui/lab": "5.0.0-alpha.165",
Expand All @@ -47,10 +47,10 @@
"@tanstack/react-form": "^0.19.5",
"@tanstack/react-query": "^5.62.11",
"@tanstack/react-query-devtools": "^5.62.11",
"@tanstack/react-router": "^1.92.9",
"@tanstack/react-router": "^1.94.1",
"@tanstack/react-table": "^8.20.6",
"@tanstack/router-devtools": "^1.92.9",
"@tanstack/router-vite-plugin": "^1.91.1",
"@tanstack/router-devtools": "^1.94.1",
"@tanstack/router-vite-plugin": "^1.94.1",
"@tanstack/zod-form-adapter": "^0.19.5",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/eslint__js": "^8.42.3",
Expand All @@ -60,15 +60,15 @@
"@types/lodash-es": "^4.17.12",
"@types/minimatch": "^5.1.2",
"@types/mui-image": "^1.0.5",
"@types/node": "^20.17.10",
"@types/node": "^20.17.11",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@types/react-modal-image": "^2.6.4",
"@types/steamid": "^2.0.3",
"@types/video-react": "^0.15.8",
"@typescript-eslint/eslint-plugin": "^8.18.2",
"@typescript-eslint/parser": "^8.18.2",
"@typescript-eslint/utils": "^8.18.2",
"@typescript-eslint/eslint-plugin": "^8.19.0",
"@typescript-eslint/parser": "^8.19.0",
"@typescript-eslint/utils": "^8.19.0",
"@vitejs/plugin-react-swc": "^3.7.2",
"base64-js": "^1.5.1",
"core-js": "3.35.1",
Expand All @@ -78,7 +78,7 @@
"eslint-plugin-jest": "^28.10.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-react-refresh": "^0.4.16",
"file-type": "^18.7.0",
"ip-cidr": "^4.0.2",
Expand All @@ -102,7 +102,7 @@
"react-timer-hook": "^3.0.8",
"steamid": "^2.1.0",
"typescript": "^5.7.2",
"typescript-eslint": "^8.18.2",
"typescript-eslint": "^8.19.0",
"video-react": "^0.16.0",
"vite": "^5.4.11",
"vite-plugin-html": "^3.2.2",
Expand Down
Loading

0 comments on commit 3061f12

Please sign in to comment.