diff --git a/package.json b/package.json index d6954b91..8f007c4a 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "@eddeee888/nx-graphql-code-generator": "2.1.0", "@eslint/eslintrc": "3.3.1", "@graphql-codegen/add": "7.1.0", - "@graphql-codegen/cli": "7.3.1", + "@graphql-codegen/cli": "7.4.0", "@graphql-codegen/near-operation-file-preset": "5.2.1", - "@graphql-codegen/plugin-helpers": "7.2.1", + "@graphql-codegen/plugin-helpers": "7.3.0", "@graphql-codegen/schema-ast": "6.1.0", "@graphql-codegen/typescript": "6.1.0", "@graphql-codegen/typescript-react-apollo": "4.4.3-alpha-20260808101442-e439530add2acc6e119f54b148ccb537e4d0a7ec", diff --git a/packages/typescript-resolver-files/package.json b/packages/typescript-resolver-files/package.json index 87cd817f..668fff95 100644 --- a/packages/typescript-resolver-files/package.json +++ b/packages/typescript-resolver-files/package.json @@ -42,7 +42,7 @@ "dependencies": { "@eddeee888/gcg-server-config": "workspace:*", "@graphql-codegen/add": "^7.1.0", - "@graphql-codegen/plugin-helpers": "^7.2.1", + "@graphql-codegen/plugin-helpers": "^7.3.0", "@graphql-codegen/schema-ast": "^6.1.0", "@graphql-codegen/typescript": "^6.1.0", "@graphql-codegen/typescript-resolvers": "^6.1.0", diff --git a/packages/typescript-resolver-files/src/preset.ts b/packages/typescript-resolver-files/src/preset.ts index 7ea88832..57ec0b8c 100644 --- a/packages/typescript-resolver-files/src/preset.ts +++ b/packages/typescript-resolver-files/src/preset.ts @@ -317,6 +317,12 @@ export const preset: Types.OutputPreset = { // is an `add`-only output, so the schema doesn't affect its content. schemaAst, documents: [], + // Forces Codegen to compare generated content vs on disk, instead of in-memory cache + // This avoids situation where resolver files are content on disk are updated, + // and goes out of sync with the in-memory cache version, and can lead to generated + // content not getting written to disk + // https://github.com/dotansimha/graphql-code-generator/pull/10928 + contentComparison: 'disk', }; }); logger.debug( diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fb4a42b7..f9ea427d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -219,7 +219,7 @@ importers: version: 1.0.0(jiti@2.7.0)(typescript@6.0.3) '@eddeee888/nx-graphql-code-generator': specifier: 2.1.0 - version: 2.1.0(@graphql-codegen/cli@7.3.1(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3))(nx@23.1.1(@swc-node/register@1.12.1(@swc/core@1.15.8(@swc/helpers@0.5.23))(@swc/types@0.1.28)(typescript@6.0.3))(@swc/core@1.15.8(@swc/helpers@0.5.23))) + version: 2.1.0(@graphql-codegen/cli@7.4.0(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3))(nx@23.1.1(@swc-node/register@1.12.1(@swc/core@1.15.8(@swc/helpers@0.5.23))(@swc/types@0.1.28)(typescript@6.0.3))(@swc/core@1.15.8(@swc/helpers@0.5.23))) '@eslint/eslintrc': specifier: 3.3.1 version: 3.3.1 @@ -227,14 +227,14 @@ importers: specifier: 7.1.0 version: 7.1.0(graphql@17.0.2) '@graphql-codegen/cli': - specifier: 7.3.1 - version: 7.3.1(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3) + specifier: 7.4.0 + version: 7.4.0(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3) '@graphql-codegen/near-operation-file-preset': specifier: 5.2.1 version: 5.2.1(graphql@17.0.2) '@graphql-codegen/plugin-helpers': - specifier: 7.2.1 - version: 7.2.1(graphql@17.0.2) + specifier: 7.3.0 + version: 7.3.0(graphql@17.0.2) '@graphql-codegen/schema-ast': specifier: 6.1.0 version: 6.1.0(graphql@17.0.2) @@ -360,7 +360,7 @@ importers: version: 7.1.0(graphql@17.0.2) '@graphql-codegen/plugin-helpers': specifier: ^7.1.0 - version: 7.1.0(graphql@17.0.2) + version: 7.3.0(graphql@17.0.2) change-case-all: specifier: ^1.0.0 version: 1.0.15 @@ -407,8 +407,8 @@ importers: specifier: ^7.1.0 version: 7.1.0(graphql@17.0.2) '@graphql-codegen/plugin-helpers': - specifier: ^7.2.1 - version: 7.2.1(graphql@17.0.2) + specifier: ^7.3.0 + version: 7.3.0(graphql@17.0.2) '@graphql-codegen/schema-ast': specifier: ^6.1.0 version: 6.1.0(graphql@17.0.2) @@ -1418,8 +1418,8 @@ packages: 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 || ^17.0.0 - '@graphql-codegen/cli@7.3.1': - resolution: {integrity: sha512-xDEI/Jpw2bmLyHJ3KDO6UavOKxujSO08p8Bz31NwRNhvKnVpy2N5tiYZhnhIBCcCqUb7PfTt11dr5EWGZGgB4w==} + '@graphql-codegen/cli@7.4.0': + resolution: {integrity: sha512-yqlvqTt6c2joKZUG2hnho1GsGxwWQIhN/XAeNEi1IgKccxId8pv4VTrLBqYJayEyFqIr5nSKqdPT+Ul3X9B+Ag==} engines: {node: '>=16'} hasBin: true peerDependencies: @@ -1463,14 +1463,8 @@ packages: 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-codegen/plugin-helpers@7.1.0': - resolution: {integrity: sha512-ieJH7kZ5oSZKBPJs7CvHMrFY/CLYLklqv74ir93qMwRna6geZsbIMoJzTDBXohxcQTITiProiYSGrEtZjIpYGg==} - engines: {node: '>=16'} - 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 || ^17.0.0 - - '@graphql-codegen/plugin-helpers@7.2.1': - resolution: {integrity: sha512-Jw2HPaioMEa4DKG7sgqzL1uWQiIWQu774FwKXx4p83/y3o5GgnRMRdTFtuQQ7Tq6PYyrI5ZITi1jAxeX/Vh2Uw==} + '@graphql-codegen/plugin-helpers@7.3.0': + resolution: {integrity: sha512-aaGfI/8Q8wmdO1nx1NMWGoZn/5Tl5TNOVQSI2qkGhk8h8Z8Uc6grFH0O6//HdHfqnUsiruBbe3IaK4/ah3sWcQ==} engines: {node: '>=16'} 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 || ^17.0.0 @@ -7364,9 +7358,9 @@ snapshots: - supports-color - typescript - '@eddeee888/nx-graphql-code-generator@2.1.0(@graphql-codegen/cli@7.3.1(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3))(nx@23.1.1(@swc-node/register@1.12.1(@swc/core@1.15.8(@swc/helpers@0.5.23))(@swc/types@0.1.28)(typescript@6.0.3))(@swc/core@1.15.8(@swc/helpers@0.5.23)))': + '@eddeee888/nx-graphql-code-generator@2.1.0(@graphql-codegen/cli@7.4.0(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3))(nx@23.1.1(@swc-node/register@1.12.1(@swc/core@1.15.8(@swc/helpers@0.5.23))(@swc/types@0.1.28)(typescript@6.0.3))(@swc/core@1.15.8(@swc/helpers@0.5.23)))': dependencies: - '@graphql-codegen/cli': 7.3.1(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3) + '@graphql-codegen/cli': 7.4.0(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3) '@nx/devkit': 20.8.4(nx@23.1.1(@swc-node/register@1.12.1(@swc/core@1.15.8(@swc/helpers@0.5.23))(@swc/types@0.1.28)(typescript@6.0.3))(@swc/core@1.15.8(@swc/helpers@0.5.23))) semver: 7.8.5 tslib: 2.8.1 @@ -7579,18 +7573,18 @@ snapshots: '@graphql-codegen/add@7.1.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) graphql: 17.0.2 tslib: 2.8.1 - '@graphql-codegen/cli@7.3.1(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3)': + '@graphql-codegen/cli@7.4.0(@types/node@22.20.1)(graphql@17.0.2)(typescript@6.0.3)': dependencies: '@babel/generator': 7.29.8 '@babel/template': 7.29.7 '@babel/types': 7.29.8 '@graphql-codegen/client-preset': 6.1.3(graphql@17.0.2) '@graphql-codegen/core': 6.2.0(graphql@17.0.2) - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-tools/apollo-engine-loader': 8.0.34(graphql@17.0.2) '@graphql-tools/code-file-loader': 8.1.36(graphql@17.0.2) '@graphql-tools/git-loader': 8.0.40(graphql@17.0.2) @@ -7638,7 +7632,7 @@ snapshots: '@babel/template': 7.29.7 '@graphql-codegen/add': 7.1.0(graphql@17.0.2) '@graphql-codegen/gql-tag-operations': 6.1.0(graphql@17.0.2) - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/typed-document-node': 7.1.0(graphql@17.0.2) '@graphql-codegen/typescript': 6.1.0(graphql@17.0.2) '@graphql-codegen/typescript-operations': 6.1.6(graphql@17.0.2) @@ -7651,7 +7645,7 @@ snapshots: '@graphql-codegen/core@6.2.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-tools/schema': 10.0.38(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) graphql: 17.0.2 @@ -7659,7 +7653,7 @@ snapshots: '@graphql-codegen/gql-tag-operations@6.1.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.5(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) auto-bind: 5.0.1 @@ -7669,7 +7663,7 @@ snapshots: '@graphql-codegen/near-operation-file-preset@5.2.1(graphql@17.0.2)': dependencies: '@graphql-codegen/add': 7.1.0(graphql@17.0.2) - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.3(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) graphql: 17.0.2 @@ -7685,16 +7679,7 @@ snapshots: import-from: 4.0.0 tslib: 2.8.1 - '@graphql-codegen/plugin-helpers@7.1.0(graphql@17.0.2)': - dependencies: - '@graphql-tools/utils': 11.2.2(graphql@17.0.2) - change-case-all: 2.1.0 - common-tags: 1.8.2 - graphql: 17.0.2 - import-from: 4.0.0 - tslib: 2.8.1 - - '@graphql-codegen/plugin-helpers@7.2.1(graphql@17.0.2)': + '@graphql-codegen/plugin-helpers@7.3.0(graphql@17.0.2)': dependencies: '@graphql-tools/utils': 11.2.2(graphql@17.0.2) change-case-all: 2.1.0 @@ -7705,14 +7690,14 @@ snapshots: '@graphql-codegen/schema-ast@6.1.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) graphql: 17.0.2 tslib: 2.8.1 '@graphql-codegen/typed-document-node@7.1.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.5(graphql@17.0.2) auto-bind: 5.0.1 change-case-all: 2.1.0 @@ -7721,7 +7706,7 @@ snapshots: '@graphql-codegen/typescript-operations@6.1.5(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/schema-ast': 6.1.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.3(graphql@17.0.2) auto-bind: 5.0.1 @@ -7730,7 +7715,7 @@ snapshots: '@graphql-codegen/typescript-operations@6.1.6(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/schema-ast': 6.1.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.5(graphql@17.0.2) auto-bind: 5.0.1 @@ -7748,7 +7733,7 @@ snapshots: '@graphql-codegen/typescript-resolvers@6.1.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/typescript': 6.1.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.3(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) @@ -7758,7 +7743,7 @@ snapshots: '@graphql-codegen/typescript@6.1.0(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-codegen/schema-ast': 6.1.0(graphql@17.0.2) '@graphql-codegen/visitor-plugin-common': 7.2.3(graphql@17.0.2) auto-bind: 5.0.1 @@ -7781,7 +7766,7 @@ snapshots: '@graphql-codegen/visitor-plugin-common@7.2.3(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-tools/optimize': 2.0.0(graphql@17.0.2) '@graphql-tools/relay-operation-optimizer': 7.1.8(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) @@ -7795,7 +7780,7 @@ snapshots: '@graphql-codegen/visitor-plugin-common@7.2.5(graphql@17.0.2)': dependencies: - '@graphql-codegen/plugin-helpers': 7.2.1(graphql@17.0.2) + '@graphql-codegen/plugin-helpers': 7.3.0(graphql@17.0.2) '@graphql-tools/optimize': 2.0.0(graphql@17.0.2) '@graphql-tools/relay-operation-optimizer': 7.1.8(graphql@17.0.2) '@graphql-tools/utils': 11.2.2(graphql@17.0.2) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index fc226505..7161d470 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,3 +6,6 @@ allowBuilds: esbuild: true nx: true unrs-resolver: true +minimumReleaseAgeExclude: + - '@graphql-codegen/cli' + - '@graphql-codegen/plugin-helpers'