From 74cb9347f84702f0234c0e76bf165287cfc58373 Mon Sep 17 00:00:00 2001 From: apollo-bot2 Date: Thu, 22 Aug 2024 03:35:25 +0000 Subject: [PATCH 1/3] [create-pull-request] automated change --- Cargo.lock | 2 +- router-bridge/Cargo.toml | 2 +- router-bridge/package-lock.json | 32 ++++++++++++++++---------------- router-bridge/package.json | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b4ceeb95..086e85a5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1603,7 +1603,7 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "router-bridge" -version = "0.5.30+v2.8.3" +version = "0.6.0+v2.9.0-beta.0" dependencies = [ "anyhow", "async-channel", diff --git a/router-bridge/Cargo.toml b/router-bridge/Cargo.toml index 2da0f55f2..97dd6d9e7 100644 --- a/router-bridge/Cargo.toml +++ b/router-bridge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "router-bridge" -version = "0.5.30+v2.8.3" +version = "0.6.0+v2.9.0-beta.0" authors = ["Apollo "] edition = "2018" description = "JavaScript bridge for the Apollo Router" diff --git a/router-bridge/package-lock.json b/router-bridge/package-lock.json index 0ec06c371..2724a3d0a 100644 --- a/router-bridge/package-lock.json +++ b/router-bridge/package-lock.json @@ -1,17 +1,17 @@ { "name": "@apollo/router-bridge", - "version": "2.8.3", + "version": "2.9.0-beta.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@apollo/router-bridge", - "version": "2.8.3", + "version": "2.9.0-beta.0", "license": "Elastic-2.0", "dependencies": { "@apollo/core-schema": "^0.3.0", - "@apollo/federation-internals": "^2.8.3", - "@apollo/query-planner": "^2.8.3", + "@apollo/federation-internals": "^2.9.0-beta.0", + "@apollo/query-planner": "^2.9.0-beta.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.usagereporting": "^3.0.0", "graphql": "16.6.0" @@ -47,9 +47,9 @@ } }, "node_modules/@apollo/federation-internals": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.8.3.tgz", - "integrity": "sha512-5GOeQ1I5C7uCU6ob/TbRGqWg2m+9qo8/8qlGhfaMUqN3ukSCmgkKUDdfg1M6sB3lDmIoL5tAoSkmJegKSaDR5A==", + "version": "2.9.0-beta.0", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.9.0-beta.0.tgz", + "integrity": "sha512-MmKvolZn4ND9G8xHAbD3f/pAw0IFLutxWBJ4jKze+tcR0g+A+jkHAqm0tqUmDyW9P1nHARbCMvh2iYp5kpTvJw==", "dependencies": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -88,11 +88,11 @@ } }, "node_modules/@apollo/query-graphs": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.8.3.tgz", - "integrity": "sha512-AB1Lr8LUr9iXGQIb70EhiSsu+G6AIW9EXkl+YGTCihn/zbsCcGx/UKr/HUsfAOyg2twenjToLcvqX5eRuM8Xag==", + "version": "2.9.0-beta.0", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.9.0-beta.0.tgz", + "integrity": "sha512-T9ruSOEbZD7EOp1VoxHeJWgh89geDrueLGFDosTBrZ70utuG3WpsJjkmDUMnUVyiXIMFOcFDIINWGGW6lOGpcg==", "dependencies": { - "@apollo/federation-internals": "2.8.3", + "@apollo/federation-internals": "2.9.0-beta.0", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -105,12 +105,12 @@ } }, "node_modules/@apollo/query-planner": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.8.3.tgz", - "integrity": "sha512-dwkschpjwoGziUjYfKwTVHAMuPoRt1Xr2suLEfHK0oSZ0AoDz3RQIBY6Dy8T61hPFB7p/3YvJja7q8jDDDP/og==", + "version": "2.9.0-beta.0", + "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.9.0-beta.0.tgz", + "integrity": "sha512-rJTELHpuzGzkiUNJuckMc/zFeRCNLsym5sDb2uueWvCW/CF7hrD5yxLqX/OQ6cwLU9a1znxuOmotxDb3UDPXLQ==", "dependencies": { - "@apollo/federation-internals": "2.8.3", - "@apollo/query-graphs": "2.8.3", + "@apollo/federation-internals": "2.9.0-beta.0", + "@apollo/query-graphs": "2.9.0-beta.0", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", diff --git a/router-bridge/package.json b/router-bridge/package.json index e689c6c5f..bd4008b8c 100644 --- a/router-bridge/package.json +++ b/router-bridge/package.json @@ -1,7 +1,7 @@ { "name": "@apollo/router-bridge", "private": true, - "version": "2.8.3", + "version": "2.9.0-beta.0", "description": "Apollo Router JS Bridge Entrypoint", "scripts": { "build": "make-dir bundled js-dist && rm -f tsconfig.tsbuildinfo && tsc --build --verbose && node esbuild/bundler.js && cp js-dist/runtime.js js-dist/do_api_schema.js js-dist/do_introspect.js js-dist/plan_worker.js js-dist/test_logger_worker.js js-dist/test_get_random_values.js js-dist/test_url.js bundled/", @@ -28,8 +28,8 @@ }, "dependencies": { "@apollo/core-schema": "^0.3.0", - "@apollo/federation-internals": "^2.8.3", - "@apollo/query-planner": "^2.8.3", + "@apollo/federation-internals": "^2.9.0-beta.0", + "@apollo/query-planner": "^2.9.0-beta.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.usagereporting": "^3.0.0", "graphql": "16.6.0" From f77266abfec4265e41d8891eff328500d0e9b9d8 Mon Sep 17 00:00:00 2001 From: "Sachin D. Shinde" Date: Wed, 21 Aug 2024 21:33:48 -0700 Subject: [PATCH 2/3] Update snapshots for new federation spec directives --- .../snapshots/router_bridge__planner__tests__subgraphs-2.snap | 4 ++++ .../snapshots/router_bridge__planner__tests__subgraphs-3.snap | 4 ++++ .../snapshots/router_bridge__planner__tests__subgraphs-4.snap | 4 ++++ .../snapshots/router_bridge__planner__tests__subgraphs-5.snap | 4 ++++ .../snapshots/router_bridge__planner__tests__subgraphs-6.snap | 4 ++++ .../snapshots/router_bridge__planner__tests__subgraphs.snap | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap index 0cf0978a3..00e0468c1 100644 --- a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap +++ b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap @@ -42,6 +42,10 @@ directive @federation__context(name: String!) repeatable on INTERFACE | OBJECT | directive @federation__fromContext(field: federation__ContextFieldValue) on ARGUMENT_DEFINITION +directive @federation__cost(weight: Int!) on ARGUMENT_DEFINITION | ENUM | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | OBJECT | SCALAR + +directive @federation__listSize(assumedSize: Int, slicingArguments: [String!], sizedFields: [String!], requireOneSlicingArgument: Boolean = true) on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap index 6b82ef724..a07a40d06 100644 --- a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap +++ b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap @@ -42,6 +42,10 @@ directive @federation__context(name: String!) repeatable on INTERFACE | OBJECT | directive @federation__fromContext(field: federation__ContextFieldValue) on ARGUMENT_DEFINITION +directive @federation__cost(weight: Int!) on ARGUMENT_DEFINITION | ENUM | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | OBJECT | SCALAR + +directive @federation__listSize(assumedSize: Int, slicingArguments: [String!], sizedFields: [String!], requireOneSlicingArgument: Boolean = true) on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap index e4c390d89..026a2be04 100644 --- a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap +++ b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap @@ -42,6 +42,10 @@ directive @federation__context(name: String!) repeatable on INTERFACE | OBJECT | directive @federation__fromContext(field: federation__ContextFieldValue) on ARGUMENT_DEFINITION +directive @federation__cost(weight: Int!) on ARGUMENT_DEFINITION | ENUM | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | OBJECT | SCALAR + +directive @federation__listSize(assumedSize: Int, slicingArguments: [String!], sizedFields: [String!], requireOneSlicingArgument: Boolean = true) on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap index dd1681a21..78027599c 100644 --- a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap +++ b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap @@ -42,6 +42,10 @@ directive @federation__context(name: String!) repeatable on INTERFACE | OBJECT | directive @federation__fromContext(field: federation__ContextFieldValue) on ARGUMENT_DEFINITION +directive @federation__cost(weight: Int!) on ARGUMENT_DEFINITION | ENUM | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | OBJECT | SCALAR + +directive @federation__listSize(assumedSize: Int, slicingArguments: [String!], sizedFields: [String!], requireOneSlicingArgument: Boolean = true) on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap index c84c890fd..07c14fec3 100644 --- a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap +++ b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap @@ -42,6 +42,10 @@ directive @federation__context(name: String!) repeatable on INTERFACE | OBJECT | directive @federation__fromContext(field: federation__ContextFieldValue) on ARGUMENT_DEFINITION +directive @federation__cost(weight: Int!) on ARGUMENT_DEFINITION | ENUM | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | OBJECT | SCALAR + +directive @federation__listSize(assumedSize: Int, slicingArguments: [String!], sizedFields: [String!], requireOneSlicingArgument: Boolean = true) on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD diff --git a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap index d9be3ec48..ec8d44709 100644 --- a/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap +++ b/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap @@ -42,6 +42,10 @@ directive @federation__context(name: String!) repeatable on INTERFACE | OBJECT | directive @federation__fromContext(field: federation__ContextFieldValue) on ARGUMENT_DEFINITION +directive @federation__cost(weight: Int!) on ARGUMENT_DEFINITION | ENUM | FIELD_DEFINITION | INPUT_FIELD_DEFINITION | OBJECT | SCALAR + +directive @federation__listSize(assumedSize: Int, slicingArguments: [String!], sizedFields: [String!], requireOneSlicingArgument: Boolean = true) on FIELD_DEFINITION + directive @stream on FIELD directive @transform(from: String!) on FIELD From 6a6e8483df7be5217d9ac67c6a7d3b9e050952e4 Mon Sep 17 00:00:00 2001 From: "Sachin D. Shinde" Date: Wed, 21 Aug 2024 22:13:12 -0700 Subject: [PATCH 3/3] Add pre-release version to package version, which wasn't auto-added by the PR --- Cargo.lock | 2 +- router-bridge/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 086e85a5a..d5deca367 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1603,7 +1603,7 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "router-bridge" -version = "0.6.0+v2.9.0-beta.0" +version = "0.6.0-beta.0+v2.9.0-beta.0" dependencies = [ "anyhow", "async-channel", diff --git a/router-bridge/Cargo.toml b/router-bridge/Cargo.toml index 97dd6d9e7..fbd52cd2d 100644 --- a/router-bridge/Cargo.toml +++ b/router-bridge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "router-bridge" -version = "0.6.0+v2.9.0-beta.0" +version = "0.6.0-beta.0+v2.9.0-beta.0" authors = ["Apollo "] edition = "2018" description = "JavaScript bridge for the Apollo Router"