Merge remote-tracking branch 'upstream/main' into dev

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
sijinhui 2023-12-20 13:36:58 +08:00
commit 551ed5f207
2 changed files with 6227 additions and 2 deletions

View File

@ -17,9 +17,9 @@
}, },
"dependencies": { "dependencies": {
"@fortaine/fetch-event-source": "^3.0.6", "@fortaine/fetch-event-source": "^3.0.6",
"@hello-pangea/dnd": "^16.3.0",
"@next-auth/prisma-adapter": "^1.0.7", "@next-auth/prisma-adapter": "^1.0.7",
"@prisma/client": "^5.7.0", "@prisma/client": "^5.7.0",
"@hello-pangea/dnd": "^16.5.0",
"@svgr/webpack": "^8.1.0", "@svgr/webpack": "^8.1.0",
"@tremor/react": "^3.12.1", "@tremor/react": "^3.12.1",
"@vercel/analytics": "^1.1.1", "@vercel/analytics": "^1.1.1",
@ -51,7 +51,8 @@
"devDependencies": { "devDependencies": {
"@tailwindcss/forms": "^0.5.7", "@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10", "@tailwindcss/typography": "^0.5.10",
"@tauri-apps/cli": "^1.4.0", "@tauri-apps/cli": "^1.5.8",
"@types/node": "^20.9.0",
"@types/react": "^18.2.14", "@types/react": "^18.2.14",
"@types/react-dom": "^18.2.7", "@types/react-dom": "^18.2.7",
"@types/react-katex": "^3.0.0", "@types/react-katex": "^3.0.0",

6224
yarn.lock Normal file

File diff suppressed because it is too large Load Diff