Merge tag 'v4.5.5'

# Conflicts:
#	app/_locales/ja/messages.json
#	package-lock.json

messages.jsonのローカライズ

1 files changed, 79 insertions, 74 deletions

diff --git a/package.json b/package.json
index ac4758f57..d154db1ec 100644
--- a/package.json
+++ b/package.json
@@ -4,40 +4,39 @@
   "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 & 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",
     "test:integration": "npm run test:integration:build && npm run test:flat && npm run test:mascara",
     "test:integration:build": "gulp build:scss",
+    "test:e2e": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:e2e:run'",
+    "test:e2e:run": "mocha test/e2e/metamask.spec --recursive",
+    "test:screens": "shell-parallel -s 'npm run ganache:start' -x 'sleep 3 && npm run test:screens:run'",
+    "test:screens:run": "node test/screens/new-ui.js",
     "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": "npm run test:flat:build:ui && npm run test:flat:build:tests && npm run test:flat:build:locales",
     "test:flat:build:tests": "node test/integration/index.js",
     "test:flat:build:states": "node development/genStates.js",
+    "test:flat:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
     "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": "mkdirp dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests",
+    "test:mascara:build": "mkdirp dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests && npm run test:mascara:build:locales",
     "test:mascara:build:ui": "browserify mascara/test/test-ui.js -o dist/mascara/ui.js",
+    "test:mascara:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
     "test:mascara:build:background": "browserify mascara/src/background.js -o dist/mascara/background.js",
     "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
-    "sentry": "export RELEASE=`cat app/manifest.json| jq -r .version` && npm run sentry:release && npm run sentry:upload",
-    "sentry:release": "npm run sentry:release:new && npm run sentry:release:clean",
-    "sentry:release:new": "sentry-cli releases --org 'metamask' --project 'metamask' new $RELEASE",
-    "sentry:release:clean": "sentry-cli releases --org 'metamask' --project 'metamask' files $RELEASE delete --all",
-    "sentry:upload": "npm run sentry:upload:source && npm run sentry:upload:maps",
-    "sentry:upload:source": "for FILEPATH in ./dist/chrome/scripts/*.js; do [ -e $FILEPATH ] || continue; export FILE=`basename $FILEPATH` && echo uploading $FILE && sentry-cli releases --org 'metamask' --project 'metamask' files $RELEASE upload $FILEPATH metamask/scripts/$FILE; done;",
-    "sentry:upload:maps": "sentry-cli releases --org 'metamask' --project 'metamask' files $RELEASE upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps' --rewrite",
+    "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",
+    "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",
@@ -56,18 +55,17 @@
         }
       ],
       "reactify",
-      "envify",
       "brfs"
     ]
   },
   "dependencies": {
-    "abi-decoder": "^1.0.9",
+    "abi-decoder": "^1.1.0",
     "asmcrypto.js": "0.22.0",
     "async": "^2.5.0",
     "await-semaphore": "^0.1.1",
     "babel-runtime": "^6.23.0",
     "bignumber.js": "^4.1.0",
-    "bip39": "^2.2.0",
+    "bip39": "^2.5.0",
     "bluebird": "^3.5.0",
     "bn.js": "^4.11.7",
     "boron": "^0.2.3",
@@ -75,8 +73,7 @@
     "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",
+    "clone": "^2.1.2",
     "copy-to-clipboard": "^3.0.8",
     "debounce": "^1.0.0",
     "debounce-stream": "^2.0.0",
@@ -84,46 +81,44 @@
     "detect-node": "^2.0.3",
     "disc": "^1.3.2",
     "dnode": "^1.2.2",
-    "end-of-stream": "^1.1.0",
+    "end-of-stream": "^1.4.1",
     "ensnare": "^1.0.0",
-    "eslint-plugin-react": "^7.4.0",
     "eth-bin-to-ops": "^1.0.1",
     "eth-block-tracker": "^2.3.0",
-    "eth-contract-metadata": "^1.1.5",
+    "eth-contract-metadata": "^1.7.0",
     "eth-hd-keyring": "^1.2.1",
     "eth-json-rpc-filters": "^1.2.5",
     "eth-json-rpc-infura": "^3.0.0",
     "eth-keyring-controller": "^2.1.4",
-    "eth-phishing-detect": "^1.1.4",
+    "eth-phishing-detect": "^1.1.13",
     "eth-query": "^2.1.2",
     "eth-sig-util": "^1.4.2",
     "eth-token-tracker": "^1.1.4",
     "ethereumjs-abi": "^0.6.4",
-    "ethereumjs-tx": "^1.3.0",
+    "ethereumjs-tx": "^1.3.4",
     "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
     "ethereumjs-wallet": "^0.6.0",
     "etherscan-link": "^1.0.2",
     "ethjs": "^0.2.8",
     "ethjs-contract": "^0.1.9",
     "ethjs-ens": "^2.0.0",
-    "ethjs-query": "^0.3.1",
-    "express": "^4.15.5",
+    "ethjs-query": "^0.3.4",
+    "express": "^4.16.3",
     "extension-link-enabler": "^1.0.0",
-    "extensionizer": "^1.0.0",
+    "extensionizer": "^1.0.1",
     "fast-json-patch": "^2.0.4",
     "fast-levenshtein": "^2.0.6",
     "fuse.js": "^3.2.0",
-    "gulp": "github:gulpjs/gulp#4.0",
     "gulp-autoprefixer": "^5.0.0",
-    "gulp-eslint": "^4.0.0",
-    "gulp-sass": "^3.1.0",
+    "gulp-debug": "^3.2.0",
+    "gulp-sass": "^3.2.1",
     "hat": "0.0.3",
     "human-standard-token-abi": "^1.0.2",
     "idb-global": "^2.1.0",
-    "identicon.js": "^2.3.1",
+    "identicon.js": "^2.3.2",
     "iframe": "^1.0.0",
     "iframe-stream": "^3.0.0",
-    "inject-css": "^0.1.1",
+    "inject-css": "^0.1.2",
     "jazzicon": "^1.2.0",
     "json-rpc-engine": "^3.6.1",
     "json-rpc-middleware-stream": "^1.0.1",
@@ -131,16 +126,16 @@
     "lodash.memoize": "^4.1.2",
     "lodash.shuffle": "^4.2.0",
     "lodash.uniqby": "^4.7.0",
-    "loglevel": "^1.4.1",
+    "loglevel": "^1.6.1",
     "metamascara": "^2.0.0",
-    "metamask-logo": "^2.1.2",
+    "metamask-logo": "^2.1.4",
     "mkdirp": "^0.5.1",
     "multiplex": "^6.7.0",
     "number-to-bn": "^1.7.0",
     "obj-multiplex": "^1.0.0",
     "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",
@@ -148,25 +143,25 @@
     "promise-filter": "^1.1.0",
     "promise-to-callback": "^1.0.0",
     "pump": "^3.0.0",
-    "pumpify": "^1.3.4",
+    "pumpify": "^1.4.0",
     "qrcode-npm": "0.0.3",
     "ramda": "^0.24.1",
-    "raven-js": "^3.24.0",
+    "raven-js": "^3.24.1",
     "react": "^15.6.2",
     "react-addons-css-transition-group": "^15.6.0",
     "react-dom": "^15.6.2",
-    "react-hyperscript": "^3.0.0",
-    "react-markdown": "^3.0.0",
-    "react-redux": "^5.0.5",
-    "react-select": "^1.0.0",
-    "react-simple-file-input": "^2.0.0",
+    "react-hyperscript": "^3.2.0",
+    "react-markdown": "^3.3.0",
+    "react-redux": "^5.0.7",
+    "react-select": "^1.2.1",
+    "react-simple-file-input": "^2.1.0",
     "react-tippy": "^1.2.2",
     "react-toggle-button": "^2.2.0",
     "react-tooltip-component": "^0.3.0",
-    "react-transition-group": "^2.2.1",
+    "react-transition-group": "^2.3.0",
     "react-trigger-change": "^1.0.2",
     "reactify": "^1.1.1",
-    "readable-stream": "^2.3.3",
+    "readable-stream": "^2.3.6",
     "recompose": "^0.25.0",
     "redux": "^3.0.5",
     "redux-logger": "^3.0.6",
@@ -174,22 +169,23 @@
     "request-promise": "^4.2.1",
     "sandwich-expando": "^1.1.3",
     "semaphore": "^1.0.5",
-    "semver": "^5.4.1",
+    "semver": "^5.5.0",
     "shallow-copy": "0.0.1",
-    "sw-stream": "^2.0.0",
-    "textarea-caret": "^3.0.1",
+    "sw-controller": "^1.0.3",
+    "sw-stream": "^2.0.2",
+    "textarea-caret": "^3.1.0",
     "through2": "^2.0.3",
     "valid-url": "^1.0.9",
     "vreme": "^3.0.2",
-    "web3": "^0.20.1",
-    "web3-provider-engine": "^13.5.6",
+    "web3": "^0.20.6",
+    "web3-provider-engine": "^13.8.0",
     "web3-stream-provider": "^3.0.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
     "@sentry/cli": "^1.30.3",
     "babel-core": "^6.24.1",
-    "babel-eslint": "^8.0.0",
+    "babel-eslint": "^8.2.2",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-polyfill": "^6.23.0",
@@ -198,10 +194,11 @@
     "babel-register": "^6.7.2",
     "babelify": "^8.0.0",
     "beefy": "^2.1.5",
-    "brfs": "^1.4.3",
+    "brfs": "^1.5.0",
     "browserify": "^16.1.1",
     "chai": "^4.1.0",
-    "compression": "^1.7.1",
+    "chromedriver": "^2.37.0",
+    "compression": "^1.7.2",
     "coveralls": "^3.0.0",
     "cross-env": "^5.1.4",
     "deep-freeze-strict": "^1.1.1",
@@ -210,18 +207,21 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-15": "^1.0.5",
     "eslint-plugin-chai": "0.0.1",
-    "eslint-plugin-mocha": "^4.9.0",
-    "eslint-plugin-react": "^7.4.0",
-    "eth-json-rpc-middleware": "^1.2.7",
+    "eslint-plugin-json": "^1.2.0",
+    "eslint-plugin-mocha": "^5.0.0",
+    "eslint-plugin-react": "^7.7.0",
+    "eth-json-rpc-middleware": "^1.6.0",
     "fs-promise": "^2.0.3",
-    "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
+    "ganache-cli": "^6.1.0",
+    "gifencoder": "^1.1.0",
+    "gulp": "github:gulpjs/gulp#4.0",
     "gulp-babel": "^7.0.0",
-    "gulp-eslint": "^4.0.0",
-    "gulp-if": "^2.0.2",
-    "gulp-json-editor": "^2.2.1",
+    "gulp-eslint": "^4.0.2",
+    "gulp-json-editor": "^2.3.0",
     "gulp-livereload": "^3.8.1",
+    "gulp-multi-process": "^1.3.1",
     "gulp-replace": "^0.6.1",
-    "gulp-sourcemaps": "^2.6.0",
+    "gulp-sourcemaps": "^2.6.4",
     "gulp-stylefmt": "^1.1.0",
     "gulp-stylelint": "^7.0.0",
     "gulp-uglify": "^3.0.0",
@@ -229,8 +229,9 @@
     "gulp-util": "^3.0.7",
     "gulp-watch": "^5.0.0",
     "gulp-zip": "^4.0.0",
+    "image-size": "^0.6.2",
     "isomorphic-fetch": "^2.2.1",
-    "jsdom": "^11.1.0",
+    "jsdom": "^11.7.0",
     "jsdom-global": "^3.0.2",
     "jshint-stylish": "~2.2.1",
     "karma": "^2.0.0",
@@ -239,29 +240,33 @@
     "karma-firefox-launcher": "^1.0.1",
     "karma-qunit": "^1.2.1",
     "lodash.assign": "^4.0.6",
-    "mocha": "^5.0.0",
+    "mocha": "^5.0.5",
     "mocha-eslint": "^4.0.0",
     "mocha-jsdom": "^1.1.0",
     "mocha-sinon": "^2.0.0",
-    "nock": "^9.0.14",
-    "node-sass": "^4.7.2",
-    "nyc": "^11.0.3",
+    "nock": "^9.2.4",
+    "node-sass": "^4.8.3",
+    "nyc": "^11.6.0",
     "open": "0.0.5",
+    "png-file-stream": "^1.0.0",
     "prompt": "^1.0.0",
     "qs": "^6.2.0",
     "qunitjs": "^2.4.1",
     "react-addons-test-utils": "^15.5.1",
     "react-test-renderer": "^15.6.2",
-    "react-testutils-additions": "^15.2.0",
+    "react-testutils-additions": "^15.3.1",
     "redux-test-utils": "^0.2.2",
-    "sinon": "^4.0.0",
+    "rimraf": "^2.6.2",
+    "selenium-webdriver": "^3.5.0",
+    "shell-parallel": "^1.0.3",
+    "sinon": "^5.0.0",
     "stylelint-config-standard": "^18.2.0",
-    "tape": "^4.5.1",
-    "testem": "^2.0.0",
-    "uglifyify": "^4.0.2",
+    "tape": "^4.9.0",
+    "testem": "^2.2.1",
+    "uglifyify": "^4.0.5",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
-    "watchify": "^3.9.0"
+    "watchify": "^3.11.0"
   },
   "engines": {
     "node": ">=0.8.0"