Merge pull request #312 from poanetwork/node-12-support
Node 12 support
This commit is contained in:
Victor Baranov
GitHub
commit
f720f74d9b
|
|
@ -92,7 +92,7 @@ workflows:
|
|||
jobs:
|
||||
prep-deps-npm:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -100,7 +100,7 @@ jobs:
|
|||
- run:
|
||||
name: Install npm 6 + deps via npm
|
||||
command: |
|
||||
sudo npm install -g npm@6.9.0 && npm install --no-save
|
||||
sudo npm install -g npm@6.12.1 && npm install --no-save
|
||||
- save_cache:
|
||||
key: dependency-cache-{{ .Revision }}
|
||||
paths:
|
||||
|
|
@ -108,7 +108,7 @@ jobs:
|
|||
|
||||
prep-build:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -127,7 +127,7 @@ jobs:
|
|||
|
||||
prep-docs:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -142,7 +142,7 @@ jobs:
|
|||
|
||||
prep-scss:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -161,7 +161,7 @@ jobs:
|
|||
|
||||
test-lint:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -172,7 +172,7 @@ jobs:
|
|||
|
||||
# test-deps:
|
||||
# docker:
|
||||
# - image: circleci/node:10.16.0-browsers
|
||||
# - image: circleci/node:12.13.1-browsers
|
||||
# steps:
|
||||
# - checkout
|
||||
# - restore_cache:
|
||||
|
|
@ -183,7 +183,7 @@ jobs:
|
|||
|
||||
test-e2e-chrome:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -208,7 +208,7 @@ jobs:
|
|||
|
||||
test-e2e-firefox:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -229,7 +229,7 @@ jobs:
|
|||
|
||||
test-e2e-beta-chrome:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -245,7 +245,7 @@ jobs:
|
|||
|
||||
test-e2e-beta-firefox:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -266,7 +266,7 @@ jobs:
|
|||
|
||||
job-screens:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -283,7 +283,7 @@ jobs:
|
|||
|
||||
job-publish-prerelease:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -310,7 +310,7 @@ jobs:
|
|||
|
||||
job-publish-release:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -323,7 +323,7 @@ jobs:
|
|||
|
||||
job-publish-postrelease:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -346,7 +346,7 @@ jobs:
|
|||
|
||||
test-unit:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -359,7 +359,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Firefox"]'
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -383,7 +383,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Chrome"]'
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -402,7 +402,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Firefox"]'
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -426,7 +426,7 @@ jobs:
|
|||
environment:
|
||||
browsers: '["Chrome"]'
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- checkout
|
||||
- restore_cache:
|
||||
|
|
@ -443,7 +443,7 @@ jobs:
|
|||
|
||||
all-tests-pass:
|
||||
docker:
|
||||
- image: circleci/node:10.16.0-browsers
|
||||
- image: circleci/node:12.13.1-browsers
|
||||
steps:
|
||||
- run:
|
||||
name: All Tests Passed
|
||||
|
|
|
|||
|
|
@ -1374,7 +1374,9 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||
*/
|
||||
setupControllerConnection (outStream) {
|
||||
const api = this.getApi()
|
||||
const dnode = Dnode(api)
|
||||
const dnode = Dnode(api, {
|
||||
weak: false,
|
||||
})
|
||||
// report new active controller connection
|
||||
this.activeControllerConnections++
|
||||
this.emit('controllerConnectionChanged', this.activeControllerConnections)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
25
package.json
25
package.json
|
|
@ -99,7 +99,6 @@
|
|||
"classnames": "^2.2.6",
|
||||
"clone": "^2.1.1",
|
||||
"copy-to-clipboard": "^3.0.8",
|
||||
"css-loader": "^0.28.11",
|
||||
"currency-formatter": "^1.4.2",
|
||||
"debounce": "1.1.0",
|
||||
"debounce-stream": "^2.0.0",
|
||||
|
|
@ -216,9 +215,9 @@
|
|||
},
|
||||
"devDependencies": {
|
||||
"@sentry/cli": "^1.30.3",
|
||||
"@storybook/addon-info": "^3.4.2",
|
||||
"@storybook/addon-info": "^5.2.6",
|
||||
"@storybook/addon-knobs": "^3.4.2",
|
||||
"@storybook/react": "^3.4.2",
|
||||
"@storybook/react": "^5.2.6",
|
||||
"addons-linter": "^1.3.4",
|
||||
"babel-core": "^6.24.1",
|
||||
"babel-eslint": "^8.0.0",
|
||||
|
|
@ -238,7 +237,7 @@
|
|||
"compression": "^1.7.1",
|
||||
"coveralls": "^3.0.0",
|
||||
"cross-env": "^5.1.4",
|
||||
"css-loader": "^0.28.11",
|
||||
"css-loader": "^3.2.0",
|
||||
"deep-freeze-strict": "^1.1.1",
|
||||
"del": "^3.0.0",
|
||||
"envify": "^4.0.0",
|
||||
|
|
@ -249,14 +248,14 @@
|
|||
"eslint-plugin-mocha": "^5.0.0",
|
||||
"eslint-plugin-react": "^7.4.0",
|
||||
"eth-json-rpc-middleware": "^3.1.3",
|
||||
"expect": "^23.6.0",
|
||||
"expect": "^25.0.0",
|
||||
"fetch-mock": "^6.5.2",
|
||||
"file-loader": "^1.1.11",
|
||||
"fs-extra": "^6.0.1",
|
||||
"fs-promise": "^2.0.3",
|
||||
"ganache-cli": "^6.4.4",
|
||||
"ganache-core": "^2.7.0",
|
||||
"geckodriver": "^1.12.2",
|
||||
"ganache-cli": "^6.7.0",
|
||||
"ganache-core": "^2.8.0",
|
||||
"geckodriver": "^1.19.1",
|
||||
"gh-pages": "^1.2.0",
|
||||
"gifencoder": "^1.1.0",
|
||||
"gulp": "github:gulpjs/gulp#v4.0.0",
|
||||
|
|
@ -276,11 +275,11 @@
|
|||
"http-server": "^0.11.1",
|
||||
"image-size": "^0.6.2",
|
||||
"isomorphic-fetch": "^2.2.1",
|
||||
"jsdoc": "^3.5.5",
|
||||
"jsdoc": "^3.6.3",
|
||||
"jsdom": "^11.2.0",
|
||||
"jsdom-global": "^3.0.2",
|
||||
"jshint-stylish": "~2.2.1",
|
||||
"karma": "^3.1.1",
|
||||
"karma": "^4.4.1",
|
||||
"karma-chrome-launcher": "^2.2.0",
|
||||
"karma-cli": "^1.0.1",
|
||||
"karma-firefox-launcher": "^1.0.1",
|
||||
|
|
@ -292,7 +291,7 @@
|
|||
"mocha-sinon": "^2.0.0",
|
||||
"nock": "^9.0.14",
|
||||
"node-sass": "^4.9.2",
|
||||
"nyc": "^13.0.0",
|
||||
"nyc": "^14.1.1",
|
||||
"path": "^0.12.7",
|
||||
"png-file-stream": "^1.1.0",
|
||||
"prepend-file": "^1.3.1",
|
||||
|
|
@ -323,7 +322,7 @@
|
|||
"watchify": "^3.11.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "10.15.3",
|
||||
"npm": "^6.9.0"
|
||||
"node": "12.13.1",
|
||||
"npm": "^6.12.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMes
|
|||
allValues = allValues.concat(typedValues)
|
||||
|
||||
allValues = allValues.sort((a, b) => {
|
||||
return a.time > b.time
|
||||
return a.time - b.time
|
||||
})
|
||||
|
||||
return allValues
|
||||
|
|
|
|||
Loading…
Reference in New Issue