diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-02-03 16:17:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 16:17:17 +0800 |
| commit | 66be5ff2756e611c7af6973e704d27ce9bbd0d45 (patch) | |
| tree | 43b5dcab6686e3db06218bfff17a943c72e6ddf3 /package.json | |
| parent | 270808c206934cf7d75fefcdd092c9595de45f29 (diff) | |
| parent | 970d4fd69519bab1de972839190a4ede888914bb (diff) | |
| download | tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.tar tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.tar.gz tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.tar.bz2 tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.tar.lz tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.tar.xz tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.tar.zst tangerine-wallet-browser-66be5ff2756e611c7af6973e704d27ce9bbd0d45.zip | |
Merge pull request #1083 from MetaMask/kumavis-refactor6
Refactor round 6
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package.json b/package.json index ecf906684..ed0be3d4b 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "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 --compilers js:babel-register --recursive \"test/unit/**/*.js\"", - "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"", + "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 ./", @@ -45,6 +45,7 @@ "clone": "^1.0.2", "copy-to-clipboard": "^2.0.0", "debounce": "^1.0.0", + "deep-merge": "^1.0.0", "denodeify": "^1.2.1", "disc": "^1.3.2", "dnode": "^1.2.2", @@ -71,7 +72,7 @@ "mississippi": "^1.2.0", "mkdirp": "^0.5.1", "multiplex": "^6.7.0", - "obs-store": "^2.3.0", + "obs-store": "^2.3.1", "once": "^1.3.3", "ping-pong-stream": "^1.0.0", "pojo-migrator": "^2.1.0", |