Skip to content

Commit 9638ff9

Browse files
Merge origin/main and resolve web dependency conflicts
Co-authored-by: quantumdynamics927-dotcom <247722560+quantumdynamics927-dotcom@users.noreply.github.com>
2 parents 269439e + f47794d commit 9638ff9

File tree

2 files changed

+70
-100
lines changed

2 files changed

+70
-100
lines changed

web/package-lock.json

Lines changed: 66 additions & 96 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"framer-motion": "^11.0.0",
2323
"lucide-react": "^0.300.0",
2424
"react": "^18.3.1",
25-
"react-dom": "^18.3.1",
25+
"react-dom": "^19.2.5",
2626
"react-router-dom": "^6.21.0",
2727
"recharts": "^2.10.0",
2828
"three": "^0.160.0",
29-
"@react-three/fiber": "^8.15.0",
29+
"@react-three/fiber": "^9.5.0",
3030
"@react-three/drei": "^10.7.7",
3131
"zustand": "^4.4.7",
3232
"clsx": "^2.0.0",
@@ -36,11 +36,11 @@
3636
"@playwright/test": "^1.48.0",
3737
"@types/node": "^20.10.0",
3838
"@types/react": "^18.2.0",
39-
"@types/react-dom": "^18.2.0",
39+
"@types/react-dom": "^19.2.3",
4040
"@types/three": "^0.160.0",
4141
"@vitejs/plugin-react": "^4.2.0",
4242
"autoprefixer": "^10.4.16",
43-
"postcss": "^8.4.32",
43+
"postcss": "^8.5.9",
4444
"tailwindcss": "^3.4.0",
4545
"typescript": "^5.3.0",
4646
"vite": "^5.0.0"

0 commit comments

Comments
 (0)