Skip to content

Commit 324f084

Browse files
eddeee888eddeee888
authored
Bump Codegen deps to support Graphql 17 (#440)
* Bump all codegen packages for graphql v17 support * Use graphql v17 * Sync up * Add changeset * Use graphql@16 for operation-location-migration-e2e * Drop node 20 support * Sync graphql-tools/merge versions * Bump @graphql-tools/merge to 9.2.0 to support graphql 17 * Regen yarn.lock to dedupe packages * Update typeDefs for v17
1 parent b2aa4e8 commit 324f084

41 files changed

Lines changed: 3308 additions & 4203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/brave-maps-flash.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@eddeee888/gcg-operation-location-migration': minor
3+
'@eddeee888/gcg-typescript-resolver-files': minor
4+
'@eddeee888/gcg-server-config': minor
5+
---
6+
7+
Support graphql@17

‎.github/workflows/operation-location-migration-e2e.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-22.04, windows-latest]
14-
node-version: [20.x, 22.x, 24.x]
14+
node-version: [22.x, 24.x]
1515
runs-on: ${{ matrix.os }}
1616
defaults:
1717
run:
@@ -27,16 +27,8 @@ jobs:
2727
with:
2828
node-version: ${{ matrix.node-version }}
2929

30-
- name: Restore node_modules cache
31-
uses: actions/cache@v4
32-
with:
33-
path: |
34-
node_modules
35-
packages/*/node_modules
36-
tools/*/node_modules
37-
key: node-modules-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
38-
restore-keys: |
39-
node-modules-${{ runner.os }}-
30+
- name: Use graphql@16 # packages like `typescript-react-apollo` are not compatible with graphql@17
31+
run: yarn add -DEW graphql@16
4032

4133
- name: e2e
4234
run: yarn nx e2e operation-location-migration-e2e

‎.github/workflows/typescript-resolver-files-e2e.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-22.04, windows-latest]
14-
node-version: [20.x, 22.x, 24.x]
14+
node-version: [22.x, 24.x]
1515
runs-on: ${{ matrix.os }}
1616
defaults:
1717
run:

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
"devDependencies": {
1313
"@changesets/cli": "2.29.5",
1414
"@eddeee888/eslint-plugin": "1.0.0",
15-
"@eddeee888/nx-graphql-code-generator": "2.0.0",
15+
"@eddeee888/nx-graphql-code-generator": "2.1.0",
1616
"@eslint/eslintrc": "3.3.1",
17-
"@graphql-codegen/add": "7.0.0",
18-
"@graphql-codegen/cli": "7.0.0",
19-
"@graphql-codegen/near-operation-file-preset": "5.2.0",
20-
"@graphql-codegen/plugin-helpers": "7.0.0",
21-
"@graphql-codegen/schema-ast": "6.0.0",
22-
"@graphql-codegen/typescript": "6.0.0",
17+
"@graphql-codegen/add": "7.1.0",
18+
"@graphql-codegen/cli": "7.2.0",
19+
"@graphql-codegen/near-operation-file-preset": "5.2.1",
20+
"@graphql-codegen/plugin-helpers": "7.1.0",
21+
"@graphql-codegen/schema-ast": "6.1.0",
22+
"@graphql-codegen/typescript": "6.1.0",
2323
"@graphql-codegen/typescript-react-apollo": "4.4.2",
24-
"@graphql-codegen/typescript-resolvers": "6.0.0",
25-
"@graphql-tools/merge": "9.1.8",
24+
"@graphql-codegen/typescript-resolvers": "6.1.0",
25+
"@graphql-tools/merge": "9.2.0",
2626
"@nx/devkit": "21.3.1",
2727
"@nx/eslint": "21.3.1",
2828
"@nx/eslint-plugin": "21.3.1",
@@ -45,7 +45,7 @@
4545
"@vitest/ui": "3.2.4",
4646
"eslint": "9.31.0",
4747
"eslint-config-prettier": "10.1.8",
48-
"graphql": "16.10.0",
48+
"graphql": "17.0.2",
4949
"graphql-scalars": "1.24.0",
5050
"jest": "30.0.4",
5151
"jest-environment-jsdom": "30.0.4",

‎packages/operation-location-migration/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"main": "./src/index.js",
2323
"types": "./src/index.d.ts",
2424
"peerDependencies": {
25-
"graphql": "^15.0.0 || ^16.0.0"
25+
"graphql": "^15.0.0 || ^16.0.0 || ^17.0.0"
2626
},
2727
"dependencies": {
28-
"@graphql-codegen/add": "^7.0.0",
29-
"@graphql-codegen/plugin-helpers": "^7.0.0",
28+
"@graphql-codegen/add": "^7.1.0",
29+
"@graphql-codegen/plugin-helpers": "^7.1.0",
3030
"@swc/helpers": "~0.5.11",
3131
"change-case-all": "^1.0.0",
3232
"ts-morph": "^22.0.0"

‎packages/server-config/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"author": "Eddy Nguyen <ch@eddeee888.me>",
2525
"license": "MIT",
2626
"dependencies": {
27-
"@graphql-codegen/typescript": "^6.0.0",
28-
"@graphql-codegen/typescript-resolvers": "^6.0.0",
27+
"@graphql-codegen/typescript": "^6.1.0",
28+
"@graphql-codegen/typescript-resolvers": "^6.1.0",
2929
"tslib": "^2.8.0"
3030
},
3131
"publishConfig": {

‎packages/typescript-resolver-files-e2e/src/test-add-option/schema-append/typeDefs.generated.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
import type { DocumentNode } from 'graphql';
2-
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"test"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Test"}}},"directives":[]}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Test"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"string"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"boolean"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"int"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"float"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},"directives":[]}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode
2+
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"test"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Test"}}}}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Test"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"string"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"boolean"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"int"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"float"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode

‎packages/typescript-resolver-files-e2e/src/test-add-option/schema-content/typeDefs.generated.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
import type { DocumentNode } from 'graphql';
2-
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"test"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Test"}}},"directives":[]}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Test"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"string"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"boolean"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"int"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"float"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},"directives":[]}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode
2+
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"test"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Test"}}}}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Test"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"string"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"boolean"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"int"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"float"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode

‎packages/typescript-resolver-files-e2e/src/test-add-option/schema-prepend/typeDefs.generated.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
import type { DocumentNode } from 'graphql';
2-
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"test"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Test"}}},"directives":[]}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Test"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"string"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"boolean"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"int"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"float"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},"directives":[]}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode
2+
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"test"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Test"}}}}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Test"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"string"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"boolean"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"int"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"float"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode

‎packages/typescript-resolver-files-e2e/src/test-complex-synth-generic-wrapper/schema/typeDefs.generated.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
import type { DocumentNode } from 'graphql';
2-
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"book"},"arguments":[{"kind":"InputValueDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},"directives":[]}],"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}},"directives":[]}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Book"},"interfaces":[],"directives":[],"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"isbn"},"arguments":[],"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"nextBookInSeries"},"arguments":[],"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}},"directives":[]},{"kind":"FieldDefinition","name":{"kind":"Name","value":"previousBookInSeries"},"arguments":[],"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}},"directives":[]}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode
2+
export const typeDefs = {"kind":"Document","definitions":[{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Query"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"book"},"arguments":[{"kind":"InputValueDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}}}]},{"kind":"ObjectTypeDefinition","name":{"kind":"Name","value":"Book"},"fields":[{"kind":"FieldDefinition","name":{"kind":"Name","value":"id"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"isbn"},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"nextBookInSeries"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}}},{"kind":"FieldDefinition","name":{"kind":"Name","value":"previousBookInSeries"},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Book"}}}]},{"kind":"SchemaDefinition","operationTypes":[{"kind":"OperationTypeDefinition","type":{"kind":"NamedType","name":{"kind":"Name","value":"Query"}},"operation":"query"}]}]} as unknown as DocumentNode

0 commit comments

Comments
 (0)