chore: resolving conflicts

This commit is contained in:
Ruben Talstra 2025-02-12 12:58:41 +01:00
parent ce407626fd
commit 17afeb5c36
Failed to extract signature
4 changed files with 1452 additions and 608 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "@librechat/backend", "name": "@librechat/backend",
"version": "v0.7.6", "version": "v0.7.7-rc1",
"description": "", "description": "",
"scripts": { "scripts": {
"start": "echo 'please run this from the root directory'", "start": "echo 'please run this from the root directory'",
@ -45,8 +45,7 @@
"@langchain/google-genai": "^0.1.7", "@langchain/google-genai": "^0.1.7",
"@langchain/google-vertexai": "^0.1.8", "@langchain/google-vertexai": "^0.1.8",
"@langchain/textsplitters": "^0.1.0", "@langchain/textsplitters": "^0.1.0",
"@librechat/agents": "^2.0.3", "@librechat/agents": "^2.0.4",
"@microsoft/microsoft-graph-client": "^3.0.7",
"@waylaidwanderer/fetch-event-source": "^3.0.1", "@waylaidwanderer/fetch-event-source": "^3.0.1",
"axios": "1.7.8", "axios": "1.7.8",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",

View file

@ -1,6 +1,6 @@
{ {
"name": "@librechat/frontend", "name": "@librechat/frontend",
"version": "v0.7.6", "version": "v0.7.7-rc1",
"description": "", "description": "",
"type": "module", "type": "module",
"scripts": { "scripts": {
@ -136,7 +136,7 @@
"tailwindcss": "^3.4.1", "tailwindcss": "^3.4.1",
"ts-jest": "^29.2.5", "ts-jest": "^29.2.5",
"typescript": "^5.3.3", "typescript": "^5.3.3",
"vite": "^5.4.14", "vite": "^6.1.0",
"vite-plugin-node-polyfills": "^0.17.0", "vite-plugin-node-polyfills": "^0.17.0",
"vite-plugin-pwa": "^0.21.1" "vite-plugin-pwa": "^0.21.1"
} }

2049
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
{ {
"name": "LibreChat", "name": "LibreChat",
"version": "v0.7.6", "version": "v0.7.7-rc1",
"description": "", "description": "",
"workspaces": [ "workspaces": [
"api", "api",