From 32957ea58dcbd6013fb951f5f2858c57d543357e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 22:44:54 +0000 Subject: [PATCH 1/2] fix(deps): update dependency @apollo/server to v5 --- .../package.json | 2 +- packages/graphql/package.json | 2 +- yarn.lock | 169 +++++++++++++++++- 3 files changed, 162 insertions(+), 11 deletions(-) diff --git a/packages/apollo-federation-subgraph-compatibility/package.json b/packages/apollo-federation-subgraph-compatibility/package.json index 8a9ea8459d..d36dc83828 100644 --- a/packages/apollo-federation-subgraph-compatibility/package.json +++ b/packages/apollo-federation-subgraph-compatibility/package.json @@ -8,7 +8,7 @@ "test:pm2": "yarn build && fedtest pm2 --endpoint http://localhost:4001 --config subgraph.config.js" }, "dependencies": { - "@apollo/server": "^4.7.0", + "@apollo/server": "^5.0.0", "@graphql-tools/wrap": "^10.0.0", "@neo4j/graphql": "^7.2.9", "graphql": "16.11.0", diff --git a/packages/graphql/package.json b/packages/graphql/package.json index 76a41ecd63..3d2fd0c0c5 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -42,7 +42,7 @@ "author": "Neo4j Inc.", "devDependencies": { "@apollo/gateway": "2.11.2", - "@apollo/server": "4.12.2", + "@apollo/server": "5.0.0", "@types/deep-equal": "1.0.4", "@types/is-uuid": "1.0.2", "@types/jest": "30.0.0", diff --git a/yarn.lock b/yarn.lock index adf7c4faf2..3472fee3c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -228,7 +228,51 @@ __metadata: languageName: node linkType: hard -"@apollo/server@npm:4.12.2, @apollo/server@npm:^4.7.0": +"@apollo/server-gateway-interface@npm:^2.0.0": + version: 2.0.0 + resolution: "@apollo/server-gateway-interface@npm:2.0.0" + dependencies: + "@apollo/usage-reporting-protobuf": "npm:^4.1.1" + "@apollo/utils.fetcher": "npm:^3.0.0" + "@apollo/utils.keyvaluecache": "npm:^4.0.0" + "@apollo/utils.logger": "npm:^3.0.0" + peerDependencies: + graphql: 14.x || 15.x || 16.x + checksum: 10c0/75a00aa16a32d9d7f84f303b0aa74a990c236ec484f4fe3a0cf26177d8fa00dbc8b09f3a8143bb3bfc00d87287ae6c74684ac403c20ec350724e88a23325e5bd + languageName: node + linkType: hard + +"@apollo/server@npm:5.0.0, @apollo/server@npm:^5.0.0": + version: 5.0.0 + resolution: "@apollo/server@npm:5.0.0" + dependencies: + "@apollo/cache-control-types": "npm:^1.0.3" + "@apollo/server-gateway-interface": "npm:^2.0.0" + "@apollo/usage-reporting-protobuf": "npm:^4.1.1" + "@apollo/utils.createhash": "npm:^3.0.0" + "@apollo/utils.fetcher": "npm:^3.0.0" + "@apollo/utils.isnodelike": "npm:^3.0.0" + "@apollo/utils.keyvaluecache": "npm:^4.0.0" + "@apollo/utils.logger": "npm:^3.0.0" + "@apollo/utils.usagereporting": "npm:^2.1.0" + "@apollo/utils.withrequired": "npm:^3.0.0" + "@graphql-tools/schema": "npm:^10.0.0" + async-retry: "npm:^1.2.1" + body-parser: "npm:^2.2.0" + cors: "npm:^2.8.5" + finalhandler: "npm:^2.1.0" + loglevel: "npm:^1.6.8" + lru-cache: "npm:^11.1.0" + negotiator: "npm:^1.0.0" + uuid: "npm:^11.1.0" + whatwg-mimetype: "npm:^4.0.0" + peerDependencies: + graphql: ^16.11.0 + checksum: 10c0/1eec9917c9d0271397688e08044b584022cf71c2d98d66639739dc7154a54d00d96ed05d871b4623b82c596817335a5ae00c7197776ed3a142a77d00cca66d3b + languageName: node + linkType: hard + +"@apollo/server@npm:^4.7.0": version: 4.12.2 resolution: "@apollo/server@npm:4.12.2" dependencies: @@ -293,6 +337,16 @@ __metadata: languageName: node linkType: hard +"@apollo/utils.createhash@npm:^3.0.0": + version: 3.0.1 + resolution: "@apollo/utils.createhash@npm:3.0.1" + dependencies: + "@apollo/utils.isnodelike": "npm:^3.0.0" + sha.js: "npm:^2.4.11" + checksum: 10c0/b826ea1208bd350353fa870bdcec2caf56731a61ddab8a05ae29f057912e5f46a28dc2fc2b28827b50b531e1684b5eb065fca4e7ef2a73a53ac17da4fcdcff75 + languageName: node + linkType: hard + "@apollo/utils.dropunuseddefinitions@npm:^2.0.1": version: 2.0.1 resolution: "@apollo/utils.dropunuseddefinitions@npm:2.0.1" @@ -309,6 +363,13 @@ __metadata: languageName: node linkType: hard +"@apollo/utils.fetcher@npm:^3.0.0": + version: 3.1.0 + resolution: "@apollo/utils.fetcher@npm:3.1.0" + checksum: 10c0/5afef2015cce6a372b1309399ce884a325cb0fb548e80779a52916b039de3076a39d38a037ad1075588eb79ea9c41338990c27a5cbe40306e067ed4997aaff62 + languageName: node + linkType: hard + "@apollo/utils.isnodelike@npm:^2.0.0, @apollo/utils.isnodelike@npm:^2.0.1": version: 2.0.1 resolution: "@apollo/utils.isnodelike@npm:2.0.1" @@ -316,6 +377,13 @@ __metadata: languageName: node linkType: hard +"@apollo/utils.isnodelike@npm:^3.0.0": + version: 3.0.0 + resolution: "@apollo/utils.isnodelike@npm:3.0.0" + checksum: 10c0/d1e1acb3f3454a6b0043ad020c0e96ad6dd22a547e8232ab1f0da81e08bb8cde5d6d9612c9da38a9525f199ea089a298ae8d8f0f84f1aa1c630853a6b252af32 + languageName: node + linkType: hard + "@apollo/utils.keyvaluecache@npm:^2.1.0": version: 2.1.1 resolution: "@apollo/utils.keyvaluecache@npm:2.1.1" @@ -326,6 +394,16 @@ __metadata: languageName: node linkType: hard +"@apollo/utils.keyvaluecache@npm:^4.0.0": + version: 4.0.0 + resolution: "@apollo/utils.keyvaluecache@npm:4.0.0" + dependencies: + "@apollo/utils.logger": "npm:^3.0.0" + lru-cache: "npm:^11.0.0" + checksum: 10c0/0e051a5672a6043723c98be66b90e0672f020e45938c85a364c4d98d23a252495a6beef0792f700283cf45e3034cc5b11e63740e973431bc42b57cf6b229b4b5 + languageName: node + linkType: hard + "@apollo/utils.logger@npm:^2.0.0, @apollo/utils.logger@npm:^2.0.1": version: 2.0.1 resolution: "@apollo/utils.logger@npm:2.0.1" @@ -333,6 +411,13 @@ __metadata: languageName: node linkType: hard +"@apollo/utils.logger@npm:^3.0.0": + version: 3.0.0 + resolution: "@apollo/utils.logger@npm:3.0.0" + checksum: 10c0/728336edaeba310ca9ffc63d58b8dde53357d094ea764e895881d1d90e11b51cd53732d77ed3bfe256ba1943996f1613f069112be9f319dc7503500ffed21be6 + languageName: node + linkType: hard + "@apollo/utils.printwithreducedwhitespace@npm:^2.0.1": version: 2.0.1 resolution: "@apollo/utils.printwithreducedwhitespace@npm:2.0.1" @@ -394,6 +479,13 @@ __metadata: languageName: node linkType: hard +"@apollo/utils.withrequired@npm:^3.0.0": + version: 3.0.0 + resolution: "@apollo/utils.withrequired@npm:3.0.0" + checksum: 10c0/49829534ba710aca9b0136eec6a31527135d965941686fae3a11dda93f2128f4cebdaa166a9a46e2d6033fda56de03fccaf6bdb5d07b3a1fddcdddaacecc36f4 + languageName: node + linkType: hard + "@assemblyscript/loader@npm:^0.19.21": version: 0.19.23 resolution: "@assemblyscript/loader@npm:0.19.23" @@ -2646,7 +2738,7 @@ __metadata: resolution: "@neo4j/graphql@workspace:packages/graphql" dependencies: "@apollo/gateway": "npm:2.11.2" - "@apollo/server": "npm:4.12.2" + "@apollo/server": "npm:5.0.0" "@apollo/subgraph": "npm:^2.2.3" "@graphql-tools/merge": "npm:^9.0.0" "@graphql-tools/resolvers-composition": "npm:^7.0.0" @@ -4610,7 +4702,7 @@ __metadata: resolution: "apollo-federation-subgraph-compatibility@workspace:packages/apollo-federation-subgraph-compatibility" dependencies: "@apollo/federation-subgraph-compatibility": "npm:2.2.1" - "@apollo/server": "npm:^4.7.0" + "@apollo/server": "npm:^5.0.0" "@graphql-tools/wrap": "npm:^10.0.0" "@neo4j/graphql": "npm:^7.2.9" fork-ts-checker-webpack-plugin: "npm:9.1.0" @@ -5218,6 +5310,23 @@ __metadata: languageName: node linkType: hard +"body-parser@npm:^2.2.0": + version: 2.2.0 + resolution: "body-parser@npm:2.2.0" + dependencies: + bytes: "npm:^3.1.2" + content-type: "npm:^1.0.5" + debug: "npm:^4.4.0" + http-errors: "npm:^2.0.0" + iconv-lite: "npm:^0.6.3" + on-finished: "npm:^2.4.1" + qs: "npm:^6.14.0" + raw-body: "npm:^3.0.0" + type-is: "npm:^2.0.0" + checksum: 10c0/a9ded39e71ac9668e2211afa72e82ff86cc5ef94de1250b7d1ba9cc299e4150408aaa5f1e8b03dd4578472a3ce6d1caa2a23b27a6c18e526e48b4595174c116c + languageName: node + linkType: hard + "boxen@npm:^5.0.0": version: 5.1.2 resolution: "boxen@npm:5.1.2" @@ -5554,7 +5663,7 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.2": +"bytes@npm:3.1.2, bytes@npm:^3.1.2": version: 3.1.2 resolution: "bytes@npm:3.1.2" checksum: 10c0/76d1c43cbd602794ad8ad2ae94095cddeb1de78c5dddaa7005c51af10b0176c69971a6d88e805a90c2b6550d76636e43c40d8427a808b8645ede885de4a0358e @@ -6915,7 +7024,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.7, debug@npm:^4.4.1": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.7, debug@npm:^4.4.0, debug@npm:^4.4.1": version: 4.4.1 resolution: "debug@npm:4.4.1" dependencies: @@ -8716,6 +8825,20 @@ __metadata: languageName: node linkType: hard +"finalhandler@npm:^2.1.0": + version: 2.1.0 + resolution: "finalhandler@npm:2.1.0" + dependencies: + debug: "npm:^4.4.0" + encodeurl: "npm:^2.0.0" + escape-html: "npm:^1.0.3" + on-finished: "npm:^2.4.1" + parseurl: "npm:^1.3.3" + statuses: "npm:^2.0.1" + checksum: 10c0/da0bbca6d03873472ee890564eb2183f4ed377f25f3628a0fc9d16dac40bed7b150a0d82ebb77356e4c6d97d2796ad2dba22948b951dddee2c8768b0d1b9fb1f + languageName: node + linkType: hard + "find-my-way@npm:^8.0.0": version: 8.2.2 resolution: "find-my-way@npm:8.2.2" @@ -9919,7 +10042,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": +"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" dependencies: @@ -12426,7 +12549,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^11.0.0": +"lru-cache@npm:^11.0.0, lru-cache@npm:^11.1.0": version: 11.1.0 resolution: "lru-cache@npm:11.1.0" checksum: 10c0/85c312f7113f65fae6a62de7985348649937eb34fb3d212811acbf6704dc322a421788aca253b62838f1f07049a84cc513d88f494e373d3756514ad263670a64 @@ -14904,7 +15027,7 @@ __metadata: languageName: node linkType: hard -"qs@npm:^6.11.2, qs@npm:^6.12.3": +"qs@npm:^6.11.2, qs@npm:^6.12.3, qs@npm:^6.14.0": version: 6.14.0 resolution: "qs@npm:6.14.0" dependencies: @@ -15024,6 +15147,18 @@ __metadata: languageName: node linkType: hard +"raw-body@npm:^3.0.0": + version: 3.0.0 + resolution: "raw-body@npm:3.0.0" + dependencies: + bytes: "npm:3.1.2" + http-errors: "npm:2.0.0" + iconv-lite: "npm:0.6.3" + unpipe: "npm:1.0.0" + checksum: 10c0/f8daf4b724064a4811d118745a781ca0fb4676298b8adadfd6591155549cfea0a067523cf7dd3baeb1265fecc9ce5dfb2fc788c12c66b85202a336593ece0f87 + languageName: node + linkType: hard + "rc@npm:1.2.8, rc@npm:^1.2.8": version: 1.2.8 resolution: "rc@npm:1.2.8" @@ -17285,7 +17420,7 @@ __metadata: languageName: node linkType: hard -"type-is@npm:^2.0.1": +"type-is@npm:^2.0.0, type-is@npm:^2.0.1": version: 2.0.1 resolution: "type-is@npm:2.0.1" dependencies: @@ -17759,6 +17894,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^11.1.0": + version: 11.1.0 + resolution: "uuid@npm:11.1.0" + bin: + uuid: dist/esm/bin/uuid + checksum: 10c0/34aa51b9874ae398c2b799c88a127701408cd581ee89ec3baa53509dd8728cbb25826f2a038f9465f8b7be446f0fbf11558862965b18d21c993684297628d4d3 + languageName: node + linkType: hard + "uuid@npm:^3.3.2": version: 3.4.0 resolution: "uuid@npm:3.4.0" @@ -17983,6 +18127,13 @@ __metadata: languageName: node linkType: hard +"whatwg-mimetype@npm:^4.0.0": + version: 4.0.0 + resolution: "whatwg-mimetype@npm:4.0.0" + checksum: 10c0/a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df + languageName: node + linkType: hard + "whatwg-url@npm:^5.0.0": version: 5.0.0 resolution: "whatwg-url@npm:5.0.0" From 1705f97ebdcc1c47ac00600a31e51f72ac42d699 Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Wed, 20 Aug 2025 07:00:53 +0200 Subject: [PATCH 2/2] feat: use as-integrations/express4 --- packages/graphql/package.json | 1 + packages/graphql/tests/e2e/setup/apollo-server.ts | 4 ++-- yarn.lock | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/graphql/package.json b/packages/graphql/package.json index 3d2fd0c0c5..2afbf87e3d 100644 --- a/packages/graphql/package.json +++ b/packages/graphql/package.json @@ -76,6 +76,7 @@ }, "dependencies": { "@apollo/subgraph": "^2.2.3", + "@as-integrations/express4": "^1.1.2", "@graphql-tools/merge": "^9.0.0", "@graphql-tools/resolvers-composition": "^7.0.0", "@graphql-tools/schema": "^10.0.0", diff --git a/packages/graphql/tests/e2e/setup/apollo-server.ts b/packages/graphql/tests/e2e/setup/apollo-server.ts index 3d29cc142d..723aa993cb 100644 --- a/packages/graphql/tests/e2e/setup/apollo-server.ts +++ b/packages/graphql/tests/e2e/setup/apollo-server.ts @@ -18,9 +18,9 @@ */ import { ApolloServer } from "@apollo/server"; -import type { ExpressMiddlewareOptions } from "@apollo/server/express4"; -import { expressMiddleware } from "@apollo/server/express4"; import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer"; +import type { ExpressMiddlewareOptions } from "@as-integrations/express4"; +import { expressMiddleware } from "@as-integrations/express4"; import bodyParser from "body-parser"; import cors from "cors"; import express from "express"; diff --git a/yarn.lock b/yarn.lock index 3472fee3c5..1d64c507ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -486,6 +486,16 @@ __metadata: languageName: node linkType: hard +"@as-integrations/express4@npm:^1.1.2": + version: 1.1.2 + resolution: "@as-integrations/express4@npm:1.1.2" + peerDependencies: + "@apollo/server": ^4.0.0 || ^5.0.0 + express: ^4.0.0 + checksum: 10c0/6934b4b878f71894f85dc0003eb404a4b701468693bf6cf686b4adf56709532f75f118b63abccc5daaf5ba3e961e541430664e21b9bfb84d7a28e6e248052e92 + languageName: node + linkType: hard + "@assemblyscript/loader@npm:^0.19.21": version: 0.19.23 resolution: "@assemblyscript/loader@npm:0.19.23" @@ -2740,6 +2750,7 @@ __metadata: "@apollo/gateway": "npm:2.11.2" "@apollo/server": "npm:5.0.0" "@apollo/subgraph": "npm:^2.2.3" + "@as-integrations/express4": "npm:^1.1.2" "@graphql-tools/merge": "npm:^9.0.0" "@graphql-tools/resolvers-composition": "npm:^7.0.0" "@graphql-tools/schema": "npm:^10.0.0"