Upgrade to apollo-server v2

Author: kylealwyn

.eslintrc.yml

@@ -10,9 +10,9 @@ const defaults = {
   connection: {
     user: connection.user || 'root',
     password: connection.password || '',
-    host: connection.host,
+    host: connection.hosts[0].name,
     port: connection.port || 5432,
-    database: connection.segments[0],
+    database: connection.path[0],
   },
   migrations: {
     directory: `${__dirname}/db/migrations`,

knexfile.js

@@ -5,39 +5,33 @@
     "knex": "ts-node ./node_modules/.bin/knex"
   },
   "dependencies": {
-    "apollo-server-express": "^1.3.2",
-    "body-parser": "^1.18.2",
-    "connection-string": "^0.4.1",
-    "core-js": "^2.5.3",
-    "dotenv": "^4.0.0",
-    "express": "^4.16.2",
-    "graphql": "^0.12.3",
-    "graphql-tools": "^2.19.0",
-    "knex": "^0.14.2",
-    "lodash": "^4.17.4",
-    "morgan": "^1.9.0",
-    "pg": "^7.4.1"
+    "apollo-server": "^2.1.0",
+    "apollo-server-express": "^2.1.0",
+    "body-parser": "^1.18.3",
+    "connection-string": "^1.0.1",
+    "core-js": "^2.5.7",
+    "dotenv": "^6.1.0",
+    "express": "^4.16.4",
+    "graphql": "^14.0.2",
+    "graphql-tools": "^4.0.1",
+    "knex": "^0.15.2",
+    "lodash": "^4.17.11",
+    "morgan": "^1.9.1",
+    "pg": "^7.5.0"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.16.8",
-    "@types/express": "^4.11.0",
-    "@types/knex": "^0.14.4",
-    "@types/node": "^9.4.0",
+    "@types/body-parser": "^1.17.0",
+    "@types/express": "^4.16.0",
+    "@types/knex": "^0.14.26",
+    "@types/node": "^10.11.7",
     "ava": "^0.25.0",
-    "eslint": "^4.16.0",
-    "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-config-google": "^0.9.1",
-    "eslint-config-prettier": "^2.9.0",
-    "eslint-import-resolver-typescript": "^1.0.2",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-prettier": "^2.5.0",
-    "eslint-plugin-security": "^1.4.0",
-    "eslint-plugin-typescript": "^0.8.1",
-    "nodemon": "^1.14.11",
-    "prettier": "^1.10.2",
-    "ts-node": "^4.1.0",
-    "tslint": "^5.9.1",
-    "typescript": "^2.6.2",
-    "typescript-eslint-parser": "^12.0.0"
+    "nodemon": "^1.18.4",
+    "prettier": "^1.14.3",
+    "ts-node": "^7.0.1",
+    "tslint": "^5.11.0",
+    "tslint-config-prettier": "^1.15.0",
+    "tslint-plugin-prettier": "^2.0.0",
+    "typescript": "^3.1.3",
+    "typescript-eslint-parser": "^20.0.0"
   }
 }

package.json

@@ -1,10 +1,10 @@
-import * as _ from 'lodash';
-import * as Knex from 'knex';
-import * as knexfile from '../knexfile';
+import _ from 'lodash';
+import Knex from 'knex';
+import knexfile from '../knexfile';
 
 class Database {
   private knexInstance: Knex;
-  private config: Object;
+  private config: object;
 
   public connect(options = {}): void {
     if (this.knexInstance) {

src/database.ts

@@ -1,26 +1,26 @@
 import * as _ from 'lodash';
-import { makeExecutableSchema } from 'graphql-tools';
+import { makeExecutableSchema } from 'apollo-server';
 import { getDirectories } from '../utils';
 
-interface QueryMutation {
-  [name: string]: Resolver;
+interface IResolver {
+  definition: string;
+  resolve: () => void;
 }
 
-interface Resolver {
-  definition: string;
-  resolve: Function;
+interface IQueryMutation {
+  [name: string]: IResolver;
 }
 
-interface Schema {
+interface ISchema {
   type: string;
-  queries: QueryMutation;
-  mutations: QueryMutation;
-  resolvers?: Object;
+  queries: IQueryMutation;
+  mutations: IQueryMutation;
+  resolvers?: object;
 }
 
 const directories = getDirectories(__dirname);
 
-const schemas: Array<Schema> = directories.reduce((schemaList, directory) => {
+const schemas: ISchema[] = directories.reduce((schemaList, directory) => {
   const schema = require(directory); // eslint-disable-line
   return [...schemaList, schema];
 }, []);
@@ -30,7 +30,7 @@ const resolverDefinitionsToString = (resolvers = {}): string =>
     .map(({ definition }) => definition)
     .join('\n');
 
-const buildResolver = (schema: Schema): Object => {
+const buildResolver = (schema: ISchema): Object => {
   const { queries = {}, mutations = {}, resolvers = {} } = schema;
 
   return {

src/schema/index.ts

@@ -1,59 +1,63 @@
-import * as http from 'http';
-import * as express from 'express';
-import * as bodyParser from 'body-parser';
-import * as logger from 'morgan';
-import { graphqlExpress, graphiqlExpress } from 'apollo-server-express';
+import http from 'http';
+import express from 'express';
+import bodyParser from 'body-parser';
+import logger from 'morgan';
+import { ApolloServer } from 'apollo-server-express';
 import schema from './schema';
 
+const apollo = new ApolloServer({
+  schema,
+  playground: true,
+});
+
 // Creates and configures an ExpressJS web server.
 class Server {
-  public express: express.Application;
-  public server: http.Server;
+  app: express.Application;
+  server: http.Server;
 
   // Run configuration methods on the Express instance.
   constructor() {
-    this.express = express();
+    this.app = express();
     this.middleware();
     this.routes();
   }
 
   // Configure Express middleware.
-  private middleware(): void {
-    this.express.use(logger('dev'));
-    this.express.use(bodyParser.json());
-    this.express.use(bodyParser.urlencoded({ extended: true }));
+  middleware() {
+    this.app.use(logger('dev'));
+    this.app.use(bodyParser.json());
+    this.app.use(bodyParser.urlencoded({ extended: true }));
+
+    apollo.applyMiddleware({
+      app: this.app,
+    });
   }
 
   // Configure API endpoints.
-  private routes(): void {
+  routes() {
     /* This is just to get up and running, and to make sure what we've got is
      * working so far. This function will change when we start to add more
      * API endpoints */
     const router = express.Router();
 
-    // The GraphQL endpoint
-    router.use('/graphql', bodyParser.json(), graphqlExpress({ schema }));
-
-    // GraphiQL, a visual editor for queries
-    router.use('/graphiql', graphiqlExpress({ endpointURL: '/graphql' }));
-    this.express.use('/', router);
+    this.app.use('/', router);
   }
 
-  public start(done = () => {}): void {
+  start(cb = () => null) {
     const port = process.env.PORT || 3000;
 
-    this.server = this.express.listen(port, err => {
+    this.server = this.app.listen(port, err => {
       if (err) {
         throw err;
       }
       console.log(`🔥 Server running on port ${port}...`); // eslint-disable-line
-      done();
+      cb();
     });
   }
 
-  public stop(done = () => {}): void {
+  stop(cb = () => null) {
     if (this.server) {
-      this.server.close(done);
+      this.server.close(cb);
     }
   }
 }

src/server.ts

@@ -1,11 +1,14 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "esnext",
     "module": "commonjs",
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "noEmitOnError": true,
     "lib": ["es2015", "es2017"]
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*"
   ],
   "exclude": [
     "node_modules"

tsconfig.json

@@ -0,0 +1,23 @@
+{
+  "extends": [
+    "tslint:latest",
+    "tslint-config-prettier",
+    "tslint-plugin-prettier"
+  ],
+  "rules": {
+    "ordered-imports": false,
+    "no-submodule-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": false,
+    "member-access": false,
+    "prettier": [true, {
+      "printWidth": 120,
+      "semi": true,
+      "useTabs": false,
+      "singleQuote": true,
+      "trailingComma": "es5",
+      "bracketSpacing": true,
+      "jsxBracketSameLine": true
+    }]
+  }
+}