1 files changed, 51 insertions, 18 deletions
diff --git a/package.json b/package.json
index fdf6c822e..11cb353ea 100644
--- a/package.json
+++ b/package.json
@@ -4,18 +4,24 @@
   "public": false,
   "private": true,
   "scripts": {
-    "start": "gulp dev",
+    "start": "npm run dev",
     "lint": "gulp lint",
-    "dev": "gulp dev",
-    "dist": "gulp dist",
-    "test": "npm run fastTest && npm run ci",
-    "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
-    "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
-    "ui": "node development/genStates.js && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
+    "buildCiUnits": "node test/integration/index.js",
+    "dev": "gulp dev --debug",
+    "disc": "gulp disc --debug",
+    "dist": "gulp dist --disableLiveReload",
+    "test": "npm run lint && npm run fastTest && npm run ci",
+    "fastTest": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"",
+    "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
+    "genStates": "node development/genStates.js",
+    "ui": "npm run genStates && 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 ./",
-    "buildMock": "browserify ./mock-dev.js -o ./development/bundle.js",
+    "buildMock": "npm run genStates && browserify ./mock-dev.js -o ./development/bundle.js",
     "testem": "npm run buildMock && testem",
-    "ci": "npm run buildMock && testem ci -P 2"
+    "ci": "npm run buildMock && npm run buildCiUnits && testem ci -P 2",
+    "announce": "node development/announcer.js",
+    "generateNotice": "node notices/notice-generator.js",
+    "deleteNotice": "node notices/notice-delete.js"
   },
   "browserify": {
     "transform": [
@@ -32,39 +38,59 @@
   },
   "dependencies": {
     "async": "^1.5.2",
+    "async-q": "^0.3.1",
+    "bip39": "^2.2.0",
+    "browser-passworder": "^2.0.3",
     "browserify-derequire": "^0.9.4",
     "clone": "^1.0.2",
     "copy-to-clipboard": "^2.0.0",
     "debounce": "^1.0.0",
+    "deep-extend": "^0.4.1",
+    "denodeify": "^1.2.1",
+    "disc": "^1.3.2",
     "dnode": "^1.2.2",
     "end-of-stream": "^1.1.0",
     "ensnare": "^1.0.0",
-    "eth-bin-to-ops": "^1.0.0",
+    "eth-bin-to-ops": "^1.0.1",
     "eth-lightwallet": "^2.3.3",
     "eth-query": "^1.0.3",
-    "eth-store": "^1.1.0",
     "ethereumjs-tx": "^1.0.0",
-    "ethereumjs-util": "^4.4.0",
+    "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
+    "ethereumjs-wallet": "^0.6.0",
+    "express": "^4.14.0",
+    "extension-link-enabler": "^1.0.0",
+    "extensionizer": "^1.0.0",
     "gulp-eslint": "^2.0.0",
     "hat": "0.0.3",
     "identicon.js": "^1.2.1",
+    "iframe": "^1.0.0",
+    "iframe-stream": "^1.0.2",
     "inject-css": "^0.1.1",
-    "jazzicon": "^1.1.3",
+    "jazzicon": "^1.2.0",
     "menu-droppo": "^1.1.0",
-    "metamask-logo": "^1.3.1",
+    "metamask-logo": "^2.1.2",
     "mississippi": "^1.2.0",
+    "mkdirp": "^0.5.1",
     "multiplex": "^6.7.0",
+    "obs-store": "^2.3.1",
     "once": "^1.3.3",
+    "ping-pong-stream": "^1.0.0",
     "pojo-migrator": "^2.1.0",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
     "post-message-stream": "^1.0.0",
+    "promise-filter": "^1.1.0",
+    "promise-to-callback": "^1.0.0",
+    "pump": "^1.0.2",
     "pumpify": "^1.3.4",
+    "qrcode-npm": "0.0.3",
     "react": "^15.0.2",
     "react-addons-css-transition-group": "^15.0.2",
     "react-dom": "^15.0.2",
     "react-hyperscript": "^2.2.2",
     "react-markdown": "^2.3.0",
     "react-redux": "^4.4.5",
+    "react-select": "^1.0.0-rc.2",
+    "react-simple-file-input": "^1.0.0",
     "react-tooltip-component": "^0.3.0",
     "readable-stream": "^2.1.2",
     "redux": "^3.0.5",
@@ -72,34 +98,39 @@
     "redux-thunk": "^1.0.2",
     "request-promise": "^4.1.1",
     "sandwich-expando": "^1.0.5",
+    "semaphore": "^1.0.5",
     "textarea-caret": "^3.0.1",
     "three.js": "^0.73.2",
     "through2": "^2.0.1",
+    "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
-    "web3": "^0.17.0-alpha",
-    "web3-provider-engine": "^8.0.2",
+    "web3": "0.18.2",
+    "web3-provider-engine": "^8.5.0",
     "web3-stream-provider": "^2.0.6",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
     "babel-eslint": "^6.0.5",
-    "babel-preset-es2015": "^6.6.0",
     "babel-register": "^6.7.2",
     "babelify": "^7.2.0",
     "beefy": "^2.1.5",
     "brfs": "^1.4.3",
     "browserify": "^13.0.0",
     "chai": "^3.5.0",
+    "clone": "^1.0.2",
     "deep-freeze-strict": "^1.1.1",
     "del": "^2.2.0",
+    "fs-promise": "^1.0.0",
     "gulp": "github:gulpjs/gulp#4.0",
-    "gulp-brfs": "^0.1.0",
+    "gulp-if": "^2.0.1",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
+    "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "gulp-zip": "^3.2.0",
+    "isomorphic-fetch": "^2.2.1",
     "jsdom": "^8.1.0",
     "jsdom-global": "^1.7.0",
     "jshint-stylish": "~0.1.5",
@@ -109,6 +140,8 @@
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^1.1.5",
     "nock": "^8.0.0",
+    "open": "0.0.5",
+    "prompt": "^1.0.0",
     "qs": "^6.2.0",
     "qunit": "^0.9.1",
     "sinon": "^1.17.3",