chore(package): update dependencies

example/index.js

@@ -1,4 +1,5 @@
-require('babel/register');
+require('babel-register');
+require('babel-polyfill');
 require('./express');
 require('./hapi');
 require('./koa');

example/package.json

@@ -7,8 +7,7 @@
   },
   "dependencies": {
     "@risingstack/graffiti": "../",
-    "@risingstack/graffiti-mongoose": "^4.0.1",
-    "babel": "^5.8.21",
+    "@risingstack/graffiti-mongoose": "^4.3.2",
     "express": "^4.13.3",
     "koa": "^1.1.0",
     "koa-static": "^1.5.1",

package.json

@@ -4,7 +4,7 @@
   "description": "Mongoose adapter for graffiti (Node.js GraphQL ORM)",
   "main": "lib/index.js",
   "scripts": {
-    "test": "NODE_ENV=test mocha --compilers js:babel/register --require co-mocha 'src/**/*.spec.js'",
+    "test": "NODE_ENV=test mocha --compilers js:babel-register --require babel-polyfill 'src/**/*.spec.js'",
     "eslint": "eslint src",
     "prepublish": "npm test && npm run build",
     "build": "rm -rf lib/* && babel src --ignore *.spec.js --out-dir lib"
@@ -32,27 +32,37 @@
     "co-body": "^4.0.0"
   },
   "peerDependencies": {
-    "graphql": "^0.4.12"
+    "graphql": "^0.4.14"
   },
   "devDependencies": {
-    "babel": "^5.8.29",
-    "babel-eslint": "^4.1.3",
-    "chai": "^3.4.0",
-    "chai-subset": "^1.1.0",
-    "co-mocha": "^1.1.2",
-    "eslint": "1.8.0",
-    "eslint-config-airbnb": "^0.1.0",
+    "babel": "^6.3.13",
+    "babel-cli": "^6.3.17",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-polyfill": "^6.3.14",
+    "babel-preset-es2015": "^6.3.13",
+    "babel-preset-stage-0": "^6.3.13",
+    "babel-register": "^6.3.13",
+    "chai": "^3.4.1",
+    "chai-subset": "^1.2.0",
+    "eslint": "1.10.3",
+    "eslint-config-airbnb": "^2.0.0",
     "express": "^4.13.3",
-    "graphql": "^0.4.12",
-    "hapi": "^11.0.3",
+    "graphql": "^0.4.14",
+    "hapi": "^11.1.2",
     "koa": "^2.0.0-alpha.2",
-    "mocha": "^2.3.3",
+    "mocha": "^2.3.4",
     "pre-commit": "^1.1.2",
     "sinon": "^1.17.2",
     "sinon-chai": "^2.8.0"
   },
   "pre-commit": [
     "eslint",
     "test"
-  ]
+  ],
+  "babel": {
+    "presets": [
+      "stage-0",
+      "es2015"
+    ]
+  }
 }

src/express/express.js

@@ -1,5 +1,5 @@
-import {graphql} from 'graphql';
-import {json} from 'co-body';
+import { graphql } from 'graphql';
+import { json } from 'co-body';
 import {
   badRequest,
   methodNotAllowed
@@ -13,18 +13,18 @@ import {
 } from '../util';
 
 function sendError(response, boom) {
-  const {statusCode, payload} = boom.output;
+  const { statusCode, payload } = boom.output;
   response.status(statusCode).send(payload);
 }
 
-export default function middleware({graphiql = true, schema = required()} = {}) {
+export default function middleware({ graphiql = true, schema = required() } = {}) {
   return (request, response, next) => {
     if (isPath(request) && (isPost(request) || isGet(request))) {
       return json(request).then((body) => {
-        const {query, variables} = Object.assign({}, body, request.query);
+        const { query, variables } = Object.assign({}, body, request.query);
 
         if (isGet(request) && request.accepts('html') && graphiql) {
-          return response.send(renderGraphiQL({query, variables}));
+          return response.send(renderGraphiQL({ query, variables }));
         }
 
         if (isGet(request) && query && query.includes('mutation')) {

src/express/express.spec.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import parser from 'co-body';
 import express from './';
 
@@ -54,7 +54,7 @@ describe('graffiti express', () => {
     });
 
     it('should return with proper result on GET', function postTest(done) {
-      const result = {data: 1};
+      const result = { data: 1 };
       const mw = mwFactory({
         schema: this.schema
       });
@@ -70,7 +70,7 @@ describe('graffiti express', () => {
       };
 
       const response = {
-        json: ({data}) => {
+        json: ({ data }) => {
           expect(data).to.be.eql(result);
           done();
         }
@@ -99,7 +99,7 @@ describe('graffiti express', () => {
 
       const response = {
         status: () => response,
-        send: ({statusCode}) => {
+        send: ({ statusCode }) => {
           expect(statusCode).to.be.eql(405);
           done();
         }
@@ -109,7 +109,7 @@ describe('graffiti express', () => {
     });
 
     it('should return with proper result on POST', function postTest(done) {
-      const result = {data: 1};
+      const result = { data: 1 };
       const mw = mwFactory({
         schema: this.schema
       });
@@ -125,7 +125,7 @@ describe('graffiti express', () => {
       };
 
       const response = {
-        json: ({data}) => {
+        json: ({ data }) => {
           expect(data).to.be.eql(result);
           done();
         }
@@ -171,9 +171,9 @@ describe('graffiti express', () => {
         accepts: (type) => type === 'html'
       };
 
-      const result = {data: 1};
+      const result = { data: 1 };
       const response = {
-        json: ({data}) => {
+        json: ({ data }) => {
           expect(data).to.be.eql(result);
           done();
         }

src/express/index.js

@@ -1 +1 @@
-export {default} from './express';
+export { default } from './express';

src/hapi/hapi.js

@@ -1,4 +1,4 @@
-import {graphql} from 'graphql';
+import { graphql } from 'graphql';
 import {
   badRequest,
   methodNotAllowed
@@ -11,18 +11,18 @@ import {
 
 import pkg from '../../package.json';
 
-function accepts({headers}, type) {
+function accepts({ headers }, type) {
   return headers.accept && headers.accept.includes(type);
 }
 
 const plugin = {
-  register: (server, {graphiql = true, schema = required()} = {}, next) => {
+  register: (server, { graphiql = true, schema = required() } = {}, next) => {
     const handler = (request, reply) => {
       const data = request.payload || request.query || {};
-      const {query, variables} = data;
+      const { query, variables } = data;
 
       if (accepts(request, 'html') && graphiql) {
-        return reply(renderGraphiQL({query, variables}));
+        return reply(renderGraphiQL({ query, variables }));
       }
 
       if (query && query.includes('mutation') && isGet(request)) {
@@ -61,6 +61,6 @@ const plugin = {
   }
 };
 
-plugin.register.attributes = {pkg};
+plugin.register.attributes = { pkg };
 
 export default plugin;

src/hapi/hapi.spec.js

@@ -1,5 +1,5 @@
-import {expect} from 'chai';
-import {Server} from 'hapi';
+import { expect } from 'chai';
+import { Server } from 'hapi';
 import hapi from './';
 
 describe('graffiti hapi', () => {
@@ -18,7 +18,7 @@ describe('graffiti hapi', () => {
       const server = new Server();
       server.connection({ port: 3000 });
 
-      const result = {data: 1};
+      const result = { data: 1 };
 
       server.register({
         register: hapi,
@@ -33,7 +33,7 @@ describe('graffiti hapi', () => {
         server.inject({
           method: 'GET',
           url: '/graphql?query={data}'
-        }, ({payload}) => {
+        }, ({ payload }) => {
           expect(JSON.parse(payload).data).to.eql(result);
           done();
         });
@@ -57,7 +57,7 @@ describe('graffiti hapi', () => {
         server.inject({
           method: 'GET',
           url: '/graphql?query=mutation%20mutate%20{updateData(data:"123"){data}}'
-        }, ({payload}) => {
+        }, ({ payload }) => {
           expect(JSON.parse(payload).error).to.be.ok; // eslint-disable-line
           done();
         });
@@ -68,7 +68,7 @@ describe('graffiti hapi', () => {
       const server = new Server();
       server.connection({ port: 3000 });
 
-      const result = {data: 1};
+      const result = { data: 1 };
 
       server.register({
         register: hapi,
@@ -87,7 +87,7 @@ describe('graffiti hapi', () => {
             query: '{data}',
             variables: {}
           }
-        }, ({payload}) => {
+        }, ({ payload }) => {
           expect(JSON.parse(payload).data).to.eql(result);
           done();
         });
@@ -114,7 +114,7 @@ describe('graffiti hapi', () => {
           headers: {
             Accept: 'text/html'
           }
-        }, ({payload}) => {
+        }, ({ payload }) => {
           expect(payload.includes('GraphiQL')).to.be.ok; // eslint-disable-line
           done();
         });
@@ -142,7 +142,7 @@ describe('graffiti hapi', () => {
           headers: {
             Accept: 'text/html'
           }
-        }, ({statusCode}) => {
+        }, ({ statusCode }) => {
           expect(statusCode).to.be.eql(404);
           done();
         });

src/hapi/index.js

@@ -1 +1 @@
-export {default} from './hapi';
+export { default } from './hapi';

src/index.spec.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import graffiti from './';
 
 describe('graffiti', () => {

src/koa/index.js

@@ -1 +1 @@
-export {default} from './koa';
+export { default } from './koa';

src/koa/koa.js

@@ -1,5 +1,5 @@
-import {graphql} from 'graphql';
-import {json} from 'co-body';
+import { graphql } from 'graphql';
+import { json } from 'co-body';
 import {
   required,
   isPath,
@@ -12,14 +12,14 @@ function accepts(type) {
   return this.headers && this.headers.accept && this.headers.accept.includes(type);
 }
 
-export default function middleware({graphiql = true, schema = required()} = {}) {
+export default function middleware({ graphiql = true, schema = required() } = {}) {
   return function *middleware(next) {
     if (isPath(this) && (isPost(this) || isGet(this))) {
       const body = yield json(this);
-      const {query, variables} = Object.assign({}, body, this.query);
+      const { query, variables } = Object.assign({}, body, this.query);
 
       if (isGet(this) && accepts.call(this, 'html') && graphiql) {
-        this.body = renderGraphiQL({query, variables});
+        this.body = renderGraphiQL({ query, variables });
         return this.body;
       }
 

src/koa/koa.spec.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import parser from 'co-body';
 import koa from './';
 
@@ -34,7 +34,7 @@ describe('graffiti koa', () => {
         }
       };
 
-      const result = {data: 1};
+      const result = { data: 1 };
       const res = yield mw.call(request);
 
       expect(res.data).to.eql(result);
@@ -56,7 +56,7 @@ describe('graffiti koa', () => {
         }
       };
 
-      const result = {data: 1};
+      const result = { data: 1 };
       const res = yield mw.call(request);
 
       expect(res.data).to.eql(result);
@@ -98,7 +98,7 @@ describe('graffiti koa', () => {
         }
       };
 
-      const result = {data: 1};
+      const result = { data: 1 };
       const res = yield mw.call(request);
       expect(res.data).to.eql(result);
     });

src/util/util.js

@@ -18,7 +18,7 @@ const GRAPHIQL_VERSION = '0.3.1';
 
 // TODO default query
 // const defaultQuery = ``;
-export function renderGraphiQL({query, variables, version = GRAPHIQL_VERSION} = {}) {
+export function renderGraphiQL({ query, variables, version = GRAPHIQL_VERSION } = {}) {
   return `
     <!DOCTYPE html>
     <html>

src/util/utils.spec.js

@@ -1,4 +1,4 @@
-import {expect} from 'chai';
+import { expect } from 'chai';
 import {
   isPost
 } from './';