Skip to content

Commit

Permalink
pin undici, config versions in lsp to fix introspection bug (#2624)
Browse files Browse the repository at this point in the history
schema lsp introspection should work again. 

swap out test mock as `@graphql-tools/url-loader` replaced `cross-undici-fetch` with `@whatwg-node/fetch`
  • Loading branch information
acao authored Aug 2, 2022
1 parent be5312a commit 0f7d7bb
Show file tree
Hide file tree
Showing 6 changed files with 329 additions and 100 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"build:packages": "yarn tsc",
"build:watch": "yarn tsc --watch",
"watch": "yarn build:watch",
"watch-vscode": "concurrently --raw \"yarn tsc --watch\" \"yarn workspace vscode-graphql run compile --watch\"",
"watch-vscode": "concurrently --raw \"yarn tsc && yarn tsc --watch\" \"yarn workspace vscode-graphql run compile --watch\"",
"check": "yarn tsc --dry",
"cypress-open": "yarn workspace graphiql cypress-open",
"dev-graphiql": "yarn workspace graphiql dev",
Expand Down Expand Up @@ -136,5 +136,8 @@
"typedoc": "^0.19.2",
"typescript": "^4.6.3",
"wsrun": "^5.2.4"
},
"resolutions": {
"graphql-config": "4.3.0"
}
}
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 @@ -37,7 +37,7 @@
"@babel/types": "^7.17.0",
"@babel/parser": "^7.17.3",
"dotenv": "8.2.0",
"graphql-config": "^4.3.0",
"graphql-config": "4.3.0",
"graphql-language-service": "^5.0.6",
"mkdirp": "^1.0.4",
"node-fetch": "^2.6.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
*
*/

jest.mock('cross-undici-fetch', () => ({
jest.mock('@whatwg-node/fetch', () => ({
fetch: require('fetch-mock').fetchHandler,
AbortController: global.AbortController,
TextDecoder: global.TextDecoder,
}));

import { GraphQLSchema } from 'graphql/type';
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 @@ -44,7 +44,7 @@
"@types/json-schema": "7.0.9",
"benchmark": "^2.1.4",
"graphql": "^16.4.0",
"graphql-config": "^4.3.0",
"graphql-config": "4.3.0",
"lodash": "^4.17.15",
"platform": "^1.3.5",
"ts-node": "^8.10.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
"devDependencies": {
"@types/capitalize": "2.0.0",
"@types/vscode": "1.62.0",
"esbuild": "0.12.15",
"esbuild": "^0.14.51",
"ovsx": "0.3.0",
"vsce": "^2.7.0"
},
Expand Down
Loading

0 comments on commit 0f7d7bb

Please sign in to comment.