mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-05 14:47:12 -04:00
fix: merge
This commit is contained in:
hossein
parent
c59c982ad3
commit
db9ffc6b93
2 changed files with 1 additions and 165 deletions
|
|
@ -114,7 +114,7 @@
|
|||
},
|
||||
"scripts": {
|
||||
"lint": "eslint .",
|
||||
"test": "mocha --import=tsx --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
|
||||
"test": "mocha --import=tsx --timeout 120000 --recursive tests/backend/specs/**.ts tests/backend/specs/**/*.ts",
|
||||
"test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api",
|
||||
"dev": "node --import tsx node/server.ts",
|
||||
"prod": "node --import tsx node/server.ts",
|
||||
|
|
|
|||
164
src/pnpm-lock.yaml
generated
164
src/pnpm-lock.yaml
generated
|
|
@ -105,13 +105,8 @@ dependencies:
|
|||
specifier: ^3.1.2
|
||||
version: 3.1.2
|
||||
socket.io-client:
|
||||
<<<<<<< HEAD
|
||||
specifier: ^3.1.3
|
||||
version: 3.1.3
|
||||
=======
|
||||
specifier: ^3.1.2
|
||||
version: 3.1.2
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
superagent:
|
||||
specifier: ^8.1.2
|
||||
version: 8.1.2
|
||||
|
|
@ -643,10 +638,6 @@ packages:
|
|||
|
||||
/@types/component-emitter@1.2.14:
|
||||
resolution: {integrity: sha512-lmPil1g82wwWg/qHSxMWkSKyJGQOK+ejXeMAAWyxNtVUD0/Ycj2maL63RAqpxVfdtvTfZkRnqzB0A9ft59y69g==}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
dev: false
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
|
||||
/@types/connect@3.4.38:
|
||||
resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
|
||||
|
|
@ -661,11 +652,7 @@ packages:
|
|||
/@types/cors@2.8.17:
|
||||
resolution: {integrity: sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==}
|
||||
dependencies:
|
||||
<<<<<<< HEAD
|
||||
'@types/node': 20.11.19
|
||||
=======
|
||||
'@types/node': 20.11.17
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
dev: false
|
||||
|
||||
/@types/debug@4.1.12:
|
||||
|
|
@ -974,13 +961,6 @@ packages:
|
|||
engines: {node: '>=0.4.0'}
|
||||
hasBin: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/after@0.8.2:
|
||||
resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/agent-base@7.1.0:
|
||||
resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
|
||||
engines: {node: '>= 14'}
|
||||
|
|
@ -1154,13 +1134,6 @@ packages:
|
|||
is-shared-array-buffer: 1.0.2
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/arraybuffer.slice@0.0.7:
|
||||
resolution: {integrity: sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/asap@2.0.6:
|
||||
resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
|
||||
|
||||
|
|
@ -1260,13 +1233,6 @@ packages:
|
|||
resolution: {integrity: sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==}
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/blob@0.0.5:
|
||||
resolution: {integrity: sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/bluebird@3.7.2:
|
||||
resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
|
||||
dev: true
|
||||
|
|
@ -1502,23 +1468,9 @@ packages:
|
|||
engines: {node: '>=4.0.0'}
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
/component-emitter@1.3.1:
|
||||
resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
|
||||
|
||||
=======
|
||||
/component-bind@1.0.0:
|
||||
resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==}
|
||||
dev: true
|
||||
|
||||
/component-emitter@1.3.1:
|
||||
resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
|
||||
|
||||
/component-inherit@0.0.3:
|
||||
resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/concat-map@0.0.1:
|
||||
resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
|
||||
|
||||
|
|
@ -1680,20 +1632,6 @@ packages:
|
|||
ms: 2.0.0
|
||||
dev: false
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/debug@3.1.0:
|
||||
resolution: {integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==}
|
||||
peerDependencies:
|
||||
supports-color: '*'
|
||||
peerDependenciesMeta:
|
||||
supports-color:
|
||||
optional: true
|
||||
dependencies:
|
||||
ms: 2.0.0
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/debug@3.2.7(supports-color@8.1.1):
|
||||
resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
|
||||
peerDependencies:
|
||||
|
|
@ -1865,49 +1803,12 @@ packages:
|
|||
- bufferutil
|
||||
- supports-color
|
||||
- utf-8-validate
|
||||
dev: true
|
||||
|
||||
/engine.io-client@4.1.4:
|
||||
resolution: {integrity: sha512-843fqAdKeUMFqKi1sSjnR11tJ4wi8sIefu6+JC1OzkkJBmjtc/gM/rZ53tJfu5Iae/3gApm5veoS+v+gtT0+Fg==}
|
||||
dependencies:
|
||||
base64-arraybuffer: 0.1.4
|
||||
component-emitter: 1.3.1
|
||||
debug: 4.3.4(supports-color@8.1.1)
|
||||
engine.io-parser: 4.0.3
|
||||
has-cors: 1.1.0
|
||||
parseqs: 0.0.6
|
||||
parseuri: 0.0.6
|
||||
ws: 7.4.6
|
||||
xmlhttprequest-ssl: 1.6.3
|
||||
yeast: 0.1.2
|
||||
transitivePeerDependencies:
|
||||
- bufferutil
|
||||
- supports-color
|
||||
- utf-8-validate
|
||||
dev: false
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/engine.io-parser@2.2.1:
|
||||
resolution: {integrity: sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==}
|
||||
dependencies:
|
||||
after: 0.8.2
|
||||
arraybuffer.slice: 0.0.7
|
||||
base64-arraybuffer: 0.1.4
|
||||
blob: 0.0.5
|
||||
has-binary2: 1.0.3
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/engine.io-parser@4.0.3:
|
||||
resolution: {integrity: sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==}
|
||||
engines: {node: '>=8.0.0'}
|
||||
dependencies:
|
||||
base64-arraybuffer: 0.1.4
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
dev: false
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
|
||||
/engine.io@4.1.2:
|
||||
resolution: {integrity: sha512-t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ==}
|
||||
|
|
@ -2925,15 +2826,6 @@ packages:
|
|||
resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/has-binary2@1.0.3:
|
||||
resolution: {integrity: sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==}
|
||||
dependencies:
|
||||
isarray: 2.0.1
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/has-cors@1.1.0:
|
||||
resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==}
|
||||
|
||||
|
|
@ -3183,13 +3075,6 @@ packages:
|
|||
engines: {node: '>=8'}
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/indexof@0.0.1:
|
||||
resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/inflight@1.0.6:
|
||||
resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
|
||||
dependencies:
|
||||
|
|
@ -3408,13 +3293,6 @@ packages:
|
|||
resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/isarray@2.0.1:
|
||||
resolution: {integrity: sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/isarray@2.0.5:
|
||||
resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
|
||||
dev: true
|
||||
|
|
@ -4676,38 +4554,7 @@ packages:
|
|||
- bufferutil
|
||||
- supports-color
|
||||
- utf-8-validate
|
||||
dev: true
|
||||
|
||||
/socket.io-client@3.1.2:
|
||||
resolution: {integrity: sha512-fXhF8plHrd7U14A7K0JPOmZzpmGkLpIS6623DzrBZqYzI/yvlP4fA3LnxwthEVgiHmn2uJ4KjdnQD8A03PuBWQ==}
|
||||
engines: {node: '>=10.0.0'}
|
||||
dependencies:
|
||||
'@types/component-emitter': 1.2.14
|
||||
backo2: 1.0.2
|
||||
component-emitter: 1.3.1
|
||||
debug: 4.3.4(supports-color@8.1.1)
|
||||
engine.io-client: 4.1.4
|
||||
parseuri: 0.0.6
|
||||
socket.io-parser: 4.0.5
|
||||
transitivePeerDependencies:
|
||||
- bufferutil
|
||||
- supports-color
|
||||
- utf-8-validate
|
||||
dev: false
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/socket.io-parser@3.3.3:
|
||||
resolution: {integrity: sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==}
|
||||
dependencies:
|
||||
component-emitter: 1.3.1
|
||||
debug: 3.1.0
|
||||
isarray: 2.0.1
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/socket.io-parser@4.0.5:
|
||||
resolution: {integrity: sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==}
|
||||
engines: {node: '>=10.0.0'}
|
||||
|
|
@ -4724,11 +4571,7 @@ packages:
|
|||
dependencies:
|
||||
'@types/cookie': 0.4.1
|
||||
'@types/cors': 2.8.17
|
||||
<<<<<<< HEAD
|
||||
'@types/node': 20.11.19
|
||||
=======
|
||||
'@types/node': 20.11.17
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
accepts: 1.3.8
|
||||
base64id: 2.0.0
|
||||
debug: 4.3.4(supports-color@8.1.1)
|
||||
|
|
@ -4985,13 +4828,6 @@ packages:
|
|||
rimraf: 3.0.2
|
||||
dev: true
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/to-array@0.1.4:
|
||||
resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==}
|
||||
dev: true
|
||||
|
||||
>>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
|
||||
/to-regex-range@5.0.1:
|
||||
resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
|
||||
engines: {node: '>=8.0'}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue