diff --git a/server/package.json b/server/package.json index d9327d7..548520c 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.17", "@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..2674b90 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.17": + version "8.3.17" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.17.tgz#d7e184a296eb455c1550ab95991c5a2f68ea16a4" + integrity sha512-CLzz49lc6BavPhH9gPRm0sJeNA7kC/tF/jLUTQsyef6xj82Jw3rqIJ9PE+bk1cqPCOG01WLOfquBu445OMDO2g== + dependencies: + "@graphql-tools/utils" "9.2.0" + 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,14 @@ dependencies: tslib "~2.3.0" +"@graphql-tools/utils@9.2.0": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.0.tgz#d74d0376231c0e8bf897a715fafaf53d0f6bf06c" + integrity sha512-s3lEG1iYkyYEnKCWrIFECX3XH2wmZvbg6Ir3udCvIDynq+ydaO7JQXobclpPtwSJtjlS353haF//6V7mnBQ4bg== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + 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" @@ -1013,7 +1029,7 @@ tslib "~2.3.0" value-or-promise "1.0.11" -"@graphql-typed-document-node/core@^3.0.0": +"@graphql-typed-document-node/core@^3.0.0", "@graphql-typed-document-node/core@^3.1.1": version "3.1.1" resolved "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.1.1.tgz" integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg== @@ -6621,10 +6637,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.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== tslib@~2.0.1: version "2.0.3" @@ -6641,6 +6657,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"