From aeeb6d31114720789907822160bf5c1e43316f34 Mon Sep 17 00:00:00 2001 From: Ivan Kerin Date: Tue, 19 Jun 2018 17:24:40 +0300 Subject: [PATCH 1/4] Bump graphql version to 14.0.0 So graphql are transitioning to real semver finally. This should fix #3562 I've set the devDependency to graphql@14.0.0-rc.2 to be able to be able to run the tests on the new version and make sure everything's fine. But I'm not sure if you think its ok to merge with that release candidate. Also I think the semver in peerDependencies is more verbose than it should be: ```js "peerDependencies": { "graphql": "^0.11.0 || ^14.0.0" } ``` This should cover all of the graphql versions from 0.11 and up, since ["^" includes minor and patch versions](https://bytearcher.com/articles/semver-explained-why-theres-a-caret-in-my-package-json/) --- packages/apollo-client/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apollo-client/package.json b/packages/apollo-client/package.json index 552786b9a41..97b75ed0e1d 100644 --- a/packages/apollo-client/package.json +++ b/packages/apollo-client/package.json @@ -55,7 +55,7 @@ "zen-observable": "^0.8.0" }, "peerDependencies": { - "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0" + "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" }, "devDependencies": { "@types/benchmark": "1.0.31", @@ -71,7 +71,7 @@ "danger": "1.1.0", "flow-bin": "0.73.0", "github": "12.1.0", - "graphql": "0.13.2", + "graphql": "14.0.0-rc.2", "graphql-tag": "2.9.2", "isomorphic-fetch": "2.2.1", "jest": "23.0.0", From 46f0fe661ed3c0e8805228dc8cb7032d60050b21 Mon Sep 17 00:00:00 2001 From: Hugh Willson Date: Tue, 10 Jul 2018 10:18:55 -0700 Subject: [PATCH 2/4] Simplify graphql peerDeps --- packages/apollo-client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-client/package.json b/packages/apollo-client/package.json index cd6e370dcc0..f73601f3d01 100644 --- a/packages/apollo-client/package.json +++ b/packages/apollo-client/package.json @@ -55,7 +55,7 @@ "zen-observable": "^0.8.0" }, "peerDependencies": { - "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0" + "graphql": "^0.11.0 || ^14.0.0" }, "devDependencies": { "@types/benchmark": "1.0.31", From 3ca0c90a7bbcf901fa11563a00669db9ed1c6703 Mon Sep 17 00:00:00 2001 From: Hugh Willson Date: Tue, 10 Jul 2018 10:19:55 -0700 Subject: [PATCH 3/4] Increase apollo-boost bundle size check --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a1dc6130e4..e1829cb7e49 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ { "name": "apollo-boost", "path": "./packages/apollo-boost/lib/bundle.min.js", - "maxSize": "33 kB" + "maxSize": "35 kB" }, { "name": "apollo-utilities", From 580cc9f661ae007033ef06c4f6d942f38c629a81 Mon Sep 17 00:00:00 2001 From: Hugh Willson Date: Tue, 10 Jul 2018 10:35:08 -0700 Subject: [PATCH 4/4] Changelog updates --- CHANGELOG.md | 2 ++ packages/apollo-client/CHANGELOG.md | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 329a189e3cb..7200323e3f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ [@hwillson](https://github.com/hwillson) in [#3635](https://github.com/apollographql/apollo-client/pull/3635) [@JakeDawkins](https://github.com/JakeDawkins) in [#3642](https://github.com/apollographql/apollo-client/pull/3642) [@hwillson](https://github.com/hwillson) in [#3644](https://github.com/apollographql/apollo-client/pull/3644) +- Updated `graphql` `peerDependencies` to handle 14.x versions. + [@ivank](https://github.com/ivank) in [#3598](https://github.com/apollographql/apollo-client/pull/3598) ### Apollo Boost (vNext) diff --git a/packages/apollo-client/CHANGELOG.md b/packages/apollo-client/CHANGELOG.md index 25133bb4fe5..108c5446a6c 100644 --- a/packages/apollo-client/CHANGELOG.md +++ b/packages/apollo-client/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +### vNext + +- Updated `graphql` `peerDependencies` to handle 14.x versions. + [PR #3598](https://github.com/apollographql/apollo-client/pull/3598) + ### 2.3.5 - Internal code formatting updates.