diff options
| -rw-r--r-- | .eslintrc | 4 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 2 | ||||
| -rw-r--r-- | package.json | 66 | ||||
| -rw-r--r-- | test/unit/nonce-tracker-test.js | 3 | ||||
| -rw-r--r-- | ui/app/components/shift-list-item.js | 2 | ||||
| -rw-r--r-- | ui/app/components/transaction-list-item.js | 2 | ||||
| -rw-r--r-- | ui/app/reducers/app.js | 9 | ||||
| -rw-r--r-- | ui/app/store.js | 4 |
9 files changed, 49 insertions, 46 deletions
@@ -50,7 +50,7 @@ "eqeqeq": [2, "allow-null"], "generator-star-spacing": [2, { "before": true, "after": true }], "handle-callback-err": [1, "^(err|error)$" ], - "indent": [2, 2, { "SwitchCase": 1 }], + "indent": "off", "jsx-quotes": [2, "prefer-single"], "key-spacing": 1, "keyword-spacing": [2, { "before": true, "after": true }], @@ -133,7 +133,7 @@ "no-with": 2, "one-var": [2, { "initialized": "never" }], "operator-linebreak": [1, "after", { "overrides": { "?": "ignore", ":": "ignore" } }], - "padded-blocks": [1, "never"], + "padded-blocks": "off", "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}], "semi": [2, "never"], "semi-spacing": [2, { "before": false, "after": true }], @@ -1,4 +1,5 @@ -# MetaMask Plugin [](https://circleci.com/gh/MetaMask/metamask-extension) [](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) +# MetaMask Plugin [](https://circleci.com/gh/MetaMask/metamask-extension) [](https://coveralls.io/github/MetaMask/metamask-extension?branch=master) [](https://greenkeeper.io/) + ## Support diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 6fde0edcd..acacf5d4c 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -86,7 +86,7 @@ function suffixCheck () { var currentUrl = window.location.href var currentRegex for (let i = 0; i < prohibitedTypes.length; i++) { - currentRegex = new RegExp(`\.${prohibitedTypes[i]}$`) + currentRegex = new RegExp(`\\.${prohibitedTypes[i]}$`) if (currentRegex.test(currentUrl)) { return false } diff --git a/package.json b/package.json index f35ac4963..83c64cdab 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ ] }, "dependencies": { - "async": "^1.5.2", + "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", "bip39": "^2.2.0", @@ -57,10 +57,10 @@ "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", "client-sw-ready-event": "^3.3.0", - "clone": "^1.0.2", - "copy-to-clipboard": "^2.0.0", + "clone": "^2.1.1", + "copy-to-clipboard": "^3.0.8", "debounce": "^1.0.0", - "deep-extend": "^0.4.1", + "deep-extend": "^0.5.0", "detect-node": "^2.0.3", "disc": "^1.3.2", "dnode": "^1.2.2", @@ -75,7 +75,7 @@ "eth-simple-keyring": "^1.1.1", "eth-token-tracker": "^1.1.2", "ethereumjs-tx": "^1.3.0", - "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", + "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.2.6", @@ -83,12 +83,13 @@ "extension-link-enabler": "^1.0.0", "extensionizer": "^1.0.0", "fast-levenshtein": "^2.0.6", - "gulp-eslint": "^2.0.0", + "gulp": "github:gulpjs/gulp#4.0", + "gulp-eslint": "^4.0.0", "hat": "0.0.3", - "idb-global": "^1.0.0", - "identicon.js": "^1.2.1", + "idb-global": "^2.1.0", + "identicon.js": "^2.3.1", "iframe": "^1.0.0", - "iframe-stream": "^1.0.2", + "iframe-stream": "^3.0.0", "inject-css": "^0.1.1", "jazzicon": "^1.2.0", "loglevel": "^1.4.1", @@ -102,7 +103,7 @@ "ping-pong-stream": "^1.0.0", "pojo-migrator": "^2.1.0", "polyfill-crypto.getrandomvalues": "^1.0.0", - "post-message-stream": "^1.0.0", + "post-message-stream": "^3.0.0", "promise-filter": "^1.1.0", "promise-to-callback": "^1.0.0", "pump": "^1.0.2", @@ -111,33 +112,32 @@ "react": "^15.0.2", "react-addons-css-transition-group": "^15.6.0", "react-dom": "^15.5.4", - "react-hyperscript": "^2.2.2", + "react-hyperscript": "^3.0.0", "react-markdown": "^2.3.0", - "react-redux": "^4.4.5", + "react-redux": "^5.0.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", - "redux-logger": "^2.10.2", - "redux-thunk": "^1.0.2", + "redux-logger": "^3.0.6", + "redux-thunk": "^2.2.0", "request-promise": "^4.1.1", "sandwich-expando": "^1.0.5", "semaphore": "^1.0.5", "sw-stream": "^2.0.0", "textarea-caret": "^3.0.1", - "three.js": "^0.73.2", "through2": "^2.0.3", "valid-url": "^1.0.9", "vreme": "^3.0.2", - "web3": "0.19.1", + "web3": "^0.20.1", "web3-provider-engine": "^13.2.9", "web3-stream-provider": "^3.0.1", "xtend": "^4.0.1" }, "devDependencies": { "babel-core": "^6.24.1", - "babel-eslint": "^6.0.5", + "babel-eslint": "^7.2.3", "babel-plugin-transform-async-to-generator": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-polyfill": "^6.23.0", @@ -146,49 +146,49 @@ "babelify": "^7.2.0", "beefy": "^2.1.5", "brfs": "^1.4.3", - "browserify": "^13.0.0", - "chai": "^3.5.0", + "browserify": "^14.4.0", + "chai": "^4.1.0", "coveralls": "^2.13.1", "deep-freeze-strict": "^1.1.1", - "del": "^2.2.0", + "del": "^3.0.0", "envify": "^4.0.0", "enzyme": "^2.8.2", "eslint-plugin-chai": "0.0.1", "eslint-plugin-mocha": "^4.9.0", + "fs-promise": "^2.0.3", "eth-json-rpc-middleware": "^1.2.7", - "fs-promise": "^1.0.0", "gulp": "github:gulpjs/gulp#4.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-replace": "^0.6.1", + "gulp-sourcemaps": "^2.6.0", "gulp-util": "^3.0.7", "gulp-watch": "^4.3.5", - "gulp-zip": "^3.2.0", + "gulp-zip": "^4.0.0", "isomorphic-fetch": "^2.2.1", - "jsdom": "^8.1.0", - "jsdom-global": "^1.7.0", - "jshint-stylish": "~0.1.5", + "jsdom": "^11.1.0", + "jsdom-global": "^3.0.2", + "jshint-stylish": "~2.2.1", "json-rpc-engine": "^3.0.1", "lodash.assign": "^4.0.6", - "mocha": "^2.4.5", - "mocha-eslint": "^2.1.1", + "mocha": "^3.4.2", + "mocha-eslint": "^4.0.0", "mocha-jsdom": "^1.1.0", - "mocha-sinon": "^1.1.5", - "nock": "^8.0.0", + "mocha-sinon": "^2.0.0", + "nock": "^9.0.14", "nyc": "^11.0.3", "open": "0.0.5", "prompt": "^1.0.0", "qs": "^6.2.0", - "qunit": "^0.9.1", + "qunit": "^1.0.0", "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", "sinon": "^2.3.8", "tape": "^4.5.1", "testem": "^1.10.3", - "uglifyify": "^3.0.1", + "uglifyify": "^4.0.2", "vinyl-buffer": "^1.0.0", "vinyl-source-stream": "^1.1.0", "watchify": "^3.7.0" diff --git a/test/unit/nonce-tracker-test.js b/test/unit/nonce-tracker-test.js index b0283e159..36025a360 100644 --- a/test/unit/nonce-tracker-test.js +++ b/test/unit/nonce-tracker-test.js @@ -31,12 +31,11 @@ describe('Nonce Tracker', function () { }) describe('#getNonceLock', function () { - it('should work', async function (done) { + it('should work', async function () { this.timeout(15000) const nonceLock = await nonceTracker.getNonceLock('0x7d3517b0d011698406d6e0aed8453f0be2697926') assert.equal(nonceLock.nextNonce, '1', 'nonce should be 1') await nonceLock.releaseLock() - done() }) }) }) diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index 32bfbeda4..079f05e31 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -2,7 +2,7 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect -const vreme = new (require('vreme')) +const vreme = new (require('vreme'))() const explorerLink = require('../../lib/explorer-link') const actions = require('../actions') const addressSummary = require('../util').addressSummary diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 01355abad..9018bab06 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -6,7 +6,7 @@ const EthBalance = require('./eth-balance') const addressSummary = require('../util').addressSummary const explorerLink = require('../../lib/explorer-link') const CopyButton = require('./copyButton') -const vreme = new (require('vreme')) +const vreme = new (require('vreme'))() const Tooltip = require('./tooltip') const numberToBN = require('number-to-bn') diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 2fcc9bfe0..3a98d53a9 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -40,9 +40,12 @@ function reduceApp (state, action) { accountDetail: { subview: 'transactions', }, - transForward: true, // Used to render transition direction - isLoading: false, // Used to display loading indicator - warning: null, // Used to display error text + // Used to render transition direction + transForward: true, + // Used to display loading indicator + isLoading: false, + // Used to display error text + warning: null, }, state.appState) switch (action.type) { diff --git a/ui/app/store.js b/ui/app/store.js index ba9e58b49..3bafdee11 100644 --- a/ui/app/store.js +++ b/ui/app/store.js @@ -1,8 +1,8 @@ const createStore = require('redux').createStore const applyMiddleware = require('redux').applyMiddleware -const thunkMiddleware = require('redux-thunk') +const thunkMiddleware = require('redux-thunk').default const rootReducer = require('./reducers') -const createLogger = require('redux-logger') +const createLogger = require('redux-logger').createLogger global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' |