Merge pull request #149 from Human-Connection/upgrade-dependencies

Upgrade dependencies

package.json

@@ -15,9 +15,9 @@
     "test": "nyc  --reporter=text-lcov yarn run test:jest",
     "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 babel-node src/ 2> /dev/null",
     "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 PERMISSIONS=disabled babel-node src/ 2> /dev/null",
-    "test:jest:cmd":       "wait-on tcp:4001 tcp:4123 && jest --forceExit --detectOpenHandles --runInBand",
+    "test:jest:cmd": "wait-on tcp:4001 tcp:4123 && jest --forceExit --detectOpenHandles --runInBand",
     "test:jest:cmd:debug": "wait-on tcp:4001 tcp:4123 && node --inspect-brk ./node_modules/.bin/jest -i --forceExit --detectOpenHandles --runInBand",
-    "test:jest":       "run-p --race test:before:* 'test:jest:cmd {@}' --",
+    "test:jest": "run-p --race test:before:* 'test:jest:cmd {@}' --",
     "test:jest:debug": "run-p --race test:before:* 'test:jest:cmd:debug {@}' --",
     "test:coverage": "nyc report --reporter=text-lcov > coverage.lcov",
     "db:script:seed": "wait-on tcp:4001 && babel-node src/seed/seed-db.js",
@@ -34,29 +34,29 @@
     ]
   },
   "dependencies": {
-    "apollo-cache-inmemory": "~1.4.0",
-    "apollo-client": "~2.4.9",
-    "apollo-link-http": "~1.5.9",
-    "apollo-server": "~2.3.1",
+    "apollo-cache-inmemory": "~1.4.2",
+    "apollo-client": "~2.4.12",
+    "apollo-link-http": "~1.5.11",
+    "apollo-server": "~2.4.0",
     "bcryptjs": "~2.4.3",
     "cheerio": "~1.0.0-rc.2",
     "cross-env": "~5.2.0",
-    "date-fns": "^2.0.0-alpha.26",
+    "date-fns": "2.0.0-alpha.26",
     "dotenv": "~6.2.0",
     "faker": "~4.1.0",
-    "graphql": "~0.13.0",
+    "graphql": "~14.1.1",
     "graphql-custom-directives": "~0.2.14",
     "graphql-iso-date": "~3.6.1",
-    "graphql-middleware": "~1.7.8",
-    "graphql-shield": "~4.1.2",
+    "graphql-middleware": "~3.0.2",
+    "graphql-shield": "~5.1.2",
     "graphql-tag": "~2.10.1",
-    "graphql-yoga": "~1.17.1",
+    "graphql-yoga": "~1.17.4",
     "jsonwebtoken": "~8.4.0",
-    "linkifyjs": "~2.1.7",
+    "linkifyjs": "~2.1.8",
     "lodash": "~4.17.11",
     "ms": "~2.1.1",
     "neo4j-driver": "~1.7.2",
-    "neo4j-graphql-js": "~2.2.0",
+    "neo4j-graphql-js": "~2.3.1",
     "node-fetch": "~2.3.0",
     "npm-run-all": "~4.1.5",
     "passport": "~0.4.0",
@@ -68,26 +68,26 @@
   },
   "devDependencies": {
     "@babel/cli": "~7.2.3",
-    "@babel/core": "^7.2.2",
+    "@babel/core": "~7.2.2",
     "@babel/node": "~7.2.2",
-    "@babel/preset-env": "~7.2.3",
+    "@babel/preset-env": "~7.3.1",
     "@babel/register": "~7.0.0",
-    "apollo-server-testing": "~2.2.6",
-    "babel-core": "^7.0.0-0",
+    "apollo-server-testing": "~2.4.0",
+    "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.1",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "~24.1.0",
     "chai": "~4.2.0",
-    "eslint": "~5.12.1",
+    "eslint": "~5.13.0",
     "eslint-config-standard": "~12.0.0",
-    "eslint-plugin-import": "~2.15.0",
-    "eslint-plugin-jest": "^22.1.3",
+    "eslint-plugin-import": "~2.16.0",
+    "eslint-plugin-jest": "~22.2.2",
     "eslint-plugin-node": "~8.0.1",
     "eslint-plugin-promise": "~4.0.1",
     "eslint-plugin-standard": "~4.0.0",
-    "graphql-request": "^1.8.2",
-    "jest": "^23.6.0",
+    "graphql-request": "~1.8.2",
+    "jest": "~24.1.0",
     "nodemon": "~1.18.9",
-    "nyc": "^13.1.0",
-    "supertest": "^3.4.2"
+    "nyc": "~13.2.0",
+    "supertest": "~3.4.2"
   }
 }

src/graphql-schema.js

@@ -66,15 +66,15 @@ export const resolvers = {
           countShouts: 'MATCH (:User)-[r:SHOUTED]->(:Post) RETURN COUNT(r) AS countShouts'
         }
         let data = {
-          countUsers: (await queryOne(queries.countUsers, session)).countUsers,
-          countPosts: (await queryOne(queries.countPosts, session)).countPosts,
-          countComments: (await queryOne(queries.countComments, session)).countComments,
-          countNotifications: (await queryOne(queries.countNotifications, session)).countNotifications,
-          countOrganizations: (await queryOne(queries.countOrganizations, session)).countOrganizations,
-          countProjects: (await queryOne(queries.countProjects, session)).countProjects,
-          countInvites: (await queryOne(queries.countInvites, session)).countInvites,
-          countFollows: (await queryOne(queries.countFollows, session)).countFollows,
-          countShouts: (await queryOne(queries.countShouts, session)).countShouts
+          countUsers: (await queryOne(queries.countUsers, session)).countUsers.low,
+          countPosts: (await queryOne(queries.countPosts, session)).countPosts.low,
+          countComments: (await queryOne(queries.countComments, session)).countComments.low,
+          countNotifications: (await queryOne(queries.countNotifications, session)).countNotifications.low,
+          countOrganizations: (await queryOne(queries.countOrganizations, session)).countOrganizations.low,
+          countProjects: (await queryOne(queries.countProjects, session)).countProjects.low,
+          countInvites: (await queryOne(queries.countInvites, session)).countInvites.low,
+          countFollows: (await queryOne(queries.countFollows, session)).countFollows.low,
+          countShouts: (await queryOne(queries.countShouts, session)).countShouts.low
         }
         resolve(data)
       })

src/server.js

@@ -1,6 +1,5 @@
 import { GraphQLServer } from 'graphql-yoga'
-import { makeExecutableSchema } from 'apollo-server'
-import { augmentSchema } from 'neo4j-graphql-js'
+import { makeAugmentedSchema } from 'neo4j-graphql-js'
 import { typeDefs, resolvers } from './graphql-schema'
 import express from 'express'
 import dotenv from 'dotenv'
@@ -23,22 +22,21 @@ requiredEnvVars.forEach(env => {
   }
 })
 
-let schema = makeExecutableSchema({
-  typeDefs,
-  resolvers
-})
-
 const driver = neo4j().getDriver()
 const debug = process.env.NODE_ENV !== 'production' && process.env.DEBUG === 'true'
 
-schema = augmentSchema(schema, {
-  query: {
-    exclude: ['Statistics', 'LoggedInUser']
-  },
-  mutation: {
-    exclude: ['Statistics', 'LoggedInUser']
-  },
-  debug: debug
+let schema = makeAugmentedSchema({
+  typeDefs,
+  resolvers,
+  config: {
+    query: {
+      exclude: ['Statistics', 'LoggedInUser']
+    },
+    mutation: {
+      exclude: ['Statistics', 'LoggedInUser']
+    },
+    debug: debug
+  }
 })
 schema = applyScalars(applyDirectives(schema))