diff --git a/.changeset/thin-clowns-punch.md b/.changeset/thin-clowns-punch.md new file mode 100644 index 0000000000..5dacac9bf7 --- /dev/null +++ b/.changeset/thin-clowns-punch.md @@ -0,0 +1,5 @@ +--- +'@graphql-codegen/typescript-graphql-request': patch +--- + +Make graphql-request@v7 peerDep diff --git a/jest.project.js b/jest.project.js index ea2a6db3a6..6891607271 100644 --- a/jest.project.js +++ b/jest.project.js @@ -19,7 +19,11 @@ module.exports = ({ dirname, projectMode = true }) => { return { ...(CI || !projectMode ? {} : { displayName: pkg.name.replace('@graphql-codegen/', '') }), - transform: { '^.+\\.tsx?$': 'babel-jest' }, + transform: { + '^.+\\.tsx?$': 'babel-jest', + '/node_modules/graphql-request/.+\\.js$': 'babel-jest', + }, + transformIgnorePatterns: ['/node_modules/(?!(graphql-request)/)'], testEnvironment: 'node', rootDir: dirname, restoreMocks: true, diff --git a/packages/plugins/typescript/graphql-request/package.json b/packages/plugins/typescript/graphql-request/package.json index 7900fedc2b..e413b3acfa 100644 --- a/packages/plugins/typescript/graphql-request/package.json +++ b/packages/plugins/typescript/graphql-request/package.json @@ -38,7 +38,7 @@ }, "peerDependencies": { "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", - "graphql-request": "^6.0.0", + "graphql-request": "^6.0.0 || ^7.0.0", "graphql-tag": "^2.0.0" }, "dependencies": { @@ -50,7 +50,8 @@ "devDependencies": { "@graphql-codegen/testing": "1.18.3", "@graphql-tools/schema": "10.0.23", - "graphql-request": "6.0.0" + "graphql-request": "7.2.0", + "node-fetch": "2.7.0" }, "publishConfig": { "directory": "dist", diff --git a/packages/plugins/typescript/graphql-request/tests/test-files/run-example-query.ts b/packages/plugins/typescript/graphql-request/tests/test-files/run-example-query.ts index 7582fcf534..94ce975ba8 100644 --- a/packages/plugins/typescript/graphql-request/tests/test-files/run-example-query.ts +++ b/packages/plugins/typescript/graphql-request/tests/test-files/run-example-query.ts @@ -1,8 +1,9 @@ import { GraphQLClient } from 'graphql-request'; +import fetch from 'node-fetch'; // FIXME: using `node-fetch` temporarily because `graphql-request@7` uses native fetch, which `nock@13.4` from `@graphql-codegen/testing` does not support import { getSdk } from './graphql-request-sdk.js'; export function runExampleQuery(x: number, y: number) { - const client = new GraphQLClient('http://localhost:4000/graphql'); + const client = new GraphQLClient('http://localhost:4000/graphql', { fetch }); const sdk = getSdk(client); return sdk.Add({ x, y }); } diff --git a/yarn.lock b/yarn.lock index 4505204a34..07e26ec3dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4593,7 +4593,14 @@ graphql-language-service-utils@^2.7.1: graphql-language-service-types "^1.8.7" nullthrows "^1.0.0" -graphql-request@6.0.0, "graphql-request@^4.0.0 || ^5.0.0 || ^6.0.0", graphql-request@^6.0.0: +graphql-request@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-7.2.0.tgz#af4aa25f27a087dd4fc93a4ff54a0f59c4487269" + integrity sha512-0GR7eQHBFYz372u9lxS16cOtEekFlZYB2qOyq8wDvzRmdRSJ0mgUVX1tzNcIzk3G+4NY+mGtSz411wZdeDF/+A== + dependencies: + "@graphql-typed-document-node/core" "^3.2.0" + +"graphql-request@^4.0.0 || ^5.0.0 || ^6.0.0", graphql-request@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-6.0.0.tgz#9c8b6a0c341f289e049936d03cc9205300faae1c" integrity sha512-2BmHTuglonjZvmNVw6ZzCfFlW/qkIPds0f+Qdi/Lvjsl3whJg2uvHmSvHnLWhUTEw6zcxPYAHiZoPvSVKOZ7Jw== @@ -6052,7 +6059,7 @@ nock@13.3.0: lodash "^4.17.21" propagate "^2.0.0" -node-fetch@^2.5.0, node-fetch@^2.6.1, node-fetch@^2.7.0: +node-fetch@2.7.0, node-fetch@^2.5.0, node-fetch@^2.6.1, node-fetch@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==