diff --git a/server/package.json b/server/package.json index 2b8e52c7..04a40bd3 100644 --- a/server/package.json +++ b/server/package.json @@ -10,7 +10,7 @@ "dotenv": "^8.2.0", "eris": "^0.15.0", "eventemitter3": "^4.0.7", - "koa": "^2.13.1", + "koa": "^3.0.1", "koa-static": "^5.0.0", "prisma": "^2.20.1", "socket.io": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index 7c1d2986..20db286d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2382,7 +2382,17 @@ __metadata: languageName: node linkType: hard -"accepts@npm:^1.3.5, accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7": +"accepts@npm:^1.3.8": + version: 1.3.8 + resolution: "accepts@npm:1.3.8" + dependencies: + mime-types: ~2.1.34 + negotiator: 0.6.3 + checksum: 1e824f92b5ae17715cee9bce2496bf05fd173d2e8545c63782954661c93b6b47d3db78ce260b7628d624847fda30604dc174d1822fcc880376047e47ab0ea297 + languageName: node + linkType: hard + +"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7": version: 1.3.7 resolution: "accepts@npm:1.3.7" dependencies: @@ -3138,16 +3148,6 @@ __metadata: languageName: node linkType: hard -"cache-content-type@npm:^1.0.0": - version: 1.0.1 - resolution: "cache-content-type@npm:1.0.1" - dependencies: - mime-types: ^2.1.18 - ylru: ^1.2.0 - checksum: 3afcece8c75fd15a74d96e8bd14d22d5387878c161672c8c7fbc7a89788698d32dc55334395feba309fd601580a410fe47860763ed78686b8b98889ea82ff670 - languageName: node - linkType: hard - "cacheable-lookup@npm:^5.0.3": version: 5.0.4 resolution: "cacheable-lookup@npm:5.0.4" @@ -3493,13 +3493,6 @@ __metadata: languageName: node linkType: hard -"co@npm:^4.6.0": - version: 4.6.0 - resolution: "co@npm:4.6.0" - checksum: 3f22dbbe0f413ff72831d087d853a81d1137093e12e8ec90b4da2bde5c67bc6bff11b6adeb38ca9fa8704b8cd40dba294948bda3c271bccb74669972b840cc1a - languageName: node - linkType: hard - "code-point-at@npm:^1.0.0": version: 1.1.0 resolution: "code-point-at@npm:1.1.0" @@ -3742,7 +3735,7 @@ __metadata: languageName: node linkType: hard -"content-disposition@npm:0.5.3, content-disposition@npm:~0.5.2": +"content-disposition@npm:0.5.3": version: 0.5.3 resolution: "content-disposition@npm:0.5.3" dependencies: @@ -3751,7 +3744,23 @@ __metadata: languageName: node linkType: hard -"content-type@npm:^1.0.4, content-type@npm:~1.0.4": +"content-disposition@npm:~0.5.4": + version: 0.5.4 + resolution: "content-disposition@npm:0.5.4" + dependencies: + safe-buffer: 5.2.1 + checksum: 44169dbbfd5f1d48cc0cf27b1196b0da485c7d2d4b22c3c20a75babbbdd2bc6028b7afa66a9f2e2a4b14cab8506823cca227cc63e7297e17b9e9b1c00593f6db + languageName: node + linkType: hard + +"content-type@npm:^1.0.5": + version: 1.0.5 + resolution: "content-type@npm:1.0.5" + checksum: b9048d1de893fcbc79c94dd17c6080e5cf9a8b35b322674be91e76c0831504f857d2caf7ce29d330e4e5f20ba914164377c99b3285cfe7ffbe64afe976dacd7b + languageName: node + linkType: hard + +"content-type@npm:~1.0.4": version: 1.0.4 resolution: "content-type@npm:1.0.4" checksum: ff6e19cbf281c23d5608723a6dc60ac97e2280bd4d21602511283112321e6c1555895e395555e367672b54a0f1585276284b7c3c8be313aca73902ac2f2609fd @@ -3788,13 +3797,13 @@ __metadata: languageName: node linkType: hard -"cookies@npm:~0.8.0": - version: 0.8.0 - resolution: "cookies@npm:0.8.0" +"cookies@npm:~0.9.1": + version: 0.9.1 + resolution: "cookies@npm:0.9.1" dependencies: depd: ~2.0.0 keygrip: ~1.1.0 - checksum: c401e0f791e5413af5a5e88db85610fad49a58c91b393a917294562b17cc30626d3730591ba73ce27e93a977f9483272c188e35fcc4ade6d2576c4f74628a9c4 + checksum: c70b9adb3cb2efa529ec14a0a63cf8ac6cd72d402648ba2456ce471f04669b4ef3c7402eeb19e6926826e0e08f9b136fe4e675912200a7fe59cf5e7ff8bf415e languageName: node linkType: hard @@ -4082,15 +4091,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:~3.1.0": - version: 3.1.0 - resolution: "debug@npm:3.1.0" - dependencies: - ms: 2.0.0 - checksum: 1295acd5e0531761255661d325cd0a80ac8c5f6de8942a53bb23c2197ccb97526972de662ed0e5d9393be83f3428a298a6e7185ecb02f0da6282019cd2ffb4a8 - languageName: node - linkType: hard - "decamelize-keys@npm:^1.1.0": version: 1.1.0 resolution: "decamelize-keys@npm:1.1.0" @@ -4281,7 +4281,7 @@ __metadata: languageName: node linkType: hard -"depd@npm:^2.0.0, depd@npm:~2.0.0": +"depd@npm:2.0.0, depd@npm:~2.0.0": version: 2.0.0 resolution: "depd@npm:2.0.0" checksum: 20726d843f5ab5e933211fcb5a440a1a3986ef9d6f85d38cf1eae815ea3cc12fa4436bd35a38e21bdb391a021b57f2d97b9f856873852506acac1b07ac913ba4 @@ -4295,7 +4295,14 @@ __metadata: languageName: node linkType: hard -"destroy@npm:^1.0.4, destroy@npm:~1.0.4": +"destroy@npm:^1.2.0": + version: 1.2.0 + resolution: "destroy@npm:1.2.0" + checksum: fea2c89e4b4d06bfe1aa6b3e3678877cb5503aeaa9048aa85e2cabc4f04effa7b67b1ec67923c784f8ffe9e94f0162347c0c46ca24cbd9279e52116542a207d3 + languageName: node + linkType: hard + +"destroy@npm:~1.0.4": version: 1.0.4 resolution: "destroy@npm:1.0.4" checksum: 5a516fc5a8a8089eecdac11da2339353542be7a71102dc5a1372ef6161501bf5c1ee59ff9f8a3f5f14cc8c88594d606f855f816d46a228ee5e0e5cb2b543534b @@ -4549,7 +4556,14 @@ __metadata: languageName: node linkType: hard -"encodeurl@npm:^1.0.2, encodeurl@npm:~1.0.2": +"encodeurl@npm:^2.0.0": + version: 2.0.0 + resolution: "encodeurl@npm:2.0.0" + checksum: 1fbc6b83fbd6b2d97ddd5ed1a47abe286eb4b45deb1e3ba4e8f3c9dfca846665f2054d039c89c52c873c992e9d5f81a7f3fe9273199f930584ffb14ceafa2393 + languageName: node + linkType: hard + +"encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" checksum: 6ee5fcbcd245d2a2b6bd6fe36b80f91e31ab46e29192c50af00e8f860c0c2310ebbdaae40257878fdce90b42abcb3526895c7c3a2e229461ed1f0d0b5a020fc8 @@ -6135,13 +6149,13 @@ fsevents@~2.3.1: languageName: node linkType: hard -"http-assert@npm:^1.3.0": - version: 1.4.1 - resolution: "http-assert@npm:1.4.1" +"http-assert@npm:^1.5.0": + version: 1.5.0 + resolution: "http-assert@npm:1.5.0" dependencies: deep-equal: ~1.0.1 - http-errors: ~1.7.2 - checksum: bf6a90287f0803dbebdc7dbd4927461bafe4a50b600f0081570573291889cd4913c78c522cf40629e19c4705d4d34df9b3834c829c3be3410424ac669c6e9550 + http-errors: ~1.8.0 + checksum: d6273afc45e52d925157d5874e9d9749bdab491c5b39ee2d834b3e30b8e9fe0898eeff1f6ce9b67d9c2d4d098e5efb9116fcd6a7bfb43dda6a5af4ce69130c79 languageName: node linkType: hard @@ -6172,7 +6186,7 @@ fsevents@~2.3.1: languageName: node linkType: hard -"http-errors@npm:^1.6.3, http-errors@npm:^1.7.3": +"http-errors@npm:^1.7.3": version: 1.8.0 resolution: "http-errors@npm:1.8.0" dependencies: @@ -6185,6 +6199,19 @@ fsevents@~2.3.1: languageName: node linkType: hard +"http-errors@npm:^2.0.0": + version: 2.0.0 + resolution: "http-errors@npm:2.0.0" + dependencies: + depd: 2.0.0 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + checksum: 505c185dd64049f1fd71858646f4fb8dc79155f77e0da48d5edcea8a41322f273b8c5e6985bb82ececcd1ee6c6248e80c43bfaa6c1b048a0b967a04452b2ef10 + languageName: node + linkType: hard + "http-errors@npm:~1.6.2": version: 1.6.3 resolution: "http-errors@npm:1.6.3" @@ -6210,6 +6237,19 @@ fsevents@~2.3.1: languageName: node linkType: hard +"http-errors@npm:~1.8.0": + version: 1.8.1 + resolution: "http-errors@npm:1.8.1" + dependencies: + depd: ~1.1.2 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: ">= 1.5.0 < 2" + toidentifier: 1.0.1 + checksum: f8bd2e837a4da9b25c21545de08bf9db2e8014a1bd025707a0d77b8562259e28a4f2b1ec750968e8676b3118668f6da41e5407e7f29055b14cd68fc54cfa6d09 + languageName: node + linkType: hard + "http-parser-js@npm:>=0.5.1": version: 0.5.3 resolution: "http-parser-js@npm:0.5.3" @@ -6756,13 +6796,6 @@ fsevents@~2.3.1: languageName: node linkType: hard -"is-generator-function@npm:^1.0.7": - version: 1.0.8 - resolution: "is-generator-function@npm:1.0.8" - checksum: 1aa2b83ca5ca750d7acb1701476aea6a01e277ab71610e01fc69ee3fbb7d050c753a5d74ece25f3f1e6c9eef1d1c42c1681be3b5c1174f183110bc0ca565677a - languageName: node - linkType: hard - "is-glob@npm:^2.0.0": version: 2.0.1 resolution: "is-glob@npm:2.0.1" @@ -7314,15 +7347,6 @@ fsevents@~2.3.1: languageName: node linkType: hard -"koa-compose@npm:^3.0.0": - version: 3.2.1 - resolution: "koa-compose@npm:3.2.1" - dependencies: - any-promise: ^1.1.0 - checksum: 68f839a57c1cb8f9a0a42b86761ffb43a53d5f95bb9c56daa03895cc5553db88f7740fcbdefd6cf3db17f0f71a8a695b5b249752aef844d44dc0a738181cdf25 - languageName: node - linkType: hard - "koa-compose@npm:^4.1.0": version: 4.1.0 resolution: "koa-compose@npm:4.1.0" @@ -7330,16 +7354,6 @@ fsevents@~2.3.1: languageName: node linkType: hard -"koa-convert@npm:^1.2.0": - version: 1.2.0 - resolution: "koa-convert@npm:1.2.0" - dependencies: - co: ^4.6.0 - koa-compose: ^3.0.0 - checksum: d74bafebae527ef5b26f9f7d66928ca9f62cabba2eb8cc8fff1742a5ed5de21a32ca9ddb0a63b0e6a3e3ae04163be95b3a0efdaed662303f921c655527e16955 - languageName: node - linkType: hard - "koa-send@npm:^5.0.0": version: 5.0.1 resolution: "koa-send@npm:5.0.1" @@ -7361,34 +7375,29 @@ fsevents@~2.3.1: languageName: node linkType: hard -"koa@npm:^2.13.1": - version: 2.13.1 - resolution: "koa@npm:2.13.1" - dependencies: - accepts: ^1.3.5 - cache-content-type: ^1.0.0 - content-disposition: ~0.5.2 - content-type: ^1.0.4 - cookies: ~0.8.0 - debug: ~3.1.0 +"koa@npm:^3.0.1": + version: 3.0.1 + resolution: "koa@npm:3.0.1" + dependencies: + accepts: ^1.3.8 + content-disposition: ~0.5.4 + content-type: ^1.0.5 + cookies: ~0.9.1 delegates: ^1.0.0 - depd: ^2.0.0 - destroy: ^1.0.4 - encodeurl: ^1.0.2 + destroy: ^1.2.0 + encodeurl: ^2.0.0 escape-html: ^1.0.3 fresh: ~0.5.2 - http-assert: ^1.3.0 - http-errors: ^1.6.3 - is-generator-function: ^1.0.7 + http-assert: ^1.5.0 + http-errors: ^2.0.0 koa-compose: ^4.1.0 - koa-convert: ^1.2.0 - on-finished: ^2.3.0 - only: ~0.0.2 - parseurl: ^1.3.2 - statuses: ^1.5.0 - type-is: ^1.6.16 + mime-types: ^3.0.1 + on-finished: ^2.4.1 + parseurl: ^1.3.3 + statuses: ^2.0.1 + type-is: ^2.0.1 vary: ^1.1.2 - checksum: d7e5a6f483c2e5b40b14e063951687ac914bdeec8afc58a0e2cc75d5ab931fbf30753b9751932cd31a506abe5f3d4599b2c002ac5ac7a179b9d3304983470afd + checksum: de5c2972ba2506e77ac3bcec9fb7bb841517920d23b6f83dbe9980b95aa3fa9243f35eb9501415598ab5dde55efd9853fa391ca86a8f7f676c01357282c0687b languageName: node linkType: hard @@ -7655,6 +7664,13 @@ fsevents@~2.3.1: languageName: node linkType: hard +"media-typer@npm:^1.1.0": + version: 1.1.0 + resolution: "media-typer@npm:1.1.0" + checksum: 62641a7390da60a5ee8fb8986f9376b7e4b18c779376696b516fe409cebebab006e6ba4a4ee1026dfd054d74f6f57d193f6ae393eede5acbea2db81d11be8172 + languageName: node + linkType: hard + "memfs@npm:^3.1.2": version: 3.2.2 resolution: "memfs@npm:3.2.2" @@ -7793,6 +7809,20 @@ fsevents@~2.3.1: languageName: node linkType: hard +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: cfa3f12a40091755ec89f2fb50d361952acf2d9acb72b8cfc5b1c1a8581fa1b906929410db8ab834f9d8dd913fe0083e58900d6b8570803b42cf16499ed57b08 + languageName: node + linkType: hard + +"mime-db@npm:^1.54.0": + version: 1.54.0 + resolution: "mime-db@npm:1.54.0" + checksum: e086c7cec0d280621a3fcf979b10016edf4fc2f136d52a20567191e710649426826dfbe25137dfc788d1fe055dc25242b1da0ea376665e0f97da953bc5b337a7 + languageName: node + linkType: hard + "mime-types@npm:^2.1.12, mime-types@npm:~2.1.19": version: 2.1.27 resolution: "mime-types@npm:2.1.27" @@ -7802,7 +7832,7 @@ fsevents@~2.3.1: languageName: node linkType: hard -"mime-types@npm:^2.1.18, mime-types@npm:^2.1.27, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24": +"mime-types@npm:^2.1.27, mime-types@npm:~2.1.17, mime-types@npm:~2.1.24": version: 2.1.30 resolution: "mime-types@npm:2.1.30" dependencies: @@ -7811,6 +7841,24 @@ fsevents@~2.3.1: languageName: node linkType: hard +"mime-types@npm:^3.0.0, mime-types@npm:^3.0.1": + version: 3.0.1 + resolution: "mime-types@npm:3.0.1" + dependencies: + mime-db: ^1.54.0 + checksum: baf3983f98e07c62d2e2cbf2c32bedeabd4f18a18cbefe448d73920323ac12cf374d1c32dc986767a0e48273c0bf4358eeb8159825b925a188c03df7e62dcdb9 + languageName: node + linkType: hard + +"mime-types@npm:~2.1.34": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: 1.52.0 + checksum: 1cbad57696e48f729add20e242f03f8b956a42a3e6e2ecd3ff74fe50ad8308d175961f88e117996dd5ec96b2d64ec69646206ddfc3dae02a629b6b2129e5e30c + languageName: node + linkType: hard + "mime@npm:1.6.0": version: 1.6.0 resolution: "mime@npm:1.6.0" @@ -8088,6 +8136,13 @@ fsevents@~2.3.1: languageName: node linkType: hard +"negotiator@npm:0.6.3": + version: 0.6.3 + resolution: "negotiator@npm:0.6.3" + checksum: 5899e1bf5cc2a599b51473af93871b130a7418cc9a32eb0c1d4ab31b14dbd764117183467ba41d5ae8081da6072f496c053a45052107e8e056c26ac2fefd12ed + languageName: node + linkType: hard + "neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" @@ -8407,7 +8462,16 @@ fsevents@~2.3.1: languageName: node linkType: hard -"on-finished@npm:^2.3.0, on-finished@npm:~2.3.0": +"on-finished@npm:^2.4.1": + version: 2.4.1 + resolution: "on-finished@npm:2.4.1" + dependencies: + ee-first: 1.1.1 + checksum: ed2f28508d2eda518aa4c814a345f1731a1c91acc05b47c17fe304cc71809c2e0e17cca1f4fd032e5e5b6b207d158d15413179868a1b90deeace8fb236fea3a6 + languageName: node + linkType: hard + +"on-finished@npm:~2.3.0": version: 2.3.0 resolution: "on-finished@npm:2.3.0" dependencies: @@ -8450,13 +8514,6 @@ fsevents@~2.3.1: languageName: node linkType: hard -"only@npm:~0.0.2": - version: 0.0.2 - resolution: "only@npm:0.0.2" - checksum: d9bb82243af05b7fccab253ad83d2e0053c4de4a1a7669d83a3a0f98af198a55f0d98cf51ccb58e9a2b67212598865e224c135cefe301846a3d7d3188245ebdb - languageName: node - linkType: hard - "opn@npm:^5.5.0": version: 5.5.0 resolution: "opn@npm:5.5.0" @@ -8684,7 +8741,7 @@ fsevents@~2.3.1: languageName: node linkType: hard -"parseurl@npm:^1.3.2, parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": +"parseurl@npm:^1.3.3, parseurl@npm:~1.3.2, parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" checksum: 52c9e86cb58e38b28f1a50a6354d16648974ab7a2b91b209f97102840471de8adf524427774af6d5bc482fb7c0a6af6ba08ab37de9a1a7ae389ebe074015914b @@ -10038,7 +10095,7 @@ fsevents@~2.3.1: languageName: node linkType: hard -"safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: 0bb57f0d8f9d1fa4fe35ad8a2db1f83a027d48f2822d59ede88fd5cd4ddad83c0b497213feb7a70fbf90597a70c5217f735b0eb1850df40ce9b4ae81dd22b3f9 @@ -10257,7 +10314,7 @@ fsevents@~2.3.1: dotenv: ^8.2.0 eris: ^0.15.0 eventemitter3: ^4.0.7 - koa: ^2.13.1 + koa: ^3.0.1 koa-static: ^5.0.0 prisma: ^2.20.1 socket.io: ^4.0.1 @@ -10685,13 +10742,27 @@ fsevents@~2.3.1: languageName: node linkType: hard -"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:^1.5.0, statuses@npm:~1.5.0": +"statuses@npm:2.0.1": + version: 2.0.1 + resolution: "statuses@npm:2.0.1" + checksum: d0d3024dd1bba02dd3cb837e4f529e2e44f9300e54ca29258e048ded4dd1fdcb85a32060870dd7abb32b6df7f5991b6ea1c051aa5c6ffda6077cac9d68226b23 + languageName: node + linkType: hard + +"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": version: 1.5.0 resolution: "statuses@npm:1.5.0" checksum: 57735269bf231176a60deb80f6d60214cb4a87663b0937e79497afe9aebe2597f8377fd28893f4d1776205f18dd0b927774a26b72051411ac5108e9e2dfc77d2 languageName: node linkType: hard +"statuses@npm:^2.0.1": + version: 2.0.2 + resolution: "statuses@npm:2.0.2" + checksum: 5756d7909ebadd30d7c15a594ad37415d212e16986b47b415dbb39437e7882e881fdd5643104516dc84116a0b5573ce2602d467a22ee314518443ac34d91af6b + languageName: node + linkType: hard + "stream-buffers@npm:^3.0.2": version: 3.0.2 resolution: "stream-buffers@npm:3.0.2" @@ -11186,6 +11257,13 @@ fsevents@~2.3.1: languageName: node linkType: hard +"toidentifier@npm:1.0.1": + version: 1.0.1 + resolution: "toidentifier@npm:1.0.1" + checksum: 2b5c573af97e7c12f91aeade737a40a539da3c123f43099bbddcd40c3365941b9877b482b994a89a3173c4e3f4f70fea887ae44242ade009efb4841f1dad9822 + languageName: node + linkType: hard + "tough-cookie@npm:~2.5.0": version: 2.5.0 resolution: "tough-cookie@npm:2.5.0" @@ -11395,7 +11473,18 @@ fsevents@~2.3.1: languageName: node linkType: hard -"type-is@npm:^1.6.16, type-is@npm:~1.6.17, type-is@npm:~1.6.18": +"type-is@npm:^2.0.1": + version: 2.0.1 + resolution: "type-is@npm:2.0.1" + dependencies: + content-type: ^1.0.5 + media-typer: ^1.1.0 + mime-types: ^3.0.0 + checksum: 2923e174b78853c66e0ebd8dd2c0115c38f02ed5cd5392ae8a79d4d1f4fd3bdbc1eb1e8898305742cc885a853a26f5bc31d4b9507f0cec900832888dde975a4f + languageName: node + linkType: hard + +"type-is@npm:~1.6.17, type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" dependencies: @@ -12240,13 +12329,6 @@ typescript@^4.1.3: languageName: node linkType: hard -"ylru@npm:^1.2.0": - version: 1.2.1 - resolution: "ylru@npm:1.2.1" - checksum: ce002a8bb58b30a5bcc8bf44a6b04fbee9450f78c29b59380223945714f4c0e38cc7f68d5b1efa8bf6cd22766f23a47698c2fd020bbb63dc55f11d8385d7c34e - languageName: node - linkType: hard - "yn@npm:3.1.1": version: 3.1.1 resolution: "yn@npm:3.1.1"