Merge pull request #3179 from apollographql/prep-2.10.0-preview.1

Prep 2.10.0 preview.1
apollographql · Nov 7, 2024 · 138e132 · 138e132
2 parents 98285e5 + a0359b0
commit 138e132
Show file tree

Hide file tree

Showing 60 changed files with 4,066 additions and 3,526 deletions.
diff --git a/.changeset/twenty-parents-wait.md b/.changeset/twenty-parents-wait.md
@@ -0,0 +1,5 @@
+---
+"@apollo/federation-internals": patch
+---
+
+Incorporate changes from v2.9.3
diff --git a/.cspell/cspell-dict.txt b/.cspell/cspell-dict.txt
@@ -45,6 +45,7 @@ condiditions
 correcly
 cyclesf
 Cypher
+dariuszkuc
 dedented
 Dedupe
 defered
@@ -61,6 +62,7 @@ Didnt
 diretive
 doesn
 Dont
+dotansimha
 effecient
 elimiate
 elts
@@ -81,6 +83,7 @@ follwoing
 fooz
 Fragmentization
 fufilled
+ghostdogpr
 GHSA
 Gmsuh
 gqlgen
@@ -191,6 +194,7 @@ resovable
 Reviwed
 Rhai
 righ
+rmosolgo
 rulesof
 runtimes
 samee
@@ -273,6 +277,7 @@ upgader
 Upgrader
 upgrader
 uppper
+Urigo
 uuidv
 vals
 verison

diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml
diff --git a/.gitleaksignore b/.gitleaksignore
@@ -0,0 +1,3 @@
+98882688d195e195234d8af24fd64fdd6d105a2b:query-planner-js/src/tests/buildPlan.test.ts:9178
+ff5e2fac1ed4731c3392546a361291b3905b494b:query-planner-js/src/tests/buildPlan.test.ts:10334
+ff5e2fac1ed4731c3392546a361291b3905b494b:query-planner-js/src/tests/buildPlan.test.ts:10339
diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md
@@ -1,5 +1,21 @@
 # CHANGELOG for `@apollo/composition`
 
+## 2.9.3
+
+### Patch Changes
+
+- Updated dependencies [[`345661c558773e4eb5d5f0b28464a8d1acdc2a2d`](https://github.com/apollographql/federation/commit/345661c558773e4eb5d5f0b28464a8d1acdc2a2d), [`e00e1c9892b48ac89823597113989830877966ef`](https://github.com/apollographql/federation/commit/e00e1c9892b48ac89823597113989830877966ef), [`cc4573471696ef78d04fa00c4cf8e5c50314ba9f`](https://github.com/apollographql/federation/commit/cc4573471696ef78d04fa00c4cf8e5c50314ba9f), [`062572b3253e8640b60a0bf58b83945094b76b6f`](https://github.com/apollographql/federation/commit/062572b3253e8640b60a0bf58b83945094b76b6f), [`df5eb3cb0e2b4802fcd425ab9c23714de2707db3`](https://github.com/apollographql/federation/commit/df5eb3cb0e2b4802fcd425ab9c23714de2707db3), [`1c99cb0dcc6c639ac351210932623ab0bd6907e4`](https://github.com/apollographql/federation/commit/1c99cb0dcc6c639ac351210932623ab0bd6907e4)]:
+  - @apollo/query-graphs@2.9.3
+  - @apollo/federation-internals@2.9.3
+
+## 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/src/__tests__/compose.setContext.test.ts b/composition-js/src/__tests__/compose.setContext.test.ts
@@ -817,7 +817,7 @@ describe("setContext tests", () => {
     expect(result.schema).toBeUndefined();
     expect(result.errors?.length).toBe(1);
     expect(result.errors?.[0].message).toBe(
-      '[Subgraph1] Object "U" has no resolvable key but has an a field with a contextual argument.'
+      '[Subgraph1] Object "U" has no resolvable key but has a field with a contextual argument.'
     );
   });
 

diff --git a/docs/shared/enterprise-directive.mdx b/docs/shared/enterprise-directive.mdx
@@ -1,5 +1,5 @@
 <EnterpriseFeature>
 
-This directive is an [Enterprise feature](/router/enterprise-features) of the GraphOS Router and requires an organization with a [GraphOS Enterprise plan](https://www.apollographql.com/pricing/). If your organization doesn't have an Enterprise plan, you can test it out by signing up for a free [Enterprise trial](/graphos/org/plans/#enterprise-trials).
+This directive is an [Enterprise feature](https://www.apollographql.com/pricing) of the GraphOS Router and requires an organization with a [GraphOS Enterprise plan](https://www.apollographql.com/pricing/). If your organization doesn't have an Enterprise plan, you can test it out by signing up for a free [Enterprise trial](https://studio.apollographql.com/signup?referrer=docs).
 
 </EnterpriseFeature>
diff --git a/docs/shared/progressive-override-enterprise.mdx b/docs/shared/progressive-override-enterprise.mdx
@@ -1,5 +1,5 @@
 <EnterpriseFeature>
 
-Progressive `@override` is an [Enterprise feature](/router/enterprise-features) of the GraphOS Router and requires an organization with a [GraphOS Enterprise plan](https://www.apollographql.com/pricing/). If your organization doesn't have an Enterprise plan, you can test it out by signing up for a free [Enterprise trial](/graphos/org/plans/#enterprise-trials).
+Progressive `@override` is an [Enterprise feature](https://www.apollographql.com/pricing) of the GraphOS Router and requires an organization with a [GraphOS Enterprise plan](https://www.apollographql.com/pricing/). If your organization doesn't have an Enterprise plan, you can test it out by signing up for a free [Enterprise trial](https://studio.apollographql.com/signup?referrer=docs).
 
 </EnterpriseFeature>