Merge pull request #4954 from MetaMask/v4.9.0

V4.9.0

1 files changed, 36 insertions, 17 deletions

diff --git a/package.json b/package.json
index 658b9147d..96b0829db 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
     "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
     "sentry:publish": "node ./development/sentry-publish.js",
-    "lint": "gulp lint",
-    "lint:fix": "gulp lint:fix",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --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\"",
@@ -54,9 +54,19 @@
         "babelify",
         {
           "presets": [
-            "es2015",
+            [
+              "env",
+              {
+                "debug": true
+              }
+            ],
             "stage-0"
           ]
+        },
+        {
+          "plugins": [
+            "transform-class-properties"
+          ]
         }
       ],
       "reactify",
@@ -93,21 +103,24 @@
     "ensnare": "^1.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
-    "eth-contract-metadata": "^1.1.5",
-    "eth-hd-keyring": "^1.2.1",
+    "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
+    "eth-ens-namehash": "^2.0.8",
+    "eth-hd-keyring": "^2.0.0",
     "eth-json-rpc-filters": "^1.2.6",
     "eth-json-rpc-infura": "^3.0.0",
+    "eth-method-registry": "^1.0.0",
     "eth-phishing-detect": "^1.1.4",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",
     "eth-token-tracker": "^1.1.4",
+    "eth-trezor-keyring": "^0.1.0",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "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",
@@ -140,6 +153,7 @@
     "metamascara": "^2.0.0",
     "metamask-logo": "^2.1.4",
     "mkdirp": "^0.5.1",
+    "multihashes": "^0.4.12",
     "multiplex": "^6.7.0",
     "number-to-bn": "^1.7.0",
     "obj-multiplex": "^1.0.0",
@@ -179,10 +193,12 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.2.0",
     "request-promise": "^4.2.1",
+    "reselect": "^3.0.1",
     "sandwich-expando": "^1.1.3",
     "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",
     "textarea-caret": "^3.0.1",
@@ -203,12 +219,13 @@
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "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",
@@ -228,17 +245,16 @@
     "eslint-plugin-mocha": "^5.0.0",
     "eslint-plugin-react": "^7.4.0",
     "eth-json-rpc-middleware": "^1.6.0",
-    "eth-keyring-controller": "^3.1.4",
+    "eth-keyring-controller": "^4.0.0",
     "file-loader": "^1.1.11",
     "fs-promise": "^2.0.3",
     "ganache-cli": "^6.1.0",
-    "ganache-core": "^2.1.0",
+    "ganache-core": "^2.1.5",
     "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",
-    "gulp-eslint": "^4.0.0",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
     "gulp-multi-process": "^1.3.1",
@@ -251,13 +267,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",
@@ -268,9 +285,9 @@
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
     "nock": "^9.0.14",
-    "node-sass": "^4.7.2",
+    "node-sass": "^4.9.2",
     "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",
@@ -282,6 +299,7 @@
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.6.2",
     "react-testutils-additions": "^15.2.0",
+    "redux-mock-store": "^1.5.3",
     "redux-test-utils": "^0.2.2",
     "resolve-url-loader": "^2.3.0",
     "rimraf": "^2.6.2",
@@ -293,13 +311,14 @@
     "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"
+    "node": "8.11.3",
+    "npm": "^6.1.0"
   }
 }