From 59f81dd00b304da062faa31b75a2fbb04f2ae493 Mon Sep 17 00:00:00 2001 From: Nishant Kumar Date: Fri, 19 Jun 2015 17:52:47 +0530 Subject: [PATCH 1/2] updated dependencies and dev-dependenc for npm packages --- package.json | 62 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 091f2e121f..c690b2472b 100755 --- a/package.json +++ b/package.json @@ -18,57 +18,57 @@ "postinstall": "bower install --config.interactive=false" }, "dependencies": { - "express": "~4.10.1", - "express-session": "~1.9.1", - "body-parser": "~1.9.0", + "express": "~4.12.4", + "express-session": "~1.11.3", + "body-parser": "~1.13.1", "cookie-parser": "~1.3.2", - "compression": "~1.2.0", + "compression": "~1.5.0", "method-override": "~2.3.0", - "morgan": "~1.4.1", - "connect-mongo": "~0.4.1", + "morgan": "~1.6.0", + "connect-mongo": "~0.8.1", "connect-flash": "~0.1.1", - "helmet": "~0.5.0", - "consolidate": "~0.10.0", + "helmet": "~0.9.1", + "consolidate": "~0.13.1", "swig": "~1.4.1", - "mongoose": "~3.8.8", + "mongoose": "~4.0.5", "passport": "~0.2.0", "passport-local": "~1.0.0", - "passport-facebook": "~1.0.2", + "passport-facebook": "~2.0.0", "passport-twitter": "~1.0.2", "passport-linkedin": "~0.1.3", - "passport-google-oauth": "~0.1.5", + "passport-google-oauth": "~0.2.0", "passport-github": "~0.1.5", - "lodash": "~2.4.1", - "forever": "~0.11.0", - "bower": "~1.3.8", + "lodash": "~3.9.3", + "forever": "~0.14.1", + "bower": "~1.4.1", "grunt-cli": "~0.1.13", - "glob": "~4.0.5", - "async": "~0.9.0", + "glob": "~5.0.10", + "async": "~1.2.1", "nodemailer": "~1.3.0", "chalk": "~1.0.0" }, "devDependencies": { - "supertest": "~0.14.0", - "should": "~4.1.0", + "supertest": "~1.0.1", + "should": "~7.0.1", "grunt-env": "~0.4.1", - "grunt-node-inspector": "~0.1.3", + "grunt-node-inspector": "~0.2.0", "grunt-contrib-watch": "~0.6.1", - "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-csslint": "^0.3.1", - "grunt-ng-annotate": "~0.4.0", - "grunt-contrib-uglify": "~0.6.0", - "grunt-contrib-cssmin": "~0.10.0", - "grunt-nodemon": "~0.3.0", - "grunt-concurrent": "~1.0.0", + "grunt-contrib-jshint": "~0.11.2", + "grunt-contrib-csslint": "^0.4.0", + "grunt-ng-annotate": "~1.0.1", + "grunt-contrib-uglify": "~0.9.1", + "grunt-contrib-cssmin": "~0.12.3", + "grunt-nodemon": "~0.4.0", + "grunt-concurrent": "~2.0.0", "grunt-mocha-test": "~0.12.1", - "grunt-karma": "~0.9.0", - "load-grunt-tasks": "~1.0.0", + "grunt-karma": "~0.11.0", + "load-grunt-tasks": "~3.2.0", "grunt-contrib-copy": "0.8", "karma": "~0.12.0", - "karma-jasmine": "~0.2.1", - "karma-coverage": "~0.2.0", + "karma-jasmine": "~0.3.5", + "karma-coverage": "~0.4.2", "karma-chrome-launcher": "~0.1.2", "karma-firefox-launcher": "~0.1.3", - "karma-phantomjs-launcher": "~0.1.2" + "karma-phantomjs-launcher": "~0.2.0" } } From df764f417ad2a3f0930509f43ad1a4f339959a53 Mon Sep 17 00:00:00 2001 From: Nishant Kumar Date: Mon, 22 Jun 2015 18:26:41 +0530 Subject: [PATCH 2/2] Updated node packages dependencies and fix glob #167 --- config/config.js | 4 +--- config/init.js | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/config.js b/config/config.js index 3a22a2cdb3..98bcdf79ef 100644 --- a/config/config.js +++ b/config/config.js @@ -50,9 +50,7 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) { if (urlRegex.test(globPatterns)) { output.push(globPatterns); } else { - glob(globPatterns, { - sync: true - }, function(err, files) { + glob(globPatterns, function(err, files) { if (removeRoot) { files = files.map(function(file) { return file.replace(removeRoot, ''); diff --git a/config/init.js b/config/init.js index 3a5b1e5203..0c32c0af53 100644 --- a/config/init.js +++ b/config/init.js @@ -14,9 +14,7 @@ module.exports = function() { * Before we begin, lets set the environment variable * We'll Look for a valid NODE_ENV variable and if one cannot be found load the development NODE_ENV */ - glob('./config/env/' + process.env.NODE_ENV + '.js', { - sync: true - }, function(err, environmentFiles) { + glob('./config/env/' + process.env.NODE_ENV + '.js',function(err, environmentFiles) { if (!environmentFiles.length) { if (process.env.NODE_ENV) { console.error(chalk.red('No configuration file found for "' + process.env.NODE_ENV + '" environment using development instead'));