Use express-graphql GraphiQL feature

This changes Swapi-graphql to have just one root endpoint which serves graphql rather than two endpoints which serve graphql and graphiql respectively.

Author: leebyron

README.md

@@ -1,10 +1,16 @@
 SWAPI GraphQL Wrapper
 =====================
 
-A wrapper around [SWAPI](http://swapi.co) built using [graphql-js](https://github.com/graphql/graphql-js), with
-[GraphiQL](https://github.com/graphql/graphiql) included for easy exploration.
+A wrapper around [SWAPI](http://swapi.co) built using GraphQL.
 
-Try it out at http://graphql-swapi.parseapp.com/graphiql/.
+Uses:
+
+* [graphql-js](https://github.com/graphql/graphql-js) - a JavaScript GraphQL runtime.
+* [DataLoader](https://github.com/facebook/dataloader) - for coalescing and caching fetches.
+* [express-graphql](https://github.com/graphql/express-graphql) - to provide HTTP access to GraphQL.
+* [GraphiQL](https://github.com/graphql/graphiql) - for easy exploration of this GraphQL server.
+
+Try it out at http://graphql-swapi.parseapp.com/.
 
 ## Getting Started
 
@@ -30,7 +36,7 @@ A local express server is in `./server`. It can be run with:
 npm start
 ```
 
-A GraphiQL instance will be opened at http://localhost:8080/graphiql to
+A GraphiQL instance will be opened at http://localhost:8080/ to
 explore the API.
 
 ## Parse Server
@@ -42,4 +48,4 @@ file, it can be deployed with:
 npm run deploy
 ```
 
-A sample deploy is at http://graphql-swapi.parseapp.com/graphiql/
+A sample deploy is at http://graphql-swapi.parseapp.com/

package.json

@@ -55,26 +55,20 @@
 
     "start": "node server/lib/server.js",
     "prestart": "npm run build-server",
-    "build-server": "npm run build-swapi && npm run build-server-js && npm run build-server-css && npm run build-server-html && npm run build-server-server",
-    "build-server-js": "mkdir -p server/lib/graphiql/ && cp node_modules/graphiql/graphiql.min.js server/lib/graphiql/graphiql.min.js",
-    "build-server-css": "mkdir -p server/lib/graphiql/ && cp node_modules/graphiql/graphiql.css server/lib/graphiql/graphiql.css",
-    "build-server-html": "mkdir -p server/lib/graphiql/ && cp server/src/graphiql/index.html server/lib/graphiql/index.html",
-    "build-server-server": "mkdir -p server/lib && babel server/src/server.js --optional runtime -o server/lib/server.js",
+    "build-server": "npm run build-swapi && mkdir -p server/lib && babel server/src/server.js --optional runtime -o server/lib/server.js",
 
     "predeploy": "npm run build-parse",
     "deploy": "cd parse/lib && parse deploy",
-    "build-parse": "npm run build-swapi && npm run build-parse-cloud && npm run build-parse-public && npm run build-parse-config",
+    "build-parse": "npm run build-swapi && npm run build-parse-cloud && npm run build-parse-config",
     "build-parse-cloud": "mkdir -p parse/lib/cloud && browserify -p ./scripts/parseify.js node_modules/babel/polyfill parse/src/cloud/main.js > parse/lib/cloud/main.js",
-    "build-parse-public": "mkdir -p parse/lib/public/graphiql && cp parse/src/public/graphiql/index.html parse/lib/public/graphiql/index.html && cp node_modules/graphiql/graphiql.min.js parse/lib/public/graphiql/graphiql.min.js && cp node_modules/graphiql/graphiql.css parse/lib/public/graphiql/graphiql.css",
     "build-parse-config": "mkdir -p parse/lib/config && cp parse/src/config/* parse/lib/config/"
   },
   "dependencies": {
     "babel-runtime": "^5.8.20",
     "dataloader": "^1.0.0",
     "express": "^4.13.3",
-    "express-graphql": "^0.3.0",
-    "graphiql": "0.2.3",
-    "graphql": "^0.4.0",
+    "express-graphql": "^0.4.0",
+    "graphql": "^0.4.5",
     "graphql-relay": "^0.3.0",
     "isomorphic-fetch": "^2.1.1",
     "react": "^0.13.3"

server/src/README.md

@@ -2,4 +2,4 @@ SWAPI Local GraphQL Server
 ==========================
 
 This directory contains code to run a local `express` server, running
-`/graphql` and `/graphiql` on localhost with the SWAPI schema.
+on localhost with the SWAPI schema.

server/src/graphiql/index.html

@@ -11,15 +11,17 @@ import graphqlHTTP from 'express-graphql';
 import swapiSchema from '../../swapi/lib/';
 
 var app = express();
-app.use('/graphiql', express.static(path.join(__dirname, 'graphiql')));
-app.use('/graphql', graphqlHTTP(() => ({
-  schema: swapiSchema
+
+// Requests to /graphql redirect to /
+app.all('/graphql', (req, res) => res.redirect('/'));
+
+app.use('/', graphqlHTTP(() => ({
+  schema: swapiSchema,
+  graphiql: true
 })));
+
 var server = app.listen(8080, () => {
   console.log(
-    `GraphQL running on http://localhost:${server.address().port}/graphql`
-  );
-  console.log(
-    `GraphiQL running on http://localhost:${server.address().port}/graphiql`
+    `GraphQL running on http://localhost:${server.address().port}/`
   );
 });