Skip to content

Commit d22f27c

Browse files
authored
Merge pull request #6501 from neo4j/renovate/lts-apollo-server-5.x
fix(deps): update dependency @apollo/server to v5 (lts)
2 parents ca3118f + 53e0abd commit d22f27c

File tree

11 files changed

+138
-18
lines changed

11 files changed

+138
-18
lines changed

examples/neo-place/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
"homepage": "https://github.com/neo4j/graphql#readme",
3737
"dependencies": {
38-
"@apollo/server": "^4.7.0",
38+
"@apollo/server": "^5.0.0",
3939
"@neo4j/graphql": "^5.4.0",
4040
"@neo4j/graphql-amqp-subscriptions-engine": "^2.0.0",
4141
"@urql/core": "^6.0.0",

examples/neo-place/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const express = require("express");
99
const cors = require("cors");
1010
const { ApolloServer } = require("@apollo/server");
1111
const { ApolloServerPluginDrainHttpServer } = require("@apollo/server/plugin/drainHttpServer");
12-
const { expressMiddleware } = require("@apollo/server/express4");
12+
const { expressMiddleware } = require("@as-integrations/express4");
1313
const setupMap = require("./map-setup");
1414
const { getDriver } = require("./get-driver");
1515
const { createEngine } = require("./create-engine");

examples/subscriptions/apollo_rabbitmq/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "",
1212
"license": "MIT",
1313
"dependencies": {
14-
"@apollo/server": "^4.7.0",
14+
"@apollo/server": "^5.0.0",
1515
"@neo4j/graphql": "^5.0.0",
1616
"@neo4j/graphql-amqp-subscriptions-engine": "^2.0.0",
1717
"amqplib": "^0.10.3",

examples/subscriptions/apollo_rabbitmq/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const { WebSocketServer } = require("ws");
2626
const { useServer } = require("graphql-ws/lib/use/ws");
2727
const express = require("express");
2828
const { ApolloServer } = require("@apollo/server");
29-
const { expressMiddleware } = require("@apollo/server/express4");
29+
const { expressMiddleware } = require("@as-integrations/express4");
3030
const { ApolloServerPluginDrainHttpServer } = require("@apollo/server/plugin/drainHttpServer");
3131
const { Neo4jGraphQLAMQPSubscriptionsEngine } = require("@neo4j/graphql-amqp-subscriptions-engine");
3232

packages/apollo-federation-subgraph-compatibility/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test:pm2": "yarn build && fedtest pm2 --endpoint http://localhost:4001 --config subgraph.config.js"
99
},
1010
"dependencies": {
11-
"@apollo/server": "^4.7.0",
11+
"@apollo/server": "^5.0.0",
1212
"@graphql-tools/wrap": "^10.0.0",
1313
"@neo4j/graphql": "^5.12.8",
1414
"graphql": "16.11.0",

packages/graphql-amqp-subscriptions-engine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
},
3434
"author": "Neo4j Inc.",
3535
"devDependencies": {
36-
"@apollo/server": "4.12.2",
36+
"@apollo/server": "5.0.0",
3737
"@neo4j/graphql": "^5.0.0",
3838
"@types/amqplib": "0.10.7",
3939
"@types/body-parser": "1.19.6",

packages/graphql-amqp-subscriptions-engine/tests/e2e/setup/apollo-server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919

2020
import { ApolloServer } from "@apollo/server";
21-
import { expressMiddleware } from "@apollo/server/express4";
2221
import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer";
22+
import { expressMiddleware } from "@as-integrations/express4";
2323
import type { Neo4jGraphQL } from "@neo4j/graphql";
2424
import bodyParser from "body-parser";
2525
import cors from "cors";

packages/graphql/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"author": "Neo4j Inc.",
4343
"devDependencies": {
4444
"@apollo/gateway": "2.11.2",
45-
"@apollo/server": "4.12.2",
45+
"@apollo/server": "5.0.0",
4646
"@types/deep-equal": "1.0.4",
4747
"@types/is-uuid": "1.0.2",
4848
"@types/jest": "29.5.14",
@@ -75,6 +75,7 @@
7575
},
7676
"dependencies": {
7777
"@apollo/subgraph": "^2.2.3",
78+
"@as-integrations/express4": "^1.1.2",
7879
"@graphql-tools/merge": "^9.0.0",
7980
"@graphql-tools/resolvers-composition": "^7.0.0",
8081
"@graphql-tools/schema": "^10.0.0",

packages/graphql/tests/e2e/setup/apollo-server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919

2020
import { ApolloServer } from "@apollo/server";
21-
import type { ExpressMiddlewareOptions } from "@apollo/server/express4";
22-
import { expressMiddleware } from "@apollo/server/express4";
2321
import { ApolloServerPluginDrainHttpServer } from "@apollo/server/plugin/drainHttpServer";
22+
import type { ExpressMiddlewareOptions } from "@as-integrations/express4";
23+
import { expressMiddleware } from "@as-integrations/express4";
2424
import bodyParser from "body-parser";
2525
import cors from "cors";
2626
import express from "express";

packages/package-tests/apollo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "Neo4j Inc.",
1313
"dependencies": {
1414
"@neo4j/graphql": "file:./package",
15-
"@apollo/server": "^4.7.0",
15+
"@apollo/server": "^5.0.0",
1616
"cross-fetch": "^4.0.0",
1717
"graphql": "^16.6.0",
1818
"neo4j-driver": "^5.8.0"

0 commit comments

Comments
 (0)