fix: Revert references to 2.8

apollographql · May 13, 2024 · e94fd45 · e94fd45
1 parent 68b9384
commit e94fd45
Show file tree

Hide file tree

Showing 19 changed files with 86 additions and 21 deletions.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -11,6 +11,7 @@
     "@apollo/subgraph": "2.7.7"
   },
   "changesets": [
-    "strange-ads-bake"
+    "strange-ads-bake",
+    "strong-seals-camp"
   ]
 }
diff --git a/.changeset/strong-seals-camp.md b/.changeset/strong-seals-camp.md
@@ -0,0 +1,5 @@
+---
+"@apollo/federation-internals": minor
+---
+
+Revert references to 2.8
diff --git a/RELEASING_CONNECTORS.md b/RELEASING_CONNECTORS.md
@@ -8,3 +8,15 @@ Remove these instructions when this feature is ready to release
 4. `npx changeset version` to bump the version
 5. Commit and push. This kicks off a new pre-release build on GitHub Actions
 6. Merge `version-connectors` into `connectors` to get the new version into the development branch
+
+Now switch to `federation-rs`
+
+1. Switch to `main` and pull the latest changes
+2. Checkout `connectors` and merge main into it
+3. `export HARMONIZER_RELEASE_VERSION=composition@v2.8.0-connectors.0` replacing the version with the one you just released
+4. `cd federation-2/harmonizer`
+5. `npm i -E @apollo/$HARMONIZER_RELEASE_VERSION`
+6. `cd -` (get back to the root of the repo)
+7. `cargo xtask dist --debug`
+8. Commit and push the changes
+9. `cargo xtask tag --package $HARMONIZER_RELEASE_VERSION --real-publish`
diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG for `@apollo/composition`
 
+## 2.8.0-connectors.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @apollo/federation-internals@2.8.0-connectors.2
+  - @apollo/query-graphs@2.8.0-connectors.2
+
 ## 2.8.0-connectors.1
 
 ### Minor Changes

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

diff --git a/composition-js/src/__tests__/hints.test.ts b/composition-js/src/__tests__/hints.test.ts
@@ -1298,7 +1298,7 @@ describe('when a directive causes an implicit federation version upgrade', () =>
     assertCompositionSuccess(result);
     expect(result).toRaiseHint(
       HINTS.IMPLICITLY_UPGRADED_FEDERATION_VERSION,
-      'Subgraph upgraded has been implicitly upgraded from federation v2.5 to v2.8',
+      'Subgraph upgraded has been implicitly upgraded from federation v2.5 to v2.7',
       '@link'
     );
   });
@@ -1318,12 +1318,12 @@ describe('when a directive causes an implicit federation version upgrade', () =>
     assertCompositionSuccess(result);
     expect(result).toRaiseHint(
       HINTS.IMPLICITLY_UPGRADED_FEDERATION_VERSION,
-      'Subgraph upgraded-1 has been implicitly upgraded from federation v2.5 to v2.8',
+      'Subgraph upgraded-1 has been implicitly upgraded from federation v2.5 to v2.7',
       '@link'
     );
     expect(result).toRaiseHint(
       HINTS.IMPLICITLY_UPGRADED_FEDERATION_VERSION,
-      'Subgraph upgraded-2 has been implicitly upgraded from federation v2.5 to v2.8',
+      'Subgraph upgraded-2 has been implicitly upgraded from federation v2.5 to v2.7',
       '@link'
     );
   });

diff --git a/federation-integration-testsuite-js/CHANGELOG.md b/federation-integration-testsuite-js/CHANGELOG.md
@@ -1,5 +1,7 @@
 # CHANGELOG for `federation-integration-testsuite-js`
 
+## 2.8.0-connectors.2
+
 ## 2.8.0-connectors.1
 
 ## 2.8.0-connectors.0

diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "apollo-federation-integration-testsuite",
   "private": true,
-  "version": "2.8.0-connectors.1",
+  "version": "2.8.0-connectors.2",
   "description": "Apollo Federation Integrations / Test Fixtures",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md
@@ -1,5 +1,14 @@
 # CHANGELOG for `@apollo/gateway`
 
+## 2.8.0-connectors.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @apollo/federation-internals@2.8.0-connectors.2
+  - @apollo/composition@2.8.0-connectors.2
+  - @apollo/query-planner@2.8.0-connectors.2
+
 ## 2.8.0-connectors.1
 
 ### Patch Changes

diff --git a/gateway-js/package.json b/gateway-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/gateway",
-  "version": "2.8.0-connectors.1",
+  "version": "2.8.0-connectors.2",
   "description": "Apollo Gateway",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -25,9 +25,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/composition": "2.8.0-connectors.1",
-    "@apollo/federation-internals": "2.8.0-connectors.1",
-    "@apollo/query-planner": "2.8.0-connectors.1",
+    "@apollo/composition": "2.8.0-connectors.2",
+    "@apollo/federation-internals": "2.8.0-connectors.2",
+    "@apollo/query-planner": "2.8.0-connectors.2",
     "@apollo/server-gateway-interface": "^1.1.0",
     "@apollo/usage-reporting-protobuf": "^4.1.0",
     "@apollo/utils.createhash": "^2.0.0",

diff --git a/internals-js/CHANGELOG.md b/internals-js/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG for `@apollo/federation-internals`
 
+## 2.8.0-connectors.2
+
+### Minor Changes
+
+- Revert references to 2.8
+
 ## 2.8.0-connectors.1
 
 ### Minor Changes

diff --git a/internals-js/package.json b/internals-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/federation-internals",
-  "version": "2.8.0-connectors.1",
+  "version": "2.8.0-connectors.2",
   "description": "Apollo Federation internal utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/internals-js/src/specs/connectSpec.ts b/internals-js/src/specs/connectSpec.ts
@@ -176,6 +176,6 @@ export type ConnectDirectiveHTTP = {
 };
 
 export const CONNECT_VERSIONS = new FeatureDefinitions<ConnectSpecDefinition>(connectIdentity)
-  .add(new ConnectSpecDefinition(new FeatureVersion(0, 1), new FeatureVersion(2, 8)));
+  .add(new ConnectSpecDefinition(new FeatureVersion(0, 1), new FeatureVersion(2, 7)));
 
 registerKnownFeature(CONNECT_VERSIONS);
diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG for `@apollo/query-graphs`
 
+## 2.8.0-connectors.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @apollo/federation-internals@2.8.0-connectors.2
+
 ## 2.8.0-connectors.1
 
 ### Patch Changes

diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/query-graphs",
-  "version": "2.8.0-connectors.1",
+  "version": "2.8.0-connectors.2",
   "description": "Apollo Federation library to work with 'query graphs'",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,7 +23,7 @@
     "node": ">=14.15.0"
   },
   "dependencies": {
-    "@apollo/federation-internals": "2.8.0-connectors.1",
+    "@apollo/federation-internals": "2.8.0-connectors.2",
     "deep-equal": "^2.0.5",
     "ts-graphviz": "^1.5.4",
     "uuid": "^9.0.0"

diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG for `@apollo/query-planner`
 
+## 2.8.0-connectors.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @apollo/federation-internals@2.8.0-connectors.2
+  - @apollo/query-graphs@2.8.0-connectors.2
+
 ## 2.8.0-connectors.1
 
 ### Patch Changes

diff --git a/query-planner-js/package.json b/query-planner-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/query-planner",
-  "version": "2.8.0-connectors.1",
+  "version": "2.8.0-connectors.2",
   "description": "Apollo Query Planner",
   "author": "Apollo <packages@apollographql.com>",
   "main": "dist/index.js",
@@ -25,8 +25,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@apollo/federation-internals": "2.8.0-connectors.1",
-    "@apollo/query-graphs": "2.8.0-connectors.1",
+    "@apollo/federation-internals": "2.8.0-connectors.2",
+    "@apollo/query-graphs": "2.8.0-connectors.2",
     "@apollo/utils.keyvaluecache": "^2.1.0",
     "chalk": "^4.1.0",
     "deep-equal": "^2.0.5",

diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG for `@apollo/subgraph`
 
+## 2.8.0-connectors.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @apollo/federation-internals@2.8.0-connectors.2
+
 ## 2.8.0-connectors.1
 
 ### Patch Changes

diff --git a/subgraph-js/package.json b/subgraph-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apollo/subgraph",
-  "version": "2.8.0-connectors.1",
+  "version": "2.8.0-connectors.2",
   "description": "Apollo Subgraph Utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@apollo/cache-control-types": "^1.0.2",
-    "@apollo/federation-internals": "2.8.0-connectors.1"
+    "@apollo/federation-internals": "2.8.0-connectors.2"
   },
   "peerDependencies": {
     "graphql": "^16.5.0"