From cdc25d5708c8448130ebafe28dbf896406679f13 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Aug 2021 08:57:15 +1000 Subject: [PATCH] Update dependency @graphql-tools/merge to v7 (#6246) Co-authored-by: Renovate Bot --- examples-staging/basic/package.json | 2 +- packages/auth/package.json | 2 +- packages/keystone/package.json | 2 +- yarn.lock | 32 ++++++++++++++--------------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples-staging/basic/package.json b/examples-staging/basic/package.json index 57397719aec..1547dc332d2 100644 --- a/examples-staging/basic/package.json +++ b/examples-staging/basic/package.json @@ -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", diff --git a/packages/auth/package.json b/packages/auth/package.json index d02646024d2..ada36b67256 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -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", diff --git a/packages/keystone/package.json b/packages/keystone/package.json index 87227fa1bb3..18efa5cde46 100644 --- a/packages/keystone/package.json +++ b/packages/keystone/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index f70c0c8a976..85f300d3db6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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/utils@8.0.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/utils@8.0.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"