diff --git a/examples/neo-place/package.json b/examples/neo-place/package.json index 688f105480..686f9032a6 100644 --- a/examples/neo-place/package.json +++ b/examples/neo-place/package.json @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/neo4j/graphql#readme", "dependencies": { - "@apollo/server": "^4.7.0", + "@apollo/server": "^5.0.0", "@neo4j/graphql": "^5.4.0", "@neo4j/graphql-amqp-subscriptions-engine": "^2.0.0", "@urql/core": "^6.0.0", diff --git a/examples/neo-place/server.js b/examples/neo-place/server.js index 2474348bed..5aa47c4614 100644 --- a/examples/neo-place/server.js +++ b/examples/neo-place/server.js @@ -9,7 +9,7 @@ const express = require("express"); const cors = require("cors"); const { ApolloServer } = require("@apollo/server"); const { ApolloServerPluginDrainHttpServer } = require("@apollo/server/plugin/drainHttpServer"); -const { expressMiddleware } = require("@apollo/server/express4"); +const { expressMiddleware } = require("@as-integrations/express4"); const setupMap = require("./map-setup"); const { getDriver } = require("./get-driver"); const { createEngine } = require("./create-engine"); diff --git a/examples/subscriptions/apollo_rabbitmq/package.json b/examples/subscriptions/apollo_rabbitmq/package.json index 25b878f2d3..09da4a39bb 100644 --- a/examples/subscriptions/apollo_rabbitmq/package.json +++ b/examples/subscriptions/apollo_rabbitmq/package.json @@ -11,7 +11,7 @@ "author": "", "license": "MIT", "dependencies": { - "@apollo/server": "^4.7.0", + "@apollo/server": "^5.0.0", "@neo4j/graphql": "^5.0.0", "@neo4j/graphql-amqp-subscriptions-engine": "^2.0.0", "amqplib": "^0.10.3", diff --git a/examples/subscriptions/apollo_rabbitmq/server.js b/examples/subscriptions/apollo_rabbitmq/server.js index bbc0160a44..fa1686e648 100644 --- a/examples/subscriptions/apollo_rabbitmq/server.js +++ b/examples/subscriptions/apollo_rabbitmq/server.js @@ -26,7 +26,7 @@ const { WebSocketServer } = require("ws"); const { useServer } = require("graphql-ws/lib/use/ws"); const express = require("express"); const { ApolloServer } = require("@apollo/server"); -const { expressMiddleware } = require("@apollo/server/express4"); +const { expressMiddleware } = require("@as-integrations/express4"); const { ApolloServerPluginDrainHttpServer } = require("@apollo/server/plugin/drainHttpServer"); const { Neo4jGraphQLAMQPSubscriptionsEngine } = require("@neo4j/graphql-amqp-subscriptions-engine"); diff --git a/packages/apollo-federation-subgraph-compatibility/package.json b/packages/apollo-federation-subgraph-compatibility/package.json index ec721891b0..9a3c9075da 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": "^5.12.8", "graphql": "16.11.0", diff --git a/packages/graphql-amqp-subscriptions-engine/package.json b/packages/graphql-amqp-subscriptions-engine/package.json index edd8086eee..0a3124c029 100644 --- a/packages/graphql-amqp-subscriptions-engine/package.json +++ b/packages/graphql-amqp-subscriptions-engine/package.json @@ -33,7 +33,7 @@ }, "author": "Neo4j Inc.", "devDependencies": { - "@apollo/server": "4.12.2", + "@apollo/server": "5.0.0", "@neo4j/graphql": "^5.0.0", "@types/amqplib": "0.10.7", "@types/body-parser": "1.19.6", diff --git a/packages/graphql-amqp-subscriptions-engine/tests/e2e/setup/apollo-server.ts b/packages/graphql-amqp-subscriptions-engine/tests/e2e/setup/apollo-server.ts index 0b11f7869e..ab0f6f0fc0 100644 --- a/packages/graphql-amqp-subscriptions-engine/tests/e2e/setup/apollo-server.ts +++ b/packages/graphql-amqp-subscriptions-engine/tests/e2e/setup/apollo-server.ts @@ -18,8 +18,8 @@ */ import { ApolloServer } from "@apollo/server"; -import { expressMiddleware } from "@apollo/server/express4"; import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer"; +import { expressMiddleware } from "@as-integrations/express4"; import type { Neo4jGraphQL } from "@neo4j/graphql"; import bodyParser from "body-parser"; import cors from "cors"; diff --git a/packages/graphql/package.json b/packages/graphql/package.json index ae62d177f5..225eb6adb9 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": "29.5.14", @@ -75,6 +75,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 26deb5ede7..7aa2338eda 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/packages/package-tests/apollo/package.json b/packages/package-tests/apollo/package.json index 52187a7dd6..c1508fc4f0 100644 --- a/packages/package-tests/apollo/package.json +++ b/packages/package-tests/apollo/package.json @@ -12,7 +12,7 @@ "author": "Neo4j Inc.", "dependencies": { "@neo4j/graphql": "file:./package", - "@apollo/server": "^4.7.0", + "@apollo/server": "^5.0.0", "cross-fetch": "^4.0.0", "graphql": "^16.6.0", "neo4j-driver": "^5.8.0" diff --git a/yarn.lock b/yarn.lock index 24c6e7d4ab..a23d3937ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -240,7 +240,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: @@ -305,6 +349,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" @@ -321,6 +375,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" @@ -328,6 +389,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" @@ -338,6 +406,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" @@ -345,6 +423,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" @@ -406,6 +491,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 + "@ardatan/relay-compiler@npm:^12.0.3": version: 12.0.3 resolution: "@ardatan/relay-compiler@npm:12.0.3" @@ -428,6 +520,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" @@ -2593,7 +2695,7 @@ __metadata: version: 0.0.0-use.local resolution: "@neo4j/graphql-amqp-subscriptions-engine@workspace:packages/graphql-amqp-subscriptions-engine" dependencies: - "@apollo/server": "npm:4.12.2" + "@apollo/server": "npm:5.0.0" "@neo4j/graphql": "npm:^5.0.0" "@types/amqplib": "npm:0.10.7" "@types/body-parser": "npm:1.19.6" @@ -2656,8 +2758,9 @@ __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" + "@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" @@ -5771,7 +5874,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:^5.12.8" fork-ts-checker-webpack-plugin: "npm:9.1.0" @@ -5789,7 +5892,7 @@ __metadata: version: 0.0.0-use.local resolution: "apollo-subscriptions-server@workspace:examples/subscriptions/apollo_rabbitmq" dependencies: - "@apollo/server": "npm:^4.7.0" + "@apollo/server": "npm:^5.0.0" "@neo4j/graphql": "npm:^5.0.0" "@neo4j/graphql-amqp-subscriptions-engine": "npm:^2.0.0" amqplib: "npm:^0.10.3" @@ -13541,7 +13644,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 @@ -14628,7 +14731,7 @@ __metadata: version: 0.0.0-use.local resolution: "neo-place@workspace:examples/neo-place" dependencies: - "@apollo/server": "npm:^4.7.0" + "@apollo/server": "npm:^5.0.0" "@neo4j/graphql": "npm:^5.4.0" "@neo4j/graphql-amqp-subscriptions-engine": "npm:^2.0.0" "@urql/core": "npm:^6.0.0" @@ -19261,6 +19364,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" @@ -19492,6 +19604,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"