Merge branch 'master' into i18n-helper

1 files changed, 13 insertions, 15 deletions

diff --git a/package.json b/package.json
index b53daeb83..62d703c90 100644
--- a/package.json
+++ b/package.json
@@ -4,14 +4,9 @@
   "public": false,
   "private": true,
   "scripts": {
-    "start": "npm run dev",
-    "dev": "gulp dev --debug",
-    "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
-    "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
-    "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
-    "mascara": "gulp build && cross-env METAMASK_DEBUG=true node ./mascara/example/server",
-    "dist": "npm run dist:clear && npm install && gulp dist",
-    "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect",
+    "start": "gulp dev:extension",
+    "mascara": "gulp dev:mascara & cross-env METAMASK_DEBUG=true node ./mascara/example/server",
+    "dist": "gulp dist",
     "test": "npm run test:unit && npm run test:integration && npm run lint",
     "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js",
@@ -41,6 +36,9 @@
     "sentry:upload:maps": "sentry-cli releases --org 'metamask' --project 'metamask' files $RELEASE upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps' --rewrite",
     "lint": "gulp lint",
     "lint:fix": "gulp lint:fix",
+    "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
     "disc": "gulp disc --debug",
     "announce": "node development/announcer.js",
     "version:bump": "node development/run-version-bump.js",
@@ -78,7 +76,6 @@
     "browserify-derequire": "^0.9.4",
     "browserify-unibabel": "^3.0.0",
     "classnames": "^2.2.5",
-    "client-sw-ready-event": "^3.3.0",
     "clone": "^2.1.1",
     "copy-to-clipboard": "^3.0.8",
     "debounce": "^1.0.0",
@@ -109,7 +106,7 @@
     "ethjs": "^0.2.8",
     "ethjs-contract": "^0.1.9",
     "ethjs-ens": "^2.0.0",
-    "ethjs-query": "^0.3.1",
+    "ethjs-query": "^0.3.4",
     "express": "^4.15.5",
     "extension-link-enabler": "^1.0.0",
     "extensionizer": "^1.0.0",
@@ -118,6 +115,7 @@
     "fuse.js": "^3.2.0",
     "gulp": "github:gulpjs/gulp#4.0",
     "gulp-autoprefixer": "^5.0.0",
+    "gulp-debug": "^3.2.0",
     "gulp-eslint": "^4.0.0",
     "gulp-sass": "^3.1.0",
     "hat": "0.0.3",
@@ -144,6 +142,7 @@
     "obs-store": "^3.0.0",
     "once": "^1.3.3",
     "percentile": "^1.2.0",
+    "pify": "^3.0.0",
     "ping-pong-stream": "^1.0.0",
     "pojo-migrator": "^2.1.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
@@ -151,7 +150,6 @@
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
     "pump": "^3.0.0",
-    "pify": "^3.0.0",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
     "ramda": "^0.24.1",
@@ -180,13 +178,14 @@
     "semaphore": "^1.0.5",
     "semver": "^5.4.1",
     "shallow-copy": "0.0.1",
-    "sw-stream": "^2.0.0",
+    "sw-controller": "^1.0.3",
+    "sw-stream": "^2.0.2",
     "textarea-caret": "^3.0.1",
     "through2": "^2.0.3",
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "^0.20.1",
-    "web3-provider-engine": "^13.5.6",
+    "web3-provider-engine": "^13.8.0",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
@@ -222,7 +221,6 @@
     "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
     "gulp-babel": "^7.0.0",
     "gulp-eslint": "^4.0.0",
-    "gulp-if": "^2.0.2",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
     "gulp-replace": "^0.6.1",
@@ -258,8 +256,8 @@
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.6.2",
     "react-testutils-additions": "^15.2.0",
-    "selenium-webdriver": "^3.5.0",
     "redux-test-utils": "^0.2.2",
+    "selenium-webdriver": "^3.5.0",
     "sinon": "^5.0.0",
     "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",