diff --git a/package.json b/package.json index d067495..1e55c4a 100644 --- a/package.json +++ b/package.json @@ -7,23 +7,23 @@ "test": "mocha" }, "dependencies": { - "archiver": "0.14.4", - "async": "1.3.0", - "aws-sdk": "2.1.39", - "basic-auth": "1.0.3", - "bcrypt": "*", - "body-parser": "~1.13.1", - "cheerio": "0.19.0", - "config": "1.14.0", - "cookie-parser": "~1.3.5", - "csurf": "1.8.3", - "debug": "~2.2.0", + "archiver": "1.3.0", + "async": "2.3.0", + "aws-sdk": "2.39.0", + "basic-auth": "1.1.0", + "bcryptjs": "2.4.3", + "body-parser": "~1.17.1", + "cheerio": "0.22.0", + "config": "1.25.1", + "cookie-parser": "~1.4.3", + "csurf": "1.9.0", + "debug": "~2.6.3", "execSync": "latest", "express": "~4.13.0", - "glob": "5.0.14", - "gm": "1.18.1", - "googleapis": "2.1.3", - "gulp": "^3.9.0", + "glob": "7.1.1", + "gm": "1.23.0", + "googleapis": "18.0.0", + "gulp": "^3.9.1", "gulp-concat": "2.6.0", "gulp-eslint": "*", "gulp-express": "0.3.0", @@ -31,51 +31,50 @@ "gulp-sass": "^2.0.3", "gulp-uglify": "^1.5.1", "gulp-util": "^3.0.6", - "helmet": "^1.1.0", - "i18n-2": "0.4.6", - "ioredis": "1.6.1", + "helmet": "^3.5.0", + "i18n-2": "0.6.3", + "ioredis": "2.5.0", "lodash": "^4.3.0", "log-timestamp": "latest", - "md5": "2.0.0", - "moment": "2.10.6", - "mongoose": "4.4.3", - "morgan": "1.6.1", - "node-sass-middleware": "0.8.0", - "pdfkit": "0.7.1", - "validator": "5.2.0", + "md5": "2.2.1", + "moment": "2.18.1", + "mongoose": "4.9.3", + "morgan": "1.8.1", + "node-sass-middleware": "0.11.0", + "pdfkit": "0.8.0", + "validator": "7.0.0", "node-phantom-simple": "2.2.4", - "phantomjs-prebuilt": "2.1.7", + "phantomjs-prebuilt": "2.1.14", "pm2": "latest", - "qr-image": "3.1.0", - "raven": "0.8.1", - "request": "2.60.0", + "qr-image": "3.2.0", + "raven": "1.2.0", + "request": "2.81.0", "sanitize-html": "^1.11.1", - "serve-favicon": "~2.3.0", + "serve-favicon": "~2.4.2", "swig": "1.4.2", "slug": "0.9.1", "underscore": "1.8.3", - "weak": "1.0.0", - "ws": "0.7.2" + "weak": "1.0.1", + "ws": "2.2.3" }, "devDependencies": { "express": "^4.13.3", - "gulp": "^3.9.0", + "gulp": "^3.9.1", "gulp-clean": "^0.3.2", "gulp-concat": "^2.6.0", - "gulp-eslint": "^1.1.0", + "gulp-eslint": "^3.0.1", "gulp-express": "^0.3.0", "gulp-fingerprint": "^0.3.2", "gulp-nodemon": "^2.0.4", - "gulp-rev": "^6.0.1", - "gulp-rev-all": "^0.8.22", + "gulp-rev": "^7.1.2", + "gulp-rev-all": "^0.9.7", "gulp-rev-replace": "^0.4.3", - "gulp-sass": "^2.1.0", - "gulp-uglify": "^1.4.2", - "mocha": "*", - "nodemon": "*", - "should": "^7.1.0", - "supertest": "^1.1.0", - "winston": "^1.0.1" + "gulp-sass": "^3.1.0", + "gulp-uglify": "^2.1.2", + "nodemon": "1.11.0", + "should": "^11.2.1", + "supertest": "^3.0.0", + "winston": "^2.3.1" }, "description": "", "main": "Gulpfile.js", diff --git a/routes/api/sessions.js b/routes/api/sessions.js index 0ec3f32..3b63042 100644 --- a/routes/api/sessions.js +++ b/routes/api/sessions.js @@ -3,7 +3,7 @@ var config = require('config'); require('../../models/schema'); -var bcrypt = require('bcrypt'); +var bcrypt = require('bcryptjs'); var crypo = require('crypto'); var express = require('express'); diff --git a/routes/api/teams.js b/routes/api/teams.js index 70ee621..da46a59 100644 --- a/routes/api/teams.js +++ b/routes/api/teams.js @@ -9,7 +9,7 @@ var mailer = require('../../helpers/mailer'); var fs = require('fs'); var _ = require('underscore'); var crypto = require('crypto'); -var bcrypt = require('bcrypt'); +var bcrypt = require('bcryptjs'); var express = require('express'); var router = express.Router(); diff --git a/routes/api/users.js b/routes/api/users.js index b273125..8140bcc 100644 --- a/routes/api/users.js +++ b/routes/api/users.js @@ -6,7 +6,7 @@ require('../../models/schema'); var mailer = require('../../helpers/mailer'); var uploader = require('../../helpers/uploader'); -var bcrypt = require('bcrypt'); +var bcrypt = require('bcryptjs'); var crypo = require('crypto'); var swig = require('swig'); var async = require('async');