federation 2.10.0

.changeset/five-ways-accept.md

@@ -0,0 +1,11 @@
+---
+"apollo-federation-integration-testsuite": minor
+"@apollo/query-planner": minor
+"@apollo/query-graphs": minor
+"@apollo/composition": minor
+"@apollo/federation-internals": minor
+"@apollo/subgraph": minor
+"@apollo/gateway": minor
+---
+
+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.

.changeset/pre.json

@@ -0,0 +1,18 @@
+{
+  "mode": "exit",
+  "tag": "alpha",
+  "initialVersions": {
+    "@apollo/composition": "2.9.0",
+    "apollo-federation-integration-testsuite": "2.9.0",
+    "@apollo/gateway": "2.9.0",
+    "@apollo/federation-internals": "2.9.0",
+    "@apollo/query-graphs": "2.9.0",
+    "@apollo/query-planner": "2.9.0",
+    "@apollo/subgraph": "2.9.0"
+  },
+  "changesets": [
+    "twenty-parents-wait",
+    "warm-moles-jog",
+    "young-pigs-crash"
+  ]
+}

.changeset/twenty-parents-wait.md

@@ -0,0 +1,5 @@
+---
+"@apollo/federation-internals": patch
+---
+
+Incorporate changes from v2.9.3

.changeset/warm-moles-jog.md

@@ -0,0 +1,5 @@
+---
+"@apollo/gateway": minor
+---
+
+Add request parameter to didEncounterError method

.changeset/young-pigs-crash.md

@@ -0,0 +1,5 @@
+---
+"@apollo/subgraph": patch
+---
+
+When resolving references, skip type resolution if the reference resolves to null.

.circleci/config.yml

@@ -2,7 +2,6 @@ version: 2.1
 
 orbs:
   node: circleci/node@5.1.0
-  secops: apollo/circleci-secops-orb@2.0.7
 
 jobs:
   # Unfortunately cimg/node doesn't tag its images with major only, you have to specify a minor version.
@@ -14,6 +13,7 @@ jobs:
         type: string
     docker:
       - image: cimg/base:stable
+    resource_class: large
     steps:
       - checkout
       - node/install:
@@ -59,17 +59,3 @@ workflows:
       - node/run:
           name: Check Prettier (tests)
           npm-run: prettier:check
-  security-scans:
-    jobs:
-      - secops/gitleaks:
-          context:
-            - platform-docker-ro
-            - github-orb
-            - secops-oidc
-          git-base-revision: <<#pipeline.git.base_revision>><<pipeline.git.base_revision>><</pipeline.git.base_revision >>
-          git-revision: << pipeline.git.revision >>
-      - secops/semgrep:
-          context:
-            - secops-oidc
-            - github-orb
-          git-base-revision: <<#pipeline.git.base_revision>><<pipeline.git.base_revision>><</pipeline.git.base_revision >>

.cspell/cspell.yml

@@ -39,6 +39,7 @@ overrides:
     ignoreRegExpList:
       - "\\]\\([^)]+\\)"
       - "youTubeID=.+/>"
+      - "WistiaId=.+/>"
   # Ignore user and repo names in GitHub links to supported subgraph libraries.
   - filename: '**/compatible-subgraphs.md'
     ignoreRegExpList:

.github/workflows/release.yml

@@ -25,11 +25,11 @@ jobs:
 
       - name: Install Dependencies
         run: npm i
-        
+
       - name: Set env
         run: echo "FEDERATION_VERSION=$(npm --prefix ./internals-js version --json |jq -r '.["@apollo/federation-internals"]')" >> $GITHUB_ENV
 
-      - name: Create Release Pull Request
+      - name: Create Release Pull Request or Publish to npm
         id: changesets
         uses: changesets/action@v1
         with:
@@ -41,7 +41,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      
+
       - name: Sleep for 20 seconds (arbitrary, give NPM time to populate new `latest` versions)
         if: steps.changesets.outputs.published == 'true'
         run: sleep 20
@@ -58,15 +58,15 @@ jobs:
               repo: 'federation-rs',
               workflow_id: '.github/workflows/release.yml',
               ref: 'main',
-              inputs: { 
+              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)
         run: echo //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }} > ~/.npmrc
-        
+
       - name: Update next tags if appropriate
         if: steps.changesets.outputs.published == 'true'
         run: node scripts/update-next-tags.mjs

composition-js/package.json

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