Skip to content

Commit 9c1fbdd

Browse files
authored
CODEGEN-759: Update @graphql-codegen/graphql-request peerDep version to 7.0.0 (#1106)
* Allow graphql-request v7 as peerDep for @graphql-codegen/typescript-graphql-request * Add changeset * Update dev graphql-request * Handle ESM * Use node-fetch to make nock work for graphql-request * Explicitly target node_modules/graphql-request js files to transform * Hack to avoid running graphql-request@7 integration test with graphql@15 * Use [email protected] in dev to suport graphql15 and 16
1 parent 580ef6e commit 9c1fbdd

5 files changed

Lines changed: 24 additions & 6 deletions

File tree

.changeset/thin-clowns-punch.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-codegen/typescript-graphql-request': patch
3+
---
4+
5+
Make graphql-request@v7 peerDep

jest.project.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ module.exports = ({ dirname, projectMode = true }) => {
1919

2020
return {
2121
...(CI || !projectMode ? {} : { displayName: pkg.name.replace('@graphql-codegen/', '') }),
22-
transform: { '^.+\\.tsx?$': 'babel-jest' },
22+
transform: {
23+
'^.+\\.tsx?$': 'babel-jest',
24+
'/node_modules/graphql-request/.+\\.js$': 'babel-jest',
25+
},
26+
transformIgnorePatterns: ['/node_modules/(?!(graphql-request)/)'],
2327
testEnvironment: 'node',
2428
rootDir: dirname,
2529
restoreMocks: true,

packages/plugins/typescript/graphql-request/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"peerDependencies": {
4040
"graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
41-
"graphql-request": "^6.0.0",
41+
"graphql-request": "^6.0.0 || ^7.0.0",
4242
"graphql-tag": "^2.0.0"
4343
},
4444
"dependencies": {
@@ -50,7 +50,8 @@
5050
"devDependencies": {
5151
"@graphql-codegen/testing": "1.18.3",
5252
"@graphql-tools/schema": "10.0.23",
53-
"graphql-request": "6.0.0"
53+
"graphql-request": "7.2.0",
54+
"node-fetch": "2.7.0"
5455
},
5556
"publishConfig": {
5657
"directory": "dist",
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { GraphQLClient } from 'graphql-request';
2+
import fetch from 'node-fetch'; // FIXME: using `node-fetch` temporarily because `graphql-request@7` uses native fetch, which `[email protected]` from `@graphql-codegen/testing` does not support
23
import { getSdk } from './graphql-request-sdk.js';
34

45
export function runExampleQuery(x: number, y: number) {
5-
const client = new GraphQLClient('http://localhost:4000/graphql');
6+
const client = new GraphQLClient('http://localhost:4000/graphql', { fetch });
67
const sdk = getSdk(client);
78
return sdk.Add({ x, y });
89
}

yarn.lock

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4593,7 +4593,14 @@ graphql-language-service-utils@^2.7.1:
45934593
graphql-language-service-types "^1.8.7"
45944594
nullthrows "^1.0.0"
45954595

4596-
[email protected], "graphql-request@^4.0.0 || ^5.0.0 || ^6.0.0", graphql-request@^6.0.0:
4596+
4597+
version "7.2.0"
4598+
resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-7.2.0.tgz#af4aa25f27a087dd4fc93a4ff54a0f59c4487269"
4599+
integrity sha512-0GR7eQHBFYz372u9lxS16cOtEekFlZYB2qOyq8wDvzRmdRSJ0mgUVX1tzNcIzk3G+4NY+mGtSz411wZdeDF/+A==
4600+
dependencies:
4601+
"@graphql-typed-document-node/core" "^3.2.0"
4602+
4603+
"graphql-request@^4.0.0 || ^5.0.0 || ^6.0.0", graphql-request@^6.0.0:
45974604
version "6.0.0"
45984605
resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.0.0.tgz#9c8b6a0c341f289e049936d03cc9205300faae1c"
45994606
integrity sha512-2BmHTuglonjZvmNVw6ZzCfFlW/qkIPds0f+Qdi/Lvjsl3whJg2uvHmSvHnLWhUTEw6zcxPYAHiZoPvSVKOZ7Jw==
@@ -6052,7 +6059,7 @@ [email protected]:
60526059
lodash "^4.17.21"
60536060
propagate "^2.0.0"
60546061

6055-
node-fetch@^2.5.0, node-fetch@^2.6.1, node-fetch@^2.7.0:
6062+
node-fetch@2.7.0, node-fetch@^2.5.0, node-fetch@^2.6.1, node-fetch@^2.7.0:
60566063
version "2.7.0"
60576064
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
60586065
integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==

0 commit comments

Comments
 (0)