From f7b9b47085e387e97f990d8695971b51d7f7149a Mon Sep 17 00:00:00 2001 From: Bassel Kanso Date: Tue, 9 Jan 2024 16:37:29 +0200 Subject: [PATCH] fix(graphql): revert graphql-upload library to non breaking change version (#19182) --- packages/plugins/graphql/package.json | 4 +- .../plugins/graphql/server/src/bootstrap.ts | 3 +- .../src/services/internals/scalars/index.ts | 3 +- yarn.lock | 83 ++++++++----------- 4 files changed, 37 insertions(+), 56 deletions(-) diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json index 809a19b33e..66b18b9a43 100644 --- a/packages/plugins/graphql/package.json +++ b/packages/plugins/graphql/package.json @@ -60,7 +60,7 @@ "graphql-depth-limit": "^1.1.0", "graphql-playground-middleware-koa": "^1.6.21", "graphql-scalars": "1.22.2", - "graphql-upload": "15.0.2", + "graphql-upload": "^13.0.0", "koa-compose": "^4.1.0", "lodash": "4.17.21", "nexus": "1.3.0", @@ -70,7 +70,7 @@ "@strapi/strapi": "4.16.2", "@strapi/types": "4.16.2", "@types/graphql-depth-limit": "1.1.5", - "@types/graphql-upload": "15.0.2", + "@types/graphql-upload": "8.0.12", "cross-env": "^7.0.3", "eslint-config-custom": "4.16.2", "koa": "2.13.4", diff --git a/packages/plugins/graphql/server/src/bootstrap.ts b/packages/plugins/graphql/server/src/bootstrap.ts index 8e08080f27..92a19adae2 100644 --- a/packages/plugins/graphql/server/src/bootstrap.ts +++ b/packages/plugins/graphql/server/src/bootstrap.ts @@ -5,8 +5,7 @@ import { ApolloServerPluginLandingPageGraphQLPlayground, } from 'apollo-server-core'; import depthLimit from 'graphql-depth-limit'; -// eslint-disable-next-line import/extensions -import graphqlUploadKoa from 'graphql-upload/graphqlUploadKoa.js'; +import { graphqlUploadKoa } from 'graphql-upload'; import type { Config } from 'apollo-server-core'; import type { Strapi } from '@strapi/types'; diff --git a/packages/plugins/graphql/server/src/services/internals/scalars/index.ts b/packages/plugins/graphql/server/src/services/internals/scalars/index.ts index b1bf710e79..baf68663d9 100644 --- a/packages/plugins/graphql/server/src/services/internals/scalars/index.ts +++ b/packages/plugins/graphql/server/src/services/internals/scalars/index.ts @@ -1,6 +1,5 @@ import { GraphQLDateTime, GraphQLLong, GraphQLJSON } from 'graphql-scalars'; -// eslint-disable-next-line import/extensions -import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'; +import { GraphQLUpload } from 'graphql-upload'; import { asNexusMethod } from 'nexus'; import TimeScalar from './time'; diff --git a/yarn.lock b/yarn.lock index 1fce6272c7..edd60eff64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8203,7 +8203,7 @@ __metadata: "@strapi/types": "npm:4.16.2" "@strapi/utils": "npm:4.16.2" "@types/graphql-depth-limit": "npm:1.1.5" - "@types/graphql-upload": "npm:15.0.2" + "@types/graphql-upload": "npm:8.0.12" apollo-server-core: "npm:3.12.1" apollo-server-koa: "npm:3.10.0" cross-env: "npm:^7.0.3" @@ -8212,7 +8212,7 @@ __metadata: graphql-depth-limit: "npm:^1.1.0" graphql-playground-middleware-koa: "npm:^1.6.21" graphql-scalars: "npm:1.22.2" - graphql-upload: "npm:15.0.2" + graphql-upload: "npm:^13.0.0" koa: "npm:2.13.4" koa-compose: "npm:^4.1.0" lodash: "npm:4.17.21" @@ -9084,15 +9084,6 @@ __metadata: languageName: node linkType: hard -"@types/busboy@npm:^1.5.0": - version: 1.5.3 - resolution: "@types/busboy@npm:1.5.3" - dependencies: - "@types/node": "npm:*" - checksum: 9ec0a125723e594816d06f6ddf5a4f8dda4855734719bb6e38bdc6fdaf59416f270744862ee54c755075af26e9f5467cc00db803ae1d88f45c1431f61a48ae58 - languageName: node - linkType: hard - "@types/cacheable-request@npm:^6.0.1": version: 6.0.2 resolution: "@types/cacheable-request@npm:6.0.2" @@ -9355,15 +9346,15 @@ __metadata: languageName: node linkType: hard -"@types/graphql-upload@npm:15.0.2": - version: 15.0.2 - resolution: "@types/graphql-upload@npm:15.0.2" +"@types/graphql-upload@npm:8.0.12": + version: 8.0.12 + resolution: "@types/graphql-upload@npm:8.0.12" dependencies: "@types/express": "npm:*" "@types/koa": "npm:*" fs-capacitor: "npm:^8.0.0" graphql: "npm:0.13.1 - 16" - checksum: 3e88a03082ce1e1de39b414a096fbd47cf1f97b6027c93cc71a216229bdfb248f54f1afc209e970e1ae3856153c20cf40d458febe348b287be237f62ea84ffc0 + checksum: 394d5e05f4d5a205dc53f66670af28de73bc73b0910e68907e6d01348caeeb27478621cfdb238a71668f0cca7347ed362c2f1a68266da4b823707dc4daba92ee languageName: node linkType: hard @@ -9851,13 +9842,6 @@ __metadata: languageName: node linkType: hard -"@types/object-path@npm:^0.11.1": - version: 0.11.4 - resolution: "@types/object-path@npm:0.11.4" - checksum: 7f1f5cb18b651d21e7861da176d8f87526c936ed949a8126a2692195cbe65734ed1a1a22c06a24a54afe1890483a3d6b074b402ebfca7a7567c1c287b588f563 - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" @@ -12530,12 +12514,12 @@ __metadata: languageName: node linkType: hard -"busboy@npm:^1.6.0": - version: 1.6.0 - resolution: "busboy@npm:1.6.0" +"busboy@npm:^0.3.1": + version: 0.3.1 + resolution: "busboy@npm:0.3.1" dependencies: - streamsearch: "npm:^1.1.0" - checksum: bee10fa10ea58e7e3e7489ffe4bda6eacd540a17de9f9cd21cc37e297b2dd9fe52b2715a5841afaec82900750d810d01d7edb4b2d456427f449b92b417579763 + dicer: "npm:0.3.0" + checksum: a5ac7fcd7c7abb65051f2bca834c0336ef6e046af4f3e1c7e730436fb5ec00d6b2bd4283faac2eb527f054793af823fe8e08a0d2c857a59b0702f1a29f89fc58 languageName: node linkType: hard @@ -14636,6 +14620,15 @@ __metadata: languageName: node linkType: hard +"dicer@npm:0.3.0": + version: 0.3.0 + resolution: "dicer@npm:0.3.0" + dependencies: + streamsearch: "npm:0.1.2" + checksum: 1e92ab2f88b20483caef916293e98f3262a28f281a42a2d9e4691319abec3e6b06ff0c7ee962e1b4a54edea742442a726cc02ac0aad98f89f694d18914c176eb + languageName: node + linkType: hard + "diff-sequences@npm:^29.4.3": version: 29.4.3 resolution: "diff-sequences@npm:29.4.3" @@ -17862,27 +17855,17 @@ __metadata: languageName: node linkType: hard -"graphql-upload@npm:15.0.2": - version: 15.0.2 - resolution: "graphql-upload@npm:15.0.2" +"graphql-upload@npm:^13.0.0": + version: 13.0.0 + resolution: "graphql-upload@npm:13.0.0" dependencies: - "@types/busboy": "npm:^1.5.0" - "@types/node": "npm:*" - "@types/object-path": "npm:^0.11.1" - busboy: "npm:^1.6.0" + busboy: "npm:^0.3.1" fs-capacitor: "npm:^6.2.0" - http-errors: "npm:^2.0.0" + http-errors: "npm:^1.8.1" object-path: "npm:^0.11.8" peerDependencies: - "@types/express": ^4.0.29 - "@types/koa": ^2.11.4 - graphql: ^16.3.0 - peerDependenciesMeta: - "@types/express": - optional: true - "@types/koa": - optional: true - checksum: bf0a7f92842882ed982a625eaf0d8c2fa36f32096d75c80b89989f17cb10e8193a033f69192d457555974f187e2e8f4eb4bf3df94a86b86c19493f9bcc7849ef + graphql: 0.13.1 - 16 + checksum: 35c4c577fa25ad25aaf72655b4ebc45660489bee700e3548ca3097323f6f58c8cbcaa2f7603d215038fdcd99068623ffd5ef1f9e1280bd8cd9e99e7c9f1b979b languageName: node linkType: hard @@ -18342,7 +18325,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: @@ -18355,7 +18338,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: @@ -28036,10 +28019,10 @@ __metadata: languageName: node linkType: hard -"streamsearch@npm:^1.1.0": - version: 1.1.0 - resolution: "streamsearch@npm:1.1.0" - checksum: 612c2b2a7dbcc859f74597112f80a42cbe4d448d03da790d5b7b39673c1197dd3789e91cd67210353e58857395d32c1e955a9041c4e6d5bae723436b3ed9ed14 +"streamsearch@npm:0.1.2": + version: 0.1.2 + resolution: "streamsearch@npm:0.1.2" + checksum: 2c9407ee6682f100a9026b4b712d01ce3889fc818b928746eeb92fb4c0cf4ee79b74af27893fd766e4a36bbed08969a8e0bd0d0be5d30b2c9028859071f8f02b languageName: node linkType: hard