From 2c27e13cc234d78cad10b551bec6258e508270f2 Mon Sep 17 00:00:00 2001 From: Matt Krick Date: Fri, 2 Aug 2024 14:04:40 -0700 Subject: [PATCH] fix: nest-graphql-endpoint support graphql v16 (#10066) Signed-off-by: Matt Krick --- packages/server/package.json | 2 +- yarn.lock | 150 ++++++++++++++++++++++++++--------- 2 files changed, 114 insertions(+), 38 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d995a509e0e..7c1ef8600be 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -115,7 +115,7 @@ "mailgun.js": "^9.3.0", "mime-types": "^2.1.16", "ms": "^2.0.0", - "nest-graphql-endpoint": "mattkrick/nest-graphql-endpoint#add-options", + "nest-graphql-endpoint": "0.8.1", "node-env-flag": "0.1.0", "node-pg-migrate": "^5.9.0", "nodemailer": "^6.9.9", diff --git a/yarn.lock b/yarn.lock index cc3f82d9c4d..90977ed9054 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4356,6 +4356,16 @@ tslib "^2.4.0" value-or-promise "^1.0.12" +"@graphql-tools/batch-execute@^9.0.4": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-9.0.4.tgz#11601409c0c33491971fc82592de12390ec58be2" + integrity sha512-kkebDLXgDrep5Y0gK1RN3DMUlLqNhg60OAz0lTCqrYeja6DshxLtLkj+zV4mVbBA4mQOEoBmw6g1LZs3dA84/w== + dependencies: + "@graphql-tools/utils" "^10.0.13" + dataloader "^2.2.2" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/code-file-loader@^8.0.0": version "8.0.2" resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-8.0.2.tgz#224b9ce29d9229c52d8bd7b6d976038f4ea5d3f4" @@ -4367,19 +4377,6 @@ tslib "^2.4.0" unixify "^1.0.0" -"@graphql-tools/delegate@8.7.1", "@graphql-tools/delegate@^8.5.4": - version "8.7.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.7.1.tgz#f30b9d035a76dc7a8e9292f31bb073fb4d6d9d83" - integrity sha512-e98/NRaOH5wQy624bRd5i5qUKz5tCs8u4xBmxW89d7t6V6CveXj7pvAgmnR9DbwOkO6IA3P799p/aa/YG/pWTA== - dependencies: - "@graphql-tools/batch-execute" "8.4.1" - "@graphql-tools/schema" "8.3.6" - "@graphql-tools/utils" "8.6.5" - dataloader "2.0.0" - graphql-executor "0.0.22" - tslib "~2.3.0" - value-or-promise "1.0.11" - "@graphql-tools/delegate@^10.0.0": version "10.0.2" resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.0.2.tgz#26fdd4b186969799570cc6d2451d05d1d7cb7c90" @@ -4392,6 +4389,31 @@ dataloader "^2.2.2" tslib "^2.5.0" +"@graphql-tools/delegate@^10.0.4": + version "10.0.17" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.0.17.tgz#25f9177c54378c723078f363a83b0bde7ea4a814" + integrity sha512-YIJleGaSjYnqIcJ5uoBWVBBE3eP5h3CvEM9PiANHtRUBmoNBKdYstkrS3IqBSlgKLsboD5CTYfmXDVQAPfH+mw== + dependencies: + "@graphql-tools/batch-execute" "^9.0.4" + "@graphql-tools/executor" "^1.3.0" + "@graphql-tools/schema" "^10.0.4" + "@graphql-tools/utils" "^10.2.3" + dataloader "^2.2.2" + tslib "^2.5.0" + +"@graphql-tools/delegate@^8.5.4": + version "8.7.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.7.1.tgz#f30b9d035a76dc7a8e9292f31bb073fb4d6d9d83" + integrity sha512-e98/NRaOH5wQy624bRd5i5qUKz5tCs8u4xBmxW89d7t6V6CveXj7pvAgmnR9DbwOkO6IA3P799p/aa/YG/pWTA== + dependencies: + "@graphql-tools/batch-execute" "8.4.1" + "@graphql-tools/schema" "8.3.6" + "@graphql-tools/utils" "8.6.5" + dataloader "2.0.0" + graphql-executor "0.0.22" + tslib "~2.3.0" + value-or-promise "1.0.11" + "@graphql-tools/executor-graphql-ws@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz#7727159ebaa9df4dc793d0d02e74dd1ca4a7cc60" @@ -4439,6 +4461,17 @@ tslib "^2.4.0" value-or-promise "^1.0.12" +"@graphql-tools/executor@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.3.0.tgz#7d3e94335895acf6616fba03d0197216eae6176e" + integrity sha512-e+rmEf/2EO4hDnbkO8mTS2FI+jGUNmYkSDKw5TgPVlO8VOKS+TXmJBK6E9v4Gc/39yVkZsffYfW/R8obJrA0mg== + dependencies: + "@graphql-tools/utils" "^10.2.3" + "@graphql-typed-document-node/core" "3.2.0" + "@repeaterjs/repeater" "^3.0.4" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/git-loader@^8.0.0": version "8.0.2" resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-8.0.2.tgz#d26d87e176ff0cea86e0acfe7c2072f32fd836c3" @@ -4541,6 +4574,14 @@ "@graphql-tools/utils" "^10.0.0" tslib "^2.4.0" +"@graphql-tools/merge@^9.0.3": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.4.tgz#66c34cbc2b9a99801c0efca7b8134b2c9aecdb06" + integrity sha512-MivbDLUQ+4Q8G/Hp/9V72hbn810IJDEZQ57F01sHnlrrijyadibfVhaQfW/pNH+9T/l8ySZpaR/DpL5i+ruZ+g== + dependencies: + "@graphql-tools/utils" "^10.0.13" + tslib "^2.4.0" + "@graphql-tools/optimize@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-2.0.0.tgz#7a9779d180824511248a50c5a241eff6e7a2d906" @@ -4581,7 +4622,7 @@ "@graphql-tools/utils" "^10.0.0" tslib "^2.4.0" -"@graphql-tools/schema@8.3.6", "@graphql-tools/schema@^8.3.3", "@graphql-tools/schema@^8.3.6": +"@graphql-tools/schema@8.3.6", "@graphql-tools/schema@^8.3.3": version "8.3.6" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.6.tgz#80cfe3eba53eb6390a60a30078d7efbdaa5cc0b7" integrity sha512-7tWYRQ8hB/rv2zAtv2LtnQl4UybyJPtRz/VLKRmgi7+F5t8iYBahmmsxMDAYMWMmWMqEDiKk54TvAes+J069rQ== @@ -4601,6 +4642,16 @@ tslib "^2.4.0" value-or-promise "^1.0.12" +"@graphql-tools/schema@^10.0.3", "@graphql-tools/schema@^10.0.4": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.4.tgz#d4fc739a2cc07b4fc5f31a714178a561cba210cd" + integrity sha512-HuIwqbKxPaJujox25Ra4qwz0uQzlpsaBOzO6CVfzB/MemZdd+Gib8AIvfhQArK0YIN40aDran/yi+E5Xf0mQww== + dependencies: + "@graphql-tools/merge" "^9.0.3" + "@graphql-tools/utils" "^10.2.1" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/schema@^9.0.16": version "9.0.16" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.16.tgz#7d340d69e6094dc01a2b9e625c7bb4fff89ea521" @@ -4654,6 +4705,16 @@ dset "^3.1.2" tslib "^2.4.0" +"@graphql-tools/utils@^10.0.13", "@graphql-tools/utils@^10.1.1", "@graphql-tools/utils@^10.2.1", "@graphql-tools/utils@^10.2.3": + version "10.3.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.3.2.tgz#dfdddf10438ccdb08a5b2c814726a667ddae1596" + integrity sha512-iaqOHS4f90KNADBHqVsRBjKpM6iSvsUg1q5GhWMK03loYLaDzftrEwcsl0OkSSnRhJvAsT7q4q3r3YzRoV0v1g== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + cross-inspect "1.0.0" + dset "^3.1.2" + tslib "^2.4.0" + "@graphql-tools/wrap@^10.0.0": version "10.0.0" resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.0.tgz#573ab111482387d4acf4757d5fb7f9553a504bc1" @@ -4665,16 +4726,16 @@ tslib "^2.4.0" value-or-promise "^1.0.12" -"@graphql-tools/wrap@^8.4.10": - version "8.4.10" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.4.10.tgz#010be7d4bafa5d79cd1917c65d09f2682bcb9d54" - integrity sha512-1/pcKRDTGIUspUl6uhlfQ0u1l4j15TVGkOkijI+gX25Q9sfAJclT0bovKBksP39G6v4hZnolpOU2txJ47MxxEg== +"@graphql-tools/wrap@^10.0.5": + version "10.0.5" + resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.5.tgz#614b964a158887b4a644f5425b2b9a57b5751f72" + integrity sha512-Cbr5aYjr3HkwdPvetZp1cpDWTGdD1Owgsb3z/ClzhmrboiK86EnQDxDvOJiQkDCPWE9lNBwj8Y4HfxroY0D9DQ== dependencies: - "@graphql-tools/delegate" "8.7.1" - "@graphql-tools/schema" "8.3.6" - "@graphql-tools/utils" "8.6.5" - tslib "~2.3.0" - value-or-promise "1.0.11" + "@graphql-tools/delegate" "^10.0.4" + "@graphql-tools/schema" "^10.0.3" + "@graphql-tools/utils" "^10.1.1" + tslib "^2.4.0" + value-or-promise "^1.0.12" "@graphql-typed-document-node/core@3.2.0", "@graphql-typed-document-node/core@^3.1.1", "@graphql-typed-document-node/core@^3.2.0": version "3.2.0" @@ -6187,6 +6248,14 @@ graphql "^15.0.0" graphql-tag "^2.10.3" +"@octokit/graphql-schema@^14.58.0": + version "14.58.0" + resolved "https://registry.yarnpkg.com/@octokit/graphql-schema/-/graphql-schema-14.58.0.tgz#61caee52b88a505820dec701a164a7196ae9d6ef" + integrity sha512-89QSUV1Dgxzq90wqkv0Nmw7jHfFCAQ4K/fjp5ezvDEHqFFzMCn25TBQlm38WB8ams+hGxInRDbITCP0n7GTGlg== + dependencies: + graphql "^16.0.0" + graphql-tag "^2.10.3" + "@octokit/graphql@^5.0.0": version "5.0.1" resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.1.tgz#a06982514ad131fb6fbb9da968653b2233fade9b" @@ -11752,6 +11821,13 @@ cross-fetch@^3.0.4, cross-fetch@^3.1.5: dependencies: node-fetch "2.6.7" +cross-inspect@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cross-inspect/-/cross-inspect-1.0.0.tgz#5fda1af759a148594d2d58394a9e21364f6849af" + integrity sha512-4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ== + dependencies: + tslib "^2.4.0" + cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -14225,7 +14301,7 @@ graphql@*, graphql@^15.0.0: resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== -graphql@16.9.0: +graphql@16.9.0, graphql@^16.0.0: version "16.9.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.9.0.tgz#1c310e63f16a49ce1fbb230bd0a000e99f6f115f" integrity sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw== @@ -17368,17 +17444,17 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nest-graphql-endpoint@mattkrick/nest-graphql-endpoint#add-options: - version "0.6.2" - resolved "https://codeload.github.com/mattkrick/nest-graphql-endpoint/tar.gz/e5fba7e8f3f92f55044dd3f1c0eb2d8dab7513fd" +nest-graphql-endpoint@0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/nest-graphql-endpoint/-/nest-graphql-endpoint-0.8.1.tgz#445f71da12dfbb859dc085dc6b294603c53e2341" + integrity sha512-l3P6qozmrSzId0o7CpnFHdbBleqFSsTwyIAyK6VB8MnzSR/IkugYiQnTCcCef0P+gI/UJnTSLBc3kRRjN5rWaw== dependencies: - "@graphql-tools/schema" "^8.3.6" - "@graphql-tools/wrap" "^8.4.10" - "@octokit/graphql-schema" "^10.36.0" - dataloader "2.0.0" - node-fetch "^2.6.7" - tslib "~2.3.1" - typescript "^4.2.4" + "@graphql-tools/schema" "^10.0.4" + "@graphql-tools/wrap" "^10.0.5" + "@octokit/graphql-schema" "^14.58.0" + dataloader "^2.2.2" + tslib "^2.6.3" + typescript "^5.5.4" netmask@^2.0.2: version "2.0.2" @@ -22087,7 +22163,7 @@ tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@^2.0.1: +tslib@^2.0.1, tslib@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== @@ -22097,7 +22173,7 @@ tslib@~2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== -tslib@~2.3.0, tslib@~2.3.1: +tslib@~2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -22223,7 +22299,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -"typescript@^3 || ^4", typescript@^4.2.4, typescript@^5.3.3: +"typescript@^3 || ^4", typescript@^5.3.3, typescript@^5.5.4: version "5.4.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372" integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==