diff --git a/package-lock.json b/package-lock.json
index 4af52a41c65f753aa277f7de368516e90d25ea24..bbee366fd60b7330ec3b119e0840cc90a2001456 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,9 +15,9 @@
}
},
"@parity/api": {
- "version": "2.1.15",
- "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.1.15.tgz",
- "integrity": "sha512-RXh4QjT3uKuir+uxjdduVbrF4llppfSToCJ9Yw6LJ7cn9SyV3LMR0MM9xuQSDLX7DXze1FXNWe1rSFQaG3YLTw==",
+ "version": "2.1.20",
+ "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.1.20.tgz",
+ "integrity": "sha512-kl50p0644oDp13zlsu5VmuhstUa4CrgcZQOV+ybQ8cnXT3eVD743S0a5zC9n8Y4RJbLxHUsM7oDkbTG3cj+/OA==",
"requires": {
"@parity/abi": "2.1.2",
"@parity/jsonrpc": "2.1.4",
@@ -30,13 +30,25 @@
"isomorphic-fetch": "2.2.1",
"js-sha3": "0.5.5",
"lodash": "4.17.4",
- "store": "2.0.12"
+ "store": "2.0.12",
+ "websocket": "1.0.25"
},
"dependencies": {
"store": {
"version": "2.0.12",
"resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz",
"integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM="
+ },
+ "websocket": {
+ "version": "1.0.25",
+ "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.25.tgz",
+ "integrity": "sha512-M58njvi6ZxVb5k7kpnHh2BvNKuBWiwIYvsToErBzWhvBZYwlEiLcyLrG41T1jRcrY9ettqPYEqduLI7ul54CVQ==",
+ "requires": {
+ "debug": "2.6.9",
+ "nan": "2.8.0",
+ "typedarray-to-buffer": "3.1.2",
+ "yaeti": "0.0.6"
+ }
}
}
},
@@ -48,10 +60,10 @@
"version": "github:js-dist-paritytech/dapp-dapp-methods#b649fb9056d49bbf4fde719f91a4cfcaf529f9f6",
"dev": true,
"requires": {
- "@parity/api": "2.1.15",
+ "@parity/api": "2.1.20",
"@parity/mobx": "1.0.7",
"@parity/ui": "3.0.24",
- "mobx": "3.4.1",
+ "mobx": "3.5.1",
"mobx-react": "4.3.5",
"prop-types": "15.6.0",
"react": "16.2.0",
@@ -63,9 +75,9 @@
},
"dependencies": {
"mobx": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.1.tgz",
- "integrity": "sha1-N6vl7ogtQBgo2fJsbBovR2FLu+8=",
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz",
+ "integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=",
"dev": true
},
"prop-types": {
@@ -122,10 +134,10 @@
"version": "github:js-dist-paritytech/dapp-dapp-visible#28546f312ea9877ebeea9c52afea1e7ec943cd0d",
"dev": true,
"requires": {
- "@parity/api": "2.1.15",
+ "@parity/api": "2.1.20",
"@parity/mobx": "1.0.7",
"@parity/ui": "3.0.24",
- "mobx": "3.4.1",
+ "mobx": "3.5.1",
"mobx-react": "4.3.5",
"prop-types": "15.6.0",
"react": "16.2.0",
@@ -137,9 +149,9 @@
},
"dependencies": {
"mobx": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.1.tgz",
- "integrity": "sha1-N6vl7ogtQBgo2fJsbBovR2FLu+8=",
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz",
+ "integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=",
"dev": true
},
"prop-types": {
@@ -216,11 +228,11 @@
"version": "github:js-dist-paritytech/dapp-status#ea6a3c01d64bd57c5fadf2264efa719a61e70a29",
"dev": true,
"requires": {
- "@parity/api": "2.1.15",
+ "@parity/api": "2.1.20",
"@parity/mobx": "1.0.7",
"@parity/ui": "3.0.24",
"format-number": "3.0.0",
- "mobx": "3.4.1",
+ "mobx": "3.5.1",
"mobx-react": "4.3.5",
"prop-types": "15.6.0",
"react": "16.2.0",
@@ -233,9 +245,9 @@
},
"dependencies": {
"mobx": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.1.tgz",
- "integrity": "sha1-N6vl7ogtQBgo2fJsbBovR2FLu+8=",
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz",
+ "integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=",
"dev": true
},
"prop-types": {
@@ -288,7 +300,7 @@
"resolved": "https://registry.npmjs.org/@parity/etherscan/-/etherscan-2.1.3.tgz",
"integrity": "sha512-GtQMaE8t7PDOcz/K4Ud+Z6EELB47+qG5V6R7iTJ4DcueXVgiMAXK5OiNeKF3Qjd1/M4FIJdFm5NTSdC7bR38+Q==",
"requires": {
- "@parity/api": "2.1.15",
+ "@parity/api": "2.1.20",
"bignumber.js": "3.0.1",
"es6-promise": "4.1.1",
"node-fetch": "1.7.3",
@@ -395,7 +407,7 @@
"resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.0.24.tgz",
"integrity": "sha512-NxrIbM9fq3SaPkdi2mtV/wMmKcl95PSyJHvcTL61lXxRmXTqa9OIOSuS4uCcHSKQARdtIoRlr9vq9SL1tj12Rg==",
"requires": {
- "@parity/api": "2.1.15",
+ "@parity/api": "2.1.20",
"@parity/etherscan": "2.1.3",
"@parity/mobx": "1.0.7",
"@parity/shared": "2.2.24",
@@ -603,12 +615,45 @@
"dev": true
},
"ansi-align": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
- "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+ "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
"dev": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "2.1.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ }
}
},
"ansi-escapes": {
@@ -677,12 +722,13 @@
}
},
"aria-query": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-0.7.0.tgz",
- "integrity": "sha512-/r2lHl09V3o74+2MLKEdewoj37YZqiQZnfen1O4iNlrOjUgeKuu1U2yF3iKh6HJxqF+OXkLMfQv65Z/cvxD6vA==",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-0.7.1.tgz",
+ "integrity": "sha1-Jsu1r/ZBRLCoJb4YRuCxbPoAsR4=",
"dev": true,
"requires": {
- "ast-types-flow": "0.0.7"
+ "ast-types-flow": "0.0.7",
+ "commander": "2.12.2"
}
},
"arr-diff": {
@@ -1927,14 +1973,15 @@
}
},
"babel-preset-react-app": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-3.1.0.tgz",
- "integrity": "sha512-jEAeVozxLzftLl0iDZ0d5jrmfbo3yogON/eI4AsEDIs8p6WW+t9mDRUsj5l12bqPOLSiVOElCQ3QyGjMcyBiwA==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-3.1.1.tgz",
+ "integrity": "sha512-9fRHopNaGL5ScRZdPSoyxRaABKmkS2fx0HUJ5Yphan5G8QDFD7lETsPyY7El6b7YPT3sNrw9gfrWzl4/LsJcfA==",
"dev": true,
"requires": {
"babel-plugin-dynamic-import-node": "1.1.0",
"babel-plugin-syntax-dynamic-import": "6.18.0",
"babel-plugin-transform-class-properties": "6.24.1",
+ "babel-plugin-transform-es2015-destructuring": "6.23.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-plugin-transform-react-constant-elements": "6.23.0",
"babel-plugin-transform-react-jsx": "6.24.1",
@@ -2240,27 +2287,91 @@
"integrity": "sha512-NMPaR8ILtdLSWzxQtEs16XbxMcY8ohWGQ5V+TZSJS3fNUt/PBAGkF6YWO9B/4qWE23bK3o0moQKq8UyFEosYkA=="
},
"boxen": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
- "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+ "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
"dev": true,
"requires": {
- "ansi-align": "1.1.0",
- "camelcase": "2.1.1",
- "chalk": "1.1.3",
+ "ansi-align": "2.0.0",
+ "camelcase": "4.1.0",
+ "chalk": "2.3.1",
"cli-boxes": "1.0.0",
- "filled-array": "1.1.0",
- "object-assign": "4.1.1",
- "repeating": "2.0.1",
- "string-width": "1.0.2",
- "widest-line": "1.0.0"
+ "string-width": "2.1.1",
+ "term-size": "1.2.0",
+ "widest-line": "2.0.0"
},
"dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
"camelcase": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
- "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "dev": true
+ },
+ "chalk": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+ "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.2.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+ "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
}
}
},
@@ -3006,28 +3117,17 @@
}
},
"configstore": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
- "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
+ "integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
"dev": true,
"requires": {
- "dot-prop": "3.0.0",
+ "dot-prop": "4.2.0",
"graceful-fs": "4.1.11",
- "mkdirp": "0.5.1",
- "object-assign": "4.1.1",
- "os-tmpdir": "1.0.2",
- "osenv": "0.1.4",
- "uuid": "2.0.3",
- "write-file-atomic": "1.3.4",
- "xdg-basedir": "2.0.0"
- },
- "dependencies": {
- "uuid": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
- "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
- "dev": true
- }
+ "make-dir": "1.1.0",
+ "unique-string": "1.0.0",
+ "write-file-atomic": "2.3.0",
+ "xdg-basedir": "3.0.0"
}
},
"connect-history-api-fallback": {
@@ -3523,6 +3623,12 @@
"randomfill": "1.0.3"
}
},
+ "crypto-random-string": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
+ "dev": true
+ },
"css-color-names": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -3978,7 +4084,6 @@
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
- "dev": true,
"requires": {
"ms": "2.0.0"
}
@@ -4388,7 +4493,7 @@
"integrity": "sha1-AB3fgWKM0ecGElxxdvU8zsVdkY4=",
"dev": true,
"requires": {
- "urijs": "1.19.0"
+ "urijs": "1.19.1"
}
},
"dom-walk": {
@@ -4429,9 +4534,9 @@
}
},
"dot-prop": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
- "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+ "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
"dev": true,
"requires": {
"is-obj": "1.0.1"
@@ -4459,14 +4564,11 @@
"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
"dev": true
},
- "duplexer2": {
+ "duplexer3": {
"version": "0.1.4",
- "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
- "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
- "dev": true,
- "requires": {
- "readable-stream": "2.3.3"
- }
+ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+ "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+ "dev": true
},
"ecc-jsbn": {
"version": "0.1.1",
@@ -4515,14 +4617,22 @@
}
},
"electron": {
- "version": "1.7.5",
- "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.5.tgz",
- "integrity": "sha1-BloxAr+LhxAt9QxQmF/v5sVpBFs=",
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2.tgz",
+ "integrity": "sha512-0TV5Hy92g8ACnPn+PVol6a/2uk+khzmRtWxhah/FcKs6StCytm5hD14QqOdZxEdJN8HljXIVCayN/wJX+0wDiQ==",
"dev": true,
"requires": {
- "@types/node": "7.0.48",
+ "@types/node": "8.9.1",
"electron-download": "3.3.0",
"extract-zip": "1.6.6"
+ },
+ "dependencies": {
+ "@types/node": {
+ "version": "8.9.1",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.1.tgz",
+ "integrity": "sha512-4JFGIC1RSoFngVsT5EZcL793/uRi/OJ3ilsp9DQUr4LZOaMhNM1pPrt9TqlXOnXj3h73hl6NF31v87eQAPXYTg==",
+ "dev": true
+ }
}
},
"electron-download": {
@@ -5101,9 +5211,9 @@
}
},
"eslint-config-react-app": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-2.0.1.tgz",
- "integrity": "sha512-gHtkzfEjKXhgZJ0Bf+EmztFSWwTiMDgoy85sFaTqrxU1BHSJ9i4i/JJtXJofVCU/SOKxYs46LO3ajvuzFQH5rw==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz",
+ "integrity": "sha512-8QZrKWuHVC57Fmu+SsKAVxnI9LycZl7NFQ4H9L+oeISuCXhYdXqsOOIVSjQFW6JF5MXZLFE+21Syhd7mF1IRZQ==",
"dev": true
},
"eslint-config-semistandard": {
@@ -5279,7 +5389,7 @@
"integrity": "sha512-5I9SpoP7gT4wBFOtXT8/tXNPYohHBVfyVfO17vkbC7r9kEIxYJF12D3pKqhk8+xnk12rfxKClS3WCFpVckFTPQ==",
"dev": true,
"requires": {
- "aria-query": "0.7.0",
+ "aria-query": "0.7.1",
"array-includes": "3.0.3",
"ast-types-flow": "0.0.7",
"axobject-query": "0.1.0",
@@ -5858,12 +5968,6 @@
}
}
},
- "filled-array": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
- "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
- "dev": true
- },
"finalhandler": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz",
@@ -7078,6 +7182,15 @@
}
}
},
+ "global-dirs": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+ "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+ "dev": true,
+ "requires": {
+ "ini": "1.3.5"
+ }
+ },
"global-modules": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
@@ -7129,26 +7242,30 @@
"dev": true
},
"got": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
- "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
+ "version": "6.7.1",
+ "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+ "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
"dev": true,
"requires": {
"create-error-class": "3.0.2",
- "duplexer2": "0.1.4",
+ "duplexer3": "0.1.4",
+ "get-stream": "3.0.0",
"is-redirect": "1.0.0",
"is-retry-allowed": "1.1.0",
"is-stream": "1.1.0",
"lowercase-keys": "1.0.0",
- "node-status-codes": "1.0.0",
- "object-assign": "4.1.1",
- "parse-json": "2.2.0",
- "pinkie-promise": "2.0.1",
- "read-all-stream": "3.1.0",
- "readable-stream": "2.3.3",
- "timed-out": "3.1.3",
- "unzip-response": "1.0.2",
+ "safe-buffer": "5.1.1",
+ "timed-out": "4.0.1",
+ "unzip-response": "2.0.1",
"url-parse-lax": "1.0.0"
+ },
+ "dependencies": {
+ "unzip-response": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+ "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
+ "dev": true
+ }
}
},
"graceful-fs": {
@@ -7718,6 +7835,12 @@
"integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
"dev": true
},
+ "import-lazy": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+ "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
+ "dev": true
+ },
"import-local": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz",
@@ -7790,7 +7913,7 @@
"dev": true,
"requires": {
"ansi-escapes": "3.0.0",
- "chalk": "2.3.0",
+ "chalk": "2.3.1",
"cli-cursor": "2.1.0",
"cli-width": "2.2.0",
"external-editor": "2.1.0",
@@ -7821,16 +7944,22 @@
}
},
"chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+ "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
"dev": true,
"requires": {
"ansi-styles": "3.2.0",
"escape-string-regexp": "1.0.5",
- "supports-color": "4.5.0"
+ "supports-color": "5.2.0"
}
},
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -7857,12 +7986,12 @@
}
},
"supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+ "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "3.0.0"
}
}
}
@@ -8024,6 +8153,11 @@
"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
"dev": true
},
+ "is-electron": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.1.0.tgz",
+ "integrity": "sha512-dkg5xT383+M6zIbbXW/z7n2nz4SFUi2OSyhntnFYkRdtV+HVEfdjEK+5AWisfYgkpe3WYjTIuh7toaKmSfFVWw=="
+ },
"is-equal-shallow": {
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
@@ -8080,6 +8214,16 @@
"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz",
"integrity": "sha1-bghLvJIGH7sJcexYts5tQE4k2mk="
},
+ "is-installed-globally": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+ "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+ "dev": true,
+ "requires": {
+ "global-dirs": "0.1.1",
+ "is-path-inside": "1.0.1"
+ }
+ },
"is-my-json-valid": {
"version": "2.16.1",
"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
@@ -8249,8 +8393,7 @@
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
- "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
- "dev": true
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
},
"is-utf8": {
"version": "0.2.1",
@@ -8494,7 +8637,7 @@
"jest-snapshot": "20.0.3",
"jest-util": "20.0.3",
"micromatch": "2.3.11",
- "node-notifier": "5.1.2",
+ "node-notifier": "5.2.1",
"pify": "2.3.0",
"slash": "1.0.0",
"string-length": "1.0.1",
@@ -9144,12 +9287,12 @@
"dev": true
},
"latest-version": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
- "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+ "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
"dev": true,
"requires": {
- "package-json": "2.4.0"
+ "package-json": "4.0.1"
}
},
"lazy-cache": {
@@ -9158,12 +9301,6 @@
"integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
"dev": true
},
- "lazy-req": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
- "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=",
- "dev": true
- },
"lcid": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -9997,8 +10134,7 @@
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
- "dev": true
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"multicast-dns": {
"version": "6.2.1",
@@ -10172,9 +10308,9 @@
}
},
"node-notifier": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.1.2.tgz",
- "integrity": "sha1-L6nhJgX6EACdRFSdb82KY93g5P8=",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
+ "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
"dev": true,
"requires": {
"growly": "1.3.0",
@@ -10183,12 +10319,6 @@
"which": "1.3.0"
}
},
- "node-status-codes": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
- "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
- "dev": true
- },
"nomnom": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz",
@@ -10567,16 +10697,6 @@
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
- "osenv": {
- "version": "0.1.4",
- "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
- "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
- "dev": true,
- "requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
- }
- },
"output-file-sync": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
@@ -10616,13 +10736,13 @@
"dev": true
},
"package-json": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
- "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+ "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
"dev": true,
"requires": {
- "got": "5.7.1",
- "registry-auth-token": "3.3.1",
+ "got": "6.7.1",
+ "registry-auth-token": "3.3.2",
"registry-url": "3.1.0",
"semver": "5.4.1"
}
@@ -12925,14 +13045,14 @@
"babel-eslint": "7.2.3",
"babel-jest": "20.0.3",
"babel-loader": "7.1.2",
- "babel-preset-react-app": "3.1.0",
+ "babel-preset-react-app": "3.1.1",
"babel-runtime": "6.26.0",
"case-sensitive-paths-webpack-plugin": "2.1.1",
"chalk": "1.1.3",
"css-loader": "0.28.7",
"dotenv": "4.0.0",
"eslint": "4.10.0",
- "eslint-config-react-app": "2.0.1",
+ "eslint-config-react-app": "2.1.0",
"eslint-loader": "1.9.0",
"eslint-plugin-flowtype": "2.39.1",
"eslint-plugin-import": "2.8.0",
@@ -13064,7 +13184,7 @@
"requires": {
"ajv": "5.5.1",
"babel-code-frame": "6.26.0",
- "chalk": "2.3.0",
+ "chalk": "2.3.1",
"concat-stream": "1.6.0",
"cross-spawn": "5.1.0",
"debug": "3.1.0",
@@ -13102,29 +13222,29 @@
},
"dependencies": {
"chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+ "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
"dev": true,
"requires": {
"ansi-styles": "3.2.0",
"escape-string-regexp": "1.0.5",
- "supports-color": "4.5.0"
+ "supports-color": "5.2.0"
}
},
"has-flag": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
- "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+ "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "3.0.0"
}
}
}
@@ -13328,48 +13448,37 @@
"dev": true,
"requires": {
"loader-utils": "1.1.0",
- "postcss": "6.0.16",
+ "postcss": "6.0.17",
"postcss-load-config": "1.2.0",
"schema-utils": "0.3.0"
},
"dependencies": {
"chalk": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
- "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+ "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
"dev": true,
"requires": {
"ansi-styles": "3.2.0",
"escape-string-regexp": "1.0.5",
- "supports-color": "4.5.0"
- },
- "dependencies": {
- "supports-color": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
- "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
- "dev": true,
- "requires": {
- "has-flag": "2.0.0"
- }
- }
+ "supports-color": "5.2.0"
}
},
"has-flag": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
- "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"postcss": {
- "version": "6.0.16",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
- "integrity": "sha512-m758RWPmSjFH/2MyyG3UOW1fgYbR9rtdzz5UNJnlm7OLtu4B2h9C6gi+bE4qFKghsBRFfZT8NzoQBs6JhLotoA==",
+ "version": "6.0.17",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz",
+ "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
+ "chalk": "2.3.1",
"source-map": "0.6.1",
- "supports-color": "5.1.0"
+ "supports-color": "5.2.0"
}
},
"source-map": {
@@ -13379,12 +13488,12 @@
"dev": true
},
"supports-color": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
- "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+ "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "3.0.0"
}
}
}
@@ -13856,16 +13965,6 @@
"warning": "3.0.0"
}
},
- "read-all-stream": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
- "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
- "dev": true,
- "requires": {
- "pinkie-promise": "2.0.1",
- "readable-stream": "2.3.3"
- }
- },
"read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -14182,9 +14281,9 @@
}
},
"registry-auth-token": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz",
- "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
+ "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
"dev": true,
"requires": {
"rc": "1.2.2",
@@ -14913,12 +15012,6 @@
}
}
},
- "slide": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
- "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
- "dev": true
- },
"sntp": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
@@ -15662,9 +15755,9 @@
}
},
"sw-precache": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/sw-precache/-/sw-precache-5.2.0.tgz",
- "integrity": "sha512-sKctdX+5hUxkqJ/1DM88ubQ+QRvyw7CnxWdk909N2DgvxMqc1gcQFrwL7zpVc87wFmCA/OvRQd0iMC2XdFopYg==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/sw-precache/-/sw-precache-5.2.1.tgz",
+ "integrity": "sha512-8FAy+BP/FXE+ILfiVTt+GQJ6UEf4CVHD9OfhzH0JX+3zoy2uFk7Vn9EfXASOtVmmIVbL3jE/W8Z66VgPSZcMhw==",
"dev": true,
"requires": {
"dom-urls": "1.1.0",
@@ -15676,7 +15769,7 @@
"mkdirp": "0.5.1",
"pretty-bytes": "4.0.2",
"sw-toolbox": "3.6.0",
- "update-notifier": "1.0.3"
+ "update-notifier": "2.3.0"
}
},
"sw-precache-webpack-plugin": {
@@ -15686,10 +15779,16 @@
"dev": true,
"requires": {
"del": "2.2.2",
- "sw-precache": "5.2.0",
- "uglify-js": "3.3.5"
+ "sw-precache": "5.2.1",
+ "uglify-js": "3.3.10"
},
"dependencies": {
+ "commander": {
+ "version": "2.14.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
+ "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
+ "dev": true
+ },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -15697,12 +15796,12 @@
"dev": true
},
"uglify-js": {
- "version": "3.3.5",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.5.tgz",
- "integrity": "sha512-ZebM2kgBL/UI9rKeAbsS2J0UPPv7SBy5hJNZml/YxB1zC6JK8IztcPs+cxilE4pu0li6vadVSFqiO7xFTKuSrg==",
+ "version": "3.3.10",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.10.tgz",
+ "integrity": "sha512-dNib7aUDNZFJNTXFyq0CDmLRVOsnY1F+IQgt2FAOdZFx2+LvKVLbbIb/fL+BYKCv3YH3bPCE/6M/JaxChtQLHQ==",
"dev": true,
"requires": {
- "commander": "2.12.2",
+ "commander": "2.14.1",
"source-map": "0.6.1"
}
}
@@ -15850,6 +15949,15 @@
"xtend": "4.0.1"
}
},
+ "term-size": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+ "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+ "dev": true,
+ "requires": {
+ "execa": "0.7.0"
+ }
+ },
"test-exclude": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz",
@@ -15951,9 +16059,9 @@
"dev": true
},
"timed-out": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
- "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+ "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
"dev": true
},
"timers-browserify": {
@@ -16112,7 +16220,6 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz",
"integrity": "sha1-EBezLZhP9VbroQD1AViauhrOLgQ=",
- "dev": true,
"requires": {
"is-typedarray": "1.0.0"
}
@@ -16321,6 +16428,15 @@
"integrity": "sha1-khD5vcqsxeHjkpSQ18AZ35bxhxI=",
"dev": true
},
+ "unique-string": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+ "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+ "dev": true,
+ "requires": {
+ "crypto-random-string": "1.0.0"
+ }
+ },
"unist-util-is": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz",
@@ -16365,19 +16481,57 @@
"integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4="
},
"update-notifier": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
- "integrity": "sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o=",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz",
+ "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=",
"dev": true,
"requires": {
- "boxen": "0.6.0",
- "chalk": "1.1.3",
- "configstore": "2.1.0",
+ "boxen": "1.3.0",
+ "chalk": "2.3.1",
+ "configstore": "3.1.1",
+ "import-lazy": "2.1.0",
+ "is-installed-globally": "0.1.0",
"is-npm": "1.0.0",
- "latest-version": "2.0.0",
- "lazy-req": "1.1.0",
+ "latest-version": "3.1.0",
"semver-diff": "2.1.0",
- "xdg-basedir": "2.0.0"
+ "xdg-basedir": "3.0.0"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
+ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.1"
+ }
+ },
+ "chalk": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+ "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.0",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.2.0"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+ "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
}
},
"upper-case": {
@@ -16387,9 +16541,9 @@
"dev": true
},
"urijs": {
- "version": "1.19.0",
- "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.0.tgz",
- "integrity": "sha512-Qs2odXn0hST5VSPVjpi73CMqtbAoanahaqWBujGU+IyMrMqpWcIhDewxQRhCkmqYxuyvICDcSuLdv2O7ncWBGw==",
+ "version": "1.19.1",
+ "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz",
+ "integrity": "sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==",
"dev": true
},
"url": {
@@ -17149,12 +17303,45 @@
}
},
"widest-line": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
- "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz",
+ "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
"dev": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "2.1.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ }
}
},
"window-size": {
@@ -17202,14 +17389,14 @@
}
},
"write-file-atomic": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
- "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
+ "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
"dev": true,
"requires": {
"graceful-fs": "4.1.11",
"imurmurhash": "0.1.4",
- "slide": "1.1.6"
+ "signal-exit": "3.0.2"
}
},
"write-file-stdout": {
@@ -17229,13 +17416,10 @@
"integrity": "sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI="
},
"xdg-basedir": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
- "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
- "dev": true,
- "requires": {
- "os-homedir": "1.0.2"
- }
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+ "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
+ "dev": true
},
"xml-char-classes": {
"version": "1.0.0",
@@ -17262,8 +17446,7 @@
"yaeti": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
- "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=",
- "dev": true
+ "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc="
},
"yallist": {
"version": "2.1.2",
diff --git a/package.json b/package.json
index 6df7d49873e61bf838115fdbb2664c8de9ac6ad9..0c8409fa1c64a316b87e348635c3c8c5d4c04695 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,8 @@
"ci:build": "cross-env NODE_ENV=production npm run build",
"clean": "rimraf ./.build ./.coverage ./.happypack",
"coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
+ "electron": "npm run build:app && electron .build/",
+ "electron:dev": "electron src/index.electron.js --dev",
"lint": "npm run lint:css && npm run lint:js",
"lint:cached": "npm run lint:css && npm run lint:js:cached",
"lint:css": "stylelint ./src/**/*.css",
@@ -39,7 +41,6 @@
"lint:js:fix": "eslint --fix --ignore-path .gitignore ./src/",
"start": "npm run clean && npm install && npm run build:inject && npm run start:app",
"start:app": "node webpack/dev.server",
- "start:electron": "npm run build:app && electron .build/",
"test": "cross-env NODE_ENV=test mocha 'src/**/*.spec.js'",
"test:coverage": "cross-env NODE_ENV=test istanbul cover _mocha -- 'src/**/*.spec.js'"
},
@@ -82,7 +83,7 @@
"cross-env": "5.1.1",
"css-loader": "0.28.4",
"ejs-loader": "0.3.0",
- "electron": "1.7.5",
+ "electron": "1.8.2",
"empty-module": "0.0.2",
"enzyme": "3.2.0",
"enzyme-adapter-react-16": "1.1.0",
@@ -141,13 +142,14 @@
"yargs": "6.6.0"
},
"dependencies": {
- "@parity/api": "2.1.15",
+ "@parity/api": "2.1.20",
"@parity/plugin-signer-account": "parity-js/plugin-signer-account#c1272caa242c8b97dac78e5d0b1e068614657fdc",
"@parity/plugin-signer-default": "parity-js/plugin-signer-default#9a47bded9d6d70b69bb2f719732bd6f7854d1842",
"@parity/plugin-signer-hardware": "parity-js/plugin-signer-hardware#4320d818a053d4efae890b74a7476e4c8dc6ba10",
"@parity/plugin-signer-qr": "parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c",
"@parity/shared": "2.2.24",
"@parity/ui": "3.0.24",
+ "is-electron": "2.1.0",
"keythereum": "1.0.2",
"lodash.flatten": "4.4.0",
"lodash.omitby": "4.6.0",
diff --git a/src/Dapp/dapp.js b/src/Dapp/dapp.js
index 58b583d49789de15f24be1aab2cd858ef1a52103..fe33c881bff7c65c7badea4cc6a387ea16741155 100644
--- a/src/Dapp/dapp.js
+++ b/src/Dapp/dapp.js
@@ -15,8 +15,9 @@
// along with Parity. If not, see .
import React, { Component } from 'react';
-import { observer } from 'mobx-react';
import { FormattedMessage } from 'react-intl';
+import isElectron from 'is-electron';
+import { observer } from 'mobx-react';
import PropTypes from 'prop-types';
import builtinDapps from '@parity/shared/lib/config/dappsBuiltin.json';
@@ -24,6 +25,7 @@ import viewsDapps from '@parity/shared/lib/config/dappsViews.json';
import DappsStore from '@parity/shared/lib/mobx/dappsStore';
import HistoryStore from '@parity/shared/lib/mobx/historyStore';
+import RequestsStore from '../DappRequests/store';
import styles from './dapp.css';
const internalDapps = [].concat(viewsDapps, builtinDapps);
@@ -45,6 +47,7 @@ export default class Dapp extends Component {
store = DappsStore.get(this.context.api);
historyStore = HistoryStore.get('dapps');
+ requestsStore = RequestsStore.get(this.context.api)
componentWillMount () {
const { id } = this.props.params;
@@ -62,6 +65,36 @@ export default class Dapp extends Component {
}
}
+ handleIframe = () => {
+ window.addEventListener('message', this.requestsStore.receiveMessage, false);
+ }
+
+ handleWebview = webview => {
+ if (!webview) {
+ return;
+ }
+
+ // Log console.logs from webview
+ webview.addEventListener('console-message', e => {
+ console.log('[DAPP]', e.message);
+ });
+
+ // Reput eventListeners when webview has finished loading dapp
+ webview.addEventListener('did-finish-load', () => {
+ this.setState({ loading: false });
+ // Listen to IPC messages from this webview
+ webview.addEventListener('ipc-message', event =>
+ this.requestsStore.receiveMessage({
+ ...event.args[0],
+ source: event.target
+ }));
+ // Send ping message to tell dapp we're ready to listen to its ipc messages
+ webview.send('ping');
+ });
+
+ this.onDappLoad();
+ };
+
loadApp (id) {
this.setState({ loading: true });
@@ -75,6 +108,30 @@ export default class Dapp extends Component {
});
}
+ renderIframe = (src, hash) => (
+
+ )
+
+ renderWebview = (src, hash) => (
+
+ );
+
render () {
const { dappsUrl } = this.context.api;
const { params } = this.props;
@@ -133,18 +190,9 @@ export default class Dapp extends Component {
hash = `#/${params.details}`;
}
- return (
-
- );
+ return isElectron()
+ ? this.renderWebview(src, hash)
+ : this.renderIframe(src, hash);
}
onDappLoad = () => {
diff --git a/src/DappRequests/store.js b/src/DappRequests/store.js
index ee990528820e18e1194cb167fe00757473858eed..48ec310289e51205fd4ab35fe852f9a0617242bf 100644
--- a/src/DappRequests/store.js
+++ b/src/DappRequests/store.js
@@ -34,8 +34,6 @@ export default class Store {
constructor (provider) {
this.provider = provider;
this.permissions = store.get(LS_PERMISSIONS) || {};
-
- window.addEventListener('message', this.receiveMessage, false);
}
@computed get hasRequests () {
@@ -112,17 +110,14 @@ export default class Store {
return;
}
- source.postMessage(
- {
- error: `Method ${method} not allowed`,
- id,
- from: 'shell',
- result: null,
- to: from,
- token
- },
- '*'
- );
+ this.sendMessage(source, {
+ error: `Method ${method} not allowed`,
+ id,
+ from: 'shell',
+ result: null,
+ to: from,
+ token
+ });
};
addAppPermission = (method, appId) => {
@@ -182,17 +177,14 @@ export default class Store {
if (!source) {
return;
}
- source.postMessage(
- {
- error: error ? error.message : null,
- id,
- from: 'shell',
- to: from,
- result,
- token
- },
- '*'
- );
+ this.sendMessage(source, {
+ error: error ? error.message : null,
+ id,
+ from: 'shell',
+ to: from,
+ result,
+ token
+ });
};
};
@@ -271,6 +263,16 @@ export default class Store {
}
};
+ sendMessage = (source, ...args) => {
+ if (source instanceof Element) {
+ // If webview, use IPC
+ return source.send('PARITY_SHELL_IPC_CHANNEL', ...args);
+ } else {
+ // If iframe, use postMessage
+ return source.postMessage(...args, '*');
+ }
+ };
+
static instance = null;
static create (provider) {
diff --git a/src/SyncWarning/syncWarning.spec.js b/src/SyncWarning/syncWarning.spec.js
index dc1308c25698f56e8645fada5f07377eff39f50e..bb2d969e2ec5ea7066885605f5052f5807bbe4e1 100644
--- a/src/SyncWarning/syncWarning.spec.js
+++ b/src/SyncWarning/syncWarning.spec.js
@@ -22,7 +22,7 @@ import SyncWarning from './';
let component;
function createApi (syncing = null) {
- return {};
+ return { pubsub: { parity: { nodeHealth: () => { } } } };
}
function render () {
diff --git a/src/index.electron.js b/src/index.electron.js
index 19168c0d6bc40b2eb82b006a368190194f8e5ed5..434fbb51c97a2aac58c4e7f0c749cfce26898fc6 100644
--- a/src/index.electron.js
+++ b/src/index.electron.js
@@ -14,32 +14,26 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see .
+const argv = require('yargs').argv;
const electron = require('electron');
-const app = electron.app;
-const BrowserWindow = electron.BrowserWindow;
-const path = require('path');
-const url = require('url');
+const { app, BrowserWindow } = electron;
let mainWindow;
function createWindow () {
mainWindow = new BrowserWindow({
- height: 600,
- width: 800
+ height: 800,
+ width: 1200
});
- mainWindow.loadURL(url.format({
- pathname: path.join(__dirname, 'index.html'),
- protocol: 'file:',
- slashes: true
- }));
-
- mainWindow.webContents.openDevTools();
-
- mainWindow.on('closed', function () {
- mainWindow = null;
- });
+ if (argv.dev === true) {
+ // Load 127.0.0.1:3000 in --dev mode
+ mainWindow.loadURL('http://127.0.0.1:3000');
+ mainWindow.webContents.openDevTools();
+ } else {
+ mainWindow.loadURL(`http://${argv['ui-interface'] || '127.0.0.1'}:${argv['ui-port'] || '8180'}`);
+ }
}
app.on('ready', createWindow);
diff --git a/src/inject.js b/src/inject.js
index 931e51a5738fb5e98636e57c82ad0d6a9b970b92..416a8d10ad1f3a6bcc81b7bb7e72b3fa05da599f 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -15,8 +15,11 @@
// along with Parity. If not, see .
import Api from '@parity/api';
+import isElectron from 'is-electron';
import qs from 'query-string';
+console.log('This inject.js has been injected by the shell.');
+
function initProvider () {
const path = window.location.pathname.split('/');
const query = qs.parse(window.location.search);
@@ -27,7 +30,9 @@ function initProvider () {
appId = path[2];
}
- const ethereum = new Api.Provider.PostMessage(appId);
+ const ethereum = isElectron()
+ ? new Api.Provider.Ipc(appId)
+ : new Api.Provider.PostMessage(appId);
console.log(`Requesting API communications token for ${appId}`);
diff --git a/webpack/inject.js b/webpack/inject.js
index ddd28d6340e773290481a140c7e79a3651cb1677..8d55ea576cbd26ac7f55aa5c8552016471ca6c1e 100644
--- a/webpack/inject.js
+++ b/webpack/inject.js
@@ -20,14 +20,11 @@ const rulesEs6 = require('./rules/es6');
const rulesParity = require('./rules/parity');
const Shared = require('./shared');
-const isProd = process.env.NODE_ENV === 'production';
const DEST = process.env.BUILD_DEST || '.build';
module.exports = {
context: path.join(__dirname, '../src'),
- devtool: isProd
- ? false
- : '#eval',
+ devtool: false,
entry: {
inject: ['./inject.js'],
parity: ['./inject.script.js'],