From ed5f915d6498b5e7f66745cf653cfa14facb5e0e Mon Sep 17 00:00:00 2001 From: Wade Baglin Date: Tue, 23 Sep 2025 09:23:28 +1000 Subject: [PATCH 1/4] Upgrade to Node 22 --- package-lock.json | 116 +++++++++++++++++++++++++++++----------------- package.json | 10 ++-- tsconfig.json | 2 +- 3 files changed, 80 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 835e3a3..58c3bba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@makerx/graphql-apollo-server", - "version": "1.6.0", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@makerx/graphql-apollo-server", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@makerx/graphql-core": "^2.2.2", @@ -24,11 +24,11 @@ "@makerx/ts-toolkit": "4.0.0-beta.24", "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-typescript": "^12.1.4", - "@tsconfig/node20": "^20.1.6", + "@tsconfig/node22": "^22.0.2", "@types/lodash.omit": "^4.5.9", "@types/node": "24.5.2", - "@typescript-eslint/eslint-plugin": "^8.44.0", - "@typescript-eslint/parser": "^8.44.0", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", "@vitest/coverage-v8": "3.2.4", "better-npm-audit": "^3.11.0", "copyfiles": "^2.4.1", @@ -45,7 +45,7 @@ "vitest": "3.2.4" }, "engines": { - "node": ">=18.0" + "node": ">=22.0" }, "optionalDependencies": { "@rollup/rollup-linux-x64-gnu": "^4.26.0" @@ -2547,8 +2547,10 @@ "linux" ] }, - "node_modules/@tsconfig/node20": { - "version": "20.1.6", + "node_modules/@tsconfig/node22": { + "version": "22.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node22/-/node22-22.0.2.tgz", + "integrity": "sha512-Kmwj4u8sDRDrMYRoN9FDEcXD8UpBSaPQQ24Gz+Gamqfm7xxn+GBR7ge/Z7pK8OXNGyUzbSwJj+TH6B+DS/epyA==", "dev": true, "license": "MIT" }, @@ -2707,15 +2709,17 @@ "peer": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.44.1.tgz", + "integrity": "sha512-molgphGqOBT7t4YKCSkbasmu1tb1MgrZ2szGzHbclF7PNmOkSTQVHy+2jXOSnxvR3+Xe1yySHFZoqMpz3TfQsw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.44.0", - "@typescript-eslint/type-utils": "8.44.0", - "@typescript-eslint/utils": "8.44.0", - "@typescript-eslint/visitor-keys": "8.44.0", + "@typescript-eslint/scope-manager": "8.44.1", + "@typescript-eslint/type-utils": "8.44.1", + "@typescript-eslint/utils": "8.44.1", + "@typescript-eslint/visitor-keys": "8.44.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", @@ -2729,7 +2733,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.44.0", + "@typescript-eslint/parser": "^8.44.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -2743,14 +2747,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.44.1.tgz", + "integrity": "sha512-EHrrEsyhOhxYt8MTg4zTF+DJMuNBzWwgvvOYNj/zm1vnaD/IC5zCXFehZv94Piqa2cRFfXrTFxIvO95L7Qc/cw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.44.0", - "@typescript-eslint/types": "8.44.0", - "@typescript-eslint/typescript-estree": "8.44.0", - "@typescript-eslint/visitor-keys": "8.44.0", + "@typescript-eslint/scope-manager": "8.44.1", + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/typescript-estree": "8.44.1", + "@typescript-eslint/visitor-keys": "8.44.1", "debug": "^4.3.4" }, "engines": { @@ -2766,12 +2772,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.44.1.tgz", + "integrity": "sha512-ycSa60eGg8GWAkVsKV4E6Nz33h+HjTXbsDT4FILyL8Obk5/mx4tbvCNsLf9zret3ipSumAOG89UcCs/KRaKYrA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.44.0", - "@typescript-eslint/types": "^8.44.0", + "@typescript-eslint/tsconfig-utils": "^8.44.1", + "@typescript-eslint/types": "^8.44.1", "debug": "^4.3.4" }, "engines": { @@ -2786,12 +2794,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.44.1.tgz", + "integrity": "sha512-NdhWHgmynpSvyhchGLXh+w12OMT308Gm25JoRIyTZqEbApiBiQHD/8xgb6LqCWCFcxFtWwaVdFsLPQI3jvhywg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.44.0", - "@typescript-eslint/visitor-keys": "8.44.0" + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/visitor-keys": "8.44.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2802,7 +2812,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.44.1.tgz", + "integrity": "sha512-B5OyACouEjuIvof3o86lRMvyDsFwZm+4fBOqFHccIctYgBjqR3qT39FBYGN87khcgf0ExpdCBeGKpKRhSFTjKQ==", "dev": true, "license": "MIT", "engines": { @@ -2817,13 +2829,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.44.1.tgz", + "integrity": "sha512-KdEerZqHWXsRNKjF9NYswNISnFzXfXNDfPxoTh7tqohU/PRIbwTmsjGK6V9/RTYWau7NZvfo52lgVk+sJh0K3g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.44.0", - "@typescript-eslint/typescript-estree": "8.44.0", - "@typescript-eslint/utils": "8.44.0", + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/typescript-estree": "8.44.1", + "@typescript-eslint/utils": "8.44.1", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, @@ -2840,7 +2854,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.44.1.tgz", + "integrity": "sha512-Lk7uj7y9uQUOEguiDIDLYLJOrYHQa7oBiURYVFqIpGxclAFQ78f6VUOM8lI2XEuNOKNB7XuvM2+2cMXAoq4ALQ==", "dev": true, "license": "MIT", "engines": { @@ -2852,14 +2868,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.44.1.tgz", + "integrity": "sha512-qnQJ+mVa7szevdEyvfItbO5Vo+GfZ4/GZWWDRRLjrxYPkhM+6zYB2vRYwCsoJLzqFCdZT4mEqyJoyzkunsZ96A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.44.0", - "@typescript-eslint/tsconfig-utils": "8.44.0", - "@typescript-eslint/types": "8.44.0", - "@typescript-eslint/visitor-keys": "8.44.0", + "@typescript-eslint/project-service": "8.44.1", + "@typescript-eslint/tsconfig-utils": "8.44.1", + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/visitor-keys": "8.44.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -2880,6 +2898,8 @@ }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2888,6 +2908,8 @@ }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", "dependencies": { @@ -2902,6 +2924,8 @@ }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "dev": true, "license": "ISC", "bin": { @@ -2912,14 +2936,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.44.1.tgz", + "integrity": "sha512-DpX5Fp6edTlocMCwA+mHY8Mra+pPjRZ0TfHkXI8QFelIKcbADQz1LUPNtzOFUriBB2UYqw4Pi9+xV4w9ZczHFg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.44.0", - "@typescript-eslint/types": "8.44.0", - "@typescript-eslint/typescript-estree": "8.44.0" + "@typescript-eslint/scope-manager": "8.44.1", + "@typescript-eslint/types": "8.44.1", + "@typescript-eslint/typescript-estree": "8.44.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2934,11 +2960,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.44.0", + "version": "8.44.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.44.1.tgz", + "integrity": "sha512-576+u0QD+Jp3tZzvfRfxon0EA2lzcDt3lhUbsC6Lgzy9x2VR4E+JUiNyGHi5T8vk0TV+fpJ5GLG1JsJuWCaKhw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.44.0", + "@typescript-eslint/types": "8.44.1", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -2951,6 +2979,8 @@ }, "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -8917,6 +8947,8 @@ }, "node_modules/ts-api-utils": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, "license": "MIT", "engines": { diff --git a/package.json b/package.json index 69d6efe..1887036 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "@makerx/graphql-apollo-server", - "version": "1.6.0", + "version": "1.7.0", "private": false, "description": "A set of MakerX plugins for Apollo Server", "author": "MakerX", "license": "MIT", "type": "module", "engines": { - "node": ">=18.0" + "node": ">=22.0" }, "bugs": { "url": "https://github.com/MakerXStudio/graphql-apollo-server/issues" @@ -56,11 +56,11 @@ "@makerx/ts-toolkit": "4.0.0-beta.24", "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-typescript": "^12.1.4", - "@tsconfig/node20": "^20.1.6", + "@tsconfig/node22": "^22.0.2", "@types/lodash.omit": "^4.5.9", "@types/node": "24.5.2", - "@typescript-eslint/eslint-plugin": "^8.44.0", - "@typescript-eslint/parser": "^8.44.0", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", "@vitest/coverage-v8": "3.2.4", "better-npm-audit": "^3.11.0", "copyfiles": "^2.4.1", diff --git a/tsconfig.json b/tsconfig.json index 332a105..10e272b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@tsconfig/node20/tsconfig.json", + "extends": "@tsconfig/node22/tsconfig.json", "compilerOptions": { "noEmit": true, "target": "ES2020", From 85d30f90bf73bb7b076ba6e1e0d139bc0df561c8 Mon Sep 17 00:00:00 2001 From: Wade Baglin Date: Tue, 23 Sep 2025 10:09:17 +1000 Subject: [PATCH 2/4] Align with graphql core --- src/plugins/graphql-operation-logging-plugin.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/graphql-operation-logging-plugin.ts b/src/plugins/graphql-operation-logging-plugin.ts index 8290892..4adffe7 100644 --- a/src/plugins/graphql-operation-logging-plugin.ts +++ b/src/plugins/graphql-operation-logging-plugin.ts @@ -54,7 +54,7 @@ export interface GraphQLOperationLoggingPluginOptions TLogger + resolveLogger?: (context: TContext) => TLogger } /** @@ -72,7 +72,7 @@ export function graphqlOperationLoggingPlugin = {}): ApolloServerPlugin { return { contextCreationDidFail: async ({ error }) => { From 2037aff8e15155bd609fd7bcc8584edd762ab5e6 Mon Sep 17 00:00:00 2001 From: Wade Baglin Date: Tue, 23 Sep 2025 10:21:27 +1000 Subject: [PATCH 3/4] Change node support to 20 --- package-lock.json | 12 ++++++------ package.json | 4 ++-- tsconfig.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 58c3bba..b83b993 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "@makerx/ts-toolkit": "4.0.0-beta.24", "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-typescript": "^12.1.4", - "@tsconfig/node22": "^22.0.2", + "@tsconfig/node20": "^20.1.6", "@types/lodash.omit": "^4.5.9", "@types/node": "24.5.2", "@typescript-eslint/eslint-plugin": "^8.44.1", @@ -45,7 +45,7 @@ "vitest": "3.2.4" }, "engines": { - "node": ">=22.0" + "node": ">=20.0" }, "optionalDependencies": { "@rollup/rollup-linux-x64-gnu": "^4.26.0" @@ -2547,10 +2547,10 @@ "linux" ] }, - "node_modules/@tsconfig/node22": { - "version": "22.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node22/-/node22-22.0.2.tgz", - "integrity": "sha512-Kmwj4u8sDRDrMYRoN9FDEcXD8UpBSaPQQ24Gz+Gamqfm7xxn+GBR7ge/Z7pK8OXNGyUzbSwJj+TH6B+DS/epyA==", + "node_modules/@tsconfig/node20": { + "version": "20.1.6", + "resolved": "https://registry.npmjs.org/@tsconfig/node20/-/node20-20.1.6.tgz", + "integrity": "sha512-sz+Hqx9zwZDpZIV871WSbUzSqNIsXzghZydypnfgzPKLltVJfkINfUeTct31n/tTSa9ZE1ZOfKdRre1uHHquYQ==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index 1887036..0c31f29 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "MIT", "type": "module", "engines": { - "node": ">=22.0" + "node": ">=20.0" }, "bugs": { "url": "https://github.com/MakerXStudio/graphql-apollo-server/issues" @@ -56,7 +56,7 @@ "@makerx/ts-toolkit": "4.0.0-beta.24", "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-typescript": "^12.1.4", - "@tsconfig/node22": "^22.0.2", + "@tsconfig/node20": "^20.1.6", "@types/lodash.omit": "^4.5.9", "@types/node": "24.5.2", "@typescript-eslint/eslint-plugin": "^8.44.1", diff --git a/tsconfig.json b/tsconfig.json index 10e272b..332a105 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@tsconfig/node22/tsconfig.json", + "extends": "@tsconfig/node20/tsconfig.json", "compilerOptions": { "noEmit": true, "target": "ES2020", From 8de7df5dc8afb0ceb0d69eeaa39bd4d5e5887be5 Mon Sep 17 00:00:00 2001 From: Wade Baglin Date: Tue, 23 Sep 2025 10:34:49 +1000 Subject: [PATCH 4/4] Change node support to 20 --- package-lock.json | 16 ++++++++-------- package.json | 2 +- src/plugins/graphql-operation-logging-plugin.ts | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index b83b993..d80ef35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@rollup/plugin-typescript": "^12.1.4", "@tsconfig/node20": "^20.1.6", "@types/lodash.omit": "^4.5.9", - "@types/node": "24.5.2", + "@types/node": "20.19.17", "@typescript-eslint/eslint-plugin": "^8.44.1", "@typescript-eslint/parser": "^8.44.1", "@vitest/coverage-v8": "3.2.4", @@ -2644,12 +2644,12 @@ "peer": true }, "node_modules/@types/node": { - "version": "24.5.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz", - "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==", + "version": "20.19.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.17.tgz", + "integrity": "sha512-gfehUI8N1z92kygssiuWvLiwcbOB3IRktR6hTDgJlXMYh5OvkPSRmgfoBUmfZt+vhwJtX7v1Yw4KvvAf7c5QKQ==", "license": "MIT", "dependencies": { - "undici-types": "~7.12.0" + "undici-types": "~6.21.0" } }, "node_modules/@types/node-fetch": { @@ -9140,9 +9140,9 @@ } }, "node_modules/undici-types": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz", - "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "license": "MIT" }, "node_modules/unixify": { diff --git a/package.json b/package.json index 0c31f29..ed1ccfb 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@rollup/plugin-typescript": "^12.1.4", "@tsconfig/node20": "^20.1.6", "@types/lodash.omit": "^4.5.9", - "@types/node": "24.5.2", + "@types/node": "20.19.17", "@typescript-eslint/eslint-plugin": "^8.44.1", "@typescript-eslint/parser": "^8.44.1", "@vitest/coverage-v8": "3.2.4", diff --git a/src/plugins/graphql-operation-logging-plugin.ts b/src/plugins/graphql-operation-logging-plugin.ts index 4adffe7..8492f49 100644 --- a/src/plugins/graphql-operation-logging-plugin.ts +++ b/src/plugins/graphql-operation-logging-plugin.ts @@ -52,7 +52,7 @@ export interface GraphQLOperationLoggingPluginOptions Record /** - * Can be used to resolve a custom logger for the plugin + * Can be used to resolve a logger for the plugin */ resolveLogger?: (context: TContext) => TLogger }