From ae6067744d83892714df928bfdda19e2629e4a34 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Wed, 3 Apr 2024 19:01:08 +0200 Subject: [PATCH 1/2] chore: update koa libs --- packages/core/admin/package.json | 6 +- packages/core/content-manager/package.json | 2 +- packages/core/content-releases/package.json | 2 +- .../core/content-type-builder/package.json | 2 +- packages/core/core/package.json | 10 +- packages/core/data-transfer/package.json | 2 +- packages/core/email/package.json | 2 +- packages/core/types/package.json | 4 +- packages/core/upload/package.json | 2 +- packages/core/utils/package.json | 2 +- packages/plugins/documentation/package.json | 2 +- packages/plugins/graphql/package.json | 4 +- .../plugins/users-permissions/package.json | 4 +- yarn.lock | 165 +++++++++++++++--- 14 files changed, 160 insertions(+), 49 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 7048adf575..729516b15c 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -106,11 +106,11 @@ "invariant": "^2.2.4", "js-cookie": "2.2.1", "jsonwebtoken": "9.0.0", - "koa": "2.13.4", + "koa": "2.15.2", "koa-compose": "4.1.0", - "koa-passport": "5.0.0", + "koa-passport": "6.0.0", "koa-static": "5.0.0", - "koa2-ratelimit": "^1.1.2", + "koa2-ratelimit": "^1.1.3", "lodash": "4.17.21", "msw": "1.3.0", "node-schedule": "2.1.0", diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json index 52eec99019..8c2305e7c8 100644 --- a/packages/core/content-manager/package.json +++ b/packages/core/content-manager/package.json @@ -70,7 +70,7 @@ "fractional-indexing": "3.2.0", "highlight.js": "^10.4.1", "immer": "9.0.21", - "koa": "2.13.4", + "koa": "2.15.2", "lodash": "4.17.21", "markdown-it": "^12.3.2", "markdown-it-abbr": "^1.0.4", diff --git a/packages/core/content-releases/package.json b/packages/core/content-releases/package.json index f677c4847e..6dc642bf90 100644 --- a/packages/core/content-releases/package.json +++ b/packages/core/content-releases/package.json @@ -78,7 +78,7 @@ "@testing-library/user-event": "14.4.3", "@types/koa": "2.13.4", "@types/styled-components": "5.1.34", - "koa": "2.13.4", + "koa": "2.15.2", "msw": "1.3.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index 9825571613..ca85cd1576 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -79,7 +79,7 @@ "@testing-library/react": "14.0.0", "@testing-library/user-event": "14.4.3", "@types/pluralize": "0.0.30", - "koa": "2.13.4", + "koa": "2.15.2", "koa-body": "4.2.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/core/core/package.json b/packages/core/core/package.json index c8560aba4b..148872b72e 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -52,8 +52,8 @@ "watch": "pack-up watch" }, "dependencies": { - "@koa/cors": "3.4.3", - "@koa/router": "10.1.1", + "@koa/cors": "5.0.0", + "@koa/router": "12.0.1", "@paralleldrive/cuid2": "2.2.2", "@strapi/admin": "5.0.0-beta.2", "@strapi/database": "5.0.0-beta.2", @@ -82,13 +82,13 @@ "http-errors": "1.8.1", "inquirer": "8.2.5", "is-docker": "2.2.1", - "koa": "2.13.4", + "koa": "2.15.2", "koa-body": "4.2.0", "koa-compose": "4.1.0", - "koa-compress": "5.1.0", + "koa-compress": "5.1.1", "koa-favicon": "2.1.0", "koa-helmet": "7.0.2", - "koa-ip": "^2.1.2", + "koa-ip": "^2.1.3", "koa-session": "6.4.0", "koa-static": "5.0.0", "lodash": "4.17.21", diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index b32ce0e9cc..de1dc58f3c 100644 --- a/packages/core/data-transfer/package.json +++ b/packages/core/data-transfer/package.json @@ -73,7 +73,7 @@ "@types/tar-stream": "2.2.2", "@types/ws": "^8.5.4", "knex": "3.0.1", - "koa": "2.13.4", + "koa": "2.15.2", "rimraf": "5.0.5", "typescript": "5.3.2" }, diff --git a/packages/core/email/package.json b/packages/core/email/package.json index f2e59b4df3..0c5f08644c 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -68,7 +68,7 @@ "@testing-library/react": "14.0.0", "@types/koa": "2.13.4", "@types/lodash": "^4.14.191", - "koa": "2.13.4", + "koa": "2.15.2", "koa-body": "4.2.0", "msw": "1.3.0", "react": "^18.2.0", diff --git a/packages/core/types/package.json b/packages/core/types/package.json index 7059e5fd52..ed32b2a421 100644 --- a/packages/core/types/package.json +++ b/packages/core/types/package.json @@ -45,13 +45,13 @@ "dependencies": { "@casl/ability": "6.5.0", "@koa/cors": "5.0.0", - "@koa/router": "10.1.1", + "@koa/router": "12.0.1", "@strapi/database": "5.0.0-beta.2", "@strapi/logger": "5.0.0-beta.2", "@strapi/permissions": "5.0.0-beta.2", "@strapi/utils": "5.0.0-beta.2", "commander": "8.3.0", - "koa": "2.13.4", + "koa": "2.15.2", "node-schedule": "2.1.0", "typedoc": "0.25.10" }, diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index 62976a20f8..2b726726ae 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -84,7 +84,7 @@ "@types/koa-range": "0.3.5", "@types/koa-static": "4.0.2", "formidable": "3.5.1", - "koa": "2.13.4", + "koa": "2.15.2", "koa-body": "4.2.0", "msw": "1.3.0", "react": "^18.2.0", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 3a3a5f9066..8ea5b86365 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -60,7 +60,7 @@ "@types/koa": "2.13.4", "@types/node": "18.19.24", "eslint-config-custom": "5.0.0-beta.2", - "koa": "2.13.4", + "koa": "2.15.2", "koa-body": "4.2.0", "tsconfig": "5.0.0-beta.2" }, diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index a611a02b76..0ed9a996d3 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -82,7 +82,7 @@ "@types/koa": "2.13.4", "@types/koa-session": "6.4.1", "@types/swagger-ui-dist": "3.30.4", - "koa": "2.13.4", + "koa": "2.15.2", "koa-body": "4.2.0", "koa-session": "6.4.0", "msw": "1.3.0", diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json index 3238cc11b1..ce718cb8d0 100644 --- a/packages/plugins/graphql/package.json +++ b/packages/plugins/graphql/package.json @@ -52,7 +52,7 @@ "@as-integrations/koa": "1.1.1", "@graphql-tools/schema": "8.5.1", "@graphql-tools/utils": "^8.13.1", - "@koa/cors": "3.4.3", + "@koa/cors": "5.0.0", "@strapi/design-system": "1.16.0", "@strapi/icons": "1.16.0", "@strapi/utils": "5.0.0-beta.2", @@ -74,7 +74,7 @@ "@types/koa__cors": "5.0.0", "cross-env": "^7.0.3", "eslint-config-custom": "5.0.0-beta.2", - "koa": "2.13.4", + "koa": "2.15.2", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "6.22.3", diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json index e4b4a822be..bfdac94a0e 100644 --- a/packages/plugins/users-permissions/package.json +++ b/packages/plugins/users-permissions/package.json @@ -55,8 +55,8 @@ "immer": "9.0.21", "jsonwebtoken": "9.0.0", "jwk-to-pem": "2.0.5", - "koa": "2.13.4", - "koa2-ratelimit": "^1.1.2", + "koa": "2.15.2", + "koa2-ratelimit": "^1.1.3", "lodash": "4.17.21", "prop-types": "^15.8.1", "purest": "4.0.2", diff --git a/yarn.lock b/yarn.lock index e4e346d5d4..33e0e6645a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4270,6 +4270,19 @@ __metadata: languageName: node linkType: hard +"@koa/router@npm:12.0.1": + version: 12.0.1 + resolution: "@koa/router@npm:12.0.1" + dependencies: + debug: "npm:^4.3.4" + http-errors: "npm:^2.0.0" + koa-compose: "npm:^4.1.0" + methods: "npm:^1.1.2" + path-to-regexp: "npm:^6.2.1" + checksum: f9427c8eb21a2d7c880dae192b7298ecb243af32a8270b5e3e32c4420da157111bc326ab0bc75ff0f17320b9d9ab9df235295fc2d53d8681b5a14103c27ad22d + languageName: node + linkType: hard + "@kwsites/file-exists@npm:^1.1.1": version: 1.1.1 resolution: "@kwsites/file-exists@npm:1.1.1" @@ -6872,12 +6885,12 @@ __metadata: invariant: "npm:^2.2.4" js-cookie: "npm:2.2.1" jsonwebtoken: "npm:9.0.0" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" koa-compose: "npm:4.1.0" - koa-passport: "npm:5.0.0" + koa-passport: "npm:6.0.0" koa-static: "npm:5.0.0" - koa2-ratelimit: "npm:^1.1.2" + koa2-ratelimit: "npm:^1.1.3" lodash: "npm:4.17.21" msw: "npm:1.3.0" node-schedule: "npm:2.1.0" @@ -6939,7 +6952,7 @@ __metadata: date-fns: "npm:2.30.0" date-fns-tz: "npm:2.0.1" formik: "npm:2.4.5" - koa: "npm:2.13.4" + koa: "npm:2.15.2" lodash: "npm:4.17.21" msw: "npm:1.3.0" node-schedule: "npm:2.1.0" @@ -6966,8 +6979,8 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/core@workspace:packages/core/core" dependencies: - "@koa/cors": "npm:3.4.3" - "@koa/router": "npm:10.1.1" + "@koa/cors": "npm:5.0.0" + "@koa/router": "npm:12.0.1" "@paralleldrive/cuid2": "npm:2.2.2" "@strapi/admin": "npm:5.0.0-beta.2" "@strapi/database": "npm:5.0.0-beta.2" @@ -7012,13 +7025,13 @@ __metadata: http-errors: "npm:1.8.1" inquirer: "npm:8.2.5" is-docker: "npm:2.2.1" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" koa-compose: "npm:4.1.0" - koa-compress: "npm:5.1.0" + koa-compress: "npm:5.1.1" koa-favicon: "npm:2.1.0" koa-helmet: "npm:7.0.2" - koa-ip: "npm:^2.1.2" + koa-ip: "npm:^2.1.3" koa-session: "npm:6.4.0" koa-static: "npm:5.0.0" lodash: "npm:4.17.21" @@ -7065,7 +7078,7 @@ __metadata: fs-extra: "npm:10.1.0" inquirer: "npm:8.2.5" knex: "npm:3.0.1" - koa: "npm:2.13.4" + koa: "npm:2.15.2" lodash: "npm:4.17.21" ora: "npm:5.4.1" resolve-cwd: "npm:3.0.0" @@ -7344,7 +7357,7 @@ __metadata: fractional-indexing: "npm:3.2.0" highlight.js: "npm:^10.4.1" immer: "npm:9.0.21" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" lodash: "npm:4.17.21" markdown-it: "npm:^12.3.2" @@ -7404,7 +7417,7 @@ __metadata: date-fns: "npm:2.30.0" fs-extra: "npm:10.1.0" immer: "npm:9.0.21" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" lodash: "npm:4.17.21" pluralize: "npm:8.0.0" @@ -7451,7 +7464,7 @@ __metadata: formik: "npm:2.4.5" fs-extra: "npm:10.1.0" immer: "npm:9.0.21" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" koa-session: "npm:6.4.0" koa-static: "npm:^5.0.0" @@ -7490,7 +7503,7 @@ __metadata: "@testing-library/react": "npm:14.0.0" "@types/koa": "npm:2.13.4" "@types/lodash": "npm:^4.14.191" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" lodash: "npm:4.17.21" msw: "npm:1.3.0" @@ -7519,7 +7532,7 @@ __metadata: "@as-integrations/koa": "npm:1.1.1" "@graphql-tools/schema": "npm:8.5.1" "@graphql-tools/utils": "npm:^8.13.1" - "@koa/cors": "npm:3.4.3" + "@koa/cors": "npm:5.0.0" "@strapi/design-system": "npm:1.16.0" "@strapi/icons": "npm:1.16.0" "@strapi/strapi": "npm:5.0.0-beta.2" @@ -7534,7 +7547,7 @@ __metadata: graphql-depth-limit: "npm:^1.1.0" graphql-playground-middleware-koa: "npm:^1.6.21" graphql-scalars: "npm:1.22.2" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-bodyparser: "npm:4.4.1" koa-compose: "npm:^4.1.0" lodash: "npm:4.17.21" @@ -7639,7 +7652,7 @@ __metadata: formik: "npm:2.4.5" fs-extra: "npm:10.1.0" immer: "npm:9.0.21" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" koa-range: "npm:0.3.0" koa-static: "npm:5.0.0" @@ -7686,8 +7699,8 @@ __metadata: immer: "npm:9.0.21" jsonwebtoken: "npm:9.0.0" jwk-to-pem: "npm:2.0.5" - koa: "npm:2.13.4" - koa2-ratelimit: "npm:^1.1.2" + koa: "npm:2.15.2" + koa2-ratelimit: "npm:^1.1.3" lodash: "npm:4.17.21" msw: "npm:1.3.0" prop-types: "npm:^15.8.1" @@ -7969,7 +7982,7 @@ __metadata: dependencies: "@casl/ability": "npm:6.5.0" "@koa/cors": "npm:5.0.0" - "@koa/router": "npm:10.1.1" + "@koa/router": "npm:12.0.1" "@strapi/database": "npm:5.0.0-beta.2" "@strapi/logger": "npm:5.0.0-beta.2" "@strapi/pack-up": "npm:5.0.0-beta.2" @@ -7982,7 +7995,7 @@ __metadata: "@types/node-schedule": "npm:2.1.0" commander: "npm:8.3.0" eslint-config-custom: "npm:5.0.0-beta.2" - koa: "npm:2.13.4" + koa: "npm:2.15.2" lodash: "npm:4.17.21" node-schedule: "npm:2.1.0" tsconfig: "npm:5.0.0-beta.2" @@ -8077,7 +8090,7 @@ __metadata: eslint-config-custom: "npm:5.0.0-beta.2" execa: "npm:5.1.1" http-errors: "npm:1.8.1" - koa: "npm:2.13.4" + koa: "npm:2.15.2" koa-body: "npm:4.2.0" lodash: "npm:4.17.21" node-machine-id: "npm:1.1.12" @@ -11746,7 +11759,7 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.2, bytes@npm:^3.0.0": +"bytes@npm:3.1.2, bytes@npm:^3.0.0, bytes@npm:^3.1.2": version: 3.1.2 resolution: "bytes@npm:3.1.2" checksum: a10abf2ba70c784471d6b4f58778c0beeb2b5d405148e66affa91f23a9f13d07603d0a0354667310ae1d6dc141474ffd44e2a074be0f6e2254edb8fc21445388 @@ -12682,7 +12695,7 @@ __metadata: languageName: node linkType: hard -"compressible@npm:^2.0.0": +"compressible@npm:^2.0.0, compressible@npm:^2.0.18": version: 2.0.18 resolution: "compressible@npm:2.0.18" dependencies: @@ -12992,6 +13005,16 @@ __metadata: languageName: node linkType: hard +"cookies@npm:~0.9.0": + version: 0.9.1 + resolution: "cookies@npm:0.9.1" + dependencies: + depd: "npm:~2.0.0" + keygrip: "npm:~1.1.0" + checksum: 4816461a38d907b20f3fb7a2bc4741fe580e7a195f3e248ef7025cb3be56a07638a0f4e72553a5f535554ca30172c8a3245c63ac72c9737cec034e9a47773392 + languageName: node + linkType: hard + "copy-descriptor@npm:^0.1.0": version: 0.1.1 resolution: "copy-descriptor@npm:0.1.1" @@ -17635,7 +17658,7 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:1.8.1, http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:^1.8.0, http-errors@npm:~1.8.0": +"http-errors@npm:1.8.1, http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:^1.8.0, http-errors@npm:^1.8.1, http-errors@npm:~1.8.0": version: 1.8.1 resolution: "http-errors@npm:1.8.1" dependencies: @@ -17648,7 +17671,7 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:2.0.0": +"http-errors@npm:2.0.0, http-errors@npm:^2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" dependencies: @@ -20143,6 +20166,18 @@ __metadata: languageName: node linkType: hard +"koa-compress@npm:5.1.1": + version: 5.1.1 + resolution: "koa-compress@npm:5.1.1" + dependencies: + bytes: "npm:^3.1.2" + compressible: "npm:^2.0.18" + http-errors: "npm:^1.8.1" + koa-is-json: "npm:^1.0.0" + checksum: e768d336756e2009cd65db28c48472827a0eb503cdf3055bdb0af0e5d74b821bb8b9820dfdcb956e359fdea3c302286d2a17eef28bd4683217a6e8d503749e68 + languageName: node + linkType: hard + "koa-convert@npm:^2.0.0": version: 2.0.0 resolution: "koa-convert@npm:2.0.0" @@ -20182,6 +20217,17 @@ __metadata: languageName: node linkType: hard +"koa-ip@npm:^2.1.3": + version: 2.1.3 + resolution: "koa-ip@npm:2.1.3" + dependencies: + debug: "npm:4.3.4" + lodash.isplainobject: "npm:4.0.6" + request-ip: "npm:3.3.0" + checksum: 67fe264367cc513ca8cb91472c5719102384fd29daac31ce93ebf9ffc15a69779d99924e7b34e03ec765be59a2bc287493d1534eba3223ab1fcc8a275909a827 + languageName: node + linkType: hard + "koa-is-json@npm:^1.0.0": version: 1.0.0 resolution: "koa-is-json@npm:1.0.0" @@ -20198,6 +20244,15 @@ __metadata: languageName: node linkType: hard +"koa-passport@npm:6.0.0": + version: 6.0.0 + resolution: "koa-passport@npm:6.0.0" + dependencies: + passport: "npm:^0.6.0" + checksum: 4482e4b3d2d847ebbee07408390edc76859389128e9544d79a616de5fb6c5bfc62ef14a52257e62b6f2d77bd9f602d749e8bf412ac676c3e58f0d74081619b5e + languageName: node + linkType: hard + "koa-range@npm:0.3.0": version: 0.3.0 resolution: "koa-range@npm:0.3.0" @@ -20258,6 +20313,24 @@ __metadata: languageName: node linkType: hard +"koa2-ratelimit@npm:^1.1.3": + version: 1.1.3 + resolution: "koa2-ratelimit@npm:1.1.3" + peerDependencies: + mongoose: ">= 5" + redis: ">= 4.0.0" + sequelize: ">=5.8.7" + peerDependenciesMeta: + mongoose: + optional: true + redis: + optional: true + sequelize: + optional: true + checksum: 7dcd8d9b0b356cfe419c93bac72a0e80370a9cd671a910e5b264370cfbdcb176c753be2f0a0df309c2bdf10febd8c58a9cc8fae817f9277c044eaba0132a6a20 + languageName: node + linkType: hard + "koa@npm:2.13.4": version: 2.13.4 resolution: "koa@npm:2.13.4" @@ -20289,6 +20362,37 @@ __metadata: languageName: node linkType: hard +"koa@npm:2.15.2": + version: 2.15.2 + resolution: "koa@npm:2.15.2" + dependencies: + accepts: "npm:^1.3.5" + cache-content-type: "npm:^1.0.0" + content-disposition: "npm:~0.5.2" + content-type: "npm:^1.0.4" + cookies: "npm:~0.9.0" + debug: "npm:^4.3.2" + delegates: "npm:^1.0.0" + depd: "npm:^2.0.0" + destroy: "npm:^1.0.4" + encodeurl: "npm:^1.0.2" + escape-html: "npm:^1.0.3" + fresh: "npm:~0.5.2" + http-assert: "npm:^1.3.0" + http-errors: "npm:^1.6.3" + is-generator-function: "npm:^1.0.7" + koa-compose: "npm:^4.1.0" + koa-convert: "npm:^2.0.0" + on-finished: "npm:^2.3.0" + only: "npm:~0.0.2" + parseurl: "npm:^1.3.2" + statuses: "npm:^1.5.0" + type-is: "npm:^1.6.16" + vary: "npm:^1.1.2" + checksum: edafa18bbbef420c557c678998252a4f448c211fdd0ff1e70eddd4f689fe1f7363fa5a05849cef5f1bcb2c3adc1ae360e68b0bcc1432cd58c5c75fb840204fe0 + languageName: node + linkType: hard + "kolorist@npm:^1.8.0": version: 1.8.0 resolution: "kolorist@npm:1.8.0" @@ -23619,7 +23723,7 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:6.2.1, path-to-regexp@npm:^6.1.0, path-to-regexp@npm:^6.2.0": +"path-to-regexp@npm:6.2.1, path-to-regexp@npm:^6.1.0, path-to-regexp@npm:^6.2.0, path-to-regexp@npm:^6.2.1": version: 6.2.1 resolution: "path-to-regexp@npm:6.2.1" checksum: 1e266be712d1a08086ee77beab12a1804842ec635dfed44f9ee1ba960a0e01cec8063fb8c92561115cdc0ce73158cdc7766e353ffa039340b4a85b370084c4d4 @@ -25169,6 +25273,13 @@ __metadata: languageName: node linkType: hard +"request-ip@npm:3.3.0": + version: 3.3.0 + resolution: "request-ip@npm:3.3.0" + checksum: 9ca26f814201da19cb6f1a18da4f036803b770665ec0e7c556ea975ba553321922a5f04909f6dfc2371f695ca8aaa3c66f02c00a5e902c76435029804cdc4964 + languageName: node + linkType: hard + "request-multipart@npm:^1.0.0": version: 1.0.0 resolution: "request-multipart@npm:1.0.0" From bf35cde68f79ff3bfa0dfe30a3b92baa44a7c2a4 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Wed, 3 Apr 2024 19:13:24 +0200 Subject: [PATCH 2/2] chore: update koa-body --- packages/core/admin/package.json | 2 +- .../admin/server/src/controllers/admin.ts | 5 + .../__tests__/project-settings.test.ts | 12 +- .../server/src/services/project-settings.ts | 8 +- .../server/src/validation/project-settings.ts | 4 +- packages/core/content-manager/package.json | 2 +- .../core/content-type-builder/package.json | 2 +- packages/core/core/package.json | 2 +- packages/core/core/src/middlewares/body.ts | 12 +- packages/core/email/package.json | 2 +- packages/core/upload/package.json | 2 +- packages/core/upload/server/src/register.ts | 2 +- .../core/upload/server/src/services/upload.ts | 6 +- packages/core/utils/package.json | 2 +- packages/plugins/documentation/package.json | 2 +- yarn.lock | 222 ++++-------------- 16 files changed, 78 insertions(+), 209 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 729516b15c..846816f4f2 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -158,7 +158,7 @@ "@types/react-window": "1.8.8", "@types/sanitize-html": "2.11.0", "@vitejs/plugin-react-swc": "3.6.0", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "6.22.3", diff --git a/packages/core/admin/server/src/controllers/admin.ts b/packages/core/admin/server/src/controllers/admin.ts index b8e1c2d77b..195120bb67 100644 --- a/packages/core/admin/server/src/controllers/admin.ts +++ b/packages/core/admin/server/src/controllers/admin.ts @@ -64,11 +64,13 @@ export default { }, } satisfies Init.Response; }, + async getProjectSettings() { return getService( 'project-settings' ).getProjectSettings() satisfies Promise; }, + async updateProjectSettings(ctx: Context) { const { request: { files, body }, @@ -87,6 +89,7 @@ export default { ...formatedFiles, }) satisfies Promise; }, + async telemetryProperties(ctx: Context) { // If the telemetry is disabled, ignore the request and return early if (strapi.telemetry.isDisabled) { @@ -123,6 +126,7 @@ export default { }, } satisfies TelemetryProperties.Response; }, + async information() { const currentEnvironment: string = strapi.config.get('environment'); const autoReload = strapi.config.get('autoReload', false); @@ -147,6 +151,7 @@ export default { }, } satisfies Information.Response; }, + async plugins(ctx: Context) { const enabledPlugins = strapi.config.get('enabledPlugins') as any; diff --git a/packages/core/admin/server/src/services/__tests__/project-settings.test.ts b/packages/core/admin/server/src/services/__tests__/project-settings.test.ts index a2d3e2f77a..ac05b83019 100644 --- a/packages/core/admin/server/src/services/__tests__/project-settings.test.ts +++ b/packages/core/admin/server/src/services/__tests__/project-settings.test.ts @@ -78,15 +78,15 @@ describe('Project setting', () => { const files = { menuLogo: { size: 123, - path: '/tmp/filename_123', - name: 'file.png', - type: 'image/png', + filepath: '/tmp/filename_123', + originalFilename: 'file.png', + mimetype: 'image/png', }, authLogo: { size: 123, - path: '/tmp/filename_123', - name: 'file.png', - type: 'image/png', + filepath: '/tmp/filename_123', + originalFilename: 'file.png', + mimetype: 'image/png', }, }; diff --git a/packages/core/admin/server/src/services/project-settings.ts b/packages/core/admin/server/src/services/project-settings.ts index 11cc864112..0d1b501715 100644 --- a/packages/core/admin/server/src/services/project-settings.ts +++ b/packages/core/admin/server/src/services/project-settings.ts @@ -35,15 +35,15 @@ const parseFilesData = async (files: UpdateProjectSettings.Request['files']) => return; } - const getStream = () => fs.createReadStream(file.path); + const getStream = () => fs.createReadStream(file.filepath); // Add formated data for the upload provider formatedFilesData[inputName] = await strapi .plugin('upload') .service('upload') .formatFileInfo({ - filename: file.name, - type: file.type, + filename: file.originalFilename, + type: file.mimetype, size: file.size, }); @@ -56,7 +56,7 @@ const parseFilesData = async (files: UpdateProjectSettings.Request['files']) => // Add file path, and stream Object.assign(formatedFilesData[inputName]!, { stream: getStream(), - tmpPath: file.path, + tmpPath: file.filepath, // TODO // @ts-expect-error define the correct return type provider: strapi.config.get('plugin::upload').provider, diff --git a/packages/core/admin/server/src/validation/project-settings.ts b/packages/core/admin/server/src/validation/project-settings.ts index 3ee14cacfd..6b5d2020ff 100644 --- a/packages/core/admin/server/src/validation/project-settings.ts +++ b/packages/core/admin/server/src/validation/project-settings.ts @@ -13,8 +13,8 @@ const updateProjectSettings = z .strict(); const updateProjectSettingsLogo = z.object({ - name: z.string().nullish(), - type: z.enum(['image/jpeg', 'image/png', 'image/svg+xml']), + originalFilename: z.string().nullish(), + mimetype: z.enum(['image/jpeg', 'image/png', 'image/svg+xml']), size: z.number().max(MAX_IMAGE_FILE_SIZE).nullish(), }); diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json index 8c2305e7c8..6b98993b93 100644 --- a/packages/core/content-manager/package.json +++ b/packages/core/content-manager/package.json @@ -104,7 +104,7 @@ "@testing-library/react": "14.0.0", "@types/jest": "29.5.2", "@types/lodash": "^4.14.191", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "msw": "1.3.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index ca85cd1576..34c6771e43 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -80,7 +80,7 @@ "@testing-library/user-event": "14.4.3", "@types/pluralize": "0.0.30", "koa": "2.15.2", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-query": "3.39.3", diff --git a/packages/core/core/package.json b/packages/core/core/package.json index 148872b72e..00576db652 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -83,7 +83,7 @@ "inquirer": "8.2.5", "is-docker": "2.2.1", "koa": "2.15.2", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "koa-compose": "4.1.0", "koa-compress": "5.1.1", "koa-favicon": "2.1.0", diff --git a/packages/core/core/src/middlewares/body.ts b/packages/core/core/src/middlewares/body.ts index 7a3b377042..76fcd0d9d6 100644 --- a/packages/core/core/src/middlewares/body.ts +++ b/packages/core/core/src/middlewares/body.ts @@ -1,11 +1,11 @@ import fse from 'fs-extra'; import { defaultsDeep } from 'lodash/fp'; -import body from 'koa-body'; +import body, { KoaBodyMiddlewareOptions } from 'koa-body'; import mime from 'mime-types'; import type Koa from 'koa'; import type { Core } from '@strapi/types'; -export type Config = body.IKoaBodyOptions; +export type Config = KoaBodyMiddlewareOptions; const defaults = { multipart: true, @@ -37,7 +37,7 @@ const bodyMiddleware: Core.MiddlewareFactory = (config, { strapi }) => { await next(); } else { try { - await body({ patchKoa: true, ...bodyConfig })(ctx, async () => {}); + await body(bodyConfig)(ctx, async () => {}); const files = getFiles(ctx); @@ -73,10 +73,10 @@ const bodyMiddleware: Core.MiddlewareFactory = (config, { strapi }) => { if (files) { if (Array.isArray(files)) { // not awaiting to not slow the request - Promise.all(files.map((file) => fse.remove(file.path))); - } else if (files && files.path) { + Promise.all(files.map((file) => fse.remove(file.filepath))); + } else if (files && files.filepath) { // not awaiting to not slow the request - fse.remove(files.path); + fse.remove(files.filepath); } delete ctx.request.files; } diff --git a/packages/core/email/package.json b/packages/core/email/package.json index 0c5f08644c..7f2f426869 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -69,7 +69,7 @@ "@types/koa": "2.13.4", "@types/lodash": "^4.14.191", "koa": "2.15.2", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "msw": "1.3.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index 2b726726ae..5b222f853e 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -85,7 +85,7 @@ "@types/koa-static": "4.0.2", "formidable": "3.5.1", "koa": "2.15.2", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "msw": "1.3.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/core/upload/server/src/register.ts b/packages/core/upload/server/src/register.ts index f8af5f4f1c..7ee813cb82 100644 --- a/packages/core/upload/server/src/register.ts +++ b/packages/core/upload/server/src/register.ts @@ -101,7 +101,7 @@ const baseProvider = { checkFileSize(file: InputFile, { sizeLimit }: { sizeLimit: number }) { if (sizeLimit && kbytesToBytes(file.size) > sizeLimit) { throw new PayloadTooLargeError( - `${file.name} exceeds size limit of ${bytesToHumanReadable(sizeLimit)}.` + `${file.originalFilename} exceeds size limit of ${bytesToHumanReadable(sizeLimit)}.` ); } }, diff --git a/packages/core/upload/server/src/services/upload.ts b/packages/core/upload/server/src/services/upload.ts index 2167ba3373..820cc28488 100644 --- a/packages/core/upload/server/src/services/upload.ts +++ b/packages/core/upload/server/src/services/upload.ts @@ -193,8 +193,8 @@ export default ({ strapi }: { strapi: Core.Strapi }) => { ): Promise { const currentFile = (await formatFileInfo( { - filename: file.name ?? 'unamed', - type: file.type ?? 'application/octet-stream', + filename: file.originalFilename ?? 'unamed', + type: file.mimetype ?? 'application/octet-stream', size: file.size, }, fileInfo, @@ -204,7 +204,7 @@ export default ({ strapi }: { strapi: Core.Strapi }) => { } )) as UploadableFile; - currentFile.getStream = () => fs.createReadStream(file.path); + currentFile.getStream = () => fs.createReadStream(file.filepath); const { optimize, isImage, isFaultyImage, isOptimizableImage } = strapi .plugin('upload') diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 8ea5b86365..dc47d96a24 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -61,7 +61,7 @@ "@types/node": "18.19.24", "eslint-config-custom": "5.0.0-beta.2", "koa": "2.15.2", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "tsconfig": "5.0.0-beta.2" }, "engines": { diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 0ed9a996d3..f5d01199fa 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -83,7 +83,7 @@ "@types/koa-session": "6.4.1", "@types/swagger-ui-dist": "3.30.4", "koa": "2.15.2", - "koa-body": "4.2.0", + "koa-body": "6.0.1", "koa-session": "6.4.0", "msw": "1.3.0", "openapi-types": "12.1.3", diff --git a/yarn.lock b/yarn.lock index 33e0e6645a..5ab9a14ed2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4239,15 +4239,6 @@ __metadata: languageName: node linkType: hard -"@koa/cors@npm:3.4.3": - version: 3.4.3 - resolution: "@koa/cors@npm:3.4.3" - dependencies: - vary: "npm:^1.1.2" - checksum: 7e91b661a2d0b73b3ae38167103c819da989a7f5102107fdf6877aaf1b435fc6bbc6dbb90c4f47d5acb09a79d98a3b06c0b7af70ba5241fa2ab49b4c8991ecc0 - languageName: node - linkType: hard - "@koa/cors@npm:5.0.0": version: 5.0.0 resolution: "@koa/cors@npm:5.0.0" @@ -4257,19 +4248,6 @@ __metadata: languageName: node linkType: hard -"@koa/router@npm:10.1.1": - version: 10.1.1 - resolution: "@koa/router@npm:10.1.1" - dependencies: - debug: "npm:^4.1.1" - http-errors: "npm:^1.7.3" - koa-compose: "npm:^4.1.0" - methods: "npm:^1.1.2" - path-to-regexp: "npm:^6.1.0" - checksum: 8a990f1b6c1bfd7d86047b73ba4a164a81e71d0af570f1bc7967d6e8d7125524d3e8948927ae8fb1d9b8ebf739b1ba732e40af006973e410995f5656aa58fece - languageName: node - linkType: hard - "@koa/router@npm:12.0.1": version: 12.0.1 resolution: "@koa/router@npm:12.0.1" @@ -6886,7 +6864,7 @@ __metadata: js-cookie: "npm:2.2.1" jsonwebtoken: "npm:9.0.0" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" koa-compose: "npm:4.1.0" koa-passport: "npm:6.0.0" koa-static: "npm:5.0.0" @@ -7026,7 +7004,7 @@ __metadata: inquirer: "npm:8.2.5" is-docker: "npm:2.2.1" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" koa-compose: "npm:4.1.0" koa-compress: "npm:5.1.1" koa-favicon: "npm:2.1.0" @@ -7358,7 +7336,7 @@ __metadata: highlight.js: "npm:^10.4.1" immer: "npm:9.0.21" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" lodash: "npm:4.17.21" markdown-it: "npm:^12.3.2" markdown-it-abbr: "npm:^1.0.4" @@ -7418,7 +7396,7 @@ __metadata: fs-extra: "npm:10.1.0" immer: "npm:9.0.21" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" lodash: "npm:4.17.21" pluralize: "npm:8.0.0" qs: "npm:6.11.1" @@ -7465,7 +7443,7 @@ __metadata: fs-extra: "npm:10.1.0" immer: "npm:9.0.21" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" koa-session: "npm:6.4.0" koa-static: "npm:^5.0.0" lodash: "npm:4.17.21" @@ -7504,7 +7482,7 @@ __metadata: "@types/koa": "npm:2.13.4" "@types/lodash": "npm:^4.14.191" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" lodash: "npm:4.17.21" msw: "npm:1.3.0" react: "npm:^18.2.0" @@ -7653,7 +7631,7 @@ __metadata: fs-extra: "npm:10.1.0" immer: "npm:9.0.21" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" koa-range: "npm:0.3.0" koa-static: "npm:5.0.0" lodash: "npm:4.17.21" @@ -8091,7 +8069,7 @@ __metadata: execa: "npm:5.1.1" http-errors: "npm:1.8.1" koa: "npm:2.15.2" - koa-body: "npm:4.2.0" + koa-body: "npm:6.0.1" lodash: "npm:4.17.21" node-machine-id: "npm:1.1.12" p-map: "npm:4.0.0" @@ -8519,6 +8497,16 @@ __metadata: languageName: node linkType: hard +"@types/co-body@npm:^6.1.0": + version: 6.1.3 + resolution: "@types/co-body@npm:6.1.3" + dependencies: + "@types/node": "npm:*" + "@types/qs": "npm:*" + checksum: e93fdc177f69ee0535cf401783258e4255f5eb8235c58b5a2a5a8958cf341fadf3d0bf2c75907ed6b7d188ce2c2f2cf9593a71d4eef12900beba54ebbbdd5cc1 + languageName: node + linkType: hard + "@types/codemirror5@npm:@types/codemirror@^5.60.15": version: 5.60.15 resolution: "@types/codemirror@npm:5.60.15" @@ -8691,12 +8679,12 @@ __metadata: languageName: node linkType: hard -"@types/formidable@npm:^1.0.31": - version: 1.2.5 - resolution: "@types/formidable@npm:1.2.5" +"@types/formidable@npm:^2.0.5": + version: 2.0.6 + resolution: "@types/formidable@npm:2.0.6" dependencies: "@types/node": "npm:*" - checksum: f11050b5847924ec1617103bb68d123229c537112b3e09a4eeac227a9fb2c882e694dd890d95c68ee44bcf0701dc61a43d0e110d3b6055bcfe4b6d647f6dcf50 + checksum: 808a9bc11276e3bd44a8b9d20f4d567ef0e452dcff7fa6ce2575b769bab049ccc4225d02ddd80f0f4de34aa2d2e7242e036bc547811667868860e8dc632d8b16 languageName: node linkType: hard @@ -11759,7 +11747,7 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.2, bytes@npm:^3.0.0, bytes@npm:^3.1.2": +"bytes@npm:3.1.2, bytes@npm:^3.1.2": version: 3.1.2 resolution: "bytes@npm:3.1.2" checksum: a10abf2ba70c784471d6b4f58778c0beeb2b5d405148e66affa91f23a9f13d07603d0a0354667310ae1d6dc141474ffd44e2a074be0f6e2254edb8fc21445388 @@ -12403,19 +12391,7 @@ __metadata: languageName: node linkType: hard -"co-body@npm:^5.1.1": - version: 5.2.0 - resolution: "co-body@npm:5.2.0" - dependencies: - inflation: "npm:^2.0.0" - qs: "npm:^6.4.0" - raw-body: "npm:^2.2.0" - type-is: "npm:^1.6.14" - checksum: 44d9157057b2696b208cabe515345f575b06b5be48261e04e27c9c3367ec2fe97da55483b4baef253df55db0e3efd96417f131ad725cb534fe209d9850bc2e47 - languageName: node - linkType: hard - -"co-body@npm:^6.0.0": +"co-body@npm:^6.0.0, co-body@npm:^6.1.0": version: 6.1.0 resolution: "co-body@npm:6.1.0" dependencies: @@ -12695,7 +12671,7 @@ __metadata: languageName: node linkType: hard -"compressible@npm:^2.0.0, compressible@npm:^2.0.18": +"compressible@npm:^2.0.18": version: 2.0.18 resolution: "compressible@npm:2.0.18" dependencies: @@ -12995,16 +12971,6 @@ __metadata: languageName: node linkType: hard -"cookies@npm:~0.8.0": - version: 0.8.0 - resolution: "cookies@npm:0.8.0" - dependencies: - depd: "npm:~2.0.0" - keygrip: "npm:~1.1.0" - checksum: 5da4d72ba81c2740511751ac8ea9506e10e2366b9ad3360333581e4667fd8d063d02c5be0bef16177de3e366b8128ed2b72921e2952c79cbca084d177e529bba - languageName: node - linkType: hard - "cookies@npm:~0.9.0": version: 0.9.1 resolution: "cookies@npm:0.9.1" @@ -16263,14 +16229,7 @@ __metadata: languageName: node linkType: hard -"formidable@npm:^1.1.1": - version: 1.2.6 - resolution: "formidable@npm:1.2.6" - checksum: 0ac4690a4664725051142b41c8e9de2072b4c9bde8e03bf07abe7c747d1e2cbefd2463de93938e6503cad628f2b06accf330885e2b6511f2511693af186ae08d - languageName: node - linkType: hard - -"formidable@npm:^2.1.2": +"formidable@npm:^2.0.1, formidable@npm:^2.1.2": version: 2.1.2 resolution: "formidable@npm:2.1.2" dependencies: @@ -17658,7 +17617,7 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:1.8.1, http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:^1.8.0, http-errors@npm:^1.8.1, http-errors@npm:~1.8.0": +"http-errors@npm:1.8.1, http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:^1.8.1, http-errors@npm:~1.8.0": version: 1.8.1 resolution: "http-errors@npm:1.8.1" dependencies: @@ -18858,13 +18817,6 @@ __metadata: languageName: node linkType: hard -"is_js@npm:^0.9.0": - version: 0.9.0 - resolution: "is_js@npm:0.9.0" - checksum: c401de405046c79ad66c1cfccbd45ccd5dbd86bbbffb09cc081217e30b3a22d9332a5ce5f9d8a296301d6cb83e9932a02aa1e02acc642a4674639295d1920ed0 - languageName: node - linkType: hard - "isarray@npm:0.0.1": version: 0.0.1 resolution: "isarray@npm:0.0.1" @@ -20124,14 +20076,17 @@ __metadata: languageName: node linkType: hard -"koa-body@npm:4.2.0": - version: 4.2.0 - resolution: "koa-body@npm:4.2.0" +"koa-body@npm:6.0.1": + version: 6.0.1 + resolution: "koa-body@npm:6.0.1" dependencies: - "@types/formidable": "npm:^1.0.31" - co-body: "npm:^5.1.1" - formidable: "npm:^1.1.1" - checksum: 745d66a319b706734b55f67783ce4157c074a82a489e8aaa0c5f72ccaa52a9e607ac2be5d3397c85a34e6c3335d6f3a79019616192aa26d708729ca785bbac8f + "@types/co-body": "npm:^6.1.0" + "@types/formidable": "npm:^2.0.5" + "@types/koa": "npm:^2.13.5" + co-body: "npm:^6.1.0" + formidable: "npm:^2.0.1" + zod: "npm:^3.19.1" + checksum: d241d4d228117da43ccd485babe9f8e221188360faef93f936f85ced03d8df900b1bd3af0f2e26b8e514f66361373078ef8501b50089b20e19c578566d25a239 languageName: node linkType: hard @@ -20153,19 +20108,6 @@ __metadata: languageName: node linkType: hard -"koa-compress@npm:5.1.0": - version: 5.1.0 - resolution: "koa-compress@npm:5.1.0" - dependencies: - bytes: "npm:^3.0.0" - compressible: "npm:^2.0.0" - http-errors: "npm:^1.8.0" - koa-is-json: "npm:^1.0.0" - statuses: "npm:^2.0.1" - checksum: 554ede160df33fed5d658afe786f5db8dea44933c0ff72c7a0abf6f5574cc139db482859f81a7eb08043a1a3b2d90ca30153411bdf7bea5fd5f39da5090a6dd4 - languageName: node - linkType: hard - "koa-compress@npm:5.1.1": version: 5.1.1 resolution: "koa-compress@npm:5.1.1" @@ -20206,17 +20148,6 @@ __metadata: languageName: node linkType: hard -"koa-ip@npm:^2.1.2": - version: 2.1.2 - resolution: "koa-ip@npm:2.1.2" - dependencies: - debug: "npm:4.3.4" - lodash.isplainobject: "npm:4.0.6" - request-ip: "npm:2.1.3" - checksum: 5c29f8575ef0211dade5ca627a4e21952ffd7d1f74c5c55a85073592e95ba1275f2f77071831befdce0bf3cfc92b4d7cbb80b99714f2258be5228cb45015d7f3 - languageName: node - linkType: hard - "koa-ip@npm:^2.1.3": version: 2.1.3 resolution: "koa-ip@npm:2.1.3" @@ -20235,15 +20166,6 @@ __metadata: languageName: node linkType: hard -"koa-passport@npm:5.0.0": - version: 5.0.0 - resolution: "koa-passport@npm:5.0.0" - dependencies: - passport: "npm:^0.6.0" - checksum: 9aef68b54a5d931b0f5324c1934be8f56ee84bf131d940082418bcd4ee5bc6142ecf2493d6710a56ed68a0610e44fa6d43412caf7dfa0e51807c35adb6443dcd - languageName: node - linkType: hard - "koa-passport@npm:6.0.0": version: 6.0.0 resolution: "koa-passport@npm:6.0.0" @@ -20295,24 +20217,6 @@ __metadata: languageName: node linkType: hard -"koa2-ratelimit@npm:^1.1.2": - version: 1.1.2 - resolution: "koa2-ratelimit@npm:1.1.2" - peerDependencies: - mongoose: ">= 5" - redis: ">= 4.0.0" - sequelize: ">=5.8.7" - peerDependenciesMeta: - mongoose: - optional: true - redis: - optional: true - sequelize: - optional: true - checksum: c15a46ab43989eaa501f2012b9ec0a5684d276c9a2d578a72adbefacca85bc5921dd9f83b69625a7c8a6e95d75ee160cd978e467f35450e8d46bb31276a61dc8 - languageName: node - linkType: hard - "koa2-ratelimit@npm:^1.1.3": version: 1.1.3 resolution: "koa2-ratelimit@npm:1.1.3" @@ -20331,37 +20235,6 @@ __metadata: languageName: node linkType: hard -"koa@npm:2.13.4": - version: 2.13.4 - resolution: "koa@npm:2.13.4" - dependencies: - accepts: "npm:^1.3.5" - cache-content-type: "npm:^1.0.0" - content-disposition: "npm:~0.5.2" - content-type: "npm:^1.0.4" - cookies: "npm:~0.8.0" - debug: "npm:^4.3.2" - delegates: "npm:^1.0.0" - depd: "npm:^2.0.0" - destroy: "npm:^1.0.4" - encodeurl: "npm:^1.0.2" - escape-html: "npm:^1.0.3" - fresh: "npm:~0.5.2" - http-assert: "npm:^1.3.0" - http-errors: "npm:^1.6.3" - is-generator-function: "npm:^1.0.7" - koa-compose: "npm:^4.1.0" - koa-convert: "npm:^2.0.0" - on-finished: "npm:^2.3.0" - only: "npm:~0.0.2" - parseurl: "npm:^1.3.2" - statuses: "npm:^1.5.0" - type-is: "npm:^1.6.16" - vary: "npm:^1.1.2" - checksum: 5ddd5a08dcfc17f87a90fd8717a158f6f42ac8113d8328d487cbdb1cf73797e9be199e1b1c5f67c9b6e5f0daef96654fb94ed244dea5500d8197b0f81f2dc652 - languageName: node - linkType: hard - "koa@npm:2.15.2": version: 2.15.2 resolution: "koa@npm:2.15.2" @@ -23723,7 +23596,7 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:6.2.1, path-to-regexp@npm:^6.1.0, path-to-regexp@npm:^6.2.0, path-to-regexp@npm:^6.2.1": +"path-to-regexp@npm:6.2.1, path-to-regexp@npm:^6.2.0, path-to-regexp@npm:^6.2.1": version: 6.2.1 resolution: "path-to-regexp@npm:6.2.1" checksum: 1e266be712d1a08086ee77beab12a1804842ec635dfed44f9ee1ba960a0e01cec8063fb8c92561115cdc0ce73158cdc7766e353ffa039340b4a85b370084c4d4 @@ -24434,7 +24307,7 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.11.1, qs@npm:^6.10.2, qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.4.0, qs@npm:^6.9.6": +"qs@npm:6.11.1, qs@npm:^6.10.2, qs@npm:^6.10.3, qs@npm:^6.11.0, qs@npm:^6.9.6": version: 6.11.1 resolution: "qs@npm:6.11.1" dependencies: @@ -24503,7 +24376,7 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.5.1, raw-body@npm:^2.2.0": +"raw-body@npm:2.5.1": version: 2.5.1 resolution: "raw-body@npm:2.5.1" dependencies: @@ -25264,15 +25137,6 @@ __metadata: languageName: node linkType: hard -"request-ip@npm:2.1.3": - version: 2.1.3 - resolution: "request-ip@npm:2.1.3" - dependencies: - is_js: "npm:^0.9.0" - checksum: b7c82f61f841ba9715dd6f7df51c8bf2317ac5e5e9235bde3b08e3d9f416f75b3815971189095f0d24debce7cbf8e016af3204eae53c91f9b3181aff2718f79b - languageName: node - linkType: hard - "request-ip@npm:3.3.0": version: 3.3.0 resolution: "request-ip@npm:3.3.0" @@ -26843,7 +26707,7 @@ __metadata: languageName: node linkType: hard -"statuses@npm:2.0.1, statuses@npm:^2.0.1": +"statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb @@ -28228,7 +28092,7 @@ __metadata: languageName: node linkType: hard -"type-is@npm:^1.6.14, type-is@npm:^1.6.16, type-is@npm:^1.6.18, type-is@npm:~1.6.18": +"type-is@npm:^1.6.16, type-is@npm:^1.6.18, type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" dependencies: @@ -29854,7 +29718,7 @@ __metadata: languageName: node linkType: hard -"zod@npm:^3.22.4": +"zod@npm:^3.19.1, zod@npm:^3.22.4": version: 3.22.4 resolution: "zod@npm:3.22.4" checksum: 73622ca36a916f785cf528fe612a884b3e0f183dbe6b33365a7d0fc92abdbedf7804c5e2bd8df0a278e1472106d46674281397a3dd800fa9031dc3429758c6ac