Merge pull request #34 from kusor/master

Bump dependencies

Author: geek

example.js

@@ -16,7 +16,7 @@ const schema = `
   }
 `;
 
-const getPerson = function (args, request) {
+const getPerson = function(args, request) {
   return new Promise((resolve) => {
     resolve({ firstname: 'billy', lastname: 'jean' });
   });

lib/index.js

@@ -20,7 +20,7 @@ const internals = {
 
 exports.name = 'graphi';
 
-exports.register = function (server, options) {
+exports.register = function(server, options) {
   const settings = Merge({}, internals.defaults, options);
 
   server.expose('resolvers', {});
@@ -82,7 +82,7 @@ exports.graphql = Graphql;
 
 exports.makeExecutableSchema = Utils.makeExecutableSchema;
 
-internals.registerSchema = function ({ schema = {}, resolvers = {}, subscriptionOptions = {} }) {
+internals.registerSchema = function({ schema = {}, resolvers = {}, subscriptionOptions = {} }) {
   const server = this;
   if (typeof schema === 'string') {
     schema = Utils.makeExecutableSchema({ schema, resolvers });
@@ -97,7 +97,7 @@ internals.registerSchema = function ({ schema = {}, resolvers = {}, subscription
   server.plugins.graphi.schema = schema;
 };
 
-internals.onPreStart = function (server) {
+internals.onPreStart = function(server) {
   const resolver = ({ prefix = '', method = 'graphql' }) => {
     return async (payload, request, ast) => {
       const url = `${prefix}/${ast.fieldName}`;
@@ -134,7 +134,7 @@ internals.onPreStart = function (server) {
   });
 };
 
-internals.graphqlHandler = async function (request, h) {
+internals.graphqlHandler = async function(request, h) {
   if (request.method.toUpperCase() === 'OPTIONS') {
     return h.continue;
   }
@@ -204,7 +204,16 @@ internals.graphqlHandler = async function (request, h) {
     return result;
   };
 
-  const result = await Graphql.execute(schema, queryAST, resolvers, request, variables, operationName, fieldResolver);
+  const result = await Graphql.execute({
+    schema,
+    document: queryAST,
+    rootValue: resolvers,
+    contextValue: request,
+    variableValues: variables,
+    operationName,
+    fieldResolver
+  });
+
   if (result.errors) {
     const formatError = request.server.plugins.graphi.settings.formatError;
     if (typeof formatError === 'function') {
@@ -225,7 +234,7 @@ internals.graphqlHandler = async function (request, h) {
   return result;
 };
 
-internals.graphiqlHandler = function (request, h) {
+internals.graphiqlHandler = function(request, h) {
   const { settings } = request.server.plugins.graphi;
   const query = request.query;
   const variables = query.variables || '{}';
@@ -239,7 +248,7 @@ internals.graphiqlHandler = function (request, h) {
   });
 };
 
-internals.tryParseVariables = function (input) {
+internals.tryParseVariables = function(input) {
   if (!input || typeof input !== 'string') {
     return input;
   }

lib/utils.js

@@ -53,7 +53,7 @@ exports.makeExecutableSchema = ({ schema, resolvers = {}, preResolve }) => {
   return astSchema;
 };
 
-exports.registerSubscriptions = function (server, schema, options) {
+exports.registerSubscriptions = function(server, schema, options) {
   const fields = schema._subscriptionType.getFields();
   const fieldKeys = Object.keys(fields);
   for (const fieldKey of fieldKeys) {
@@ -71,8 +71,8 @@ exports.registerSubscriptions = function (server, schema, options) {
   }
 };
 
-exports.publish = function (server) {
-  return function (name, obj) {
+exports.publish = function(server) {
+  return function(name, obj) {
     const schema = this.schema;
 
     const field = schema._subscriptionType.getFields()[name];
@@ -91,7 +91,7 @@ exports.publish = function (server) {
   };
 };
 
-internals.wrapResolve = function (resolve) {
+internals.wrapResolve = function(resolve) {
   return (root, args, request) => {
     const preResolve = this;
     const context = preResolve(root, args, request);

package.json

@@ -25,21 +25,21 @@
   },
   "homepage": "https://github.com/geek/graphi#readme",
   "devDependencies": {
-    "belly-button": "7.x.x",
+    "belly-button": "8.x.x",
     "cb-barrier": "1.x.x",
-    "@hapi/code": "8.x.x",
-    "@hapi/eslint-plugin": "5.x.x",
-    "@hapi/hapi": "20.x.x",
+    "@hapi/code": "9.x.x",
+    "@hapi/eslint-plugin": "6.x.x",
+    "@hapi/hapi": "21.x.x",
     "hapi-auth-bearer-token": "8.x.x",
-    "@hapi/lab": "24.x.x",
-    "@hapi/nes": "12.x.x",
+    "@hapi/lab": "25.x.x",
+    "@hapi/nes": "13.x.x",
     "opentracing": "0.14.x",
     "traci": "3.x.x",
-    "@hapi/wreck": "17.x.x"
+    "@hapi/wreck": "18.x.x"
   },
   "dependencies": {
-    "@hapi/boom": "9.x.x",
-    "graphql": "15.x.x",
+    "@hapi/boom": "10.x.x",
+    "graphql": "16.6.x",
     "apollo-server-module-graphiql": "1.4.x",
     "lodash.merge": "4.6.x"
   }