From 6dca438b800cb402c3ff0c67358367665b88c3b9 Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 23 Jul 2020 14:44:00 +0200 Subject: [PATCH 1/4] fix(apollo-tools): add undeclared peer dependency graphql --- packages/apollo-tools/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/apollo-tools/package.json b/packages/apollo-tools/package.json index 65f3fda388..8865ff8b93 100644 --- a/packages/apollo-tools/package.json +++ b/packages/apollo-tools/package.json @@ -15,6 +15,12 @@ "node": ">=8", "npm": ">=6" }, + "dependencies": { + "apollo-env": "file:../apollo-env" + }, + "peerDependencies": { + "graphql": "^14.2.1 || ^15.0.0" + }, "jest": { "preset": "ts-jest", "testEnvironment": "node", From 08126dd1c3743ffddc350e1f835e3acb1981ac4d Mon Sep 17 00:00:00 2001 From: merceyz Date: Thu, 23 Jul 2020 14:52:21 +0200 Subject: [PATCH 2/4] docs: update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e3ff61267..1d512a544f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ > **Note:** Apollo's GraphQL VSCode extension is no longer housed in this repository. It is now maintained separately in [this repo](https://github.com/apollographql/vscode-graphql). +## vNEXT + +- `apollo-tools` + - Add undeclared peer dependency `graphql` [#2049](https://github.com/apollographql/apollo-tooling/pull/2049) + ## `apollo@2.33.9` - `apollo-language-server@1.26.7` / `apollo-codegen-core@0.40.7` From dc67921d76870fdf1dbfcf6db5cb7b9bd5659c99 Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 29 Mar 2022 13:09:01 -0700 Subject: [PATCH 3/4] Remove accidental rebase addition --- package-lock.json | 6 +++++- packages/apollo-tools/package.json | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b2d98cf27..6c5e4ea94c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20411,6 +20411,9 @@ "engines": { "node": ">=8", "npm": ">=6" + }, + "peerDependencies": { + "graphql": "^14.2.1 || ^15.0.0" } }, "packages/apollo/node_modules/glob": { @@ -20511,7 +20514,8 @@ } }, "@apollographql/apollo-tools": { - "version": "file:packages/apollo-tools" + "version": "file:packages/apollo-tools", + "requires": {} }, "@apollographql/graphql-language-service-interface": { "version": "2.0.2", diff --git a/packages/apollo-tools/package.json b/packages/apollo-tools/package.json index 8865ff8b93..5c0daa33ca 100644 --- a/packages/apollo-tools/package.json +++ b/packages/apollo-tools/package.json @@ -15,9 +15,6 @@ "node": ">=8", "npm": ">=6" }, - "dependencies": { - "apollo-env": "file:../apollo-env" - }, "peerDependencies": { "graphql": "^14.2.1 || ^15.0.0" }, From fe340320ecad080d9340166b552471b337e443ca Mon Sep 17 00:00:00 2001 From: Trevor Scheer Date: Tue, 29 Mar 2022 13:09:50 -0700 Subject: [PATCH 4/4] Extend range to include v16 --- package-lock.json | 2 +- packages/apollo-tools/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c5e4ea94c..1838573092 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20413,7 +20413,7 @@ "npm": ">=6" }, "peerDependencies": { - "graphql": "^14.2.1 || ^15.0.0" + "graphql": "^14.2.1 || ^15.0.0 || ^16.0.0" } }, "packages/apollo/node_modules/glob": { diff --git a/packages/apollo-tools/package.json b/packages/apollo-tools/package.json index 5c0daa33ca..a3e1a195f9 100644 --- a/packages/apollo-tools/package.json +++ b/packages/apollo-tools/package.json @@ -16,7 +16,7 @@ "npm": ">=6" }, "peerDependencies": { - "graphql": "^14.2.1 || ^15.0.0" + "graphql": "^14.2.1 || ^15.0.0 || ^16.0.0" }, "jest": { "preset": "ts-jest",