From 1f4f62c00be6544470248f2af815a18719978a6f Mon Sep 17 00:00:00 2001 From: apetitco Date: Fri, 19 Dec 2025 15:16:02 +0100 Subject: [PATCH] fighting git conflicts --- .idea/vcs.xml | 6 + docker-compose.yml | 3 - frontend/pnpm-lock.yaml | 567 --------------------------- src/@shared/package.json | 8 - src/auth/package.json | 8 - src/chat/package.json | 8 - src/package.json | 8 - src/pnpm-lock.yaml | 720 ++--------------------------------- src/tic-tac-toe/package.json | 15 +- src/user/package.json | 8 - 10 files changed, 35 insertions(+), 1316 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 715d2cc..f4303df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,8 +67,6 @@ services: gelf-address: "udp://127.0.0.1:12201" tag: "{{.Name}}" -<<<<<<< HEAD -======= ############### # TIC-TAC-TOE # ############### @@ -92,7 +90,6 @@ services: ############### # CHAT # ############### ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) chat: build: context: ./src/ diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 26b3ee6..ec12443 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -10,15 +10,7 @@ importers: dependencies: '@tailwindcss/vite': specifier: ^4.1.18 -<<<<<<< HEAD -<<<<<<< HEAD version: 4.1.18(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)) -======= - version: 4.1.18(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - version: 4.1.18(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@types/qrcode': specifier: ^1.5.6 version: 1.5.6 @@ -43,8 +35,6 @@ importers: version: 5.9.3 vite: specifier: ^7.3.0 -<<<<<<< HEAD -<<<<<<< HEAD version: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2) vite-tsconfig-paths: specifier: ^5.1.4 @@ -54,428 +44,156 @@ packages: '@esbuild/aix-ppc64@0.27.2': resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} -======= - version: 7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2) - vite-tsconfig-paths: - specifier: ^5.1.4 - version: 5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)) - -packages: - - '@esbuild/aix-ppc64@0.27.1': - resolution: {integrity: sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - version: 7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2) - vite-tsconfig-paths: - specifier: ^5.1.4 - version: 5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)) - -packages: - - '@esbuild/aix-ppc64@0.27.1': - resolution: {integrity: sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ppc64] os: [aix] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/android-arm64@0.27.2': resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==} -======= - '@esbuild/android-arm64@0.27.1': - resolution: {integrity: sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/android-arm64@0.27.1': - resolution: {integrity: sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [android] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/android-arm@0.27.2': resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==} -======= - '@esbuild/android-arm@0.27.1': - resolution: {integrity: sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/android-arm@0.27.1': - resolution: {integrity: sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm] os: [android] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/android-x64@0.27.2': resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==} -======= - '@esbuild/android-x64@0.27.1': - resolution: {integrity: sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/android-x64@0.27.1': - resolution: {integrity: sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [android] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/darwin-arm64@0.27.2': resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==} -======= - '@esbuild/darwin-arm64@0.27.1': - resolution: {integrity: sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/darwin-arm64@0.27.1': - resolution: {integrity: sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [darwin] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/darwin-x64@0.27.2': resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==} -======= - '@esbuild/darwin-x64@0.27.1': - resolution: {integrity: sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/darwin-x64@0.27.1': - resolution: {integrity: sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [darwin] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/freebsd-arm64@0.27.2': resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==} -======= - '@esbuild/freebsd-arm64@0.27.1': - resolution: {integrity: sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/freebsd-arm64@0.27.1': - resolution: {integrity: sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [freebsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/freebsd-x64@0.27.2': resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==} -======= - '@esbuild/freebsd-x64@0.27.1': - resolution: {integrity: sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/freebsd-x64@0.27.1': - resolution: {integrity: sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [freebsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-arm64@0.27.2': resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==} -======= - '@esbuild/linux-arm64@0.27.1': - resolution: {integrity: sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-arm64@0.27.1': - resolution: {integrity: sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-arm@0.27.2': resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==} -======= - '@esbuild/linux-arm@0.27.1': - resolution: {integrity: sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-arm@0.27.1': - resolution: {integrity: sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-ia32@0.27.2': resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==} -======= - '@esbuild/linux-ia32@0.27.1': - resolution: {integrity: sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-ia32@0.27.1': - resolution: {integrity: sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ia32] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-loong64@0.27.2': resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==} -======= - '@esbuild/linux-loong64@0.27.1': - resolution: {integrity: sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-loong64@0.27.1': - resolution: {integrity: sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [loong64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-mips64el@0.27.2': resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==} -======= - '@esbuild/linux-mips64el@0.27.1': - resolution: {integrity: sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-mips64el@0.27.1': - resolution: {integrity: sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [mips64el] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-ppc64@0.27.2': resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==} -======= - '@esbuild/linux-ppc64@0.27.1': - resolution: {integrity: sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-ppc64@0.27.1': - resolution: {integrity: sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ppc64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-riscv64@0.27.2': resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==} -======= - '@esbuild/linux-riscv64@0.27.1': - resolution: {integrity: sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-riscv64@0.27.1': - resolution: {integrity: sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [riscv64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-s390x@0.27.2': resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==} -======= - '@esbuild/linux-s390x@0.27.1': - resolution: {integrity: sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-s390x@0.27.1': - resolution: {integrity: sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [s390x] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-x64@0.27.2': resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==} -======= - '@esbuild/linux-x64@0.27.1': - resolution: {integrity: sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-x64@0.27.1': - resolution: {integrity: sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/netbsd-arm64@0.27.2': resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==} -======= - '@esbuild/netbsd-arm64@0.27.1': - resolution: {integrity: sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/netbsd-arm64@0.27.1': - resolution: {integrity: sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [netbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/netbsd-x64@0.27.2': resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==} -======= - '@esbuild/netbsd-x64@0.27.1': - resolution: {integrity: sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/netbsd-x64@0.27.1': - resolution: {integrity: sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [netbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/openbsd-arm64@0.27.2': resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==} -======= - '@esbuild/openbsd-arm64@0.27.1': - resolution: {integrity: sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/openbsd-arm64@0.27.1': - resolution: {integrity: sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [openbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/openbsd-x64@0.27.2': resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==} -======= - '@esbuild/openbsd-x64@0.27.1': - resolution: {integrity: sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/openbsd-x64@0.27.1': - resolution: {integrity: sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [openbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/openharmony-arm64@0.27.2': resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==} -======= - '@esbuild/openharmony-arm64@0.27.1': - resolution: {integrity: sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/openharmony-arm64@0.27.1': - resolution: {integrity: sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [openharmony] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/sunos-x64@0.27.2': resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==} -======= - '@esbuild/sunos-x64@0.27.1': - resolution: {integrity: sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/sunos-x64@0.27.1': - resolution: {integrity: sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [sunos] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/win32-arm64@0.27.2': resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==} -======= - '@esbuild/win32-arm64@0.27.1': - resolution: {integrity: sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/win32-arm64@0.27.1': - resolution: {integrity: sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [win32] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/win32-ia32@0.27.2': resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==} -======= - '@esbuild/win32-ia32@0.27.1': - resolution: {integrity: sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/win32-ia32@0.27.1': - resolution: {integrity: sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ia32] os: [win32] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/win32-x64@0.27.2': resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==} -======= - '@esbuild/win32-x64@0.27.1': - resolution: {integrity: sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/win32-x64@0.27.1': - resolution: {integrity: sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -705,18 +423,8 @@ packages: '@types/js-cookie@3.0.6': resolution: {integrity: sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==} -<<<<<<< HEAD -<<<<<<< HEAD '@types/node@25.0.3': resolution: {integrity: sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==} -======= - '@types/node@25.0.2': - resolution: {integrity: sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node@25.0.2': - resolution: {integrity: sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@types/qrcode@1.5.6': resolution: {integrity: sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==} @@ -786,18 +494,8 @@ packages: resolution: {integrity: sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==} engines: {node: '>=10.13.0'} -<<<<<<< HEAD -<<<<<<< HEAD esbuild@0.27.2: resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==} -======= - esbuild@0.27.1: - resolution: {integrity: sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - esbuild@0.27.1: - resolution: {integrity: sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} hasBin: true @@ -1110,8 +808,6 @@ packages: snapshots: -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/aix-ppc64@0.27.2': optional: true @@ -1188,162 +884,6 @@ snapshots: optional: true '@esbuild/win32-x64@0.27.2': -======= - '@esbuild/aix-ppc64@0.27.1': - optional: true - - '@esbuild/android-arm64@0.27.1': - optional: true - - '@esbuild/android-arm@0.27.1': - optional: true - - '@esbuild/android-x64@0.27.1': - optional: true - - '@esbuild/darwin-arm64@0.27.1': - optional: true - - '@esbuild/darwin-x64@0.27.1': - optional: true - - '@esbuild/freebsd-arm64@0.27.1': - optional: true - - '@esbuild/freebsd-x64@0.27.1': - optional: true - - '@esbuild/linux-arm64@0.27.1': - optional: true - - '@esbuild/linux-arm@0.27.1': - optional: true - - '@esbuild/linux-ia32@0.27.1': - optional: true - - '@esbuild/linux-loong64@0.27.1': - optional: true - - '@esbuild/linux-mips64el@0.27.1': - optional: true - - '@esbuild/linux-ppc64@0.27.1': - optional: true - - '@esbuild/linux-riscv64@0.27.1': - optional: true - - '@esbuild/linux-s390x@0.27.1': - optional: true - - '@esbuild/linux-x64@0.27.1': - optional: true - - '@esbuild/netbsd-arm64@0.27.1': - optional: true - - '@esbuild/netbsd-x64@0.27.1': - optional: true - - '@esbuild/openbsd-arm64@0.27.1': - optional: true - - '@esbuild/openbsd-x64@0.27.1': - optional: true - - '@esbuild/openharmony-arm64@0.27.1': - optional: true - - '@esbuild/sunos-x64@0.27.1': - optional: true - - '@esbuild/win32-arm64@0.27.1': - optional: true - - '@esbuild/win32-ia32@0.27.1': - optional: true - - '@esbuild/win32-x64@0.27.1': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/aix-ppc64@0.27.1': - optional: true - - '@esbuild/android-arm64@0.27.1': - optional: true - - '@esbuild/android-arm@0.27.1': - optional: true - - '@esbuild/android-x64@0.27.1': - optional: true - - '@esbuild/darwin-arm64@0.27.1': - optional: true - - '@esbuild/darwin-x64@0.27.1': - optional: true - - '@esbuild/freebsd-arm64@0.27.1': - optional: true - - '@esbuild/freebsd-x64@0.27.1': - optional: true - - '@esbuild/linux-arm64@0.27.1': - optional: true - - '@esbuild/linux-arm@0.27.1': - optional: true - - '@esbuild/linux-ia32@0.27.1': - optional: true - - '@esbuild/linux-loong64@0.27.1': - optional: true - - '@esbuild/linux-mips64el@0.27.1': - optional: true - - '@esbuild/linux-ppc64@0.27.1': - optional: true - - '@esbuild/linux-riscv64@0.27.1': - optional: true - - '@esbuild/linux-s390x@0.27.1': - optional: true - - '@esbuild/linux-x64@0.27.1': - optional: true - - '@esbuild/netbsd-arm64@0.27.1': - optional: true - - '@esbuild/netbsd-x64@0.27.1': - optional: true - - '@esbuild/openbsd-arm64@0.27.1': - optional: true - - '@esbuild/openbsd-x64@0.27.1': - optional: true - - '@esbuild/openharmony-arm64@0.27.1': - optional: true - - '@esbuild/sunos-x64@0.27.1': - optional: true - - '@esbuild/win32-arm64@0.27.1': - optional: true - - '@esbuild/win32-ia32@0.27.1': - optional: true - - '@esbuild/win32-x64@0.27.1': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) optional: true '@jridgewell/gen-mapping@0.3.13': @@ -1494,56 +1034,24 @@ snapshots: '@tailwindcss/oxide-win32-arm64-msvc': 4.1.18 '@tailwindcss/oxide-win32-x64-msvc': 4.1.18 -<<<<<<< HEAD -<<<<<<< HEAD '@tailwindcss/vite@4.1.18(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2))': -======= - '@tailwindcss/vite@4.1.18(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2))': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@tailwindcss/vite@4.1.18(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2))': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: '@tailwindcss/node': 4.1.18 '@tailwindcss/oxide': 4.1.18 tailwindcss: 4.1.18 -<<<<<<< HEAD -<<<<<<< HEAD vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2) -======= - vite: 7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - vite: 7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@types/estree@1.0.8': {} '@types/js-cookie@3.0.6': {} -<<<<<<< HEAD -<<<<<<< HEAD '@types/node@25.0.3': -======= - '@types/node@25.0.2': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node@25.0.2': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: undici-types: 7.16.0 '@types/qrcode@1.5.6': dependencies: -<<<<<<< HEAD -<<<<<<< HEAD '@types/node': 25.0.3 -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) ansi-regex@5.0.1: {} @@ -1600,8 +1108,6 @@ snapshots: graceful-fs: 4.2.11 tapable: 2.3.0 -<<<<<<< HEAD -<<<<<<< HEAD esbuild@0.27.2: optionalDependencies: '@esbuild/aix-ppc64': 0.27.2 @@ -1630,43 +1136,6 @@ snapshots: '@esbuild/win32-arm64': 0.27.2 '@esbuild/win32-ia32': 0.27.2 '@esbuild/win32-x64': 0.27.2 -======= - esbuild@0.27.1: - optionalDependencies: -======= - esbuild@0.27.1: - optionalDependencies: ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) - '@esbuild/aix-ppc64': 0.27.1 - '@esbuild/android-arm': 0.27.1 - '@esbuild/android-arm64': 0.27.1 - '@esbuild/android-x64': 0.27.1 - '@esbuild/darwin-arm64': 0.27.1 - '@esbuild/darwin-x64': 0.27.1 - '@esbuild/freebsd-arm64': 0.27.1 - '@esbuild/freebsd-x64': 0.27.1 - '@esbuild/linux-arm': 0.27.1 - '@esbuild/linux-arm64': 0.27.1 - '@esbuild/linux-ia32': 0.27.1 - '@esbuild/linux-loong64': 0.27.1 - '@esbuild/linux-mips64el': 0.27.1 - '@esbuild/linux-ppc64': 0.27.1 - '@esbuild/linux-riscv64': 0.27.1 - '@esbuild/linux-s390x': 0.27.1 - '@esbuild/linux-x64': 0.27.1 - '@esbuild/netbsd-arm64': 0.27.1 - '@esbuild/netbsd-x64': 0.27.1 - '@esbuild/openbsd-arm64': 0.27.1 - '@esbuild/openbsd-x64': 0.27.1 - '@esbuild/openharmony-arm64': 0.27.1 - '@esbuild/sunos-x64': 0.27.1 - '@esbuild/win32-arm64': 0.27.1 - '@esbuild/win32-ia32': 0.27.1 - '@esbuild/win32-x64': 0.27.1 -<<<<<<< HEAD ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) fdir@6.5.0(picomatch@4.0.3): optionalDependencies: @@ -1864,63 +1333,27 @@ snapshots: undici-types@7.16.0: {} -<<<<<<< HEAD -<<<<<<< HEAD vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2)): -======= - vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)): ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2)): ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: debug: 4.4.3 globrex: 0.1.2 tsconfck: 3.1.6(typescript@5.9.3) optionalDependencies: -<<<<<<< HEAD -<<<<<<< HEAD vite: 7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2) -======= - vite: 7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - vite: 7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) transitivePeerDependencies: - supports-color - typescript -<<<<<<< HEAD -<<<<<<< HEAD vite@7.3.0(@types/node@25.0.3)(jiti@2.6.1)(lightningcss@1.30.2): dependencies: esbuild: 0.27.2 -======= - vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2): - dependencies: - esbuild: 0.27.1 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - vite@7.3.0(@types/node@25.0.2)(jiti@2.6.1)(lightningcss@1.30.2): - dependencies: - esbuild: 0.27.1 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 postcss: 8.5.6 rollup: 4.53.5 tinyglobby: 0.2.15 optionalDependencies: -<<<<<<< HEAD -<<<<<<< HEAD '@types/node': 25.0.3 -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) fsevents: 2.3.3 jiti: 2.6.1 lightningcss: 1.30.2 diff --git a/src/@shared/package.json b/src/@shared/package.json index 1c7cd91..4cdbef0 100644 --- a/src/@shared/package.json +++ b/src/@shared/package.json @@ -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": { diff --git a/src/auth/package.json b/src/auth/package.json index b9d98d9..b709575 100644 --- a/src/auth/package.json +++ b/src/auth/package.json @@ -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", diff --git a/src/chat/package.json b/src/chat/package.json index bd698a8..555055b 100644 --- a/src/chat/package.json +++ b/src/chat/package.json @@ -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", diff --git a/src/package.json b/src/package.json index f7da1b7..3169a11 100644 --- a/src/package.json +++ b/src/package.json @@ -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" } } diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 5d2f60e..dffd059 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -9,18 +9,8 @@ importers: .: dependencies: '@redocly/cli': -<<<<<<< HEAD -<<<<<<< HEAD specifier: ^2.13.0 version: 2.13.0(@opentelemetry/api@1.9.0)(ajv@8.17.1)(core-js@3.47.0) -======= - specifier: ^2.12.7 - version: 2.12.7(@opentelemetry/api@1.9.0)(ajv@8.17.1)(core-js@3.47.0) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - specifier: ^2.12.7 - version: 2.12.7(@opentelemetry/api@1.9.0)(ajv@8.17.1)(core-js@3.47.0) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) bindings: specifier: ^1.5.0 version: 1.5.0 @@ -51,15 +41,7 @@ importers: version: 8.50.0(eslint@9.39.2)(typescript@5.9.3) vite: specifier: ^7.3.0 -<<<<<<< HEAD -<<<<<<< HEAD version: 7.3.0(@types/node@25.0.3)(yaml@2.8.2) -======= - version: 7.3.0(@types/node@25.0.2)(yaml@2.8.2) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - version: 7.3.0(@types/node@25.0.2)(yaml@2.8.2) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@shared': dependencies: @@ -97,18 +79,8 @@ importers: specifier: ^1.1.2 version: 1.1.2 typebox: -<<<<<<< HEAD -<<<<<<< HEAD specifier: ^1.0.64 version: 1.0.64 -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) uuidv7: specifier: ^1.1.0 version: 1.1.0 @@ -150,18 +122,8 @@ importers: specifier: ^5.1.0 version: 5.1.0 typebox: -<<<<<<< HEAD -<<<<<<< HEAD specifier: ^1.0.64 version: 1.0.64 -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) devDependencies: '@types/node': specifier: ^22.19.3 @@ -206,18 +168,8 @@ importers: specifier: ^4.8.1 version: 4.8.1 typebox: -<<<<<<< HEAD -<<<<<<< HEAD specifier: ^1.0.64 version: 1.0.64 -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) devDependencies: '@types/node': specifier: ^22.19.3 @@ -231,11 +183,6 @@ importers: vite-tsconfig-paths: specifier: ^5.1.4 version: 5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@22.19.3)(yaml@2.8.2)) -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) tic-tac-toe: dependencies: @@ -266,19 +213,16 @@ importers: socket.io: specifier: ^4.8.1 version: 4.8.1 -<<<<<<< HEAD -<<<<<<< HEAD ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= typebox: - specifier: ^1.0.63 - version: 1.0.63 + specifier: ^1.0.64 + version: 1.0.64 devDependencies: '@types/node': specifier: ^22.19.3 version: 22.19.3 + fastify-socket.io: + specifier: ^5.1.0 + version: 5.1.0(fastify@5.6.2)(socket.io@4.8.1) rollup-plugin-node-externals: specifier: ^8.1.2 version: 8.1.2(rollup@4.53.5) @@ -288,7 +232,6 @@ importers: vite-tsconfig-paths: specifier: ^5.1.4 version: 5.1.4(typescript@5.9.3)(vite@7.3.0(@types/node@22.19.3)(yaml@2.8.2)) ->>>>>>> c741c20 (fixed things) user: dependencies: @@ -317,18 +260,8 @@ importers: specifier: ^5.1.0 version: 5.1.0 typebox: -<<<<<<< HEAD -<<<<<<< HEAD specifier: ^1.0.64 version: 1.0.64 -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - specifier: ^1.0.63 - version: 1.0.63 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) devDependencies: '@types/node': specifier: ^22.19.3 @@ -366,418 +299,158 @@ packages: '@emotion/unitless@0.8.1': resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/aix-ppc64@0.27.2': resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} -======= - '@esbuild/aix-ppc64@0.27.1': - resolution: {integrity: sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/aix-ppc64@0.27.1': - resolution: {integrity: sha512-HHB50pdsBX6k47S4u5g/CaLjqS3qwaOVE5ILsq64jyzgMhLuCuZ8rGzM9yhsAjfjkbgUPMzZEPa7DAp7yz6vuA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ppc64] os: [aix] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/android-arm64@0.27.2': resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==} -======= - '@esbuild/android-arm64@0.27.1': - resolution: {integrity: sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/android-arm64@0.27.1': - resolution: {integrity: sha512-45fuKmAJpxnQWixOGCrS+ro4Uvb4Re9+UTieUY2f8AEc+t7d4AaZ6eUJ3Hva7dtrxAAWHtlEFsXFMAgNnGU9uQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [android] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/android-arm@0.27.2': resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==} -======= - '@esbuild/android-arm@0.27.1': - resolution: {integrity: sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/android-arm@0.27.1': - resolution: {integrity: sha512-kFqa6/UcaTbGm/NncN9kzVOODjhZW8e+FRdSeypWe6j33gzclHtwlANs26JrupOntlcWmB0u8+8HZo8s7thHvg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm] os: [android] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/android-x64@0.27.2': resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==} -======= - '@esbuild/android-x64@0.27.1': - resolution: {integrity: sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/android-x64@0.27.1': - resolution: {integrity: sha512-LBEpOz0BsgMEeHgenf5aqmn/lLNTFXVfoWMUox8CtWWYK9X4jmQzWjoGoNb8lmAYml/tQ/Ysvm8q7szu7BoxRQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [android] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/darwin-arm64@0.27.2': resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==} -======= - '@esbuild/darwin-arm64@0.27.1': - resolution: {integrity: sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/darwin-arm64@0.27.1': - resolution: {integrity: sha512-veg7fL8eMSCVKL7IW4pxb54QERtedFDfY/ASrumK/SbFsXnRazxY4YykN/THYqFnFwJ0aVjiUrVG2PwcdAEqQQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [darwin] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/darwin-x64@0.27.2': resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==} -======= - '@esbuild/darwin-x64@0.27.1': - resolution: {integrity: sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/darwin-x64@0.27.1': - resolution: {integrity: sha512-+3ELd+nTzhfWb07Vol7EZ+5PTbJ/u74nC6iv4/lwIU99Ip5uuY6QoIf0Hn4m2HoV0qcnRivN3KSqc+FyCHjoVQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [darwin] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/freebsd-arm64@0.27.2': resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==} -======= - '@esbuild/freebsd-arm64@0.27.1': - resolution: {integrity: sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/freebsd-arm64@0.27.1': - resolution: {integrity: sha512-/8Rfgns4XD9XOSXlzUDepG8PX+AVWHliYlUkFI3K3GB6tqbdjYqdhcb4BKRd7C0BhZSoaCxhv8kTcBrcZWP+xg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [freebsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/freebsd-x64@0.27.2': resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==} -======= - '@esbuild/freebsd-x64@0.27.1': - resolution: {integrity: sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/freebsd-x64@0.27.1': - resolution: {integrity: sha512-GITpD8dK9C+r+5yRT/UKVT36h/DQLOHdwGVwwoHidlnA168oD3uxA878XloXebK4Ul3gDBBIvEdL7go9gCUFzQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [freebsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-arm64@0.27.2': resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==} -======= - '@esbuild/linux-arm64@0.27.1': - resolution: {integrity: sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-arm64@0.27.1': - resolution: {integrity: sha512-W9//kCrh/6in9rWIBdKaMtuTTzNj6jSeG/haWBADqLLa9P8O5YSRDzgD5y9QBok4AYlzS6ARHifAb75V6G670Q==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-arm@0.27.2': resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==} -======= - '@esbuild/linux-arm@0.27.1': - resolution: {integrity: sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-arm@0.27.1': - resolution: {integrity: sha512-ieMID0JRZY/ZeCrsFQ3Y3NlHNCqIhTprJfDgSB3/lv5jJZ8FX3hqPyXWhe+gvS5ARMBJ242PM+VNz/ctNj//eA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-ia32@0.27.2': resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==} -======= - '@esbuild/linux-ia32@0.27.1': - resolution: {integrity: sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-ia32@0.27.1': - resolution: {integrity: sha512-VIUV4z8GD8rtSVMfAj1aXFahsi/+tcoXXNYmXgzISL+KB381vbSTNdeZHHHIYqFyXcoEhu9n5cT+05tRv13rlw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ia32] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-loong64@0.27.2': resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==} -======= - '@esbuild/linux-loong64@0.27.1': - resolution: {integrity: sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-loong64@0.27.1': - resolution: {integrity: sha512-l4rfiiJRN7sTNI//ff65zJ9z8U+k6zcCg0LALU5iEWzY+a1mVZ8iWC1k5EsNKThZ7XCQ6YWtsZ8EWYm7r1UEsg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [loong64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-mips64el@0.27.2': resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==} -======= - '@esbuild/linux-mips64el@0.27.1': - resolution: {integrity: sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-mips64el@0.27.1': - resolution: {integrity: sha512-U0bEuAOLvO/DWFdygTHWY8C067FXz+UbzKgxYhXC0fDieFa0kDIra1FAhsAARRJbvEyso8aAqvPdNxzWuStBnA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [mips64el] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-ppc64@0.27.2': resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==} -======= - '@esbuild/linux-ppc64@0.27.1': - resolution: {integrity: sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-ppc64@0.27.1': - resolution: {integrity: sha512-NzdQ/Xwu6vPSf/GkdmRNsOfIeSGnh7muundsWItmBsVpMoNPVpM61qNzAVY3pZ1glzzAxLR40UyYM23eaDDbYQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ppc64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-riscv64@0.27.2': resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==} -======= - '@esbuild/linux-riscv64@0.27.1': - resolution: {integrity: sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-riscv64@0.27.1': - resolution: {integrity: sha512-7zlw8p3IApcsN7mFw0O1Z1PyEk6PlKMu18roImfl3iQHTnr/yAfYv6s4hXPidbDoI2Q0pW+5xeoM4eTCC0UdrQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [riscv64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-s390x@0.27.2': resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==} -======= - '@esbuild/linux-s390x@0.27.1': - resolution: {integrity: sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-s390x@0.27.1': - resolution: {integrity: sha512-cGj5wli+G+nkVQdZo3+7FDKC25Uh4ZVwOAK6A06Hsvgr8WqBBuOy/1s+PUEd/6Je+vjfm6stX0kmib5b/O2Ykw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [s390x] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/linux-x64@0.27.2': resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==} -======= - '@esbuild/linux-x64@0.27.1': - resolution: {integrity: sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/linux-x64@0.27.1': - resolution: {integrity: sha512-z3H/HYI9MM0HTv3hQZ81f+AKb+yEoCRlUby1F80vbQ5XdzEMyY/9iNlAmhqiBKw4MJXwfgsh7ERGEOhrM1niMA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [linux] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/netbsd-arm64@0.27.2': resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==} -======= - '@esbuild/netbsd-arm64@0.27.1': - resolution: {integrity: sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/netbsd-arm64@0.27.1': - resolution: {integrity: sha512-wzC24DxAvk8Em01YmVXyjl96Mr+ecTPyOuADAvjGg+fyBpGmxmcr2E5ttf7Im8D0sXZihpxzO1isus8MdjMCXQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [netbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/netbsd-x64@0.27.2': resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==} -======= - '@esbuild/netbsd-x64@0.27.1': - resolution: {integrity: sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/netbsd-x64@0.27.1': - resolution: {integrity: sha512-1YQ8ybGi2yIXswu6eNzJsrYIGFpnlzEWRl6iR5gMgmsrR0FcNoV1m9k9sc3PuP5rUBLshOZylc9nqSgymI+TYg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [netbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/openbsd-arm64@0.27.2': resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==} -======= - '@esbuild/openbsd-arm64@0.27.1': - resolution: {integrity: sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/openbsd-arm64@0.27.1': - resolution: {integrity: sha512-5Z+DzLCrq5wmU7RDaMDe2DVXMRm2tTDvX2KU14JJVBN2CT/qov7XVix85QoJqHltpvAOZUAc3ndU56HSMWrv8g==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [openbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/openbsd-x64@0.27.2': resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==} -======= - '@esbuild/openbsd-x64@0.27.1': - resolution: {integrity: sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/openbsd-x64@0.27.1': - resolution: {integrity: sha512-Q73ENzIdPF5jap4wqLtsfh8YbYSZ8Q0wnxplOlZUOyZy7B4ZKW8DXGWgTCZmF8VWD7Tciwv5F4NsRf6vYlZtqg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [openbsd] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/openharmony-arm64@0.27.2': resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==} -======= - '@esbuild/openharmony-arm64@0.27.1': - resolution: {integrity: sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/openharmony-arm64@0.27.1': - resolution: {integrity: sha512-ajbHrGM/XiK+sXM0JzEbJAen+0E+JMQZ2l4RR4VFwvV9JEERx+oxtgkpoKv1SevhjavK2z2ReHk32pjzktWbGg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [openharmony] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/sunos-x64@0.27.2': resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==} -======= - '@esbuild/sunos-x64@0.27.1': - resolution: {integrity: sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/sunos-x64@0.27.1': - resolution: {integrity: sha512-IPUW+y4VIjuDVn+OMzHc5FV4GubIwPnsz6ubkvN8cuhEqH81NovB53IUlrlBkPMEPxvNnf79MGBoz8rZ2iW8HA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [sunos] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/win32-arm64@0.27.2': resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==} -======= - '@esbuild/win32-arm64@0.27.1': - resolution: {integrity: sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/win32-arm64@0.27.1': - resolution: {integrity: sha512-RIVRWiljWA6CdVu8zkWcRmGP7iRRIIwvhDKem8UMBjPql2TXM5PkDVvvrzMtj1V+WFPB4K7zkIGM7VzRtFkjdg==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [arm64] os: [win32] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/win32-ia32@0.27.2': resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==} -======= - '@esbuild/win32-ia32@0.27.1': - resolution: {integrity: sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/win32-ia32@0.27.1': - resolution: {integrity: sha512-2BR5M8CPbptC1AK5JbJT1fWrHLvejwZidKx3UMSF0ecHMa+smhi16drIrCEggkgviBwLYd5nwrFLSl5Kho96RQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [ia32] os: [win32] -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/win32-x64@0.27.2': resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==} -======= - '@esbuild/win32-x64@0.27.1': - resolution: {integrity: sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@esbuild/win32-x64@0.27.1': - resolution: {integrity: sha512-d5X6RMYv6taIymSk8JBP+nxv8DQAMY6A51GPgusqLdK9wBz5wWIXy1KjTck6HnjE9hqJzJRdk+1p/t5soSbCtw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -1055,18 +728,8 @@ packages: '@redocly/ajv@8.17.1': resolution: {integrity: sha512-EDtsGZS964mf9zAUXAl9Ew16eYbeyAFWhsPr0fX6oaJxgd8rApYlPBf0joyhnUHz88WxrigyFtTaqqzXNzPgqw==} -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/cli@2.13.0': resolution: {integrity: sha512-VOGh8p5gKy+u94SbvMGaHvDM6TPw668D9iQkNSztoi4T5sj3ZwM7Y8Z3yZnMqC5s5epDcLAMq4jCO8UVn5ZWHg==} -======= - '@redocly/cli@2.12.7': - resolution: {integrity: sha512-cevNpojACA3JVUU3fqIzebY1CXipeBl84EMrriAgB4Pi0cHWImf12WkpLN/MCKMlW20/IzBzQ04CVlTyKFXuyw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@redocly/cli@2.12.7': - resolution: {integrity: sha512-cevNpojACA3JVUU3fqIzebY1CXipeBl84EMrriAgB4Pi0cHWImf12WkpLN/MCKMlW20/IzBzQ04CVlTyKFXuyw==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=22.12.0 || >=20.19.0 <21.0.0', npm: '>=10'} hasBin: true @@ -1080,34 +743,14 @@ packages: resolution: {integrity: sha512-2+O+riuIUgVSuLl3Lyh5AplWZyVMNuG2F98/o6NrutKJfW4/GTZdPpZlIphS0HGgcOHgmWcCSHj+dWFlZaGSHw==} engines: {node: '>=18.17.0', npm: '>=9.5.0'} -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/openapi-core@2.13.0': resolution: {integrity: sha512-xQ4z5tsrXbIa4EfCniHv1zZ4etmQ0lpRcxy750iOamV5A/+19mgbPtD+UQCoT18puDAjcnOgpX7x2ha72qKrnw==} engines: {node: '>=22.12.0 || >=20.19.0 <21.0.0', npm: '>=10'} '@redocly/respect-core@2.13.0': resolution: {integrity: sha512-35OidNXWkmmsJiwgX+tFw7FaU8usZVvZ/lFBFNJga65pivEvaDlfiwKxIRTzM4iuNbc2FRvP2q30dlGAztv0tg==} -======= - '@redocly/openapi-core@2.12.7': - resolution: {integrity: sha512-b32Pvl4IE2QZFPpPXD7Qciwy1/AZ2EUaYJ++Oyngaz5WlyeGb9HX/fWmf2QO0YvSqNdK7OSY3m8lPBQ+zlNlgw==} engines: {node: '>=22.12.0 || >=20.19.0 <21.0.0', npm: '>=10'} - '@redocly/respect-core@2.12.7': - resolution: {integrity: sha512-pBm81qeCYkOC0BCAO6lnEDifLChpCUFP6CsBPNXTYgpFa606UjDULYVIcVUOvwZGlqv6euWIHNT8DfkzFGeltQ==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) - engines: {node: '>=22.12.0 || >=20.19.0 <21.0.0', npm: '>=10'} - -======= - '@redocly/openapi-core@2.12.7': - resolution: {integrity: sha512-b32Pvl4IE2QZFPpPXD7Qciwy1/AZ2EUaYJ++Oyngaz5WlyeGb9HX/fWmf2QO0YvSqNdK7OSY3m8lPBQ+zlNlgw==} - engines: {node: '>=22.12.0 || >=20.19.0 <21.0.0', npm: '>=10'} - - '@redocly/respect-core@2.12.7': - resolution: {integrity: sha512-pBm81qeCYkOC0BCAO6lnEDifLChpCUFP6CsBPNXTYgpFa606UjDULYVIcVUOvwZGlqv6euWIHNT8DfkzFGeltQ==} - engines: {node: '>=22.12.0 || >=20.19.0 <21.0.0', npm: '>=10'} - ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@rollup/rollup-android-arm-eabi@4.53.5': resolution: {integrity: sha512-iDGS/h7D8t7tvZ1t6+WPK04KD0MwzLZrG0se1hzBjSi5fyxlsiggoJHwh18PCFNn7tG43OWb6pdZ6Y+rMlmyNQ==} cpu: [arm] @@ -1242,18 +885,8 @@ packages: '@types/node@22.19.3': resolution: {integrity: sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==} -<<<<<<< HEAD -<<<<<<< HEAD '@types/node@25.0.3': resolution: {integrity: sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==} -======= - '@types/node@25.0.2': - resolution: {integrity: sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node@25.0.2': - resolution: {integrity: sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@types/stylis@4.2.5': resolution: {integrity: sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==} @@ -1689,18 +1322,8 @@ packages: es6-promise@3.3.1: resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==} -<<<<<<< HEAD -<<<<<<< HEAD esbuild@0.27.2: resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==} -======= - esbuild@0.27.1: - resolution: {integrity: sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - esbuild@0.27.1: - resolution: {integrity: sha512-yY35KZckJJuVVPXpvjgxiCuVEJT67F6zDeVTv4rizyPrfGBUpZQsvmxnN+C371c2esD/hNMjj4tpBhuueLN7aA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) engines: {node: '>=18'} hasBin: true @@ -1811,9 +1434,18 @@ packages: resolution: {integrity: sha512-7Jsfj2uLuGWvnxjrGDrHWpSm65+OcVx0ZbTD2wwkz6Wt6KjGm6+ZYwwpdXdwAlzbJYq+LCEMNvDJc4485AQ1vQ==} hasBin: true + fastify-plugin@4.5.1: + resolution: {integrity: sha512-stRHYGeuqpEZTL1Ef0Ovr2ltazUT9g844X5z/zEBFLG8RYlpDiOCIG+ATvYEp+/zmc7sN29mcIMp8gvYplYPIQ==} + fastify-plugin@5.1.0: resolution: {integrity: sha512-FAIDA8eovSt5qcDgcBvDuX/v0Cjz0ohGhENZ/wpc3y+oZCY2afZ9Baqql3g/lC+OHRnciQol4ww7tuthOb9idw==} + fastify-socket.io@5.1.0: + resolution: {integrity: sha512-GC1gjrxBGeTbMWV779XHF4uw3AtgKwSQJ9MnjGiMp91ZBuPXEdBYa7NnAMDEl3oZPgK9JO4BlNncTV+UAN+1kg==} + peerDependencies: + fastify: 4.x.x + socket.io: '>=4' + fastify@5.6.2: resolution: {integrity: sha512-dPugdGnsvYkBlENLhCgX8yhyGCsCPrpA8lFWbTNU428l+YOnLgYHR69hzV8HWPC79n536EqzqQtvhtdaCE0dKg==} @@ -2853,6 +2485,9 @@ packages: tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -2864,18 +2499,8 @@ packages: resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==} engines: {node: '>= 0.6'} -<<<<<<< HEAD -<<<<<<< HEAD typebox@1.0.64: resolution: {integrity: sha512-U6quDhQMzQRzBX8jvlE5mZlUnlMRTaZrG/QMAhOYVJ0D0rhq1iOXBQVSzBX0JgAh55jXQ7fWIv24i+lVimXcDw==} -======= - typebox@1.0.63: - resolution: {integrity: sha512-qqQ1IePTIL3Illa9C5GToVAUM5qRwOaDN4x/V4jBIt4V0S3lqttJbUNIYm+u+QXvvVxOnTddWxa+6hGuujIEwA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - typebox@1.0.63: - resolution: {integrity: sha512-qqQ1IePTIL3Illa9C5GToVAUM5qRwOaDN4x/V4jBIt4V0S3lqttJbUNIYm+u+QXvvVxOnTddWxa+6hGuujIEwA==} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) typescript-eslint@8.50.0: resolution: {integrity: sha512-Q1/6yNUmCpH94fbgMUMg2/BSAr/6U7GBk61kZTv1/asghQOWOjTlp9K8mixS5NcJmm2creY+UFfGeW/+OcA64A==} @@ -3106,8 +2731,6 @@ snapshots: '@emotion/unitless@0.8.1': {} -<<<<<<< HEAD -<<<<<<< HEAD '@esbuild/aix-ppc64@0.27.2': optional: true @@ -3184,166 +2807,8 @@ snapshots: optional: true '@esbuild/win32-x64@0.27.2': -======= - '@esbuild/aix-ppc64@0.27.1': optional: true - '@esbuild/android-arm64@0.27.1': - optional: true - - '@esbuild/android-arm@0.27.1': - optional: true - - '@esbuild/android-x64@0.27.1': - optional: true - - '@esbuild/darwin-arm64@0.27.1': - optional: true - - '@esbuild/darwin-x64@0.27.1': - optional: true - - '@esbuild/freebsd-arm64@0.27.1': - optional: true - - '@esbuild/freebsd-x64@0.27.1': - optional: true - - '@esbuild/linux-arm64@0.27.1': - optional: true - - '@esbuild/linux-arm@0.27.1': - optional: true - - '@esbuild/linux-ia32@0.27.1': - optional: true - - '@esbuild/linux-loong64@0.27.1': - optional: true - - '@esbuild/linux-mips64el@0.27.1': - optional: true - - '@esbuild/linux-ppc64@0.27.1': - optional: true - - '@esbuild/linux-riscv64@0.27.1': - optional: true - - '@esbuild/linux-s390x@0.27.1': - optional: true - - '@esbuild/linux-x64@0.27.1': - optional: true - - '@esbuild/netbsd-arm64@0.27.1': - optional: true - - '@esbuild/netbsd-x64@0.27.1': - optional: true - - '@esbuild/openbsd-arm64@0.27.1': - optional: true - - '@esbuild/openbsd-x64@0.27.1': - optional: true - - '@esbuild/openharmony-arm64@0.27.1': - optional: true - - '@esbuild/sunos-x64@0.27.1': - optional: true - - '@esbuild/win32-arm64@0.27.1': - optional: true - - '@esbuild/win32-ia32@0.27.1': - optional: true - - '@esbuild/win32-x64@0.27.1': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) - optional: true - -======= - '@esbuild/aix-ppc64@0.27.1': - optional: true - - '@esbuild/android-arm64@0.27.1': - optional: true - - '@esbuild/android-arm@0.27.1': - optional: true - - '@esbuild/android-x64@0.27.1': - optional: true - - '@esbuild/darwin-arm64@0.27.1': - optional: true - - '@esbuild/darwin-x64@0.27.1': - optional: true - - '@esbuild/freebsd-arm64@0.27.1': - optional: true - - '@esbuild/freebsd-x64@0.27.1': - optional: true - - '@esbuild/linux-arm64@0.27.1': - optional: true - - '@esbuild/linux-arm@0.27.1': - optional: true - - '@esbuild/linux-ia32@0.27.1': - optional: true - - '@esbuild/linux-loong64@0.27.1': - optional: true - - '@esbuild/linux-mips64el@0.27.1': - optional: true - - '@esbuild/linux-ppc64@0.27.1': - optional: true - - '@esbuild/linux-riscv64@0.27.1': - optional: true - - '@esbuild/linux-s390x@0.27.1': - optional: true - - '@esbuild/linux-x64@0.27.1': - optional: true - - '@esbuild/netbsd-arm64@0.27.1': - optional: true - - '@esbuild/netbsd-x64@0.27.1': - optional: true - - '@esbuild/openbsd-arm64@0.27.1': - optional: true - - '@esbuild/openbsd-x64@0.27.1': - optional: true - - '@esbuild/openharmony-arm64@0.27.1': - optional: true - - '@esbuild/sunos-x64@0.27.1': - optional: true - - '@esbuild/win32-arm64@0.27.1': - optional: true - - '@esbuild/win32-ia32@0.27.1': - optional: true - - '@esbuild/win32-x64@0.27.1': - optional: true - ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) '@eslint-community/eslint-utils@4.9.0(eslint@9.39.2)': dependencies: eslint: 9.39.2 @@ -3661,32 +3126,14 @@ snapshots: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/cli@2.13.0(@opentelemetry/api@1.9.0)(ajv@8.17.1)(core-js@3.47.0)': -======= - '@redocly/cli@2.12.7(@opentelemetry/api@1.9.0)(ajv@8.17.1)(core-js@3.47.0)': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@redocly/cli@2.12.7(@opentelemetry/api@1.9.0)(ajv@8.17.1)(core-js@3.47.0)': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: '@opentelemetry/exporter-trace-otlp-http': 0.202.0(@opentelemetry/api@1.9.0) '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0) '@opentelemetry/sdk-trace-node': 2.0.1(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.34.0 -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/openapi-core': 2.13.0(ajv@8.17.1) '@redocly/respect-core': 2.13.0(ajv@8.17.1) -======= - '@redocly/openapi-core': 2.12.7(ajv@8.17.1) - '@redocly/respect-core': 2.12.7(ajv@8.17.1) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@redocly/openapi-core': 2.12.7(ajv@8.17.1) - '@redocly/respect-core': 2.12.7(ajv@8.17.1) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) abort-controller: 3.0.0 chokidar: 3.6.0 colorette: 1.4.0 @@ -3738,15 +3185,7 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/openapi-core@2.13.0(ajv@8.17.1)': -======= - '@redocly/openapi-core@2.12.7(ajv@8.17.1)': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@redocly/openapi-core@2.12.7(ajv@8.17.1)': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: '@redocly/ajv': 8.17.1 '@redocly/config': 0.41.0 @@ -3760,28 +3199,12 @@ snapshots: transitivePeerDependencies: - ajv -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/respect-core@2.13.0(ajv@8.17.1)': -======= - '@redocly/respect-core@2.12.7(ajv@8.17.1)': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@redocly/respect-core@2.12.7(ajv@8.17.1)': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: '@faker-js/faker': 7.6.0 '@noble/hashes': 1.8.0 '@redocly/ajv': 8.17.1 -<<<<<<< HEAD -<<<<<<< HEAD '@redocly/openapi-core': 2.13.0(ajv@8.17.1) -======= - '@redocly/openapi-core': 2.12.7(ajv@8.17.1) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@redocly/openapi-core': 2.12.7(ajv@8.17.1) ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) better-ajv-errors: 1.2.0(ajv@8.17.1) colorette: 2.0.20 json-pointer: 0.6.2 @@ -3881,15 +3304,7 @@ snapshots: dependencies: undici-types: 6.21.0 -<<<<<<< HEAD -<<<<<<< HEAD '@types/node@25.0.3': -======= - '@types/node@25.0.2': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node@25.0.2': ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) dependencies: undici-types: 7.16.0 @@ -4336,8 +3751,6 @@ snapshots: es6-promise@3.3.1: {} -<<<<<<< HEAD -<<<<<<< HEAD esbuild@0.27.2: optionalDependencies: '@esbuild/aix-ppc64': 0.27.2 @@ -4366,43 +3779,6 @@ snapshots: '@esbuild/win32-arm64': 0.27.2 '@esbuild/win32-ia32': 0.27.2 '@esbuild/win32-x64': 0.27.2 -======= - esbuild@0.27.1: - optionalDependencies: -======= - esbuild@0.27.1: - optionalDependencies: ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) - '@esbuild/aix-ppc64': 0.27.1 - '@esbuild/android-arm': 0.27.1 - '@esbuild/android-arm64': 0.27.1 - '@esbuild/android-x64': 0.27.1 - '@esbuild/darwin-arm64': 0.27.1 - '@esbuild/darwin-x64': 0.27.1 - '@esbuild/freebsd-arm64': 0.27.1 - '@esbuild/freebsd-x64': 0.27.1 - '@esbuild/linux-arm': 0.27.1 - '@esbuild/linux-arm64': 0.27.1 - '@esbuild/linux-ia32': 0.27.1 - '@esbuild/linux-loong64': 0.27.1 - '@esbuild/linux-mips64el': 0.27.1 - '@esbuild/linux-ppc64': 0.27.1 - '@esbuild/linux-riscv64': 0.27.1 - '@esbuild/linux-s390x': 0.27.1 - '@esbuild/linux-x64': 0.27.1 - '@esbuild/netbsd-arm64': 0.27.1 - '@esbuild/netbsd-x64': 0.27.1 - '@esbuild/openbsd-arm64': 0.27.1 - '@esbuild/openbsd-x64': 0.27.1 - '@esbuild/openharmony-arm64': 0.27.1 - '@esbuild/sunos-x64': 0.27.1 - '@esbuild/win32-arm64': 0.27.1 - '@esbuild/win32-ia32': 0.27.1 - '@esbuild/win32-x64': 0.27.1 -<<<<<<< HEAD ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) escalade@3.2.0: {} @@ -4543,8 +3919,17 @@ snapshots: semver: 7.7.3 yargs-parser: 22.0.0 + fastify-plugin@4.5.1: {} + fastify-plugin@5.1.0: {} + fastify-socket.io@5.1.0(fastify@5.6.2)(socket.io@4.8.1): + dependencies: + fastify: 5.6.2 + fastify-plugin: 4.5.1 + socket.io: 4.8.1 + tslib: 2.8.1 + fastify@5.6.2: dependencies: '@fastify/ajv-compiler': 4.0.5 @@ -5236,15 +4621,7 @@ snapshots: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 -<<<<<<< HEAD -<<<<<<< HEAD '@types/node': 25.0.3 -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) long: 5.3.2 pump@3.0.3: @@ -5659,17 +5036,8 @@ snapshots: tslib@2.6.2: {} -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -======= ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) tslib@2.8.1: {} ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= ->>>>>>> c741c20 (fixed things) tunnel-agent@0.6.0: dependencies: safe-buffer: 5.2.1 @@ -5684,15 +5052,7 @@ snapshots: media-typer: 1.1.0 mime-types: 3.0.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) typescript-eslint@8.50.0(eslint@9.39.2)(typescript@5.9.3): dependencies: @@ -5747,15 +5107,7 @@ snapshots: vite@7.3.0(@types/node@22.19.3)(yaml@2.8.2): dependencies: -<<<<<<< HEAD -<<<<<<< HEAD esbuild: 0.27.2 -======= - esbuild: 0.27.1 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - esbuild: 0.27.1 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 postcss: 8.5.6 @@ -5766,36 +5118,16 @@ snapshots: fsevents: 2.3.3 yaml: 2.8.2 -<<<<<<< HEAD -<<<<<<< HEAD vite@7.3.0(@types/node@25.0.3)(yaml@2.8.2): dependencies: esbuild: 0.27.2 -======= - vite@7.3.0(@types/node@25.0.2)(yaml@2.8.2): - dependencies: - esbuild: 0.27.1 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - vite@7.3.0(@types/node@25.0.2)(yaml@2.8.2): - dependencies: - esbuild: 0.27.1 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 postcss: 8.5.6 rollup: 4.53.5 tinyglobby: 0.2.15 optionalDependencies: -<<<<<<< HEAD -<<<<<<< HEAD '@types/node': 25.0.3 -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) -======= - '@types/node': 25.0.2 ->>>>>>> 16e6ae0 ((schism): started separating backend from frontend) fsevents: 2.3.3 yaml: 2.8.2 diff --git a/src/tic-tac-toe/package.json b/src/tic-tac-toe/package.json index 7719b58..e9edce4 100644 --- a/src/tic-tac-toe/package.json +++ b/src/tic-tac-toe/package.json @@ -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) } } diff --git a/src/user/package.json b/src/user/package.json index 984ad8d..2987bf2 100644 --- a/src/user/package.json +++ b/src/user/package.json @@ -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",