Merge branch 'main' into next

NOUIY · Nov 20, 2023 · cd00b17 · cd00b17
2 parents e325b49 + 7903a29
commit cd00b17
Show file tree

Hide file tree

Showing 26 changed files with 658 additions and 531 deletions.
diff --git a/.cspell/cspell.yml b/.cspell/cspell.yml
@@ -34,10 +34,11 @@ overrides:
   - filename: '**/CHANGELOG*.md'
     ignoreRegExpList:
       - "@[-\\w]+"
-  # Ignore the targets of links in Markdown/MDX files.
+  # Ignore the targets of links and YouTube IDs in Markdown/MDX files.
   - filename: '**/*.md*'
     ignoreRegExpList:
       - "\\]\\([^)]+\\)"
+      - "youTubeID=.+/>"
   # Ignore user and repo names in GitHub links to supported subgraph libraries.
   - filename: '**/supported-subgraphs.md'
     ignoreRegExpList:

diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG for `@apollo/composition`
 
+## 2.5.7
+### Patch Changes
+
+- Updated dependencies []:
+  - @apollo/federation-internals@2.5.7
+  - @apollo/query-graphs@2.5.7
+
 ## 2.5.6
 ### Patch Changes
 

diff --git a/composition-js/package.json b/composition-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/composition",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "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.5.6",
-    "@apollo/query-graphs": "2.5.6"
+    "@apollo/federation-internals": "2.5.7",
+    "@apollo/query-graphs": "2.5.7"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"

diff --git a/docs/shared/diagrams/managed-federation.mdx b/docs/shared/diagrams/managed-federation.mdx
@@ -0,0 +1,17 @@
+```mermaid
+graph LR;
+  subgraph "Your infrastructure"
+  serviceA[Products subgraph];
+  serviceB[Reviews subgraph];
+  router([Router]);
+  end
+  subgraph "Apollo GraphOS"
+  registry{{Schema Registry}};
+  uplink{{Uplink}}
+  end
+  serviceA & serviceB -->|"Publishes<br/>schema"| registry;
+  registry -->|"Updates<br/>config"| uplink;
+  router -->|Polls for config changes| uplink;
+  class registry secondary;
+  class uplink secondary;
+```
diff --git a/docs/source/building-supergraphs/supported-subgraphs.md b/docs/source/building-supergraphs/supported-subgraphs.md