From 0f784802917cb5f30df606672b9e3f5d1905f9d7 Mon Sep 17 00:00:00 2001 From: Patrick Sullivan Date: Thu, 16 Jan 2014 02:43:48 -0800 Subject: [PATCH 1/2] fix(dependencies): replace bcrypt with bcrypt-json Windows cannot easily use native bcrypt. --- templates/common/_package.json | 2 +- templates/express/models/user.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/common/_package.json b/templates/common/_package.json index c9429a5a2..6f6535bf0 100644 --- a/templates/common/_package.json +++ b/templates/common/_package.json @@ -9,7 +9,7 @@ "connect-mongo": "~0.4.0", "passport": "latest", "passport-local": "latest", - "bcrypt": "~0.7.7"<% } %><% if (jade) { %>, + "bcrypt-nodejs": "~0.0.3"<% } %><% if (jade) { %>, "jade": "latest"<% } %><% if (!jade) { %>, "ejs": "~0.8.4"<% } %> }, diff --git a/templates/express/models/user.js b/templates/express/models/user.js index 307b710e9..f6873223e 100644 --- a/templates/express/models/user.js +++ b/templates/express/models/user.js @@ -3,7 +3,7 @@ var mongoose = require('mongoose'), uniqueValidator = require('mongoose-unique-validator'), Schema = mongoose.Schema, - bcrypt = require('bcrypt'); + bcrypt = require('bcrypt-nodejs'); var authTypes = ['github', 'twitter', 'facebook', 'google'], SALT_WORK_FACTOR = 10; From 08badb9fa88d0cc35d3b20cb5b316eddfd8805c6 Mon Sep 17 00:00:00 2001 From: Patrick Sullivan Date: Thu, 16 Jan 2014 02:48:21 -0800 Subject: [PATCH 2/2] fix(dependencies): include grunt-karma in package.json --- templates/common/_package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/common/_package.json b/templates/common/_package.json index 6f6535bf0..741b1d12a 100644 --- a/templates/common/_package.json +++ b/templates/common/_package.json @@ -39,6 +39,7 @@ "jshint-stylish": "~0.1.3", "load-grunt-tasks": "~0.2.0", "time-grunt": "~0.2.1", + "grunt-karma": "~0.6.2", "grunt-express-server": "~0.4.5", "grunt-open": "~0.2.0", "connect-livereload": "~0.3.0"