Merge pull request #58 from apollostack/graphql-server

Sashko Stubailo · web-flow · commit be35d9cc1920 · 2016-10-23T04:01:27.000-04:00
Upgrade to GraphQL Server 0.4
diff --git a/api/index.js b/api/index.js
@@ -1,6 +1,6 @@
 import path from 'path';
 import express from 'express';
-import { apolloExpress, graphiqlExpress } from 'apollo-server';
+import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
 import bodyParser from 'body-parser';
 
 import {
@@ -33,7 +33,7 @@ app.use(bodyParser.json());
 
 setUpGitHubLogin(app);
 
-app.use('/graphql', apolloExpress((req) => {
+app.use('/graphql', graphqlExpress((req) => {
   // Get the query, the same way express-graphql does it
   // https://github.com/graphql/express-graphql/blob/3fa6e68582d6d933d37fa9e841da5d2aa39261cd/src/index.js#L257
   const query = req.query.query || req.body.query;
diff --git a/package.json b/package.json
@@ -40,14 +40,14 @@
     "nodemon": "1.11.0"
   },
   "dependencies": {
-    "apollo-server": "0.3.3",
     "body-parser": "1.15.2",
     "connect-session-knex": "1.2.0",
     "dataloader": "1.2.0",
     "dotenv": "2.0.0",
     "express": "4.14.0",
     "express-session": "1.14.1",
     "graphql": "0.7.2",
+    "graphql-server-express": "^0.4.1",
     "graphql-subscriptions": "0.2.0",
     "graphql-tools": "0.7.2",
     "knex": "0.12.6",
