From 289288787cc6f05d7b161b6e3cf25a7f533aa09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Nison?= Date: Mon, 11 Nov 2019 16:03:03 +0100 Subject: [PATCH 1/3] Adds missing peer dependency --- packages/apollo-engine-reporting/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 335ddf75863..00f29d69dfa 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -18,5 +18,8 @@ "apollo-server-types": "file:../apollo-server-types", "async-retry": "^1.2.1", "graphql-extensions": "file:../graphql-extensions" + }, + "peerDependencies": { + "graphql": "^14.2.1" } } From a3e99ab6fe64afe2f6d0207dd05992dfa74c7d1d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 27 Nov 2019 15:38:43 +0200 Subject: [PATCH 2/3] Widen `peerDependencies` range to match other Apollo packages' ranges. The `apollo-engine-reporting` package was absolutely missing its `peerDependencies` specification for `graphql`. The previous commit added it, but we also need to expand it to match the same range as suggested by the rest of the Apollo packages in the Apollo Server monorepo. Ref: https://git.io/JeXBd --- packages/apollo-engine-reporting/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 00f29d69dfa..ac7aa090e08 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -20,6 +20,6 @@ "graphql-extensions": "file:../graphql-extensions" }, "peerDependencies": { - "graphql": "^14.2.1" + "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0" } } From fcad6757a1d6c35497859e679710276ff580bda0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 27 Nov 2019 16:48:45 +0200 Subject: [PATCH 3/3] Add CHANGELOG.md for #3496. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69e4fc93949..3270b01aaa1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ The version headers in this history reflect the versions of Apollo Server itself > The changes noted within this `vNEXT` section have not been released yet. New PRs and commits which introduce changes should include an entry in this `vNEXT` section as part of their development. When a release is being prepared, a new header will be (manually) created below and the the appropriate changes within that release will be moved into the new section. - `@apollo/gateway`: Add `@types/node-fetch` as a regular dependency to avoid missing dependency for TypeScript consumers. [PR #3546](https://github.com/apollographql/apollo-server/pull/3546) [Issue #3471](https://github.com/apollographql/apollo-server/issues/3471) +- `apollo-engine-reporting`: Declare acceptable `graphql` versions ranges in `peerDependencies` rather than allowing it to occur implicitly (and less ideally) via its consumers (e.g. most `apollo-server-*` packages). [PR #3496](https://github.com/apollographql/apollo-server/pull/3496) ### v2.9.12