Skip to content

Commit 5ffba99

Browse files
committed
apollo successfully migrated from v3 to v4
1 parent 93f841b commit 5ffba99

File tree

2 files changed

+28
-6
lines changed

2 files changed

+28
-6
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
"homepage": "https://github.com/open-source-labs/ReacType#readme",
128128
"dependencies": {
129129
"@apollo/client": "^3.6.9",
130+
"@apollo/server": "^4.4.1",
130131
"@babel/cli": "^7.18.10",
131132
"@babel/register": "^7.18.9",
132133
"@graphql-tools/schema": "^9.0.17",
@@ -147,6 +148,7 @@
147148
"autoprefixer": "^10.4.8",
148149
"babel-polyfill": "^6.26.0",
149150
"bcryptjs": "^2.4.3",
151+
"body-parser": "^1.20.2",
150152
"cookie-parser": "^1.4.6",
151153
"cors": "^2.8.5",
152154
"d3": "^7.6.1",

server/server.js

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
const { ApolloServer } = require('apollo-server-express');
1+
const { ApolloServer } = require('@apollo/server');//changed for v4
2+
3+
//v4 Apollo imports
4+
import { expressMiddleware } from '@apollo/server/express4';
5+
import cors from 'cors';
6+
import { json } from 'body-parser';
7+
8+
//possibly redundant
29
const {makeExecutableSchema} = require('@graphql-tools/schema');
10+
311
const express = require('express');
412
const cookieParser = require('cookie-parser');
513
//const passport = require('passport');
614
//const GitHubStrategy = require('passport-github2').Strategy;
715
const { DEV_PORT } = require('../config');
816

917
const path = require('path');
10-
const cors = require('cors');
18+
1119
const userController = require('./controllers/userController');
1220
const cookieController = require('./controllers/cookieController');
1321
const sessionController = require('./controllers/sessionController');
@@ -131,10 +139,22 @@ const { dirname } = require('node:path');
131139
const schema = makeExecutableSchema({typeDefs, resolvers});
132140

133141
const server = new ApolloServer({schema});
134-
(async function() {
135-
await server.start()
136-
server.applyMiddleware({ app, path: '/graphql' });
137-
}());
142+
//V3 syntax
143+
// (async function() {
144+
// await server.start()
145+
// server.applyMiddleware({ app, path: '/graphql' });
146+
// }());
147+
148+
//v4 syntax
149+
await server.start()
150+
app.use(
151+
'/graphql',
152+
cors(),
153+
json(),
154+
expressMiddleware(server, {
155+
context: async ({ req }) => ({ token: req.headers.token }),
156+
}),
157+
);
138158

139159
/** ****************************************************************** */
140160

0 commit comments

Comments
 (0)