diff --git a/server/package.json b/server/package.json index d9327d7..eb47cf2 100644 --- a/server/package.json +++ b/server/package.json @@ -20,7 +20,7 @@ "@graphql-codegen/typescript-resolvers": "^2.6.1", "@graphql-tools/graphql-file-loader": "^6.0.0", "@graphql-tools/load": "^6.0.0", - "@graphql-tools/merge": "^6.0.0", + "@graphql-tools/merge": "^8.2.7", "@graphql-tools/schema": "^8.3.3", "apollo-server": "^3.6.4", "apollo-server-core": "^3.6.5", diff --git a/yarn.lock b/yarn.lock index e157697..d151037 100644 --- a/yarn.lock +++ b/yarn.lock @@ -876,7 +876,7 @@ p-limit "3.1.0" tslib "~2.3.0" -"@graphql-tools/merge@8.2.4", "@graphql-tools/merge@^8.2.1": +"@graphql-tools/merge@8.2.4": version "8.2.4" resolved "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.4.tgz" integrity sha512-hiNRTsS948F+BB4Q7CZXLaGFOIHQzmimVq3EEI/+PQZsPb7kYDzg0Ow0GyV4conDdEiooLqHf7I1dWzTYwvs0A== @@ -884,7 +884,7 @@ "@graphql-tools/utils" "8.6.3" tslib "~2.3.0" -"@graphql-tools/merge@^6.0.0", "@graphql-tools/merge@^6.2.12": +"@graphql-tools/merge@^6.2.12": version "6.2.17" resolved "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.17.tgz" integrity sha512-G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow== @@ -893,6 +893,14 @@ "@graphql-tools/utils" "8.0.2" tslib "~2.3.0" +"@graphql-tools/merge@^8.2.1", "@graphql-tools/merge@^8.2.7": + version "8.2.7" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.7.tgz#add05bcc47df6b7390f31acbcadd986e160d58f9" + integrity sha512-rKxjNogqu1UYAG/y5FOb6lJsmSQbWA+jq4inWjNEVX54VGGE7/WGnmPaqcsyomNOfS3vIRS6NnG+DxiQSqetjg== + dependencies: + "@graphql-tools/utils" "8.6.6" + tslib "~2.3.0" + "@graphql-tools/mock@^8.1.2": version "8.6.1" resolved "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.6.1.tgz" @@ -986,13 +994,20 @@ dependencies: tslib "~2.3.0" -"@graphql-tools/utils@8.6.3", "@graphql-tools/utils@^8.1.1", "@graphql-tools/utils@^8.3.0", "@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.2": +"@graphql-tools/utils@8.6.3": version "8.6.3" resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.3.tgz" integrity sha512-CNyP7Uu7dlVMQ32IpHWOxz4yic9BYXXVkDhG0UdTKSszvzHdgMilemE9MpUrGzzBPsTe3aYTtNGyPUkyh9yTXA== dependencies: tslib "~2.3.0" +"@graphql-tools/utils@8.6.6", "@graphql-tools/utils@^8.1.1", "@graphql-tools/utils@^8.3.0", "@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.2": + version "8.6.6" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.6.6.tgz#f7c88d32818b748f3e3867ed87a562769b544417" + integrity sha512-wjY2ljKLCnnbRrDNPPgPNqCujou0LFSOWcxAjV6DYUlfFWTsAEvlYmsmY4T+K12wI/fnqoJ2bUwIlap1plFDMg== + dependencies: + tslib "~2.3.0" + "@graphql-tools/utils@^7.0.0", "@graphql-tools/utils@^7.5.0": version "7.10.0" resolved "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.10.0.tgz"