|
|
@ -3853,16 +3853,17 @@ cookie-signature@1.0.6:
|
|
|
|
resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
|
|
|
|
integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
|
|
|
|
integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
cookie@~0.4.1:
|
|
|
|
|
|
|
|
version "0.4.2"
|
|
|
|
|
|
|
|
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
|
|
|
|
|
|
|
|
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
|
|
|
|
|
|
|
|
|
|
|
|
cookie@0.4.1:
|
|
|
|
cookie@0.4.1:
|
|
|
|
version "0.4.1"
|
|
|
|
version "0.4.1"
|
|
|
|
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"
|
|
|
|
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
|
|
|
|
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
|
|
|
|
|
|
|
|
|
|
|
|
cookie@0.4.2:
|
|
|
|
cookie@0.4.2:
|
|
|
|
=======
|
|
|
|
|
|
|
|
cookie@~0.4.1:
|
|
|
|
|
|
|
|
>>>>>>> a8c529123b11a032c4ba44a1587af10373815560
|
|
|
|
|
|
|
|
version "0.4.2"
|
|
|
|
version "0.4.2"
|
|
|
|
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
|
|
|
|
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
|
|
|
|
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
|
|
|
@ -3902,11 +3903,7 @@ core-util-is@~1.0.0:
|
|
|
|
resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
|
|
|
|
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
|
|
|
|
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
cors@^2.8.5:
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
cors@^2.8.5, cors@~2.8.5:
|
|
|
|
cors@^2.8.5, cors@~2.8.5:
|
|
|
|
>>>>>>> a8c529123b11a032c4ba44a1587af10373815560
|
|
|
|
|
|
|
|
version "2.8.5"
|
|
|
|
version "2.8.5"
|
|
|
|
resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
|
|
|
|
integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
|
|
|
|
integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
|
|
|
@ -4181,11 +4178,7 @@ debug@^3.2.7:
|
|
|
|
dependencies:
|
|
|
|
dependencies:
|
|
|
|
ms "^2.1.1"
|
|
|
|
ms "^2.1.1"
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@4:
|
|
|
|
debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@4:
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@4:
|
|
|
|
|
|
|
|
>>>>>>> a8c529123b11a032c4ba44a1587af10373815560
|
|
|
|
|
|
|
|
version "4.3.4"
|
|
|
|
version "4.3.4"
|
|
|
|
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
|
|
|
|
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
|
|
|
|
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
|
|
|
@ -4534,14 +4527,6 @@ encodeurl@~1.0.2:
|
|
|
|
resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
|
|
|
|
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
|
|
|
|
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
encoding@^0.1.0, encoding@^0.1.12:
|
|
|
|
|
|
|
|
version "0.1.13"
|
|
|
|
|
|
|
|
resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
|
|
|
|
|
|
|
|
integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
|
|
|
|
|
|
|
|
dependencies:
|
|
|
|
|
|
|
|
iconv-lite "^0.6.2"
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
engine.io-client@~6.5.2:
|
|
|
|
engine.io-client@~6.5.2:
|
|
|
|
version "6.5.3"
|
|
|
|
version "6.5.3"
|
|
|
|
resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz"
|
|
|
@ -4573,7 +4558,6 @@ engine.io@~6.5.2:
|
|
|
|
debug "~4.3.1"
|
|
|
|
debug "~4.3.1"
|
|
|
|
engine.io-parser "~5.2.1"
|
|
|
|
engine.io-parser "~5.2.1"
|
|
|
|
ws "~8.11.0"
|
|
|
|
ws "~8.11.0"
|
|
|
|
>>>>>>> a8c529123b11a032c4ba44a1587af10373815560
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
enhanced-resolve@^5.15.0:
|
|
|
|
enhanced-resolve@^5.15.0:
|
|
|
|
version "5.15.0"
|
|
|
|
version "5.15.0"
|
|
|
@ -5108,7 +5092,6 @@ expect@^29.0.0:
|
|
|
|
jest-message-util "^29.7.0"
|
|
|
|
jest-message-util "^29.7.0"
|
|
|
|
jest-util "^29.7.0"
|
|
|
|
jest-util "^29.7.0"
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
express-session@^1.17.3:
|
|
|
|
express-session@^1.17.3:
|
|
|
|
version "1.17.3"
|
|
|
|
version "1.17.3"
|
|
|
|
resolved "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz"
|
|
|
@ -5123,8 +5106,6 @@ express-session@^1.17.3:
|
|
|
|
safe-buffer "5.2.1"
|
|
|
|
safe-buffer "5.2.1"
|
|
|
|
uid-safe "~2.1.5"
|
|
|
|
uid-safe "~2.1.5"
|
|
|
|
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
>>>>>>> a8c529123b11a032c4ba44a1587af10373815560
|
|
|
|
|
|
|
|
express@^4.17.3, express@^4.18.2:
|
|
|
|
express@^4.17.3, express@^4.18.2:
|
|
|
|
version "4.18.2"
|
|
|
|
version "4.18.2"
|
|
|
|
resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
|
|
|
@ -5848,7 +5829,7 @@ humanize-ms@^1.2.1:
|
|
|
|
dependencies:
|
|
|
|
dependencies:
|
|
|
|
ms "^2.0.0"
|
|
|
|
ms "^2.0.0"
|
|
|
|
|
|
|
|
|
|
|
|
iconv-lite@^0.6.2, iconv-lite@^0.6.3:
|
|
|
|
iconv-lite@^0.6.3:
|
|
|
|
version "0.6.3"
|
|
|
|
version "0.6.3"
|
|
|
|
resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
|
|
|
|
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
|
|
|
|
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
|
|
|
@ -9488,12 +9469,11 @@ slash@^4.0.0:
|
|
|
|
resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
|
|
|
|
integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
|
|
|
|
integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
smart-buffer@^4.2.0:
|
|
|
|
smart-buffer@^4.2.0:
|
|
|
|
version "4.2.0"
|
|
|
|
version "4.2.0"
|
|
|
|
resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
|
|
|
|
integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
|
|
|
|
integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
|
|
|
|
=======
|
|
|
|
|
|
|
|
socket.io-adapter@~2.5.2:
|
|
|
|
socket.io-adapter@~2.5.2:
|
|
|
|
version "2.5.2"
|
|
|
|
version "2.5.2"
|
|
|
|
resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz"
|
|
|
|
resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz"
|
|
|
@ -9531,7 +9511,6 @@ socket.io@^4.7.2:
|
|
|
|
engine.io "~6.5.2"
|
|
|
|
engine.io "~6.5.2"
|
|
|
|
socket.io-adapter "~2.5.2"
|
|
|
|
socket.io-adapter "~2.5.2"
|
|
|
|
socket.io-parser "~4.2.4"
|
|
|
|
socket.io-parser "~4.2.4"
|
|
|
|
>>>>>>> a8c529123b11a032c4ba44a1587af10373815560
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sockjs@^0.3.24:
|
|
|
|
sockjs@^0.3.24:
|
|
|
|
version "0.3.24"
|
|
|
|
version "0.3.24"
|
|
|
|