merge main into next --strategy-option theirs

.github/CODEOWNERS

@@ -1,2 +1,2 @@
-* @apollographql/atlas
+* @apollographql/fed-core
 /docs/ @apollographql/docs

.github/ISSUE_TEMPLATE/config.yml

@@ -1,10 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: "GraphOS Discord Server"
-    url: https://discord.com/invite/graphos
-    about: >-
-      Come join us in our GraphOS Discord server; our community and DevRel team
-      are happy to answer any questions you might have.
   - name: "Apollo Discourse Community"
     url: https://community.apollographql.com/tag/federation
     about: >-

.github/workflows/release.yml

@@ -47,21 +47,6 @@ jobs:
         run: sleep 20
         shell: bash
 
-      - name: Kick off release in federation-rs
-        if: steps.changesets.outputs.published == 'true'
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.ACTION_PAT }}
-          script: |
-            await github.rest.actions.createWorkflowDispatch({
-              owner: 'apollographql',
-              repo: 'federation-rs',
-              workflow_id: '.github/workflows/release.yml',
-              ref: 'main',
-              inputs: {
-                version: "${{ env.FEDERATION_VERSION }}"
-              }
-            })
       - name: Write token to the NPM rc file (login)
         if: steps.changesets.outputs.published == 'true'
         # write token to the NPM rc file (npm login)

composition-js/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG for `@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](https://github.com/apollographql/federation/pull/3215))
+
+### Patch Changes
+
+- Updated dependencies [[`8927e315ab0e865ef3ff12320f265ee95588b899`](https://github.com/apollographql/federation/commit/8927e315ab0e865ef3ff12320f265ee95588b899), [`8927e315ab0e865ef3ff12320f265ee95588b899`](https://github.com/apollographql/federation/commit/8927e315ab0e865ef3ff12320f265ee95588b899)]:
+  - @apollo/query-graphs@2.10.0
+  - @apollo/federation-internals@2.10.0
+
 ## 2.9.3
 
 ### Patch Changes

composition-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/composition",
-  "version": "2.10.0-alpha.4",
+  "version": "2.10.0",
   "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.10.0-alpha.4",
-    "@apollo/query-graphs": "2.10.0-alpha.4"
+    "@apollo/federation-internals": "2.10.0",
+    "@apollo/query-graphs": "2.10.0"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"