Merge remote-tracking branch 'origin/main'

# Conflicts:
#	package.json
#	pnpm-lock.yaml
This commit is contained in:
2026-06-02 17:22:07 +08:00
15 changed files with 1425 additions and 1118 deletions
+5 -4
View File
@@ -12,19 +12,20 @@
"predeploy": "pnpm build"
},
"dependencies": {
"@reduxjs/toolkit": "^2.12.0",
"@tailwindcss/vite": "^4.3.0",
"@reduxjs/toolkit": "^2.11.2",
"@tailwindcss/vite": "^4.2.2",
"axios": "^1.16.1",
"moment": "^2.30.1",
"dayjs": "^1.11.20",
"react": "^19.2.6",
"react-dom": "^19.2.6",
"react-redux": "^9.3.0",
"react-router": "^7.16.0",
"react-router-dom": "^7.16.0",
"redux-persist": "^6.0.0",
"tailwindcss": "^4.3.0"
},
"devDependencies": {
"@eslint/js": "^10.0.1",
"@eslint/js": "^9.39.1",
"@types/node": "^25.9.1",
"@types/react": "^19.2.15",
"@types/react-dom": "^19.2.3",