From 7ce0f5572a39b71f0bcd26a6301518ef3c987c97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 02:36:02 +0000 Subject: [PATCH] Bump @graphql-tools/merge from 6.2.17 to 8.3.14 Bumps [@graphql-tools/merge](https://github.com/ardatan/graphql-tools/tree/HEAD/packages/merge) from 6.2.17 to 8.3.14. - [Release notes](https://github.com/ardatan/graphql-tools/releases) - [Changelog](https://github.com/ardatan/graphql-tools/blob/master/packages/merge/CHANGELOG.md) - [Commits](https://github.com/ardatan/graphql-tools/commits/@graphql-tools/merge@8.3.14/packages/merge) --- updated-dependencies: - dependency-name: "@graphql-tools/merge" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- server/package.json | 2 +- yarn.lock | 32 ++++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/server/package.json b/server/package.json index d9327d7..979da64 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.3.14", "@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..735581a 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.3.14": + version "8.3.14" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.14.tgz#d4d0a645656691d35e90e0686a6fa3d4091a34da" + integrity sha512-zV0MU1DnxJLIB0wpL4N3u21agEiYFsjm6DI130jqHpwF0pR9HkF+Ni65BNfts4zQelP0GjkHltG+opaozAJ1NA== + dependencies: + "@graphql-tools/utils" "9.1.3" + tslib "^2.4.0" + "@graphql-tools/mock@^8.1.2": version "8.6.1" resolved "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.6.1.tgz" @@ -993,6 +1001,13 @@ dependencies: tslib "~2.3.0" +"@graphql-tools/utils@9.1.3": + version "9.1.3" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.1.3.tgz#861f87057b313726136fa6ddfbd2380eae906599" + integrity sha512-bbJyKhs6awp1/OmP+WKA1GOyu9UbgZGkhIj5srmiMGLHohEOKMjW784Sk0BZil1w2x95UPu0WHw6/d/HVCACCg== + dependencies: + tslib "^2.4.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" @@ -6621,10 +6636,10 @@ tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@~2.3.0: - version "2.3.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@^2, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== tslib@~2.0.1: version "2.0.3" @@ -6641,6 +6656,11 @@ tslib@~2.2.0: resolved "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz" integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== +tslib@~2.3.0: + version "2.3.1" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"