Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use getDescription from graphql package #672

Merged
merged 31 commits into from
Jul 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9349d51
use getDescription from graphql package
Mar 9, 2018
2c14e2f
update @types/graphql to latest version
Mar 16, 2018
18b18d3
Merge with master
Mar 16, 2018
096b7d8
update CHANGELOG.md
Mar 16, 2018
8e46e57
Merge with master
Mar 19, 2018
8e3452b
fix types in extractExtensionDefinitions function
Mar 20, 2018
28c24fc
update changelog.md to resolve conflict
Mar 20, 2018
b5fcc45
remove graphql 0.11, 0.12 as peer deps and their tests
Mar 20, 2018
794049b
update changelog.md to resolve conflict
Mar 20, 2018
45b7709
Merge branch 'master' into use_getDescription_from_graphql-js
Mar 22, 2018
cd83ee1
Merge branch 'master' into use_getDescription_from_graphql-js
Mar 23, 2018
9181b8a
Merge branch 'master' into use_getDescription_from_graphql-js
Mar 24, 2018
6d12c15
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 2, 2018
f68257b
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 3, 2018
d85cdcc
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 10, 2018
3ce7490
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 10, 2018
5fee297
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 10, 2018
293a921
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 11, 2018
8826006
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 12, 2018
54d012e
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 16, 2018
282e4e4
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 18, 2018
e416ddb
Merge branch 'master' into use_getDescription_from_graphql-js
benjamn Apr 23, 2018
c0e3969
Merge branch 'master' into use_getDescription_from_graphql-js
Apr 27, 2018
f5c9f95
Merge branch 'master' into use_getDescription_from_graphql-js
May 4, 2018
fbd0b3b
Merge branch 'master' into use_getDescription_from_graphql-js
May 10, 2018
f28b02b
Merge branch 'master' into use_getDescription_from_graphql-js
May 20, 2018
baf0bcd
Merge branch 'master' into use_getDescription_from_graphql-js
May 31, 2018
505678a
Merge branch 'master' into use_getDescription_from_graphql-js
Jun 1, 2018
b0feea9
Merge with master
Jun 23, 2018
cc76cee
fix types in extractExtensionDefinitions function
Jun 23, 2018
12dee76
Merge branch 'master' into use_getDescription_from_graphql-js
Jul 14, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ script:
sudo: false

env:
- GRAPHQL_VERSION='^0.12'
- GRAPHQL_VERSION='^0.13'
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Change log

* Use `getDescription` from `graphql-js` package [PR #672](https://github.com/apollographql/graphql-tools/pull/672)

### v3.0.5

* Update apollo-link to 1.2.2 [#785](https://github.com/apollographql/graphql-tools/pull/785)
Expand All @@ -18,7 +20,6 @@
[Issue #753](https://github.com/apollographql/graphql-tools/issues/753)
[PR #806](https://github.com/apollographql/graphql-tools/pull/806)


### v3.0.2

* Fixed duplicate fragments getting added during transform in `FilterToSchema` [#778](https://github.com/apollographql/graphql-tools/pull/778)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"uuid": "^3.1.0"
},
"peerDependencies": {
"graphql": "^0.12.0 || ^0.13.0"
"graphql": "^0.13.0"
},
"devDependencies": {
"@types/chai": "4.0.10",
"@types/graphql": "0.11.7",
"@types/graphql": "0.12.5",
"@types/dateformat": "^1.0.1",
"@types/mocha": "^2.2.44",
"@types/node": "^8.0.47",
Expand Down
5 changes: 0 additions & 5 deletions src/generate/extractExtensionDefinitions.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
import { DocumentNode, DefinitionNode } from 'graphql';

// This was changed in graphql@0.12
// See https://github.com/apollographql/graphql-tools/pull/541
// TODO fix types https://github.com/apollographql/graphql-tools/issues/542
const oldTypeExtensionDefinitionKind = 'TypeExtensionDefinition';
const newExtensionDefinitionKind = 'ObjectTypeExtension';
const interfaceExtensionDefinitionKind = 'InterfaceTypeExtension';

export default function extractExtensionDefinitions(ast: DocumentNode) {
const extensionDefs = ast.definitions.filter(
(def: DefinitionNode) =>
def.kind === oldTypeExtensionDefinitionKind ||
(def.kind as any) === newExtensionDefinitionKind ||
(def.kind as any) === interfaceExtensionDefinitionKind,
);
Expand Down
Loading