From b956881100b70447c61091f434301b05bf5ef138 Mon Sep 17 00:00:00 2001
From: Brook Elgie <specialbrew@gmail.com>
Date: Thu, 9 Feb 2017 09:15:37 +0000
Subject: [PATCH] Remove and update some npm dependencies

- Remove 'q' from deps
- Remove deprecated node-uuid, add uuid
- Remove chalk and colors
- Remove execSync from deps
- Remove optimist from deps
---
 census/controllers/census.js                        | 2 +-
 census/migrations/20150824164300-notificationlog.js | 7 +------
 census/routes/utils.js                              | 2 +-
 fixtures/entry.js                                   | 2 +-
 fixtures/utils.js                                   | 2 +-
 package.json                                        | 7 +------
 scripts/users.js                                    | 2 +-
 7 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/census/controllers/census.js b/census/controllers/census.js
index 7494f2bb..8ed64b19 100644
--- a/census/controllers/census.js
+++ b/census/controllers/census.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const marked = require('marked');
 const config = require('../config');
-const uuid = require('node-uuid');
+const uuid = require('uuid');
 const url = require('url');
 const querystring = require('querystring');
 const utils = require('./utils');
diff --git a/census/migrations/20150824164300-notificationlog.js b/census/migrations/20150824164300-notificationlog.js
index cac10905..4f9e73a8 100644
--- a/census/migrations/20150824164300-notificationlog.js
+++ b/census/migrations/20150824164300-notificationlog.js
@@ -1,11 +1,6 @@
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
-var _ = require('lodash');
-var Promise = require('bluebird');
-var models = require('../models');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 
 module.exports = {
   up: function(queryInterface, Sequelize) {
diff --git a/census/routes/utils.js b/census/routes/utils.js
index d70307a0..ba829351 100644
--- a/census/routes/utils.js
+++ b/census/routes/utils.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const passport = require('passport');
-const uuid = require('node-uuid');
+const uuid = require('uuid');
 const GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
 const FacebookStrategy = require('passport-facebook').Strategy;
 const models = require('../models');
diff --git a/fixtures/entry.js b/fixtures/entry.js
index 8d1b840c..d7535905 100644
--- a/fixtures/entry.js
+++ b/fixtures/entry.js
@@ -1,7 +1,7 @@
 'use strict';
 
 var _ = require('lodash');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var datasets = require('./dataset');
 var places = require('./place');
 var users = require('./user');
diff --git a/fixtures/utils.js b/fixtures/utils.js
index 74ec235d..b984aeee 100644
--- a/fixtures/utils.js
+++ b/fixtures/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const uuid = require('node-uuid');
+const uuid = require('uuid');
 const controllerUtils = require('../census/controllers/utils');
 
 const userIds = [
diff --git a/package.json b/package.json
index 21e1b2ba..5e69461a 100644
--- a/package.json
+++ b/package.json
@@ -48,14 +48,12 @@
     "moment": "^2.10.3",
     "morgan": "^1.5.3",
     "nconf": "^0.8.4",
-    "node-uuid": "^1.4.3",
     "nunjucks": "^2.5.2",
     "passport": "^0.3.2",
     "passport-facebook": "^2.0.0",
     "passport-google-oauth": "^1.0.0",
     "passport-local": "^1.0.0",
     "pg": "^6.1.0",
-    "q": "^1.4.1",
     "raven": "^0.12.1",
     "react": "^15.3.0",
     "react-dom": "^15.3.0",
@@ -65,6 +63,7 @@
     "subdomain": "^1.2.0",
     "throng": "^4.0.0",
     "umzug": "^1.6.0",
+    "uuid": "^3.0.1",
     "validator": "^6.1.0",
     "webpack": "^1.13.2",
     "xss": "^0.2.13"
@@ -73,8 +72,6 @@
     "babel-jsxgettext": "^0.2.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.1.0",
-    "chalk": "^1.1.0",
-    "colors": "^1.1.0",
     "command-line-args": "^3.0.5",
     "command-line-commands": "^1.0.4",
     "coveralls": "^2.11.9",
@@ -82,7 +79,6 @@
     "eslint": "^3.0.1",
     "eslint-config-google": "^0.6.0",
     "eslint-plugin-react": "^6.1.1",
-    "execSync": "^1.0.2",
     "gulp": "^3.8.9",
     "gulp-concat-po": "^0.1.0",
     "gulp-filter": "^4.0.0",
@@ -97,7 +93,6 @@
     "jsxgettext": "^0.9.0",
     "mocha": "^3.0.2",
     "node-inspector": "^0.12.8",
-    "optimist": "~0.6.1",
     "react-addons-test-utils": "^15.3.0",
     "rewire": "^2.5.2",
     "supertest": "^2.0.0",
diff --git a/scripts/users.js b/scripts/users.js
index 439f5e25..97582652 100644
--- a/scripts/users.js
+++ b/scripts/users.js
@@ -2,7 +2,7 @@ var csv = require('csv');
 var fs = require('fs');
 var models = require('../census/models');
 var Promise = require('bluebird');
-var uuid = require('node-uuid');
+var uuid = require('uuid');
 var fileData;
 var utils = require('./utils');