Merge branch 'master' into greenkeeper-semantic-release-6.3.2

jbhannah · Dec 5, 2016 · e6de4a5 · e6de4a5
2 parents 17f4c2f + 3a5f84e
commit e6de4a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/amperize.js b/lib/amperize.js
@@ -5,7 +5,7 @@ var merge = require('lodash.merge')
   , emits = require('emits')
   , html = require('htmlparser2')
   , util = require('util')
-  , uuid = require('node-uuid')
+  , uuid = require('uuid')
   , async = require('async')
   , url = require('url')
   , http = require('http')

diff --git a/package.json b/package.json
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/jbhannah/amperize#readme",
   "dependencies": {
-    "async": "2.0.1",
+    "async": "2.1.4",
     "emits": "3.0.0",
     "htmlparser2": "3.9.1",
     "image-size": "0.5.0",
     "lodash.merge": "4.6.0",
     "nock": "^8.0.0",
-    "node-uuid": "1.4.7",
-    "rewire": "^2.5.2"
+    "rewire": "^2.5.2",
+    "uuid": "^3.0.0"
   },
   "devDependencies": {
     "chai": "3.5.0",