Skip to content

Commit

Permalink
Update dependency @graphql-tools/merge to v7 (#6246)
Browse files Browse the repository at this point in the history
Co-authored-by: Renovate Bot <[email protected]>
  • Loading branch information
renovate[bot] and renovate-bot authored Aug 5, 2021
1 parent f46fd32 commit cdc25d5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion examples-staging/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@graphql-tools/merge": "^6.2.16",
"@graphql-tools/merge": "^7.0.0",
"@keystone-next/auth": "^30.0.0",
"@keystone-next/document-renderer": "^4.0.0",
"@keystone-next/fields": "^13.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"dependencies": {
"@babel/runtime": "^7.14.8",
"@graphql-tools/merge": "^6.2.16",
"@graphql-tools/merge": "^7.0.0",
"@keystone-next/admin-ui-utils": "^5.0.5",
"@keystone-next/fields": "^13.0.0",
"@keystone-next/types": "^23.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/keystone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@babel/plugin-transform-modules-commonjs": "^7.14.5",
"@babel/runtime": "^7.14.8",
"@emotion/hash": "^0.8.0",
"@graphql-tools/merge": "^6.2.16",
"@graphql-tools/merge": "^7.0.0",
"@hapi/iron": "^6.0.0",
"@keystone-next/admin-ui-utils": "^5.0.5",
"@keystone-next/fields": "^13.0.0",
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1510,29 +1510,29 @@
minimatch "^3.0.4"
strip-json-comments "^3.1.1"

"@graphql-tools/merge@6.2.16", "@graphql-tools/merge@^6.2.16":
version "6.2.16"
resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-6.2.16.tgz#5dd5f582075c21ef4d74ef84dfcc4e8d0c2db186"
integrity sha512-KjZ1pppzKcr2Uspgb53p8uw5yhWVuGIL+sEroar7vLsClSsuiGib8OKVICAGWjC9wrCxGaL9SjJGavfXpJMQIg==
"@graphql-tools/merge@7.0.0", "@graphql-tools/merge@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-7.0.0.tgz#af3380f5dc4536870397a3bac5afd0cd53e11add"
integrity sha512-u7TTwKQ7cybAkn6snYPRg3um/C2u690wlD8TgHITAmGQDAExN/yipSSBgu4rXWopsPLsY0G30mJ8tOWToZVE1w==
dependencies:
"@graphql-tools/schema" "^8.0.1"
"@graphql-tools/utils" "8.0.1"
"@graphql-tools/schema" "^8.0.3"
"@graphql-tools/utils" "8.0.2"
tslib "~2.3.0"

"@graphql-tools/schema@^8.0.1":
version "8.0.1"
resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.0.1.tgz#178b734f3784e632a76bdd144ffa8a32169a6f4a"
integrity sha512-QG2HGLJjmsNc1wcj+rwZTEArgfMp7rsrb8iVq4P8ce1mDYAt6kRV6bLyPVb9q/j8Ik2zBc/B/Y1jPsnAVUHwdA==
"@graphql-tools/schema@^8.0.3":
version "8.0.3"
resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.0.3.tgz#504a6b279be52a278b9c8af90b710c9dcc9ff732"
integrity sha512-ufJH7r/RcetVPd3kKCZ16/JTRkOX8aB1yGbYnUjqWEIdYEZc3Fpg7AVlcliu2JlvwR+WSNlgWn2QK76QCsFFdA==
dependencies:
"@graphql-tools/merge" "6.2.16"
"@graphql-tools/utils" "8.0.1"
"@graphql-tools/merge" "7.0.0"
"@graphql-tools/utils" "8.0.2"
tslib "~2.3.0"
value-or-promise "1.0.10"

"@graphql-tools/[email protected].1":
version "8.0.1"
resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.0.1.tgz#bf09e8d6d17c4a0830f0fbf2c69dd725de19058c"
integrity sha512-gjQk6sht4b0/hcG+QEVxfMyO8bn5tuU1nIOVhQ4whgFaUmrnb3hx2mwzz1EJzfIOAuHKE8tY0lu6jt3bGTD4yg==
"@graphql-tools/[email protected].2":
version "8.0.2"
resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.0.2.tgz#795a8383cdfdc89855707d62491c576f439f3c51"
integrity sha512-gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==
dependencies:
tslib "~2.3.0"

Expand Down

1 comment on commit cdc25d5

@vercel
Copy link

@vercel vercel bot commented on cdc25d5 Aug 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.