Skip to content

Commit

Permalink
improvment: upgrade graphql-config to 3.0.0-alpha.23 (#1436)
Browse files Browse the repository at this point in the history
  • Loading branch information
acao authored Mar 21, 2020
1 parent cd77a51 commit 6339ba7
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 144 deletions.
2 changes: 1 addition & 1 deletion packages/graphql-language-service-interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
},
"dependencies": {
"graphql-config": "3.0.0-alpha.17",
"graphql-config": "3.0.0-alpha.23",
"graphql-language-service-parser": "^1.6.0-alpha.1",
"graphql-language-service-types": "^1.6.0-alpha.3",
"graphql-language-service-utils": "^2.4.0-alpha.3"
Expand Down
1 change: 0 additions & 1 deletion packages/graphql-language-service-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
},
"dependencies": {
"graphql-config": "3.0.0-alpha.17",
"graphql-language-service-types": "^1.6.0-alpha.3"
}
}
2 changes: 1 addition & 1 deletion packages/graphql-language-service-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@babel/parser": "^7.9.0",
"glob": "^7.1.2",
"graphql-config": "3.0.0-alpha.17",
"graphql-config": "3.0.0-alpha.23",
"graphql-language-service-interface": "^2.4.0-alpha.3",
"graphql-language-service-types": "^1.6.0-alpha.3",
"graphql-language-service-utils": "^2.4.0-alpha.3",
Expand Down
3 changes: 2 additions & 1 deletion packages/graphql-language-service-server/src/GraphQLCache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ export async function getGraphQLCache(
extensions?: Array<(config: GraphQLConfig) => GraphQLConfig>,
config?: GraphQLConfig,
): Promise<GraphQLCacheInterface> {
let graphQLConfig = config || (await loadConfig({ rootDir: configDir }));
let graphQLConfig =
config ?? ((await loadConfig({ rootDir: configDir })) as GraphQLConfig);
if (extensions && extensions.length > 0) {
for await (const extension of extensions) {
graphQLConfig = await extension(graphQLConfig);
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-language-service-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
},
"dependencies": {
"graphql-config": "3.0.0-alpha.17"
"graphql-config": "3.0.0-alpha.23"
},
"devDependencies": {
"vscode-languageserver-types": "3.15.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-language-service-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
},
"dependencies": {
"graphql-config": "3.0.0-alpha.17",
"graphql-config": "3.0.0-alpha.23",
"graphql-language-service-types": "^1.6.0-alpha.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-language-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependencies": {
"@babel/polyfill": "7.8.7",
"graphql-config": "3.0.0-alpha.17",
"graphql-config": "3.0.0-alpha.23",
"graphql-language-service-interface": "^2.4.0-alpha.3",
"graphql-language-service-server": "^2.4.0-alpha.3",
"graphql-language-service-utils": "^2.4.0-alpha.3",
Expand Down
265 changes: 128 additions & 137 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 6339ba7

Please sign in to comment.