diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e558bb13..15cfc379e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## Upcoming - `apollo` - - + - Relax graphql version, resolve missing types "Boolean", "String" [#1355](https://github.com/apollographql/apollo-tooling/pull/1355) - `apollo-codegen-core` - - `apollo-codegen-flow` diff --git a/package-lock.json b/package-lock.json index fd7f371d3c..5a1546ad2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2216,7 +2216,7 @@ "git-parse": "1.0.3", "git-rev-sync": "1.12.0", "glob": "7.1.4", - "graphql": "~14.2.1", + "graphql": "14.0.2 - 14.2.0 || ^14.3.1", "graphql-tag": "2.10.1", "heroku-cli-util": "8.0.11", "listr": "0.14.3", @@ -2464,7 +2464,7 @@ "cosmiconfig": "^5.0.6", "dotenv": "^8.0.0", "glob": "^7.1.3", - "graphql": "~14.2.1", + "graphql": "14.0.2 - 14.2.0 || ^14.3.1", "graphql-tag": "^2.10.1", "lodash.debounce": "^4.0.8", "lodash.merge": "^4.6.1", @@ -6172,9 +6172,9 @@ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" }, "graphql": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.2.1.tgz", - "integrity": "sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==", + "version": "14.3.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.3.1.tgz", + "integrity": "sha512-FZm7kAa3FqKdXy8YSSpAoTtyDFMIYSpCDOr+3EqlI1bxmtHu+Vv/I2vrSeT1sBOEnEniX3uo4wFhFdS/8XN6gA==", "requires": { "iterall": "^1.2.2" } diff --git a/packages/apollo-language-server/package.json b/packages/apollo-language-server/package.json index 584d8eaf17..c595abad05 100644 --- a/packages/apollo-language-server/package.json +++ b/packages/apollo-language-server/package.json @@ -32,7 +32,7 @@ "cosmiconfig": "^5.0.6", "dotenv": "^8.0.0", "glob": "^7.1.3", - "graphql": "~14.2.1", + "graphql": "14.0.2 - 14.2.0 || ^14.3.1", "graphql-tag": "^2.10.1", "lodash.debounce": "^4.0.8", "lodash.merge": "^4.6.1", diff --git a/packages/apollo-language-server/src/providers/schema/engine.ts b/packages/apollo-language-server/src/providers/schema/engine.ts index f32af3313b..48331fcd62 100644 --- a/packages/apollo-language-server/src/providers/schema/engine.ts +++ b/packages/apollo-language-server/src/providers/schema/engine.ts @@ -1,15 +1,7 @@ // EngineSchemaProvider (engine schema reg => schema) import { NotificationHandler } from "vscode-languageserver"; - import gql from "graphql-tag"; - -import { - GraphQLSchema, - buildClientSchema, - IntrospectionSchema, - IntrospectionQuery -} from "graphql"; - +import { GraphQLSchema, buildClientSchema } from "graphql"; import { ApolloEngineClient, ClientIdentity } from "../../engine"; import { ClientConfig, parseServiceSpecifier } from "../../config"; import { @@ -101,7 +93,7 @@ export const SCHEMA_QUERY = gql` subscriptionType { name } - types { + types(filter: { includeBuiltInTypes: true }) { ...IntrospectionFullType } directives { diff --git a/packages/apollo/package.json b/packages/apollo/package.json index b0da6f6e63..878d469f44 100644 --- a/packages/apollo/package.json +++ b/packages/apollo/package.json @@ -54,7 +54,7 @@ "git-parse": "1.0.3", "git-rev-sync": "1.12.0", "glob": "7.1.4", - "graphql": "~14.2.1", + "graphql": "14.0.2 - 14.2.0 || ^14.3.1", "graphql-tag": "2.10.1", "heroku-cli-util": "8.0.11", "listr": "0.14.3",