From d27af0d268dd0b4951254b3dc6540df1c69ec118 Mon Sep 17 00:00:00 2001 From: Eddy Nguyen Date: Wed, 18 Feb 2026 21:35:12 +1100 Subject: [PATCH 1/4] Add changeset --- .changeset/shaky-queens-sell.md | 8 ++++++++ .github/workflows/main.yml | 6 +++--- .github/workflows/release.yml | 15 +++++++++++++++ .../plugins/typescript/react-query/src/fetcher.ts | 5 +---- .../tests/__snapshots__/react-query.spec.ts.snap | 4 ++-- .../plugins/typescript/solid-query/src/fetcher.ts | 5 +---- 6 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 .changeset/shaky-queens-sell.md create mode 100644 .github/workflows/release.yml diff --git a/.changeset/shaky-queens-sell.md b/.changeset/shaky-queens-sell.md new file mode 100644 index 0000000000..1b7031d453 --- /dev/null +++ b/.changeset/shaky-queens-sell.md @@ -0,0 +1,8 @@ +--- +'@graphql-codegen/typescript-react-query': patch +'@graphql-codegen/typescript-solid-query': patch +--- + +Query keys should be shared between suspense and non-suspense hooks to ensure consistent state +management and synchronization, preventing discrepancies and maintaining a single source of truth +for query invalidation. diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8befd2416d..ef768ffdc0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - name: Setup env uses: the-guild-org/shared-config/setup@main with: - nodeVersion: 18 + nodeVersion: 24 - name: Prettier Check run: yarn prettier:check dev-tests: @@ -83,10 +83,10 @@ jobs: strategy: matrix: os: [ubuntu-latest] # remove windows to speed up the tests - node_version: [18, 20, 22] + node_version: [20, 22, 24] graphql_version: [15, 16] include: - - node-version: 18 + - node-version: 20 os: windows-latest graphql_version: 16 steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000..c065f3a70a --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,15 @@ +name: release +on: + push: + branches: + - main + +jobs: + stable: + uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main + with: + releaseScript: release + nodeVersion: 24 + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + npmToken: ${{ secrets.NPM_TOKEN }} diff --git a/packages/plugins/typescript/react-query/src/fetcher.ts b/packages/plugins/typescript/react-query/src/fetcher.ts index 34f392204d..cbdda157be 100644 --- a/packages/plugins/typescript/react-query/src/fetcher.ts +++ b/packages/plugins/typescript/react-query/src/fetcher.ts @@ -135,10 +135,7 @@ export abstract class FetcherRenderer { >(${argumentsResult}) => { ${implHookOuter} return ${query.getHook()}<${operationResultType}, TError, TData>( - ${this.generateQueryFormattedParameters( - this.generateQueryKey(config), - implFetcher, - )} + ${this.generateQueryFormattedParameters(this.generateQueryKey(config), implFetcher)} )};`; }; diff --git a/packages/plugins/typescript/react-query/tests/__snapshots__/react-query.spec.ts.snap b/packages/plugins/typescript/react-query/tests/__snapshots__/react-query.spec.ts.snap index 3e28630dee..7eb3ff8be3 100644 --- a/packages/plugins/typescript/react-query/tests/__snapshots__/react-query.spec.ts.snap +++ b/packages/plugins/typescript/react-query/tests/__snapshots__/react-query.spec.ts.snap @@ -1439,7 +1439,7 @@ export const useSuspenseTestQuery = < return useSuspenseQuery( { - queryKey: variables === undefined ? ['testSuspense'] : ['testSuspense', variables], + queryKey: variables === undefined ? ['test'] : ['test', variables], queryFn: fetcher(dataSource.endpoint, dataSource.fetchParams || {}, TestDocument, variables), ...options } @@ -1478,7 +1478,7 @@ export const useSuspenseInfiniteTestQuery = < (() => { const { queryKey: optionsQueryKey, ...restOptions } = options; return { - queryKey: optionsQueryKey ?? variables === undefined ? ['test.infiniteSuspense'] : ['test.infiniteSuspense', variables], + queryKey: optionsQueryKey ?? variables === undefined ? ['test.infinite'] : ['test.infinite', variables], queryFn: (metaData) => fetcher(dataSource.endpoint, dataSource.fetchParams || {}, TestDocument, {...variables, ...(metaData.pageParam ?? {})})(), ...restOptions } diff --git a/packages/plugins/typescript/solid-query/src/fetcher.ts b/packages/plugins/typescript/solid-query/src/fetcher.ts index b5d4a80b93..27c90da308 100644 --- a/packages/plugins/typescript/solid-query/src/fetcher.ts +++ b/packages/plugins/typescript/solid-query/src/fetcher.ts @@ -125,10 +125,7 @@ export abstract class FetcherRenderer { >(${argumentsResult}) => { ${implHookOuter} return ${query.getHook()}<${operationResultType}, TError, TData>( - ${this.generateQueryFormattedParameters( - this.generateQueryKey(config), - implFetcher, - )} + ${this.generateQueryFormattedParameters(this.generateQueryKey(config), implFetcher)} )};`; }; From 4e4de25de78e8769bbe5a0d69962a5a176727531 Mon Sep 17 00:00:00 2001 From: Eddy Nguyen Date: Wed, 4 Mar 2026 20:56:47 +1100 Subject: [PATCH 2/4] Revert version changes --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef768ffdc0..ea214f6b58 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -83,10 +83,10 @@ jobs: strategy: matrix: os: [ubuntu-latest] # remove windows to speed up the tests - node_version: [20, 22, 24] + node_version: [18, 20, 22] graphql_version: [15, 16] include: - - node-version: 20 + - node-version: 18 os: windows-latest graphql_version: 16 steps: From ba55fb7bf1f82cf1202d5f4e96c70180e3ddfe36 Mon Sep 17 00:00:00 2001 From: Eddy Nguyen Date: Wed, 4 Mar 2026 20:57:19 +1100 Subject: [PATCH 3/4] Remove bad rebase --- .github/workflows/release.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index c065f3a70a..0000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: release -on: - push: - branches: - - main - -jobs: - stable: - uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main - with: - releaseScript: release - nodeVersion: 24 - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} From 2416d9be8b59b495b12fb590121b12d2e833c26d Mon Sep 17 00:00:00 2001 From: Eddy Nguyen Date: Wed, 4 Mar 2026 21:04:24 +1100 Subject: [PATCH 4/4] Add missing permissions --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 13fdd4c432..325f6be408 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,6 +28,7 @@ jobs: uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main permissions: id-token: write # allows ODIC publishing + contents: write with: releaseScript: release nodeVersion: 24