From 90d83aaa4547b8d6a75c206b77ddff03c19974b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 05:42:36 -0800 Subject: [PATCH 1/5] fix(deps): update dependency graphql-yoga to v5 (#9688) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [graphql-yoga](https://togithub.com/dotansimha/graphql-yoga) ([source](https://togithub.com/dotansimha/graphql-yoga/tree/HEAD/packages/graphql-yoga)) | [`4.0.4` -> `5.1.0`](https://renovatebot.com/diffs/npm/graphql-yoga/4.0.4/5.1.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/graphql-yoga/5.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/graphql-yoga/5.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/graphql-yoga/4.0.4/5.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/graphql-yoga/4.0.4/5.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
dotansimha/graphql-yoga (graphql-yoga) ### [`v5.1.0`](https://togithub.com/dotansimha/graphql-yoga/blob/HEAD/packages/graphql-yoga/CHANGELOG.md#510) [Compare Source](https://togithub.com/dotansimha/graphql-yoga/compare/graphql-yoga@5.0.2...graphql-yoga@5.1.0) ##### Minor Changes - [#​2992](https://togithub.com/dotansimha/graphql-yoga/pull/2992) [`b1f0e3a2`](https://togithub.com/dotansimha/graphql-yoga/commit/b1f0e3a2986956c6791a251df908e3f8b50ec966) Thanks [@​magrinj](https://togithub.com/magrinj)! - Export YogaSchemaDefinition and mergeSchemas ### [`v5.0.2`](https://togithub.com/dotansimha/graphql-yoga/blob/HEAD/packages/graphql-yoga/CHANGELOG.md#502) [Compare Source](https://togithub.com/dotansimha/graphql-yoga/compare/graphql-yoga@5.0.1...graphql-yoga@5.0.2) ##### Patch Changes - [#​3133](https://togithub.com/dotansimha/graphql-yoga/pull/3133) [`77d107fe`](https://togithub.com/dotansimha/graphql-yoga/commit/77d107fe1a01044f4ba017ca960bb1bd58407ed7) Thanks [@​ardatan](https://togithub.com/ardatan)! - Update HTTP Executor and add `method` and `useGETForQueries` to GraphiQL options ### [`v5.0.1`](https://togithub.com/dotansimha/graphql-yoga/blob/HEAD/packages/graphql-yoga/CHANGELOG.md#501) [Compare Source](https://togithub.com/dotansimha/graphql-yoga/compare/graphql-yoga@5.0.0...graphql-yoga@5.0.1) ##### Patch Changes - [`3fea19f2`](https://togithub.com/dotansimha/graphql-yoga/commit/3fea19f2a01c85b7d837163d763fae107e8f5a53) Thanks [@​antonio-iodice](https://togithub.com/antonio-iodice)! - Do not return 404 when using query params or trailing slashes ### [`v5.0.0`](https://togithub.com/dotansimha/graphql-yoga/blob/HEAD/packages/graphql-yoga/CHANGELOG.md#500) [Compare Source](https://togithub.com/dotansimha/graphql-yoga/compare/graphql-yoga@4.0.5...graphql-yoga@5.0.0) ##### Major Changes - [#​3063](https://togithub.com/dotansimha/graphql-yoga/pull/3063) [`01430e03`](https://togithub.com/dotansimha/graphql-yoga/commit/01430e03288f072a9cb09b0b898316b1f5b58a5f) Thanks [@​EmrysMyrddin](https://togithub.com/EmrysMyrddin)! - **Breaking Change:** Drop support of Node.js 16 - [#​3070](https://togithub.com/dotansimha/graphql-yoga/pull/3070) [`5b615478`](https://togithub.com/dotansimha/graphql-yoga/commit/5b6154783957874281bdf180575cdf57fadb75bf) Thanks [@​renovate](https://togithub.com/apps/renovate)! - dependencies updates: - Updated dependency [`@envelop/core@^5.0.0` โ†—๏ธŽ](https://www.npmjs.com/package/@​envelop/core/v/5.0.0) (from `^4.0.0`, in `dependencies`) ##### Patch Changes - [#​3051](https://togithub.com/dotansimha/graphql-yoga/pull/3051) [`350bb851`](https://togithub.com/dotansimha/graphql-yoga/commit/350bb85195c01cc5b5721f7a90f6cfbe1af36aff) Thanks [@​ardatan](https://togithub.com/ardatan)! - Use the same context object in the entire pipeline - Updated dependencies \[[`01430e03`](https://togithub.com/dotansimha/graphql-yoga/commit/01430e03288f072a9cb09b0b898316b1f5b58a5f)]: - [@​graphql-yoga/subscription](https://togithub.com/graphql-yoga/subscription)[@​5](https://togithub.com/5).0.0 - [@​graphql-yoga/logger](https://togithub.com/graphql-yoga/logger)[@​2](https://togithub.com/2).0.0 ### [`v4.0.5`](https://togithub.com/dotansimha/graphql-yoga/blob/HEAD/packages/graphql-yoga/CHANGELOG.md#405) [Compare Source](https://togithub.com/dotansimha/graphql-yoga/compare/graphql-yoga@4.0.4...graphql-yoga@4.0.5) ##### Patch Changes - [#​3004](https://togithub.com/dotansimha/graphql-yoga/pull/3004) [`bf602edf`](https://togithub.com/dotansimha/graphql-yoga/commit/bf602edf790590de1db26b5f3fc39f895104055c) Thanks [@​EmrysMyrddin](https://togithub.com/EmrysMyrddin)! - Fix dynamic schema function type and documentation
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: David Thyresson --- packages/graphql-server/package.json | 2 +- packages/studio/api/fastify/yoga.ts | 11 ++--- packages/studio/api/graphql/yoga.ts | 11 ++--- packages/studio/package.json | 2 +- yarn.lock | 69 ++++++++++++++++++++++------ 5 files changed, 66 insertions(+), 29 deletions(-) diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 39bdf08d83c1..8f7c1542efd4 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -41,7 +41,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/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)), diff --git a/packages/studio/package.json b/packages/studio/package.json index 214990568dce..5969ec1d396b 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -39,7 +39,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 be02cacee416..1d62c124ecf3 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" @@ -9024,7 +9065,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" @@ -9387,7 +9428,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" @@ -21712,16 +21753,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" @@ -21729,7 +21770,7 @@ __metadata: tslib: "npm:^2.5.2" peerDependencies: graphql: ^15.2.0 || ^16.0.0 - checksum: 147471c0c2da15567b0f49f6f8e62d92761c4bee6a953152b1ecfa0041a56bd100b3975218680a35cfe30fdbaf0e9d9fbd764f4d63ec4c217afac27ce9c0bf5d + checksum: 9814a12c279ea52050367a2c803d50669a180347e94ddd48bfc0579ecf0b0c686bcc824df564a47f5c280c91214779515e35955c00ccdee6ac60fe45bd7f69ed languageName: node linkType: hard From ebee4b614e6f48ff88696482898c14bd5d244418 Mon Sep 17 00:00:00 2001 From: Josh GM Walker <56300765+Josh-Walker-GM@users.noreply.github.com> Date: Tue, 2 Jan 2024 19:31:54 +0000 Subject: [PATCH 2/5] fix(dbAuth): Correct hardcoded DB column (#9788) **Problem** Logging in with webauthn enabled was broken when you had customised your schema to use different column names than the default. See #8743 for details. **Changes** 1. Alters the where clause to use the same column names as the create a few lines below. See: https://github.com/redwoodjs/redwood/blob/c7ae669e36c5e1b7edcd4ee5436558831bad94b8/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts#L979-L983 **Fixes** Fixes #8743 --- packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts b/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts index 6c28f1b066e2..0e54d2c95193 100644 --- a/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts +++ b/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts @@ -970,8 +970,9 @@ export class DbAuthHandler< const existingDevice = await this.dbCredentialAccessor.findFirst({ where: { - id: plainCredentialId, - userId: user[this.options.authFields.id], + [this.options.webAuthn.credentialFields.id]: plainCredentialId, + [this.options.webAuthn.credentialFields.userId]: + user[this.options.authFields.id], }, }) From c5301730085687723f0e90b9344c8ea22da73fd0 Mon Sep 17 00:00:00 2001 From: Tobbe Lundberg Date: Tue, 2 Jan 2024 20:51:05 +0100 Subject: [PATCH 3/5] Use regex to make test pass in VSCode (#9791) --- .../dataMigrate/src/__tests__/install.test.ts | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/packages/cli-packages/dataMigrate/src/__tests__/install.test.ts b/packages/cli-packages/dataMigrate/src/__tests__/install.test.ts index e7eb5165d42c..378cb0eef95e 100644 --- a/packages/cli-packages/dataMigrate/src/__tests__/install.test.ts +++ b/packages/cli-packages/dataMigrate/src/__tests__/install.test.ts @@ -1,3 +1,5 @@ +import type yargs from 'yargs' + import * as installCommand from '../commands/install' import { handler as dataMigrateInstallHandler } from '../commands/installHandler.js' @@ -24,12 +26,24 @@ describe('install', () => { }) it('`builder` has an epilogue', () => { - const yargs = { epilogue: jest.fn() } - // @ts-expect-error this is a test file; epilogue is the only thing `builder` calls right now + // The typecasting here is to make TS happy when calling `builder(yargs)` + // further down. We know that only `epilogue` will be called. + const yargs = { epilogue: jest.fn() } as unknown as yargs.Argv + installCommand.builder(yargs) - expect(yargs.epilogue).toBeCalledWith( - // eslint-disable-next-line no-irregular-whitespace - 'Also see the Redwood CLI Reference (โ€‹https://redwoodjs.com/docs/cli-commands#datamigrate-installโ€‹)' + + // The epilogue is a string that contains a link to the docs. The string + // contains special control characters when rendered in a terminal that + // supports clickable links. We use regular expressions and wildcards here + // to avoid having to match control characters that might not even always + // be there + expect(yargs.epilogue).toHaveBeenCalledWith( + expect.stringMatching(/Also see the .*Redwood CLI Reference.*/) + ) + expect(yargs.epilogue).toHaveBeenCalledWith( + expect.stringMatching( + /https:\/\/redwoodjs\.com\/docs\/cli-commands#datamigrate-install/ + ) ) }) From 401b5c0c640847e1c2200a0583003c8a3ecb263c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 15:09:19 -0800 Subject: [PATCH 4/5] chore(deps): update dependency @envelop/core to v5 (#9669) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [@envelop/core](https://togithub.com/n1ru4l/envelop) ([source](https://togithub.com/n1ru4l/envelop/tree/HEAD/packages/core)) | [`4.0.3` -> `5.0.0`](https://renovatebot.com/diffs/npm/@envelop%2fcore/4.0.3/5.0.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/@envelop%2fcore/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/@envelop%2fcore/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/@envelop%2fcore/4.0.3/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/@envelop%2fcore/4.0.3/5.0.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
n1ru4l/envelop (@​envelop/core) ### [`v5.0.0`](https://togithub.com/n1ru4l/envelop/blob/HEAD/packages/core/CHANGELOG.md#500) [Compare Source](https://togithub.com/n1ru4l/envelop/compare/@envelop/core@4.0.3...@envelop/core@5.0.0) ##### Major Changes - [#​1986](https://togithub.com/n1ru4l/envelop/pull/1986) [`68e7a2a5`](https://togithub.com/n1ru4l/envelop/commit/68e7a2a59a2f9872652b4bae28f30c3a2fb70487) Thanks [@​EmrysMyrddin](https://togithub.com/EmrysMyrddin)! - **Breaking Change:** Support of Node 16 is dropped. - [#​1939](https://togithub.com/n1ru4l/envelop/pull/1939) [`f7ef03c0`](https://togithub.com/n1ru4l/envelop/commit/f7ef03c07ae1af3abf08de86bc95fe626bbc7913) Thanks [@​EmrysMyrddin](https://togithub.com/EmrysMyrddin)! - The `addPlugin` function now insert the plugin in place in the plugin list, leading to a more predictable execution order. **Breaking Change:** This change alter the execution order of plugins. This can break some plugins that was relying on the fact the `addPlugin` allowed to push a plugin to the end of the plugin list. If it is the case, the best fix is to reorder the plugin list and ensure the plugin is in the right position, after all its dependencies. ##### Patch Changes - Updated dependencies \[[`68e7a2a5`](https://togithub.com/n1ru4l/envelop/commit/68e7a2a59a2f9872652b4bae28f30c3a2fb70487)]: - [@​envelop/types](https://togithub.com/envelop/types)[@​5](https://togithub.com/5).0.0
--- ### Configuration ๐Ÿ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). ๐Ÿšฆ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. โ™ป **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. ๐Ÿ”• **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/redwoodjs/redwood). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Dominic Saadi --- packages/graphql-server/package.json | 2 +- packages/realtime/package.json | 2 +- yarn.lock | 16 +++++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/graphql-server/package.json b/packages/graphql-server/package.json index 8f7c1542efd4..8fed8a5e6f05 100644 --- a/packages/graphql-server/package.json +++ b/packages/graphql-server/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.23.6", - "@envelop/core": "4.0.3", + "@envelop/core": "5.0.0", "@envelop/depth-limit": "3.0.3", "@envelop/disable-introspection": "5.0.3", "@envelop/filter-operation-type": "5.0.3", diff --git a/packages/realtime/package.json b/packages/realtime/package.json index 00995a680e3f..faad07152bd7 100644 --- a/packages/realtime/package.json +++ b/packages/realtime/package.json @@ -37,7 +37,7 @@ "ioredis": "^5.3.2" }, "devDependencies": { - "@envelop/core": "4.0.3", + "@envelop/core": "5.0.0", "@envelop/testing": "6.0.3", "@envelop/types": "4.0.1", "esbuild": "0.19.9", diff --git a/yarn.lock b/yarn.lock index 1d62c124ecf3..dcdd691785e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2301,7 +2301,17 @@ __metadata: languageName: node linkType: hard -"@envelop/core@npm:4.0.3, @envelop/core@npm:^4.0.0": +"@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/core@npm:^4.0.0": version: 4.0.3 resolution: "@envelop/core@npm:4.0.3" dependencies: @@ -9039,7 +9049,7 @@ __metadata: "@babel/cli": "npm:7.23.4" "@babel/core": "npm:^7.22.20" "@babel/runtime-corejs3": "npm:7.23.6" - "@envelop/core": "npm:4.0.3" + "@envelop/core": "npm:5.0.0" "@envelop/depth-limit": "npm:3.0.3" "@envelop/disable-introspection": "npm:5.0.3" "@envelop/filter-operation-type": "npm:5.0.3" @@ -9263,7 +9273,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redwoodjs/realtime@workspace:packages/realtime" dependencies: - "@envelop/core": "npm:4.0.3" + "@envelop/core": "npm:5.0.0" "@envelop/live-query": "npm:6.0.3" "@envelop/testing": "npm:6.0.3" "@envelop/types": "npm:4.0.1" From 3e08e20ac98e19c153d983cb7bc53b628d62ad19 Mon Sep 17 00:00:00 2001 From: Dominic Saadi Date: Wed, 3 Jan 2024 00:05:40 +0000 Subject: [PATCH 5/5] chore: yarn install to update `yarn.lock` (follow up to #9669) --- yarn.lock | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index dcdd691785e6..f9958be5f81f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2301,7 +2301,7 @@ __metadata: languageName: node linkType: hard -"@envelop/core@npm:5.0.0": +"@envelop/core@npm:5.0.0, @envelop/core@npm:^5.0.0": version: 5.0.0 resolution: "@envelop/core@npm:5.0.0" dependencies: @@ -2321,16 +2321,6 @@ __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"