122 WIP upgrade some minor packages. (#124)

* 122 WIP upgrade some minor packages. * upgrade apollo, graphql related libs. * 122 update eslint libs, fix small lint errors in api.
mikelax · Apr 15, 2018 · 78a7e1d · 78a7e1d
1 parent 9b878a3
commit 78a7e1d
Show file tree

Hide file tree

Showing 9 changed files with 738 additions and 446 deletions.
diff --git a/api/package.json b/api/package.json
@@ -14,12 +14,12 @@
     "seed:load": "knex seed:run"
   },
   "dependencies": {
-    "apollo-server-express": "^1.2.0",
+    "apollo-server-express": "1.3.4",
     "aws-sdk": "^2.177.0",
-    "axios": "^0.17.1",
+    "axios": "0.18.0",
     "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
-    "cloudinary": "^1.9.1",
+    "cloudinary": "1.11.0",
     "compression": "1.7.2",
     "config": "1.30.0",
     "connect-static-file": "^2.0.0",
@@ -28,40 +28,40 @@
     "dataloader": "^1.4.0",
     "express": "4.16.3",
     "express-jwt": "5.3.1",
-    "graphql": "^0.11.7",
-    "graphql-iso-date": "^3.3.0",
-    "graphql-redis-subscriptions": "^1.3.1",
-    "graphql-subscriptions": "^0.5.6",
-    "graphql-tools": "^2.18.0",
-    "graphql-type-json": "^0.1.4",
+    "graphql": "0.13.0",
+    "graphql-iso-date": "3.5.0",
+    "graphql-redis-subscriptions": "1.4.0",
+    "graphql-subscriptions": "0.5.8",
+    "graphql-tools": "2.24.0",
+    "graphql-type-json": "0.2.1",
     "helmet": "3.12.0",
     "joi": "^13.1.2",
     "jwks-rsa": "^1.2.1",
     "knex": "^0.14.0",
-    "lodash": "^4.17.4",
+    "lodash": "4.17.5",
     "morgan": "^1.9.0",
     "multer": "^1.3.0",
     "objection": "^0.9.0",
     "pg": "7.4.1",
     "sanitize-html": "^1.18.2",
     "shortid": "^2.2.8",
-    "source-map-support": "0.5.0",
+    "source-map-support": "0.5.4",
     "sql-fixtures": "^1.0.0",
-    "subscriptions-transport-ws": "^0.9.3",
+    "subscriptions-transport-ws": "0.9.7",
     "winston": "2.4.1"
   },
   "devDependencies": {
     "babel-core": "6.26.0",
-    "babel-eslint": "^8.0.2",
+    "babel-eslint": "8.2.3",
     "babel-loader": "7.1.2",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-0": "^6.24.1",
-    "eslint": "^4.9.0",
+    "eslint": "4.19.1",
     "eslint-config-airbnb": "^16.1.0",
-    "eslint-import-resolver-webpack": "^0.8.3",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-jsx-a11y": "^6.0.2",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-import-resolver-webpack": "0.9.0",
+    "eslint-plugin-import": "2.11.0",
+    "eslint-plugin-jsx-a11y": "6.0.3",
+    "eslint-plugin-react": "7.7.0",
     "nodemon": "^1.12.1",
     "webpack": "3.8.1",
     "webpack-dev-server": "^2.9.4"

diff --git a/api/routes/imageUploadImpl.js b/api/routes/imageUploadImpl.js
@@ -1,7 +1,7 @@
-import { uploadToCloudinary } from 'services/cloudinary';
+import uploadToCloudinary from 'services/cloudinary';
 
 
-export function uploadUserPicture(req, res, next) {
+export default function uploadUserPicture(req, res, next) {
   return uploadToCloudinary(req.file, req.dbUser, req.body.imageType)
     .then(responseData => res.json(responseData))
     .catch(error => next(error));

diff --git a/api/routes/index.js b/api/routes/index.js
@@ -1,6 +1,6 @@
 import multer from 'multer';
 
-import { uploadUserPicture } from './imageUploadImpl';
+import uploadUserPicture from './imageUploadImpl';
 import { setDbUserByToken } from '../middleware/security';
 
 const router = require('express').Router();

diff --git a/api/schemas/index.js b/api/schemas/index.js
@@ -5,12 +5,12 @@ import GraphQLJSON from 'graphql-type-json';
 import { GraphQLDateTime } from 'graphql-iso-date';
 
 import { characterTypeDefs, characterResolvers } from './character';
-import { gameTypeDefs, gameResolvers } from 'schemas/game';
-import { gameLabelTypeDefs, gameLabelResolvers } from 'schemas/gameLabel';
-import { gameLoungeTypeDefs, gameLoungeResolvers } from 'schemas/gameLounge';
-import { gameMessageTypeDefs, gameMessageResolvers } from 'schemas/gameMessage';
-import { gamePlayerTypeDefs, gamePlayerResolvers } from 'schemas/gamePlayer';
-import { userTypeDefs, userResolvers } from 'schemas/user';
+import { gameTypeDefs, gameResolvers } from './game';
+import { gameLabelTypeDefs, gameLabelResolvers } from './gameLabel';
+import { gameLoungeTypeDefs, gameLoungeResolvers } from './gameLounge';
+import { gameMessageTypeDefs, gameMessageResolvers } from './gameMessage';
+import { gamePlayerTypeDefs, gamePlayerResolvers } from './gamePlayer';
+import { userTypeDefs, userResolvers } from './user';
 
 import queries from './queries';
 import mutations from './mutations';
@@ -51,4 +51,3 @@ export default makeExecutableSchema({
     userResolvers
   )
 });
-
diff --git a/api/services/cloudinary.js b/api/services/cloudinary.js
@@ -13,7 +13,7 @@ const imageTypeTransformation = {
   messageImage: 'c_fill,g_auto,w_640,h_480'
 };
 
-export function uploadToCloudinary(file, dbUser, imageType) {
+export default function uploadToCloudinary(file, dbUser, imageType) {
   return Bluebird.try(() => {
     const fileName = shortid.generate();
     const transform = imageTypeTransformation[imageType];
@@ -86,4 +86,3 @@ function s3UploadFile(fileBuffer, fileName) {
   return s3.upload(options)
     .promise();
 }
-
diff --git a/api/services/knex.js b/api/services/knex.js
@@ -28,7 +28,7 @@ knex
     const { startTime } = times[uid];
     const endTime = Date.now();
     const elapsedTime = endTime - startTime;
-    const bindings = _(query.bindings).map(b => _.isObject(b) ? JSON.stringify(b) : b).join(',');
+    const bindings = _(query.bindings).map((b) => { return _.isObject(b) ? JSON.stringify(b) : b; }).join(',');
 
     logger.info(query.sql, `- [${bindings}] - ${elapsedTime.toFixed(3)} ms`);