Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/brave-maps-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@eddeee888/gcg-operation-location-migration': minor
'@eddeee888/gcg-typescript-resolver-files': minor
'@eddeee888/gcg-server-config': minor
---

Support graphql@17
14 changes: 3 additions & 11 deletions .github/workflows/operation-location-migration-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, windows-latest]
node-version: [20.x, 22.x, 24.x]
node-version: [22.x, 24.x]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand All @@ -27,16 +27,8 @@ jobs:
with:
node-version: ${{ matrix.node-version }}

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

- name: e2e
run: yarn nx e2e operation-location-migration-e2e
2 changes: 1 addition & 1 deletion .github/workflows/typescript-resolver-files-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04, windows-latest]
node-version: [20.x, 22.x, 24.x]
node-version: [22.x, 24.x]
runs-on: ${{ matrix.os }}
defaults:
run:
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"devDependencies": {
"@changesets/cli": "2.29.5",
"@eddeee888/eslint-plugin": "1.0.0",
"@eddeee888/nx-graphql-code-generator": "2.0.0",
"@eddeee888/nx-graphql-code-generator": "2.1.0",
"@eslint/eslintrc": "3.3.1",
"@graphql-codegen/add": "7.0.0",
"@graphql-codegen/cli": "7.0.0",
"@graphql-codegen/near-operation-file-preset": "5.2.0",
"@graphql-codegen/plugin-helpers": "7.0.0",
"@graphql-codegen/schema-ast": "6.0.0",
"@graphql-codegen/typescript": "6.0.0",
"@graphql-codegen/add": "7.1.0",
"@graphql-codegen/cli": "7.2.0",
"@graphql-codegen/near-operation-file-preset": "5.2.1",
"@graphql-codegen/plugin-helpers": "7.1.0",
"@graphql-codegen/schema-ast": "6.1.0",
"@graphql-codegen/typescript": "6.1.0",
"@graphql-codegen/typescript-react-apollo": "4.4.2",
"@graphql-codegen/typescript-resolvers": "6.0.0",
"@graphql-tools/merge": "9.1.8",
"@graphql-codegen/typescript-resolvers": "6.1.0",
"@graphql-tools/merge": "9.2.0",
"@nx/devkit": "21.3.1",
"@nx/eslint": "21.3.1",
"@nx/eslint-plugin": "21.3.1",
Expand All @@ -45,7 +45,7 @@
"@vitest/ui": "3.2.4",
"eslint": "9.31.0",
"eslint-config-prettier": "10.1.8",
"graphql": "16.10.0",
"graphql": "17.0.2",
"graphql-scalars": "1.24.0",
"jest": "30.0.4",
"jest-environment-jsdom": "30.0.4",
Expand Down
6 changes: 3 additions & 3 deletions packages/operation-location-migration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"main": "./src/index.js",
"types": "./src/index.d.ts",
"peerDependencies": {
"graphql": "^15.0.0 || ^16.0.0"
"graphql": "^15.0.0 || ^16.0.0 || ^17.0.0"
},
"dependencies": {
"@graphql-codegen/add": "^7.0.0",
"@graphql-codegen/plugin-helpers": "^7.0.0",
"@graphql-codegen/add": "^7.1.0",
"@graphql-codegen/plugin-helpers": "^7.1.0",
"@swc/helpers": "~0.5.11",
"change-case-all": "^1.0.0",
"ts-morph": "^22.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/server-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"author": "Eddy Nguyen <ch@eddeee888.me>",
"license": "MIT",
"dependencies": {
"@graphql-codegen/typescript": "^6.0.0",
"@graphql-codegen/typescript-resolvers": "^6.0.0",
"@graphql-codegen/typescript": "^6.1.0",
"@graphql-codegen/typescript-resolvers": "^6.1.0",
"tslib": "^2.8.0"
},
"publishConfig": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import type { DocumentNode } from 'graphql';
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
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import type { DocumentNode } from 'graphql';
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
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import type { DocumentNode } from 'graphql';
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
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
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
import type { DocumentNode } from 'graphql';
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ directive @deprecated(
"""
Explains why this element was deprecated, usually also including a suggestion for how to access supported similar data. Formatted using the Markdown syntax, as specified by [CommonMark](https://commonmark.org/).
"""
reason: String = "No longer supported"
) on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE
reason: String! = "No longer supported"
) on FIELD_DEFINITION | ARGUMENT_DEFINITION | INPUT_FIELD_DEFINITION | ENUM_VALUE | DIRECTIVE_DEFINITION

"""Exposes a URL that specifies the behavior of this scalar."""
directive @specifiedBy(
Expand Down Expand Up @@ -56,7 +56,7 @@ type __Schema {
subscriptionType: __Type

"""A list of all directives supported by this server."""
directives: [__Directive!]!
directives(includeDeprecated: Boolean! = false): [__Directive!]!
}

"""
Expand All @@ -69,11 +69,11 @@ type __Type {
name: String
description: String
specifiedByURL: String
fields(includeDeprecated: Boolean = false): [__Field!]
fields(includeDeprecated: Boolean! = false): [__Field!]
interfaces: [__Type!]
possibleTypes: [__Type!]
enumValues(includeDeprecated: Boolean = false): [__EnumValue!]
inputFields(includeDeprecated: Boolean = false): [__InputValue!]
enumValues(includeDeprecated: Boolean! = false): [__EnumValue!]
inputFields(includeDeprecated: Boolean! = false): [__InputValue!]
ofType: __Type
isOneOf: Boolean
}
Expand Down Expand Up @@ -117,7 +117,7 @@ Object and Interface types are described by a list of Fields, each of which has
type __Field {
name: String!
description: String
args(includeDeprecated: Boolean = false): [__InputValue!]!
args(includeDeprecated: Boolean! = false): [__InputValue!]!
type: __Type!
isDeprecated: Boolean!
deprecationReason: String
Expand Down Expand Up @@ -159,7 +159,9 @@ type __Directive {
description: String
isRepeatable: Boolean!
locations: [__DirectiveLocation!]!
args(includeDeprecated: Boolean = false): [__InputValue!]!
args(includeDeprecated: Boolean! = false): [__InputValue!]!
isDeprecated: Boolean!
deprecationReason: String
}

"""
Expand Down Expand Up @@ -187,9 +189,12 @@ enum __DirectiveLocation {
"""Location adjacent to an inline fragment."""
INLINE_FRAGMENT

"""Location adjacent to a variable definition."""
"""Location adjacent to an operation variable definition."""
VARIABLE_DEFINITION

"""Location adjacent to a fragment variable definition."""
FRAGMENT_VARIABLE_DEFINITION

"""Location adjacent to a schema definition."""
SCHEMA

Expand Down Expand Up @@ -222,6 +227,9 @@ enum __DirectiveLocation {

"""Location adjacent to an input object field definition."""
INPUT_FIELD_DEFINITION

"""Location adjacent to a directive definition."""
DIRECTIVE_DEFINITION
}
scalar BigInt

Expand Down
Loading
Loading