diff --git a/federation-1/Cargo.lock b/federation-1/Cargo.lock index 9525bb156..d4342e020 100644 --- a/federation-1/Cargo.lock +++ b/federation-1/Cargo.lock @@ -299,7 +299,7 @@ dependencies = [ [[package]] name = "harmonizer" -version = "0.36.1" +version = "0.37.0" dependencies = [ "apollo-federation-types", "deno_core", @@ -747,7 +747,7 @@ dependencies = [ [[package]] name = "supergraph" -version = "0.36.1" +version = "0.37.0" dependencies = [ "apollo-federation-types", "camino", diff --git a/federation-1/harmonizer/Cargo.toml b/federation-1/harmonizer/Cargo.toml index 818f1a228..85d6745e1 100644 --- a/federation-1/harmonizer/Cargo.toml +++ b/federation-1/harmonizer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "harmonizer" -version = "0.36.1" +version = "0.37.0" authors = ["Apollo Graph, Inc. "] edition = "2018" description = "Apollo Federation utility to compose a supergraph from subgraphs" diff --git a/federation-1/harmonizer/RELEASE_CHECKLIST.md b/federation-1/harmonizer/RELEASE_CHECKLIST.md index d39e1f6c3..bddf70112 100644 --- a/federation-1/harmonizer/RELEASE_CHECKLIST.md +++ b/federation-1/harmonizer/RELEASE_CHECKLIST.md @@ -13,8 +13,8 @@ None of the `federation-rs` packages currently maintain changelogs as they are l 1. Make sure you have both `npm` and `cargo` installed on your machine and in your `PATH`. 1. Run `PUBSLUG=composition@v{version}` where `{version}` is the new version you're bumping to. The major version should NOT be 2, it should be 0. 1. Run `git checkout main && git stash && git pull && git checkout -b $PUBSLUG`. -1. Update the version of `@apollo/federation` in `./harmonizer-0/package.json` -1. Run `cargo build -p harmonizer-0` from the root of `federation-rs` +1. Update the version of `@apollo/federation` in `./federation-1/harmonizer/package.json` +1. Run `cargo xtask dist --debug` from the root of `federation-rs` 1. Push up a commit containing the version bumps with the message `release: $PUBSLUG` 1. Wait for tests to pass on the PR 1. Merge your PR to `main` diff --git a/federation-1/harmonizer/package-lock.json b/federation-1/harmonizer/package-lock.json index 02e0a75d5..d8bc7347c 100644 --- a/federation-1/harmonizer/package-lock.json +++ b/federation-1/harmonizer/package-lock.json @@ -1,15 +1,15 @@ { "name": "@apollo/harmonizer-0", - "version": "0.36.1", + "version": "0.37.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@apollo/harmonizer-0", - "version": "0.36.1", + "version": "0.37.0", "license": "MIT", "dependencies": { - "@apollo/federation": "0.36.1" + "@apollo/federation": "0.37.0" }, "devDependencies": { "buffer": "^6.0.3", @@ -27,12 +27,20 @@ "graphql": "^14.5.0 || ^15.0.0" } }, + "node_modules/@apollo/cache-control-types": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@apollo/cache-control-types/-/cache-control-types-1.0.2.tgz", + "integrity": "sha512-Por80co1eUm4ATsvjCOoS/tIR8PHxqVjsA6z76I6Vw0rFn4cgyVElQcmQDIZiYsy41k8e5xkrMRECkM2WR8pNw==", + "peerDependencies": { + "graphql": "14.x || 15.x || 16.x" + } + }, "node_modules/@apollo/federation": { - "version": "0.36.1", - "resolved": "https://registry.npmjs.org/@apollo/federation/-/federation-0.36.1.tgz", - "integrity": "sha512-SAvW7ZRUEtmAdK+UWRXZxo/wRNVbDDyYbeYJooKAtvc8B4Mly+2PusqBQ+4RuHhg5dSqrv5d6RXJeY9MBiraVA==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@apollo/federation/-/federation-0.37.0.tgz", + "integrity": "sha512-/ZB6OeqPQpIhJdKi8lrSEa5ATJ+3/c/+BZ6bVHF5sYnm55IwSsiDWdSEMqtcs1lMjZ0Al96MpJOMw9oc7WMYOw==", "dependencies": { - "@apollo/subgraph": "^0.4.1", + "@apollo/subgraph": "^0.5.0", "apollo-server-types": "^3.0.2", "lodash.xorby": "^4.7.0" }, @@ -69,9 +77,12 @@ } }, "node_modules/@apollo/subgraph": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-0.4.1.tgz", - "integrity": "sha512-4tm9sY/aYGwB20xccVRJiLupEpEhXBbhbJNlpqigtXnE6A5uQvvKn7qgDdZn5fZr6rw4kX5N9lLSliU03QwTfA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-0.5.1.tgz", + "integrity": "sha512-pj+igKgdpmTfgUmscTNuVdLip8WZ8jFKS5FGb/tD2hj4xPwaQ+MfszLsuNfoytp7d63PdLorIndxcHCW+rb7Dg==", + "dependencies": { + "@apollo/cache-control-types": "^1.0.2" + }, "engines": { "node": ">=12.13.0 <18.0" }, @@ -1945,12 +1956,18 @@ } }, "dependencies": { + "@apollo/cache-control-types": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@apollo/cache-control-types/-/cache-control-types-1.0.2.tgz", + "integrity": "sha512-Por80co1eUm4ATsvjCOoS/tIR8PHxqVjsA6z76I6Vw0rFn4cgyVElQcmQDIZiYsy41k8e5xkrMRECkM2WR8pNw==", + "requires": {} + }, "@apollo/federation": { - "version": "0.36.1", - "resolved": "https://registry.npmjs.org/@apollo/federation/-/federation-0.36.1.tgz", - "integrity": "sha512-SAvW7ZRUEtmAdK+UWRXZxo/wRNVbDDyYbeYJooKAtvc8B4Mly+2PusqBQ+4RuHhg5dSqrv5d6RXJeY9MBiraVA==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@apollo/federation/-/federation-0.37.0.tgz", + "integrity": "sha512-/ZB6OeqPQpIhJdKi8lrSEa5ATJ+3/c/+BZ6bVHF5sYnm55IwSsiDWdSEMqtcs1lMjZ0Al96MpJOMw9oc7WMYOw==", "requires": { - "@apollo/subgraph": "^0.4.1", + "@apollo/subgraph": "^0.5.0", "apollo-server-types": "^3.0.2", "lodash.xorby": "^4.7.0" } @@ -1976,10 +1993,12 @@ } }, "@apollo/subgraph": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-0.4.1.tgz", - "integrity": "sha512-4tm9sY/aYGwB20xccVRJiLupEpEhXBbhbJNlpqigtXnE6A5uQvvKn7qgDdZn5fZr6rw4kX5N9lLSliU03QwTfA==", - "requires": {} + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@apollo/subgraph/-/subgraph-0.5.1.tgz", + "integrity": "sha512-pj+igKgdpmTfgUmscTNuVdLip8WZ8jFKS5FGb/tD2hj4xPwaQ+MfszLsuNfoytp7d63PdLorIndxcHCW+rb7Dg==", + "requires": { + "@apollo/cache-control-types": "^1.0.2" + } }, "@babel/code-frame": { "version": "7.16.7", diff --git a/federation-1/harmonizer/package.json b/federation-1/harmonizer/package.json index d50aa884d..2d1f8a8db 100644 --- a/federation-1/harmonizer/package.json +++ b/federation-1/harmonizer/package.json @@ -1,7 +1,7 @@ { "name": "@apollo/harmonizer-0", "private": true, - "version": "0.36.1", + "version": "0.37.0", "description": "Apollo Federation Harmonizer JS Entrypoint", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -28,7 +28,7 @@ "npm": ">=7 <9" }, "dependencies": { - "@apollo/federation": "0.36.1" + "@apollo/federation": "0.37.0" }, "peerDependencies": { "graphql": "^14.5.0 || ^15.0.0" diff --git a/federation-1/supergraph/Cargo.toml b/federation-1/supergraph/Cargo.toml index 8ca379fe4..0aabbda3f 100644 --- a/federation-1/supergraph/Cargo.toml +++ b/federation-1/supergraph/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "supergraph" -version = "0.36.1" +version = "0.37.0" edition = "2021" publish = false