From bacd2b18f8c5438e3c7faae3b12e6575f6d86215 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:28:15 +0000 Subject: [PATCH 1/2] fix(deps): update dependency graphql-yoga to v5 --- packages/graphql-server/package.json | 2 +- packages/studio/package.json | 2 +- yarn.lock | 69 ++++++++++++++++++++++------ 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 2fa3967e884f..8145307dd641 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -39,7 +39,7 @@ "graphql": "16.8.1", "graphql-scalars": "1.22.4", "graphql-tag": "2.12.6", - "graphql-yoga": "4.0.4", + "graphql-yoga": "5.1.0", "lodash": "4.17.21", "uuid": "9.0.1" }, diff --git a/packages/studio/package.json b/packages/studio/package.json index 7e2cfebbb189..4120b22c18e6 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -38,7 +38,7 @@ "fastify-raw-body": "4.3.0", "graphql": "16.8.1", "graphql-scalars": "1.22.4", - "graphql-yoga": "4.0.4", + "graphql-yoga": "5.1.0", "jsonwebtoken": "9.0.2", "lodash": "4.17.21", "mailparser": "^3.6.5", diff --git a/yarn.lock b/yarn.lock index 6ff3c94b6a56..4f24f0d3dc14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2311,6 +2311,16 @@ __metadata: languageName: node linkType: hard +"@envelop/core@npm:^5.0.0": + version: 5.0.0 + resolution: "@envelop/core@npm:5.0.0" + dependencies: + "@envelop/types": "npm:5.0.0" + tslib: "npm:^2.5.0" + checksum: abc06585177a634d355fd7cec22a838086e6ccf20317f34b4b9eb92c4acb1aee7f09f621197f065619148a58de027a968ecb26d0bdee87bf0380769816ad4be2 + languageName: node + linkType: hard + "@envelop/depth-limit@npm:3.0.3": version: 3.0.3 resolution: "@envelop/depth-limit@npm:3.0.3" @@ -2397,6 +2407,15 @@ __metadata: languageName: node linkType: hard +"@envelop/types@npm:5.0.0": + version: 5.0.0 + resolution: "@envelop/types@npm:5.0.0" + dependencies: + tslib: "npm:^2.5.0" + checksum: 0cbaa68218cb6121b58c6d354b0a17913ded042673df7bfcf385cac6c3b42713b82719875f553b31e8f059727ff5478ed11b33b4febf8deeaf902f1a92b212a8 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm64@npm:0.18.20" @@ -4625,12 +4644,12 @@ __metadata: languageName: node linkType: hard -"@graphql-yoga/logger@npm:^1.0.0": - version: 1.0.0 - resolution: "@graphql-yoga/logger@npm:1.0.0" +"@graphql-yoga/logger@npm:^2.0.0": + version: 2.0.0 + resolution: "@graphql-yoga/logger@npm:2.0.0" dependencies: tslib: "npm:^2.5.2" - checksum: b43a7c86faad2447a696b2c4f46e9219cc1ae95484857c8f54e5ad4ba7d984a3f37149c45320659ffc89da2aefdb44ad2a68a5b57acb88d3aad86caad2a8bcfe + checksum: 1489588485c9974aba66c0e5002a1251085771b0703ac1aaa2a3df93b895fc57f7cf6203680ff453b304d4ba438ea6a4cc9999d13a4bf6fd5128f3f088ff927b languageName: node linkType: hard @@ -4681,7 +4700,7 @@ __metadata: languageName: node linkType: hard -"@graphql-yoga/subscription@npm:4.0.0, @graphql-yoga/subscription@npm:^4.0.0": +"@graphql-yoga/subscription@npm:4.0.0": version: 4.0.0 resolution: "@graphql-yoga/subscription@npm:4.0.0" dependencies: @@ -4693,6 +4712,18 @@ __metadata: languageName: node linkType: hard +"@graphql-yoga/subscription@npm:^5.0.0": + version: 5.0.0 + resolution: "@graphql-yoga/subscription@npm:5.0.0" + dependencies: + "@graphql-yoga/typed-event-target": "npm:^3.0.0" + "@repeaterjs/repeater": "npm:^3.0.4" + "@whatwg-node/events": "npm:^0.1.0" + tslib: "npm:^2.5.2" + checksum: 05e2f5cb23ea2b3cfe3737cf13fb98ebb3ded8a6a8239a170a6bd65b443109595e1bf2bbef94e3b18438b63dae18761bce4225eb437420bae651131457ede8b5 + languageName: node + linkType: hard + "@graphql-yoga/typed-event-target@npm:^2.0.0": version: 2.0.0 resolution: "@graphql-yoga/typed-event-target@npm:2.0.0" @@ -4703,6 +4734,16 @@ __metadata: languageName: node linkType: hard +"@graphql-yoga/typed-event-target@npm:^3.0.0": + version: 3.0.0 + resolution: "@graphql-yoga/typed-event-target@npm:3.0.0" + dependencies: + "@repeaterjs/repeater": "npm:^3.0.4" + tslib: "npm:^2.5.2" + checksum: 563c26e4ef8f116e3b2991651acc2a80a37e1c53c6df4159e46e948b226624fc3c414663deef063fa19a7a63bc6a2d2ed8b950782b4d57f34eea775e3312d61c + languageName: node + linkType: hard + "@grpc/grpc-js@npm:~1.8.0": version: 1.8.20 resolution: "@grpc/grpc-js@npm:1.8.20" @@ -9010,7 +9051,7 @@ __metadata: graphql: "npm:16.8.1" graphql-scalars: "npm:1.22.4" graphql-tag: "npm:2.12.6" - graphql-yoga: "npm:4.0.4" + graphql-yoga: "npm:5.1.0" jest: "npm:29.7.0" jsonwebtoken: "npm:9.0.2" lodash: "npm:4.17.21" @@ -9363,7 +9404,7 @@ __metadata: graphiql: "npm:3.0.10" graphql: "npm:16.8.1" graphql-scalars: "npm:1.22.4" - graphql-yoga: "npm:4.0.4" + graphql-yoga: "npm:5.1.0" jest: "npm:29.7.0" json-bigint-patch: "npm:0.0.8" jsonwebtoken: "npm:9.0.2" @@ -21666,16 +21707,16 @@ __metadata: languageName: node linkType: hard -"graphql-yoga@npm:4.0.4": - version: 4.0.4 - resolution: "graphql-yoga@npm:4.0.4" +"graphql-yoga@npm:5.1.0": + version: 5.1.0 + resolution: "graphql-yoga@npm:5.1.0" dependencies: - "@envelop/core": "npm:^4.0.0" + "@envelop/core": "npm:^5.0.0" "@graphql-tools/executor": "npm:^1.0.0" "@graphql-tools/schema": "npm:^10.0.0" "@graphql-tools/utils": "npm:^10.0.0" - "@graphql-yoga/logger": "npm:^1.0.0" - "@graphql-yoga/subscription": "npm:^4.0.0" + "@graphql-yoga/logger": "npm:^2.0.0" + "@graphql-yoga/subscription": "npm:^5.0.0" "@whatwg-node/fetch": "npm:^0.9.7" "@whatwg-node/server": "npm:^0.9.1" dset: "npm:^3.1.1" @@ -21683,7 +21724,7 @@ __metadata: tslib: "npm:^2.5.2" peerDependencies: graphql: ^15.2.0 || ^16.0.0 - checksum: 147471c0c2da15567b0f49f6f8e62d92761c4bee6a953152b1ecfa0041a56bd100b3975218680a35cfe30fdbaf0e9d9fbd764f4d63ec4c217afac27ce9c0bf5d + checksum: 9814a12c279ea52050367a2c803d50669a180347e94ddd48bfc0579ecf0b0c686bcc824df564a47f5c280c91214779515e35955c00ccdee6ac60fe45bd7f69ed languageName: node linkType: hard From 3521573cb2ddb355efc39dd1afa047041190cc4a Mon Sep 17 00:00:00 2001 From: David Thyresson Date: Fri, 29 Dec 2023 08:47:21 -0500 Subject: [PATCH 2/2] Rework Yoga and Fastify types for v5 compatibility --- packages/studio/api/fastify/yoga.ts | 11 +++++------ packages/studio/api/graphql/yoga.ts | 11 ++++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/packages/studio/api/fastify/yoga.ts b/packages/studio/api/fastify/yoga.ts index e5f2392ae13b..5a874c28ad8b 100644 --- a/packages/studio/api/fastify/yoga.ts +++ b/packages/studio/api/fastify/yoga.ts @@ -1,5 +1,4 @@ -import type { FastifyInstance } from 'fastify' -import type { FastifyRequest, FastifyReply } from 'fastify' +import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify' import type { YogaServerInstance } from 'graphql-yoga' export default async function routes( @@ -12,7 +11,7 @@ export default async function routes( req: FastifyRequest reply: FastifyReply }, - Record + {} > } ) { @@ -24,9 +23,9 @@ export default async function routes( req, reply, }) - response.headers.forEach((value, key) => { - reply.header(key, value) - }) + for (const [name, value] of response.headers) { + reply.header(name, value) + } reply.status(response.status) reply.send(response.body) return reply diff --git a/packages/studio/api/graphql/yoga.ts b/packages/studio/api/graphql/yoga.ts index 115bdeb798bd..b90ea06c46f3 100644 --- a/packages/studio/api/graphql/yoga.ts +++ b/packages/studio/api/graphql/yoga.ts @@ -290,13 +290,10 @@ export const setupYoga = (fastify: FastifyInstance) => { }, }) - const yoga = createYoga< - { - req: FastifyRequest - reply: FastifyReply - }, - Record - >({ + const yoga = createYoga<{ + req: FastifyRequest + reply: FastifyReply + }>({ schema, logging: { debug: (...args) => args.forEach((arg) => fastify.log.debug(arg)),