merge main into next --strategy-option theirs#3227
Merged
lennyburdette merged 25 commits intonextfrom Mar 12, 2025
Merged
Conversation
Removes unnecessary netlify.toml
For entity detection, make sure we're using the keyDirective as it appears in the subgraph schema fixes #3187
Pairs with https://github.com/apollographql/docs-rewrite/pull/353 to centralize legacy redirects
Clarify that no router redeploy is required to update percent label for progressive override
This PR enhances didEncounterError method in RemoteGraphQLDataSource class. Co-authored-by: Chris Lenfest <clenfest@apollographql.com>
Updates the "IDE Support" page to describe options beyond JetBrains.
Updates: - Include reference to new Vim/NeoVim doc - Move page from reference to main federation docs for better visibility
Add deprecation `<Caution>` on v1.x versions in changelog
Clarify required `@link` directive for Fed 2
On [federation overview page](https://www.apollographql.com/docs/deploy-preview/e4ba354a8ee685ee51a883f4/graphos/schema-design/federated-schemas/federation): - Add benefit for connecting APIs declaratively - Prioritize connectors quickstart - Emphasize orchestration - Link to Odyssey connectors course --------- Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.com>
Update Intro to Entities --------- Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.com>
Updates JetBrains info to the new Apollo plugin! Do not merge until after https://github.com/apollographql/docs-rewrite/pull/454
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.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) ### Patch Changes - Updated dependencies \[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31), [`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]: - @apollo/query-graphs@2.10.0 - @apollo/federation-internals@2.10.0 ## @apollo/gateway@2.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) - Add request parameter to didEncounterError method ([#3194](#3194)) ### Patch Changes - Updated dependencies \[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31), [`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]: - @apollo/query-planner@2.10.0 - @apollo/composition@2.10.0 - @apollo/federation-internals@2.10.0 ## @apollo/federation-internals@2.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) ### Patch Changes - Incorporate changes from v2.9.3 ([#3215](#3215)) ## @apollo/query-graphs@2.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) ### Patch Changes - Updated dependencies \[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31), [`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]: - @apollo/federation-internals@2.10.0 ## @apollo/query-planner@2.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) ### Patch Changes - Updated dependencies \[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31), [`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]: - @apollo/query-graphs@2.10.0 - @apollo/federation-internals@2.10.0 ## @apollo/subgraph@2.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) ### Patch Changes - When resolving references, skip type resolution if the reference resolves to null. ([#3215](#3215)) - Updated dependencies \[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31), [`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]: - @apollo/federation-internals@2.10.0 ## apollo-federation-integration-testsuite@2.10.0 ### Minor Changes - Adds the ability to compose and serialize directives for [Apollo Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors, compose your supergraphs using [GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management) or [rover](https://www.apollographql.com/docs/rover/commands/dev), and run your supergraph in [Apollo Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or higher. ([#3215](#3215)) --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Lenny Burdette <lenny@apollographql.com>
Update diagrams for the federation conceptual page
Updates federation versions to include 2.10 and adds connectors federation errors. Some reformatting included.
Moves IDE support page to docs repo. Await https://github.com/apollographql/docs-rewrite/pull/465 merge.
Fix legacy link
|
Collaborator
✅ Docs preview has no changesThe preview was not built because there were no changes. Build ID: 5ace45d9f0c38819a8c191d6 |
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. |
dylan-apollo
approved these changes
Mar 12, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.