Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

1 files changed, 12 insertions, 11 deletions

diff --git a/package.json b/package.json
index 0332f06b8..7e28df8c3 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "dist": "gulp dist",
     "doc": "jsdoc -c development/tools/.jsdoc.json",
     "test": "npm run test:unit && npm run test:integration && npm run lint",
+    "watch:test:unit": "nodemon --exec \"npm run test:unit\" ./test ./app ./ui",
     "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\" && dot-only-hunter",
     "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js",
     "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
@@ -45,8 +46,6 @@
     "disc": "gulp disc --debug",
     "announce": "node development/announcer.js",
     "version:bump": "node development/run-version-bump.js",
-    "generateNotice": "node notices/notice-generator.js",
-    "deleteNotice": "node notices/notice-delete.js",
     "storybook": "start-storybook -p 6006 -c .storybook"
   },
   "browserify": {
@@ -111,7 +110,7 @@
     "ethereumjs-wallet": "^0.6.0",
     "etherscan-link": "^1.0.2",
     "ethjs": "^0.4.0",
-    "ethjs-contract": "^0.2.0",
+    "ethjs-contract": "^0.2.3",
     "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.3.4",
     "express": "^4.15.5",
@@ -187,6 +186,7 @@
     "semaphore": "^1.0.5",
     "semver": "^5.4.1",
     "shallow-copy": "0.0.1",
+    "superstatic": "^5.0.2",
     "sw-controller": "^1.0.3",
     "sw-stream": "^2.0.2",
     "swappable-obj-proxy": "^1.0.2",
@@ -212,7 +212,7 @@
     "babel-register": "^6.7.2",
     "babelify": "^8.0.0",
     "beefy": "^2.1.5",
-    "brfs": "^1.4.3",
+    "brfs": "^1.6.1",
     "browserify": "^16.1.1",
     "chai": "^4.1.0",
     "chromedriver": "2.36.0",
@@ -235,9 +235,9 @@
     "fs-extra": "^6.0.1",
     "fs-promise": "^2.0.3",
     "ganache-cli": "^6.1.0",
-    "ganache-core": "^2.1.0",
+    "ganache-core": "^2.1.3",
     "geckodriver": "^1.11.0",
-    "gh-pages": "^1.1.0",
+    "gh-pages": "^1.2.0",
     "gifencoder": "^1.1.0",
     "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
     "gulp-babel": "^7.0.0",
@@ -254,13 +254,14 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^5.0.0",
     "gulp-zip": "^4.0.0",
+    "http-server": "^0.11.1",
     "image-size": "^0.6.2",
     "isomorphic-fetch": "^2.2.1",
     "jsdoc": "^3.5.5",
     "jsdom": "^11.2.0",
     "jsdom-global": "^3.0.2",
     "jshint-stylish": "~2.2.1",
-    "karma": "^2.0.0",
+    "karma": "^2.0.4",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-firefox-launcher": "^1.0.1",
@@ -271,9 +272,9 @@
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
-    "node-sass": "^4.7.2",
+    "node-sass": "^4.9.0",
     "nsp": "^3.2.1",
-    "nyc": "^11.0.3",
+    "nyc": "^13.0.0",
     "open": "0.0.5",
     "path": "^0.12.7",
     "png-file-stream": "^1.0.0",
@@ -297,11 +298,11 @@
     "style-loader": "^0.21.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",
-    "testem": "^2.0.0",
+    "testem": "^2.8.0",
     "through2": "^2.0.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
-    "watchify": "^3.9.0"
+    "watchify": "^3.11.0"
   },
   "engines": {
     "node": ">=8.0.0"