Merge pull request #694 from gitroomhq/hotfix-conflict-fix

fix conflicts (override "dev" package jsons with "main" package jsons)
This commit is contained in:
egelhaus 2025-04-11 22:55:36 +02:00 committed by GitHub
commit 4ce941214f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2982 additions and 2389 deletions

5335
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -34,19 +34,19 @@
},
"private": true,
"dependencies": {
"@atproto/api": "^0.13.11",
"@aws-sdk/client-s3": "^3.712.0",
"@aws-sdk/s3-request-presigner": "^3.782.0",
"@atproto/api": "^0.14.21",
"@aws-sdk/client-s3": "^3.787.0",
"@aws-sdk/s3-request-presigner": "^3.787.0",
"@casl/ability": "^6.5.0",
"@copilotkit/react-core": "^1.5.19",
"@copilotkit/react-textarea": "^1.5.19",
"@copilotkit/react-ui": "^1.5.19",
"@copilotkit/runtime": "^1.4.7",
"@copilotkit/react-core": "^1.8.4",
"@copilotkit/react-textarea": "^1.8.4",
"@copilotkit/react-ui": "^1.8.4",
"@copilotkit/runtime": "^1.8.4",
"@hookform/resolvers": "^3.3.4",
"@langchain/community": "^0.3.19",
"@langchain/core": "^0.3.26",
"@langchain/langgraph": "^0.2.34",
"@langchain/openai": "^0.3.16",
"@langchain/community": "^0.3.40",
"@langchain/core": "^0.3.44",
"@langchain/langgraph": "^0.2.63",
"@langchain/openai": "^0.5.5",
"@mantine/core": "^5.10.5",
"@mantine/dates": "^5.10.5",
"@mantine/hooks": "^5.10.5",
@ -68,20 +68,20 @@
"@nx/next": "19.7.2",
"@nx/node": "19.7.2",
"@nx/react": "19.7.2",
"@nx/vite": "20.5.0",
"@nx/vite": "19.7.2",
"@nx/webpack": "19.7.2",
"@nx/workspace": "19.7.2",
"@postiz/wallets": "^0.0.1",
"@prisma/client": "^6.5.0",
"@solana/wallet-adapter-react": "^0.15.35",
"@solana/wallet-adapter-react-ui": "^0.9.35",
"@swc/helpers": "0.5.15",
"@swc/helpers": "0.5.13",
"@sweetalert2/theme-dark": "^5.0.16",
"@types/bcrypt": "^5.0.2",
"@types/concat-stream": "^2.0.3",
"@types/facebook-nodejs-business-sdk": "^20.0.2",
"@types/jsonwebtoken": "^9.0.5",
"@types/lodash": "^4.17.16",
"@types/lodash": "^4.14.202",
"@types/md5": "^2.3.5",
"@types/mime": "^4.0.0",
"@types/mime-types": "^2.1.4",
@ -97,7 +97,7 @@
"@uiw/react-md-editor": "^4.0.3",
"@uppy/aws-s3": "^4.1.0",
"@uppy/compressor": "^2.1.1",
"@uppy/core": "^4.4.3",
"@uppy/core": "^4.2.0",
"@uppy/dashboard": "^4.1.0",
"@uppy/drag-drop": "^4.0.2",
"@uppy/file-input": "^4.0.1",
@ -160,7 +160,7 @@
"react-use-keypress": "^1.3.1",
"redis": "^4.6.12",
"reflect-metadata": "^0.1.13",
"remove-markdown": "^0.6.0",
"remove-markdown": "^0.5.0",
"resend": "^3.2.0",
"rss-parser": "^3.13.0",
"rxjs": "^7.8.0",
@ -169,7 +169,7 @@
"simple-statistics": "^7.8.3",
"stripe": "^15.5.0",
"striptags": "^3.2.0",
"sweetalert2": "^11.6.13",
"sweetalert2": "^11.17.2",
"swr": "^2.2.5",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss": "3.4.3",
@ -230,7 +230,7 @@
"prisma": "^6.5.0",
"react-refresh": "^0.10.0",
"sass": "1.62.1",
"ts-jest": "^29.3.1",
"ts-jest": "^29.1.0",
"ts-node": "10.9.2",
"typescript": "5.5.4",
"vite": "^5.0.0",