From 66bf7d174b679155e3aaf72fe1efeb8be6446edb Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sun, 6 Jul 2025 13:34:05 -0700 Subject: [PATCH] Fix pnpm overrides configuration format Move overrides from pnpm.overrides to top-level overrides in package.json to match the format expected by pnpm lockfile. This resolves the ERR_PNPM_LOCKFILE_CONFIG_MISMATCH error in CI. --- package.json | 6 ++---- pnpm-lock.yaml | 35 ++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 21f37c24..2993ef84 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,8 @@ "examples/*" ], "packageManager": "pnpm@8.0.0", - "pnpm": { - "overrides": { - "graphql": "16.8.1" - } + "overrides": { + "graphql": "16.8.1" }, "engines": { "node": ">=16.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 22b37065..86c62b6d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,9 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - graphql: 16.8.1 - importers: .: @@ -127,7 +124,7 @@ importers: specifier: ^4.2.2 version: 4.3.6 graphql: - specifier: 16.8.1 + specifier: ^16.8.1 version: 16.8.1 graphql-http: specifier: ^1.22.1 @@ -2366,30 +2363,30 @@ packages: resolution: {integrity: sha512-FzLXZQJOZHB75SecYFOIEEHw/qcxkRFViw0lVqHpaL07c+GqDxv6VOto0FZCIiV9RgGdyRj3O8lXDCp9Cw1MbA==} engines: {node: '>=16.0.0'} peerDependencies: - graphql: 16.8.1 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 '@graphql-tools/merge@9.0.17': resolution: {integrity: sha512-3K4g8KKbIqfdmK0L5+VtZsqwAeElPkvT5ejiH+KEhn2wyKNCi4HYHxpQk8xbu+dSwLlm9Lhet1hylpo/mWCkuQ==} engines: {node: '>=16.0.0'} peerDependencies: - graphql: 16.8.1 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 '@graphql-tools/schema@10.0.16': resolution: {integrity: sha512-G2zgb8hNg9Sx6Z2FSXm57ToNcwMls9A9cUm+EsCrnGGDsryzN5cONYePUpSGj5NCFivVp3o1FT5dg19P/1qeqQ==} engines: {node: '>=16.0.0'} peerDependencies: - graphql: 16.8.1 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 '@graphql-tools/utils@10.7.2': resolution: {integrity: sha512-Wn85S+hfkzfVFpXVrQ0hjnePa3p28aB6IdAGCiD1SqBCSMDRzL+OFEtyAyb30nV9Mqflqs9lCqjqlR2puG857Q==} engines: {node: '>=16.0.0'} peerDependencies: - graphql: 16.8.1 + graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 '@graphql-typed-document-node/core@3.2.0': resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==} peerDependencies: - graphql: 16.8.1 + 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-yoga/logger@2.0.1': resolution: {integrity: sha512-Nv0BoDGLMg9QBKy9cIswQ3/6aKaKjlTh87x3GiBg2Z4RrjyrM48DvOOK0pJh1C1At+b0mUIM67cwZcFTDLN4sA==} @@ -7897,13 +7894,17 @@ packages: resolution: {integrity: sha512-4Jor+LRbA7SfSaw7dfDUs2UBzvWg3cKrykfHRgKsOIvQaLuf+QOcG2t3Mx5N9GzSNJcuqMqJWz0ta5+BryEmXg==} engines: {node: '>=12'} peerDependencies: - graphql: 16.8.1 + graphql: '>=0.11 <=16' graphql-yoga@5.10.10: resolution: {integrity: sha512-0KF0mxKeedMBYOSVLbJh7GJJwrObhBktr77SuDdZPmVA+OtdC9Xef+gYHsk7EQDeBPodgsA99pmd/tL9j0d4zg==} engines: {node: '>=18.0.0'} peerDependencies: - graphql: 16.8.1 + graphql: ^15.2.0 || ^16.0.0 + + graphql@16.11.0: + resolution: {integrity: sha512-mS1lbMsxgQj6hge1XZ6p7GPhbrtFwUFYi3wRzXAC/FmYnyXMTvvI3td3rjmQ2u8ewXueaSvRPWaEcgVVOT9Jnw==} + engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0} graphql@16.8.1: resolution: {integrity: sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==} @@ -17909,15 +17910,13 @@ snapshots: transitivePeerDependencies: - '@parcel/core' - '@parcel/cache@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': + '@parcel/cache@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))': dependencies: '@parcel/core': 2.12.0(@swc/helpers@0.5.15) '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) '@parcel/logger': 2.12.0 '@parcel/utils': 2.12.0 lmdb: 2.8.5 - transitivePeerDependencies: - - '@swc/helpers' '@parcel/cache@2.7.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))': dependencies: @@ -17989,7 +17988,7 @@ snapshots: '@parcel/core@2.12.0(@swc/helpers@0.5.15)': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15)) '@parcel/diagnostic': 2.12.0 '@parcel/events': 2.12.0 '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) @@ -18478,7 +18477,7 @@ snapshots: '@parcel/types@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15)': dependencies: - '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) + '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15)) '@parcel/diagnostic': 2.12.0 '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.15))(@swc/helpers@0.5.15) @@ -24191,12 +24190,14 @@ snapshots: lru-cache: 10.4.3 tslib: 2.8.1 + graphql@16.11.0: {} + graphql@16.8.1: {} grats@0.0.31: dependencies: commander: 10.0.1 - graphql: 16.8.1 + graphql: 16.11.0 semver: 7.7.2 typescript: 5.5.4