Merge branch 'master' into AddTokenList

1 files changed, 26 insertions, 9 deletions

diff --git a/package.json b/package.json
index 2eaaf7154..07f2c488c 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "start": "npm run dev",
     "dev": "gulp dev --debug",
     "disc": "gulp disc --debug",
-    "dist": "gulp dist --disableLiveReload",
+    "dist": "npm install && gulp dist --disableLiveReload",
     "test": "npm run lint && npm run test-unit && npm run test-integration",
     "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test-integration": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
@@ -21,7 +21,12 @@
     "testem": "npm run buildMock && testem",
     "announce": "node development/announcer.js",
     "generateNotice": "node notices/notice-generator.js",
-    "deleteNotice": "node notices/notice-delete.js"
+    "deleteNotice": "node notices/notice-delete.js",
+    "mascara": "node ./mascara/example/server",
+    "buildMascaraCi": "browserify mascara/test/window-load.js -o mascara/test/bundle.js",
+    "buildMascaraSWCi": "browserify mascara/src/background.js -o mascara/test/background.js",
+    "mascaraCi": "npm run buildMascaraCi && npm run buildMascaraSWCi && node mascara/test/index.js",
+    "testMascara": "cd mascara/test && npm run mascaraCi && testem ci -P 3"
   },
   "browserify": {
     "transform": [
@@ -29,7 +34,8 @@
         "babelify",
         {
           "presets": [
-            "es2015"
+            "es2015",
+            "stage-0"
           ]
         }
       ],
@@ -39,36 +45,39 @@
   },
   "dependencies": {
     "async": "^1.5.2",
-    "async-q": "^0.3.1",
+    "babel-runtime": "^6.23.0",
     "bip39": "^2.2.0",
     "bluebird": "^3.5.0",
     "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
-    "client-sw-ready-event": "^3.0.1",
+    "client-sw-ready-event": "^3.3.0",
     "clone": "^1.0.2",
     "copy-to-clipboard": "^2.0.0",
     "debounce": "^1.0.0",
     "deep-extend": "^0.4.1",
     "denodeify": "^1.2.1",
+    "detect-node": "^2.0.3",
     "disc": "^1.3.2",
     "dnode": "^1.2.2",
     "end-of-stream": "^1.1.0",
     "ensnare": "^1.0.0",
     "eth-bin-to-ops": "^1.0.1",
+    "eth-contract-metadata": "^1.0.0",
     "eth-hd-keyring": "^1.1.1",
-    "eth-query": "^1.0.3",
+    "eth-query": "^2.1.1",
     "eth-sig-util": "^1.1.1",
     "eth-simple-keyring": "^1.1.1",
     "eth-token-tracker": "^1.0.4",
-    "ethereumjs-tx": "^1.2.5",
+    "ethereumjs-tx": "^1.3.0",
     "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
-    "ethjs-ens": "^1.0.2",
+    "ethjs-ens": "^2.0.0",
     "express": "^4.14.0",
     "extension-link-enabler": "^1.0.0",
     "extensionizer": "^1.0.0",
     "gulp-eslint": "^2.0.0",
     "hat": "0.0.3",
+    "idb-global": "^1.0.0",
     "identicon.js": "^1.2.1",
     "iframe": "^1.0.0",
     "iframe-stream": "^1.0.2",
@@ -80,6 +89,7 @@
     "mississippi": "^1.2.0",
     "mkdirp": "^0.5.1",
     "multiplex": "^6.7.0",
+    "number-to-bn": "^1.7.0",
     "obs-store": "^2.3.1",
     "once": "^1.3.3",
     "ping-pong-stream": "^1.0.0",
@@ -114,7 +124,7 @@
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
     "web3": "0.18.2",
-    "web3-provider-engine": "^11.0.2",
+    "web3-provider-engine": "^12.2.4",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
   },
@@ -135,6 +145,9 @@
     "deep-freeze-strict": "^1.1.1",
     "del": "^2.2.0",
     "envify": "^4.0.0",
+    "enzyme": "^2.8.2",
+    "eslint-plugin-chai": "0.0.1",
+    "eslint-plugin-mocha": "^4.9.0",
     "fs-promise": "^1.0.0",
     "gulp": "github:gulpjs/gulp#4.0",
     "gulp-if": "^2.0.1",
@@ -159,6 +172,10 @@
     "prompt": "^1.0.0",
     "qs": "^6.2.0",
     "qunit": "^0.9.1",
+    "react-addons-test-utils": "^15.5.1",
+    "react-dom": "^15.5.4",
+    "react-test-renderer": "^15.5.4",
+    "react-testutils-additions": "^15.2.0",
     "sinon": "^1.17.3",
     "tape": "^4.5.1",
     "testem": "^1.10.3",