Merge branch 'master' into retry-tx-refractor

1 files changed, 15 insertions, 13 deletions

diff --git a/package.json b/package.json
index fd2554f73..00587ece6 100644
--- a/package.json
+++ b/package.json
@@ -6,23 +6,24 @@
   "scripts": {
     "start": "npm run dev",
     "dev": "gulp dev --debug",
-    "ui": "npm run test:flat:build:states && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
-    "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "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 && METAMASK_DEBUG=true node ./mascara/example/server",
+    "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",
     "test": "npm run lint && npm run test:coverage && npm run test:integration",
-    "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
-    "test:single": "METAMASK_ENV=test mocha --require test/helper.js",
-    "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
+    "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",
+    "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
+    "test:integration:build": "gulp build:scss",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",
     "test:coveralls-upload": "if [ $COVERALLS_REPO_TOKEN ]; then nyc report --reporter=text-lcov | coveralls; fi",
     "test:flat": "npm run test:flat:build && karma start test/flat.conf.js",
     "test:flat:build": "npm run test:flat:build:ui && npm run test:flat:build:tests",
     "test:flat:build:tests": "node test/integration/index.js",
     "test:flat:build:states": "node development/genStates.js",
-    "test:flat:build:ui": "npm run test:flat:build:states && browserify ./mock-dev.js -o ./development/bundle.js",
+    "test:flat:build:ui": "npm run test:flat:build:states && browserify ./development/mock-dev.js -o ./development/bundle.js",
     "test:mascara": "npm run test:mascara:build && karma start test/mascara.conf.js",
     "test:mascara:build": "mkdir -p dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests",
     "test:mascara:build:ui": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js",
@@ -71,6 +72,7 @@
     "clone": "^2.1.1",
     "copy-to-clipboard": "^3.0.8",
     "debounce": "^1.0.0",
+    "debounce-stream": "^2.0.0",
     "deep-extend": "^0.5.0",
     "detect-node": "^2.0.3",
     "disc": "^1.3.2",
@@ -105,7 +107,7 @@
     "fast-levenshtein": "^2.0.6",
     "fuse.js": "^3.2.0",
     "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-autoprefixer": "^4.0.0",
+    "gulp-autoprefixer": "^5.0.0",
     "gulp-eslint": "^4.0.0",
     "gulp-sass": "^3.1.0",
     "hat": "0.0.3",
@@ -125,7 +127,6 @@
     "loglevel": "^1.4.1",
     "metamascara": "^2.0.0",
     "metamask-logo": "^2.1.2",
-    "mississippi": "^1.2.0",
     "mkdirp": "^0.5.1",
     "multiplex": "^6.7.0",
     "number-to-bn": "^1.7.0",
@@ -139,7 +140,7 @@
     "post-message-stream": "^3.0.0",
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
-    "pump": "^1.0.2",
+    "pump": "^3.0.0",
     "pumpify": "^1.3.4",
     "qrcode-npm": "0.0.3",
     "ramda": "^0.24.1",
@@ -189,10 +190,11 @@
     "babelify": "^8.0.0",
     "beefy": "^2.1.5",
     "brfs": "^1.4.3",
-    "browserify": "^14.4.0",
+    "browserify": "^16.1.1",
     "chai": "^4.1.0",
     "compression": "^1.7.1",
     "coveralls": "^3.0.0",
+    "cross-env": "^5.1.4",
     "deep-freeze-strict": "^1.1.1",
     "del": "^3.0.0",
     "envify": "^4.0.0",
@@ -212,7 +214,7 @@
     "gulp-replace": "^0.6.1",
     "gulp-sourcemaps": "^2.6.0",
     "gulp-stylefmt": "^1.1.0",
-    "gulp-stylelint": "^4.0.0",
+    "gulp-stylelint": "^7.0.0",
     "gulp-uglify": "^3.0.0",
     "gulp-uglify-es": "^1.0.1",
     "gulp-util": "^3.0.7",
@@ -244,7 +246,7 @@
     "react-testutils-additions": "^15.2.0",
     "redux-test-utils": "^0.2.2",
     "sinon": "^4.0.0",
-    "stylelint-config-standard": "^17.0.0",
+    "stylelint-config-standard": "^18.2.0",
     "tape": "^4.5.1",
     "testem": "^2.0.0",
     "uglifyify": "^4.0.2",