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.

Sign up for GitHub

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

Jump to bottom

Resolve missing types "Boolean", "String" #1355

Merged
merged 4 commits into from Jun 27, 2019
Merged

Resolve missing types "Boolean", "String" #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71884d6
Resolve missing types
trevor-scheer Jun 17, 2019
78835e4
Update changelog
trevor-scheer Jun 17, 2019
26e3305
Merge branch 'master' into trevor/fix-graphql-version
trevor-scheer Jun 27, 2019
363a01f
Fix version range
trevor-scheer Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
## Upcoming

- `apollo`
- <First `apollo-codegen-core` related entry goes here>
- Relax graphql version, resolve missing types "Boolean", "String" [#1355](https://github.com/apollographql/apollo-tooling/pull/1355)
- `apollo-codegen-core`
- <First `apollo-codegen-core` related entry goes here>
- `apollo-codegen-flow`
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/apollo-language-server/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
12 changes: 2 additions & 10 deletions packages/apollo-language-server/src/providers/schema/engine.ts
View file
Open in desktop
@@ -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 {
Expand Down Expand Up @@ -101,7 +93,7 @@ export const SCHEMA_QUERY = gql`
subscriptionType {
name
}
types {
types(filter: { includeBuiltInTypes: true }) {
...IntrospectionFullType
}
directives {
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down