diff --git a/.changeset/@graphql-mesh_fusion-runtime-7351-dependencies.md b/.changeset/@graphql-mesh_fusion-runtime-7351-dependencies.md new file mode 100644 index 0000000000000..cc8122f304620 --- /dev/null +++ b/.changeset/@graphql-mesh_fusion-runtime-7351-dependencies.md @@ -0,0 +1,6 @@ +--- +"@graphql-mesh/fusion-runtime": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/federation@^2.2.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/federation/v/2.2.0) (from `^2.1.2`, in `dependencies`) + - Added dependency [`@graphql-mesh/cross-helpers@^0.4.4` ↗︎](https://www.npmjs.com/package/@graphql-mesh/cross-helpers/v/0.4.4) (to `dependencies`) diff --git a/.changeset/@graphql-mesh_graphql-7351-dependencies.md b/.changeset/@graphql-mesh_graphql-7351-dependencies.md new file mode 100644 index 0000000000000..57d9334ad459e --- /dev/null +++ b/.changeset/@graphql-mesh_graphql-7351-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/graphql": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/federation@^2.2.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/federation/v/2.2.0) (from `^2.1.2`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_serve-runtime-7351-dependencies.md b/.changeset/@graphql-mesh_serve-runtime-7351-dependencies.md new file mode 100644 index 0000000000000..1e5bc334c9453 --- /dev/null +++ b/.changeset/@graphql-mesh_serve-runtime-7351-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/serve-runtime": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/federation@^2.2.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/federation/v/2.2.0) (from `^2.1.2`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_supergraph-7351-dependencies.md b/.changeset/@graphql-mesh_supergraph-7351-dependencies.md new file mode 100644 index 0000000000000..bd3175ebba24e --- /dev/null +++ b/.changeset/@graphql-mesh_supergraph-7351-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/supergraph": patch +--- +dependencies updates: + - Updated dependency [`@graphql-tools/federation@^2.2.0` ↗︎](https://www.npmjs.com/package/@graphql-tools/federation/v/2.2.0) (from `^2.1.2`, in `dependencies`) diff --git a/packages/fusion/runtime/package.json b/packages/fusion/runtime/package.json index 40f5f34b47713..875a6e386ab88 100644 --- a/packages/fusion/runtime/package.json +++ b/packages/fusion/runtime/package.json @@ -51,13 +51,14 @@ }, "dependencies": { "@envelop/core": "^5.0.1", + "@graphql-mesh/cross-helpers": "^0.4.4", "@graphql-mesh/runtime": "^0.100.1", "@graphql-mesh/transport-common": "^0.4.1", "@graphql-mesh/types": "^0.99.1", "@graphql-mesh/utils": "^0.99.1", "@graphql-tools/delegate": "^10.0.14", "@graphql-tools/executor": "^1.2.8", - "@graphql-tools/federation": "^2.1.2", + "@graphql-tools/federation": "^2.2.0", "@graphql-tools/stitch": "^9.2.10", "@graphql-tools/stitching-directives": "^3.0.2", "@graphql-tools/utils": "^10.2.3", diff --git a/packages/fusion/runtime/src/federation.ts b/packages/fusion/runtime/src/federation.ts index ba807f4e68fa2..219e5edc4ba03 100644 --- a/packages/fusion/runtime/src/federation.ts +++ b/packages/fusion/runtime/src/federation.ts @@ -13,6 +13,7 @@ import { typeFromAST, visit, } from 'graphql'; +import { process } from '@graphql-mesh/cross-helpers'; import type { TransportEntry } from '@graphql-mesh/transport-common'; import { getDirectiveExtensions, @@ -549,7 +550,7 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({ return onSubgraphExecute(subgraphName, req); }; }, - batch: true, + batch: !process.env.JEST, onStitchingOptions(opts: any) { subschemas = opts.subschemas; opts.typeDefs = [opts.typeDefs, additionalTypeDefs]; diff --git a/packages/legacy/handlers/graphql/package.json b/packages/legacy/handlers/graphql/package.json index 7efda6d4c1aed..7ee1820bd74b7 100644 --- a/packages/legacy/handlers/graphql/package.json +++ b/packages/legacy/handlers/graphql/package.json @@ -43,7 +43,7 @@ "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.4", "@graphql-tools/delegate": "^10.0.14", - "@graphql-tools/federation": "^2.1.2", + "@graphql-tools/federation": "^2.2.0", "@graphql-tools/url-loader": "^8.0.0", "lodash.get": "^4.4.2" }, diff --git a/packages/legacy/handlers/supergraph/package.json b/packages/legacy/handlers/supergraph/package.json index a747e3e6e3580..91e08d2a5aa2d 100644 --- a/packages/legacy/handlers/supergraph/package.json +++ b/packages/legacy/handlers/supergraph/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "@graphql-mesh/string-interpolation": "^0.5.4", - "@graphql-tools/federation": "^2.1.2", + "@graphql-tools/federation": "^2.2.0", "@graphql-tools/url-loader": "^8.0.2", "@graphql-tools/utils": "^10.2.2", "lodash.get": "^4.4.2" diff --git a/packages/serve-runtime/package.json b/packages/serve-runtime/package.json index 677c5355f91d6..657428e25056f 100644 --- a/packages/serve-runtime/package.json +++ b/packages/serve-runtime/package.json @@ -49,7 +49,7 @@ "@graphql-tools/delegate": "^10.0.14", "@graphql-tools/executor-http": "^1.1.5", "@graphql-tools/executor-yoga": "^3.0.0", - "@graphql-tools/federation": "^2.1.2", + "@graphql-tools/federation": "^2.2.0", "@graphql-tools/stitch": "^9.2.10", "@graphql-tools/utils": "^10.2.3", "@whatwg-node/server": "^0.9.34", diff --git a/yarn.lock b/yarn.lock index 8bf31cabf7ccc..8a31e5524c75f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -63,7 +63,7 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:3.11.0": +"@apollo/client@npm:3.11.0, @apollo/client@npm:~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ~3.10.0 || ~3.11.0": version: 3.11.0 resolution: "@apollo/client@npm:3.11.0" dependencies: @@ -100,7 +100,7 @@ __metadata: languageName: node linkType: hard -"@apollo/client@npm:^3.8.0, @apollo/client@npm:~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ~3.10.0": +"@apollo/client@npm:^3.8.0": version: 3.10.8 resolution: "@apollo/client@npm:3.10.8" dependencies: @@ -4969,13 +4969,14 @@ __metadata: resolution: "@graphql-mesh/fusion-runtime@workspace:packages/fusion/runtime" dependencies: "@envelop/core": "npm:^5.0.1" + "@graphql-mesh/cross-helpers": "npm:^0.4.4" "@graphql-mesh/runtime": "npm:^0.100.1" "@graphql-mesh/transport-common": "npm:^0.4.1" "@graphql-mesh/types": "npm:^0.99.1" "@graphql-mesh/utils": "npm:^0.99.1" "@graphql-tools/delegate": "npm:^10.0.14" "@graphql-tools/executor": "npm:^1.2.8" - "@graphql-tools/federation": "npm:^2.1.2" + "@graphql-tools/federation": "npm:^2.2.0" "@graphql-tools/stitch": "npm:^9.2.10" "@graphql-tools/stitching-directives": "npm:^3.0.2" "@graphql-tools/utils": "npm:^10.2.3" @@ -4995,7 +4996,7 @@ __metadata: dependencies: "@graphql-mesh/string-interpolation": "npm:^0.5.4" "@graphql-tools/delegate": "npm:^10.0.14" - "@graphql-tools/federation": "npm:^2.1.2" + "@graphql-tools/federation": "npm:^2.2.0" "@graphql-tools/url-loader": "npm:^8.0.0" lodash.get: "npm:^4.4.2" peerDependencies: @@ -5559,7 +5560,7 @@ __metadata: "@graphql-tools/delegate": "npm:^10.0.14" "@graphql-tools/executor-http": "npm:^1.1.5" "@graphql-tools/executor-yoga": "npm:^3.0.0" - "@graphql-tools/federation": "npm:^2.1.2" + "@graphql-tools/federation": "npm:^2.2.0" "@graphql-tools/stitch": "npm:^9.2.10" "@graphql-tools/utils": "npm:^10.2.3" "@whatwg-node/server": "npm:^0.9.34" @@ -5623,7 +5624,7 @@ __metadata: resolution: "@graphql-mesh/supergraph@workspace:packages/legacy/handlers/supergraph" dependencies: "@graphql-mesh/string-interpolation": "npm:^0.5.4" - "@graphql-tools/federation": "npm:^2.1.2" + "@graphql-tools/federation": "npm:^2.2.0" "@graphql-tools/url-loader": "npm:^8.0.2" "@graphql-tools/utils": "npm:^10.2.2" lodash.get: "npm:^4.4.2" @@ -6332,11 +6333,11 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/federation@npm:^2.1.2": - version: 2.1.3 - resolution: "@graphql-tools/federation@npm:2.1.3" +"@graphql-tools/federation@npm:^2.2.0": + version: 2.2.0 + resolution: "@graphql-tools/federation@npm:2.2.0" dependencies: - "@apollo/client": "npm:~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ~3.10.0" + "@apollo/client": "npm:~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0 || ~3.8.0 || ~3.9.0 || ~3.10.0 || ~3.11.0" "@graphql-tools/delegate": "npm:^10.0.15" "@graphql-tools/executor-http": "npm:^1.1.5" "@graphql-tools/merge": "npm:^9.0.3" @@ -6352,7 +6353,7 @@ __metadata: dependenciesMeta: "@apollo/client": optional: true - checksum: 10c0/f6901d0870ec35512ddd0fcc1a112210e9ee5a3475c791b9412ff734bcad788fc7a1ecdca02d37581f23d555c6b8a29c0631b6d819bc7fc5dafe18d18e7ceedf + checksum: 10c0/581ba473b8a21972b54870032982f93fe977312e61654051a6c03114576b72527b2aca5d4ef41d1324ddad91c406d6019b42aa71c47e9d493b47fd0728ab3b54 languageName: node linkType: hard