From ad943713619c85070cd97d198eef52196f8824c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:18:57 -0700 Subject: [PATCH] release: on branch main (#3153) This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @apollo/composition@2.9.2 ### Patch Changes - Updated dependencies \[[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`e1e2605b30efc488b57f62ba43436606a38a3607`](https://github.com/apollographql/federation/commit/e1e2605b30efc488b57f62ba43436606a38a3607), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: - @apollo/federation-internals@2.9.2 - @apollo/query-graphs@2.9.2 ## @apollo/gateway@2.9.2 ### Patch Changes - Updated dependencies \[[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`e1e2605b30efc488b57f62ba43436606a38a3607`](https://github.com/apollographql/federation/commit/e1e2605b30efc488b57f62ba43436606a38a3607), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: - @apollo/query-planner@2.9.2 - @apollo/federation-internals@2.9.2 - @apollo/composition@2.9.2 ## @apollo/federation-internals@2.9.2 ### Patch Changes - Fixes handling of a `__typename` selection during query planning process. ([#3156](https://github.com/apollographql/federation/pull/3156)) When expanding fragments we were keeping references to the same `Field`s regardless where those fragments appeared in our original selection set. This was generally fine as in most cases we would have same inline fragment selection sets across whole operation but was causing problems when we were applying another optimization by collapsing those expanded inline fragments creating a new selection set. As a result, if any single field selection (within that fragment) would perform optimization around the usage of `__typename`, ALL occurrences of that field selection would get that optimization as well. - Add validations for demand control directive applications ([#3148](https://github.com/apollographql/federation/pull/3148)) ## @apollo/query-graphs@2.9.2 ### Patch Changes - Fixes issue where contextual parameters can have naming collisions if used in multiple subgraphs ([#3155](https://github.com/apollographql/federation/pull/3155)) - Updated dependencies \[[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: - @apollo/federation-internals@2.9.2 ## @apollo/query-planner@2.9.2 ### Patch Changes - Fixes handling of a `__typename` selection during query planning process. ([#3156](https://github.com/apollographql/federation/pull/3156)) When expanding fragments we were keeping references to the same `Field`s regardless where those fragments appeared in our original selection set. This was generally fine as in most cases we would have same inline fragment selection sets across whole operation but was causing problems when we were applying another optimization by collapsing those expanded inline fragments creating a new selection set. As a result, if any single field selection (within that fragment) would perform optimization around the usage of `__typename`, ALL occurrences of that field selection would get that optimization as well. - Fixes issue where contextual parameters can have naming collisions if used in multiple subgraphs ([#3155](https://github.com/apollographql/federation/pull/3155)) - Updated dependencies \[[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`e1e2605b30efc488b57f62ba43436606a38a3607`](https://github.com/apollographql/federation/commit/e1e2605b30efc488b57f62ba43436606a38a3607), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: - @apollo/federation-internals@2.9.2 - @apollo/query-graphs@2.9.2 ## @apollo/subgraph@2.9.2 ### Patch Changes - Updated dependencies \[[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: - @apollo/federation-internals@2.9.2 ## apollo-federation-integration-testsuite@2.9.2 Co-authored-by: github-actions[bot] --- .changeset/shaggy-phones-know.md | 8 ----- .changeset/tame-paws-return.md | 6 ---- .changeset/tidy-trees-dress.md | 5 --- composition-js/CHANGELOG.md | 8 +++++ composition-js/package.json | 6 ++-- .../CHANGELOG.md | 2 ++ .../package.json | 2 +- gateway-js/CHANGELOG.md | 9 ++++++ gateway-js/package.json | 8 ++--- internals-js/CHANGELOG.md | 10 ++++++ internals-js/package.json | 2 +- package-lock.json | 32 +++++++++---------- query-graphs-js/CHANGELOG.md | 9 ++++++ query-graphs-js/package.json | 4 +-- query-planner-js/CHANGELOG.md | 14 ++++++++ query-planner-js/package.json | 6 ++-- subgraph-js/CHANGELOG.md | 7 ++++ subgraph-js/package.json | 4 +-- 18 files changed, 91 insertions(+), 51 deletions(-) delete mode 100644 .changeset/shaggy-phones-know.md delete mode 100644 .changeset/tame-paws-return.md delete mode 100644 .changeset/tidy-trees-dress.md diff --git a/.changeset/shaggy-phones-know.md b/.changeset/shaggy-phones-know.md deleted file mode 100644 index fc51db809..000000000 --- a/.changeset/shaggy-phones-know.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@apollo/query-planner": patch -"@apollo/federation-internals": patch ---- - -Fixes handling of a `__typename` selection during query planning process. - -When expanding fragments we were keeping references to the same `Field`s regardless where those fragments appeared in our original selection set. This was generally fine as in most cases we would have same inline fragment selection sets across whole operation but was causing problems when we were applying another optimization by collapsing those expanded inline fragments creating a new selection set. As a result, if any single field selection (within that fragment) would perform optimization around the usage of `__typename`, ALL occurrences of that field selection would get that optimization as well. diff --git a/.changeset/tame-paws-return.md b/.changeset/tame-paws-return.md deleted file mode 100644 index 819bf0d1b..000000000 --- a/.changeset/tame-paws-return.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@apollo/query-planner": patch -"@apollo/query-graphs": patch ---- - -Fixes issue where contextual parameters can have naming collisions if used in multiple subgraphs diff --git a/.changeset/tidy-trees-dress.md b/.changeset/tidy-trees-dress.md deleted file mode 100644 index eb8718314..000000000 --- a/.changeset/tidy-trees-dress.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@apollo/federation-internals": patch ---- - -Add validations for demand control directive applications diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md index d613cff50..56e7753bb 100644 --- a/composition-js/CHANGELOG.md +++ b/composition-js/CHANGELOG.md @@ -1,5 +1,13 @@ # CHANGELOG for `@apollo/composition` +## 2.9.2 + +### Patch Changes + +- Updated dependencies [[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`e1e2605b30efc488b57f62ba43436606a38a3607`](https://github.com/apollographql/federation/commit/e1e2605b30efc488b57f62ba43436606a38a3607), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: + - @apollo/federation-internals@2.9.2 + - @apollo/query-graphs@2.9.2 + ## 2.9.1 ### Patch Changes diff --git a/composition-js/package.json b/composition-js/package.json index 81cae5f56..c60f19be1 100644 --- a/composition-js/package.json +++ b/composition-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/composition", - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Federation composition utilities", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -27,8 +27,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.9.1", - "@apollo/query-graphs": "2.9.1" + "@apollo/federation-internals": "2.9.2", + "@apollo/query-graphs": "2.9.2" }, "peerDependencies": { "graphql": "^16.5.0" diff --git a/federation-integration-testsuite-js/CHANGELOG.md b/federation-integration-testsuite-js/CHANGELOG.md index 9b9abbfcc..81106b530 100644 --- a/federation-integration-testsuite-js/CHANGELOG.md +++ b/federation-integration-testsuite-js/CHANGELOG.md @@ -1,5 +1,7 @@ # CHANGELOG for `federation-integration-testsuite-js` +## 2.9.2 + ## 2.9.1 ## 2.9.0 diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json index 78af2666b..0a1027b91 100644 --- a/federation-integration-testsuite-js/package.json +++ b/federation-integration-testsuite-js/package.json @@ -1,7 +1,7 @@ { "name": "apollo-federation-integration-testsuite", "private": true, - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Federation Integrations / Test Fixtures", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md index 40d44ff71..ce43bcacf 100644 --- a/gateway-js/CHANGELOG.md +++ b/gateway-js/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGELOG for `@apollo/gateway` +## 2.9.2 + +### Patch Changes + +- Updated dependencies [[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`e1e2605b30efc488b57f62ba43436606a38a3607`](https://github.com/apollographql/federation/commit/e1e2605b30efc488b57f62ba43436606a38a3607), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: + - @apollo/query-planner@2.9.2 + - @apollo/federation-internals@2.9.2 + - @apollo/composition@2.9.2 + ## 2.9.1 ### Patch Changes diff --git a/gateway-js/package.json b/gateway-js/package.json index a039559da..bd7fc2c6a 100644 --- a/gateway-js/package.json +++ b/gateway-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Gateway", "author": "Apollo ", "main": "dist/index.js", @@ -25,9 +25,9 @@ "access": "public" }, "dependencies": { - "@apollo/composition": "2.9.1", - "@apollo/federation-internals": "2.9.1", - "@apollo/query-planner": "2.9.1", + "@apollo/composition": "2.9.2", + "@apollo/federation-internals": "2.9.2", + "@apollo/query-planner": "2.9.2", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", diff --git a/internals-js/CHANGELOG.md b/internals-js/CHANGELOG.md index d1f034240..803b705b1 100644 --- a/internals-js/CHANGELOG.md +++ b/internals-js/CHANGELOG.md @@ -1,5 +1,15 @@ # CHANGELOG for `@apollo/federation-internals` +## 2.9.2 + +### Patch Changes + +- Fixes handling of a `__typename` selection during query planning process. ([#3156](https://github.com/apollographql/federation/pull/3156)) + + When expanding fragments we were keeping references to the same `Field`s regardless where those fragments appeared in our original selection set. This was generally fine as in most cases we would have same inline fragment selection sets across whole operation but was causing problems when we were applying another optimization by collapsing those expanded inline fragments creating a new selection set. As a result, if any single field selection (within that fragment) would perform optimization around the usage of `__typename`, ALL occurrences of that field selection would get that optimization as well. + +- Add validations for demand control directive applications ([#3148](https://github.com/apollographql/federation/pull/3148)) + ## 2.9.1 ### Patch Changes diff --git a/internals-js/package.json b/internals-js/package.json index b8b730103..74036cb3c 100644 --- a/internals-js/package.json +++ b/internals-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation-internals", - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Federation internal utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/package-lock.json b/package-lock.json index ca8578518..c714329b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,11 +70,11 @@ }, "composition-js": { "name": "@apollo/composition", - "version": "2.9.1", + "version": "2.9.2", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.9.1", - "@apollo/query-graphs": "2.9.1" + "@apollo/federation-internals": "2.9.2", + "@apollo/query-graphs": "2.9.2" }, "engines": { "node": ">=14.15.0" @@ -85,7 +85,7 @@ }, "federation-integration-testsuite-js": { "name": "apollo-federation-integration-testsuite", - "version": "2.9.1", + "version": "2.9.2", "license": "Elastic-2.0", "dependencies": { "graphql-tag": "^2.12.6", @@ -94,12 +94,12 @@ }, "gateway-js": { "name": "@apollo/gateway", - "version": "2.9.1", + "version": "2.9.2", "license": "Elastic-2.0", "dependencies": { - "@apollo/composition": "2.9.1", - "@apollo/federation-internals": "2.9.1", - "@apollo/query-planner": "2.9.1", + "@apollo/composition": "2.9.2", + "@apollo/federation-internals": "2.9.2", + "@apollo/query-planner": "2.9.2", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", @@ -125,7 +125,7 @@ }, "internals-js": { "name": "@apollo/federation-internals", - "version": "2.9.1", + "version": "2.9.2", "license": "Elastic-2.0", "dependencies": { "@types/uuid": "^9.0.0", @@ -17859,10 +17859,10 @@ }, "query-graphs-js": { "name": "@apollo/query-graphs", - "version": "2.9.1", + "version": "2.9.2", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.9.1", + "@apollo/federation-internals": "2.9.2", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -17876,11 +17876,11 @@ }, "query-planner-js": { "name": "@apollo/query-planner", - "version": "2.9.1", + "version": "2.9.2", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.9.1", - "@apollo/query-graphs": "2.9.1", + "@apollo/federation-internals": "2.9.2", + "@apollo/query-graphs": "2.9.2", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", @@ -17909,11 +17909,11 @@ }, "subgraph-js": { "name": "@apollo/subgraph", - "version": "2.9.1", + "version": "2.9.2", "license": "MIT", "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.9.1" + "@apollo/federation-internals": "2.9.2" }, "engines": { "node": ">=14.15.0" diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md index 2dbd7fcc5..f85f08656 100644 --- a/query-graphs-js/CHANGELOG.md +++ b/query-graphs-js/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGELOG for `@apollo/query-graphs` +## 2.9.2 + +### Patch Changes + +- Fixes issue where contextual parameters can have naming collisions if used in multiple subgraphs ([#3155](https://github.com/apollographql/federation/pull/3155)) + +- Updated dependencies [[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: + - @apollo/federation-internals@2.9.2 + ## 2.9.1 ### Patch Changes diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json index 317caf322..cacb70ce1 100644 --- a/query-graphs-js/package.json +++ b/query-graphs-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-graphs", - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Federation library to work with 'query graphs'", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -23,7 +23,7 @@ "node": ">=14.15.0" }, "dependencies": { - "@apollo/federation-internals": "2.9.1", + "@apollo/federation-internals": "2.9.2", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md index 25e8f4153..3113073ec 100644 --- a/query-planner-js/CHANGELOG.md +++ b/query-planner-js/CHANGELOG.md @@ -1,5 +1,19 @@ # CHANGELOG for `@apollo/query-planner` +## 2.9.2 + +### Patch Changes + +- Fixes handling of a `__typename` selection during query planning process. ([#3156](https://github.com/apollographql/federation/pull/3156)) + + When expanding fragments we were keeping references to the same `Field`s regardless where those fragments appeared in our original selection set. This was generally fine as in most cases we would have same inline fragment selection sets across whole operation but was causing problems when we were applying another optimization by collapsing those expanded inline fragments creating a new selection set. As a result, if any single field selection (within that fragment) would perform optimization around the usage of `__typename`, ALL occurrences of that field selection would get that optimization as well. + +- Fixes issue where contextual parameters can have naming collisions if used in multiple subgraphs ([#3155](https://github.com/apollographql/federation/pull/3155)) + +- Updated dependencies [[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`e1e2605b30efc488b57f62ba43436606a38a3607`](https://github.com/apollographql/federation/commit/e1e2605b30efc488b57f62ba43436606a38a3607), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: + - @apollo/federation-internals@2.9.2 + - @apollo/query-graphs@2.9.2 + ## 2.9.1 ### Patch Changes diff --git a/query-planner-js/package.json b/query-planner-js/package.json index 3a14f093e..c6fc13ea8 100644 --- a/query-planner-js/package.json +++ b/query-planner-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-planner", - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Query Planner", "author": "Apollo ", "main": "dist/index.js", @@ -25,8 +25,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.9.1", - "@apollo/query-graphs": "2.9.1", + "@apollo/federation-internals": "2.9.2", + "@apollo/query-graphs": "2.9.2", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md index 1bbdf5a22..acd0935d0 100644 --- a/subgraph-js/CHANGELOG.md +++ b/subgraph-js/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG for `@apollo/subgraph` +## 2.9.2 + +### Patch Changes + +- Updated dependencies [[`2192f355f50db33fe0807d16153f357696b9f190`](https://github.com/apollographql/federation/commit/2192f355f50db33fe0807d16153f357696b9f190), [`5ac01b534318105e904c1e6598070f753add3bb1`](https://github.com/apollographql/federation/commit/5ac01b534318105e904c1e6598070f753add3bb1)]: + - @apollo/federation-internals@2.9.2 + ## 2.9.1 ### Patch Changes diff --git a/subgraph-js/package.json b/subgraph-js/package.json index c718a90ff..cfed18475 100644 --- a/subgraph-js/package.json +++ b/subgraph-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/subgraph", - "version": "2.9.1", + "version": "2.9.2", "description": "Apollo Subgraph Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -25,7 +25,7 @@ }, "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.9.1" + "@apollo/federation-internals": "2.9.2" }, "peerDependencies": { "graphql": "^16.5.0"