From 3920435ccea4a88617eba665f49dde946f3b505b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:03:53 -0800 Subject: [PATCH] Automated PR for harmonizer release 2.7.0 (#445) Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action --------- Co-authored-by: apollo-bot2 Co-authored-by: Trevor Scheer --- federation-2/Cargo.lock | 4 +- federation-2/harmonizer/Cargo.toml | 2 +- federation-2/harmonizer/package-lock.json | 54 +++++++++---------- federation-2/harmonizer/package.json | 4 +- .../harmonizer__tests__it_works.snap | 11 ++-- federation-2/supergraph/Cargo.toml | 2 +- 6 files changed, 41 insertions(+), 36 deletions(-) diff --git a/federation-2/Cargo.lock b/federation-2/Cargo.lock index 5211e950b..a4978f7c5 100644 --- a/federation-2/Cargo.lock +++ b/federation-2/Cargo.lock @@ -1079,7 +1079,7 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "harmonizer" -version = "2.6.3" +version = "2.7.0" dependencies = [ "apollo-federation-types", "deno_core", @@ -2299,7 +2299,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "supergraph" -version = "2.6.3" +version = "2.7.0" dependencies = [ "apollo-federation-types", "camino", diff --git a/federation-2/harmonizer/Cargo.toml b/federation-2/harmonizer/Cargo.toml index eab5b7413..29d77e0bb 100644 --- a/federation-2/harmonizer/Cargo.toml +++ b/federation-2/harmonizer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "harmonizer" -version = "2.6.3" +version = "2.7.0" 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 ed8d6b5d0..833f9abea 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.3", + "version": "2.7.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@apollo/harmonizer-2", - "version": "2.6.3", + "version": "2.7.0", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { - "@apollo/composition": "2.6.3" + "@apollo/composition": "2.7.0" }, "devDependencies": { "@iarna/toml": "2.2.5", @@ -32,12 +32,12 @@ } }, "node_modules/@apollo/composition": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.6.3.tgz", - "integrity": "sha512-7Q6xITvZifAWXPzN1ZkqMss9mBZgCL1hdKmM117UhqOfYrZ331DdUaln4I07Ae7wjXEg0KUb7AElx/1x+gm6qg==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.7.0.tgz", + "integrity": "sha512-PuXxGcYYWxyXRNybk/7vupJ6YIxTXlrha9ZJJ+a++Hp86+D09MgdWQz7upkHrkD7bHNL4Nq6y+X0ighJPtI2og==", "dependencies": { - "@apollo/federation-internals": "2.6.3", - "@apollo/query-graphs": "2.6.3" + "@apollo/federation-internals": "2.7.0", + "@apollo/query-graphs": "2.7.0" }, "engines": { "node": ">=14.15.0" @@ -47,9 +47,9 @@ } }, "node_modules/@apollo/federation-internals": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.3.tgz", - "integrity": "sha512-Motm6p4C4t1lUXOq9kIVyP6jANSymiUgfwc0TYjeSehKRFq6qxv9L2gPSVFvyfm/gI+gLlDscDN63YtxpUzqhQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.7.0.tgz", + "integrity": "sha512-NiTYMJQ3XnEH8HJxv3rEUGOdGrUr0ZUJcVOyzc3YJ5M9Lxx/AGgQe7mCsaFQOfofYyy9hoh2sHUDhB7ngsnh3Q==", "dependencies": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -64,11 +64,11 @@ } }, "node_modules/@apollo/query-graphs": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.3.tgz", - "integrity": "sha512-h+39kWnVq8GzhSyE2HGg4CKpzTDj1480EcLFuSk11QSN99uXjqwwciY5J83tlaSBONni0TvJ6Efctvp6ag0Xpw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.7.0.tgz", + "integrity": "sha512-9UeJ1bVlKspzQXtgvdWPTc8SI8O+firzG44gRpx1E44U/yK2TseQvR4vHvMONl6u28bYT/KVa/jxLZTEEQ1H/g==", "dependencies": { - "@apollo/federation-internals": "2.6.3", + "@apollo/federation-internals": "2.7.0", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -2113,18 +2113,18 @@ }, "dependencies": { "@apollo/composition": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.6.3.tgz", - "integrity": "sha512-7Q6xITvZifAWXPzN1ZkqMss9mBZgCL1hdKmM117UhqOfYrZ331DdUaln4I07Ae7wjXEg0KUb7AElx/1x+gm6qg==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/composition/-/composition-2.7.0.tgz", + "integrity": "sha512-PuXxGcYYWxyXRNybk/7vupJ6YIxTXlrha9ZJJ+a++Hp86+D09MgdWQz7upkHrkD7bHNL4Nq6y+X0ighJPtI2og==", "requires": { - "@apollo/federation-internals": "2.6.3", - "@apollo/query-graphs": "2.6.3" + "@apollo/federation-internals": "2.7.0", + "@apollo/query-graphs": "2.7.0" } }, "@apollo/federation-internals": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.3.tgz", - "integrity": "sha512-Motm6p4C4t1lUXOq9kIVyP6jANSymiUgfwc0TYjeSehKRFq6qxv9L2gPSVFvyfm/gI+gLlDscDN63YtxpUzqhQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.7.0.tgz", + "integrity": "sha512-NiTYMJQ3XnEH8HJxv3rEUGOdGrUr0ZUJcVOyzc3YJ5M9Lxx/AGgQe7mCsaFQOfofYyy9hoh2sHUDhB7ngsnh3Q==", "requires": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -2133,11 +2133,11 @@ } }, "@apollo/query-graphs": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.3.tgz", - "integrity": "sha512-h+39kWnVq8GzhSyE2HGg4CKpzTDj1480EcLFuSk11QSN99uXjqwwciY5J83tlaSBONni0TvJ6Efctvp6ag0Xpw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.7.0.tgz", + "integrity": "sha512-9UeJ1bVlKspzQXtgvdWPTc8SI8O+firzG44gRpx1E44U/yK2TseQvR4vHvMONl6u28bYT/KVa/jxLZTEEQ1H/g==", "requires": { - "@apollo/federation-internals": "2.6.3", + "@apollo/federation-internals": "2.7.0", "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 18139ac73..d3077fcfe 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.3", + "version": "2.7.0", "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.3" + "@apollo/composition": "2.7.0" }, "peerDependencies": { "graphql": "^15.7.0 || ^16.0.0" diff --git a/federation-2/harmonizer/src/snapshots/harmonizer__tests__it_works.snap b/federation-2/harmonizer/src/snapshots/harmonizer__tests__it_works.snap index 5d733cbde..5f2884d34 100644 --- a/federation-2/harmonizer/src/snapshots/harmonizer__tests__it_works.snap +++ b/federation-2/harmonizer/src/snapshots/harmonizer__tests__it_works.snap @@ -1,17 +1,20 @@ --- source: harmonizer/src/lib.rs +assertion_line: 132 expression: "harmonize(vec![SubgraphDefinition ::\n new(\"users\", \"undefined\",\n \"\n type User @key(fields: \\\"id\\\") {\n id: ID\n name: String\n }\n\n type Query {\n users: [User!]\n }\n \"),\n SubgraphDefinition ::\n new(\"movies\", \"undefined\",\n \"\n type Movie {\n title: String\n name: String\n }\n\n type User @key(fields: \\\"id\\\") {\n id: ID\n favorites: [Movie!]\n }\n\n type Query {\n movies: [Movie!]\n }\n \")]).unwrap().supergraph_sdl" --- schema @link(url: "https://specs.apollo.dev/link/v1.0") - @link(url: "https://specs.apollo.dev/join/v0.3", for: EXECUTION) + @link(url: "https://specs.apollo.dev/join/v0.4", for: EXECUTION) { query: Query } +directive @join__directive(graphs: [join__Graph!], name: String!, args: join__DirectiveArguments) repeatable on SCHEMA | OBJECT | INTERFACE | FIELD_DEFINITION + directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE -directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION +directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION directive @join__graph(name: String!, url: String!) on ENUM_VALUE @@ -23,6 +26,8 @@ directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA +scalar join__DirectiveArguments + scalar join__FieldSet enum join__Graph { @@ -66,4 +71,4 @@ type User id: ID favorites: [Movie!] @join__field(graph: MOVIES) name: String @join__field(graph: USERS) -} \ No newline at end of file +} diff --git a/federation-2/supergraph/Cargo.toml b/federation-2/supergraph/Cargo.toml index cfc40630a..17e52f20b 100644 --- a/federation-2/supergraph/Cargo.toml +++ b/federation-2/supergraph/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "supergraph" -version = "2.6.3" +version = "2.7.0" edition = "2021" publish = false