rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fighting git conflicts

Browse source
This commit is contained in:
apetitco 2025-12-19 15:16:02 +01:00
parent 8898d53526
commit 04c598bed3
11 changed files with 55 additions and 1321 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/@shared/package.json
View file

@ -20,15 +20,7 @@
"fastify-plugin": "^5.1.0",
"joi": "^18.0.2",
"otp": "^1.1.2",
<<<<<<< HEAD
<<<<<<< HEAD
"typebox": "^1.0.64",
=======
"typebox": "^1.0.63",
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
"typebox": "^1.0.63",
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
"uuidv7": "^1.1.0"
},
"devDependencies": {

8
src/auth/package.json
View file

@ -27,15 +27,7 @@
"fastify": "^5.6.2",
"fastify-cli": "^7.4.1",
"fastify-plugin": "^5.1.0",
<<<<<<< HEAD
<<<<<<< HEAD
"typebox": "^1.0.64"
=======
"typebox": "^1.0.63"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
"typebox": "^1.0.63"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
},
"devDependencies": {
"@types/node": "^22.19.3",

8
src/chat/package.json
View file

@ -27,15 +27,7 @@
"fastify": "^5.6.2",
"fastify-plugin": "^5.1.0",
"socket.io": "^4.8.1",
<<<<<<< HEAD
<<<<<<< HEAD
"typebox": "^1.0.64"
=======
"typebox": "^1.0.63"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
"typebox": "^1.0.63"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
},
"devDependencies": {
"@types/node": "^22.19.3",

8
src/package.json
View file

@ -33,15 +33,7 @@
"vite": "^7.3.0"
},
"dependencies": {
<<<<<<< HEAD
<<<<<<< HEAD
"@redocly/cli": "^2.13.0",
=======
"@redocly/cli": "^2.12.7",
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
"@redocly/cli": "^2.12.7",
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
"bindings": "^1.5.0"
}
}

720
src/pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

15
src/tic-tac-toe/package.json
View file

@ -15,10 +15,6 @@
"license": "ISC",
"packageManager": "pnpm@10.24.0",
"dependencies": {
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> c741c20 (fixed things)
"@fastify/autoload": "^6.3.1",
"@fastify/formbody": "^8.0.2",
"@fastify/multipart": "^9.3.0",
@ -28,19 +24,14 @@
"fastify": "^5.6.2",
"fastify-plugin": "^5.1.0",
"socket.io": "^4.8.1",
"typebox": "^1.0.63"
"typebox": "^1.0.64"
},
"devDependencies": {
"@types/node": "^22.19.3",
"fastify-socket.io": "^5.1.0",
"rollup-plugin-node-externals": "^8.1.2",
"socket.io": "^4.8.1",
"vite": "^7.3.0",
"vite-tsconfig-paths": "^5.1.4"
<<<<<<< HEAD
=======
"fastify-socket.io": "^5.1.0",
"socket.io": "^4.8.1"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
>>>>>>> c741c20 (fixed things)
}
}

8
src/user/package.json
View file

@ -26,15 +26,7 @@
"fastify": "^5.6.2",
"fastify-cli": "^7.4.1",
"fastify-plugin": "^5.1.0",
<<<<<<< HEAD
<<<<<<< HEAD
"typebox": "^1.0.64"
=======
"typebox": "^1.0.63"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
=======
"typebox": "^1.0.63"
>>>>>>> 16e6ae0 ((schism): started separating backend from frontend)
},
"devDependencies": {
"@types/node": "^22.19.3",