diff --git a/federation-2/Cargo.lock b/federation-2/Cargo.lock index b3ce38d3b..7bc7d1444 100644 --- a/federation-2/Cargo.lock +++ b/federation-2/Cargo.lock @@ -1043,7 +1043,7 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "harmonizer" -version = "2.6.2" +version = "2.6.3" dependencies = [ "apollo-federation-types", "deno_core", @@ -2233,7 +2233,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "supergraph" -version = "2.6.2" +version = "2.6.3" dependencies = [ "apollo-federation-types", "camino", diff --git a/federation-2/harmonizer/Cargo.toml b/federation-2/harmonizer/Cargo.toml index 377e1c4a8..71872fe8a 100644 --- a/federation-2/harmonizer/Cargo.toml +++ b/federation-2/harmonizer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "harmonizer" -version = "2.6.2" +version = "2.6.3" authors = ["Apollo "] edition = "2018" description = "Apollo Federation utility to compose a supergraph from subgraphs" diff --git a/federation-2/harmonizer/package-lock.json b/federation-2/harmonizer/package-lock.json index 6e4d32d4d..ed8d6b5d0 100644 --- a/federation-2/harmonizer/package-lock.json +++ b/federation-2/harmonizer/package-lock.json @@ -1,15 +1,15 @@ { "name": "@apollo/harmonizer-2", - "version": "2.6.2", + "version": "2.6.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@apollo/harmonizer-2", - "version": "2.6.2", + "version": "2.6.3", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { - "@apollo/composition": "2.6.2" + "@apollo/composition": "2.6.3" }, "devDependencies": { "@iarna/toml": "2.2.5", @@ -32,12 +32,12 @@ } }, "node_modules/@apollo/composition": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.6.2.tgz", - "integrity": "sha512-rbMRcnvEDtOT+e6OiKUY9virbhpIK9E8bQ6eGoakwCYz8bVXdBBPQdKuvhnvzNAe0LeOPMcsx3Pp9mPT9wz80g==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.6.3.tgz", + "integrity": "sha512-7Q6xITvZifAWXPzN1ZkqMss9mBZgCL1hdKmM117UhqOfYrZ331DdUaln4I07Ae7wjXEg0KUb7AElx/1x+gm6qg==", "dependencies": { - "@apollo/federation-internals": "2.6.2", - "@apollo/query-graphs": "2.6.2" + "@apollo/federation-internals": "2.6.3", + "@apollo/query-graphs": "2.6.3" }, "engines": { "node": ">=14.15.0" @@ -47,9 +47,9 @@ } }, "node_modules/@apollo/federation-internals": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.2.tgz", - "integrity": "sha512-L5Ppl+FQ2+ETpJ8NCa7T8ifAjAX8K/4NW8N08d6TRUJu0M/8rvIL0CgX033Jno/+FVIFhNBbVN2kGoSKDl1YPQ==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.3.tgz", + "integrity": "sha512-Motm6p4C4t1lUXOq9kIVyP6jANSymiUgfwc0TYjeSehKRFq6qxv9L2gPSVFvyfm/gI+gLlDscDN63YtxpUzqhQ==", "dependencies": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -64,11 +64,11 @@ } }, "node_modules/@apollo/query-graphs": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.2.tgz", - "integrity": "sha512-1pQABsPS38Sqz1u3pW1WDmq/xJDWkdZGUsHNSAaSbdRAQMT5Lf9M9uzBUcNR5g+byvzKOc6nnxkh2W/tls5kBw==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.3.tgz", + "integrity": "sha512-h+39kWnVq8GzhSyE2HGg4CKpzTDj1480EcLFuSk11QSN99uXjqwwciY5J83tlaSBONni0TvJ6Efctvp6ag0Xpw==", "dependencies": { - "@apollo/federation-internals": "2.6.2", + "@apollo/federation-internals": "2.6.3", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -2113,18 +2113,18 @@ }, "dependencies": { "@apollo/composition": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.6.2.tgz", - "integrity": "sha512-rbMRcnvEDtOT+e6OiKUY9virbhpIK9E8bQ6eGoakwCYz8bVXdBBPQdKuvhnvzNAe0LeOPMcsx3Pp9mPT9wz80g==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.6.3.tgz", + "integrity": "sha512-7Q6xITvZifAWXPzN1ZkqMss9mBZgCL1hdKmM117UhqOfYrZ331DdUaln4I07Ae7wjXEg0KUb7AElx/1x+gm6qg==", "requires": { - "@apollo/federation-internals": "2.6.2", - "@apollo/query-graphs": "2.6.2" + "@apollo/federation-internals": "2.6.3", + "@apollo/query-graphs": "2.6.3" } }, "@apollo/federation-internals": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.2.tgz", - "integrity": "sha512-L5Ppl+FQ2+ETpJ8NCa7T8ifAjAX8K/4NW8N08d6TRUJu0M/8rvIL0CgX033Jno/+FVIFhNBbVN2kGoSKDl1YPQ==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.3.tgz", + "integrity": "sha512-Motm6p4C4t1lUXOq9kIVyP6jANSymiUgfwc0TYjeSehKRFq6qxv9L2gPSVFvyfm/gI+gLlDscDN63YtxpUzqhQ==", "requires": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -2133,11 +2133,11 @@ } }, "@apollo/query-graphs": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.2.tgz", - "integrity": "sha512-1pQABsPS38Sqz1u3pW1WDmq/xJDWkdZGUsHNSAaSbdRAQMT5Lf9M9uzBUcNR5g+byvzKOc6nnxkh2W/tls5kBw==", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.3.tgz", + "integrity": "sha512-h+39kWnVq8GzhSyE2HGg4CKpzTDj1480EcLFuSk11QSN99uXjqwwciY5J83tlaSBONni0TvJ6Efctvp6ag0Xpw==", "requires": { - "@apollo/federation-internals": "2.6.2", + "@apollo/federation-internals": "2.6.3", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" diff --git a/federation-2/harmonizer/package.json b/federation-2/harmonizer/package.json index fb6b23df1..18139ac73 100644 --- a/federation-2/harmonizer/package.json +++ b/federation-2/harmonizer/package.json @@ -1,7 +1,7 @@ { "name": "@apollo/harmonizer-2", "private": true, - "version": "2.6.2", + "version": "2.6.3", "description": "Apollo Federation Harmonizer JS Entrypoint", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -29,7 +29,7 @@ "npm": ">=7 <10" }, "dependencies": { - "@apollo/composition": "2.6.2" + "@apollo/composition": "2.6.3" }, "peerDependencies": { "graphql": "^15.7.0 || ^16.0.0" diff --git a/federation-2/supergraph/Cargo.toml b/federation-2/supergraph/Cargo.toml index 528f80fbb..cfc40630a 100644 --- a/federation-2/supergraph/Cargo.toml +++ b/federation-2/supergraph/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "supergraph" -version = "2.6.2" +version = "2.6.3" edition = "2021" publish = false diff --git a/xtask/src/utils.rs b/xtask/src/utils.rs index c23dcb942..34c61fd7a 100644 --- a/xtask/src/utils.rs +++ b/xtask/src/utils.rs @@ -1,8 +1,8 @@ -use anyhow::{anyhow, Context, Result}; +use anyhow::{anyhow, Result}; use camino::Utf8PathBuf; use lazy_static::lazy_static; -use std::{convert::TryFrom, env, str}; +use std::{convert::From, env, str}; const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR"); @@ -47,8 +47,7 @@ pub(crate) fn get_workspace_roots() -> Result> { } fn project_root() -> Result { - let manifest_dir = Utf8PathBuf::try_from(MANIFEST_DIR) - .with_context(|| "Could not find the root directory.")?; + let manifest_dir = Utf8PathBuf::from(MANIFEST_DIR); let root_dir = manifest_dir .ancestors() .nth(1)