From 54e3a624fe4f43275a104ebd237e65366864da81 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 13 Feb 2018 15:27:41 +0100 Subject: [PATCH 1/8] Update @parity/ui --- package-lock.json | 693 +++++++++++++++++++++------------ package.json | 2 +- src/SyncWarning/syncWarning.js | 6 +- 3 files changed, 445 insertions(+), 256 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4af52a4..4e7028b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,9 +49,9 @@ "dev": true, "requires": { "@parity/api": "2.1.15", - "@parity/mobx": "1.0.7", - "@parity/ui": "3.0.24", - "mobx": "3.4.1", + "@parity/mobx": "1.1.2", + "@parity/ui": "3.1.2", + "mobx": "3.5.1", "mobx-react": "4.3.5", "prop-types": "15.6.0", "react": "16.2.0", @@ -63,9 +63,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": { @@ -123,9 +123,9 @@ "dev": true, "requires": { "@parity/api": "2.1.15", - "@parity/mobx": "1.0.7", - "@parity/ui": "3.0.24", - "mobx": "3.4.1", + "@parity/mobx": "1.1.2", + "@parity/ui": "3.1.2", + "mobx": "3.5.1", "mobx-react": "4.3.5", "prop-types": "15.6.0", "react": "16.2.0", @@ -137,9 +137,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": { @@ -217,10 +217,10 @@ "dev": true, "requires": { "@parity/api": "2.1.15", - "@parity/mobx": "1.0.7", - "@parity/ui": "3.0.24", + "@parity/mobx": "1.1.2", + "@parity/ui": "3.1.2", "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 +233,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": { @@ -313,11 +313,22 @@ } }, "@parity/mobx": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.0.7.tgz", - "integrity": "sha512-HC9VFcFnZ+h/YZWSiA2vIJcXK2yhLNFipPxAIMkDMClgNX9sOxrItmjmTfETAlHVM/axO2FIluLCd3VO/Xze8w==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz", + "integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==", + "dev": true, "requires": { - "@parity/ledger": "2.1.2" + "@parity/jsonrpc": "2.1.5", + "@parity/ledger": "2.1.2", + "@parity/shared": "2.2.24" + }, + "dependencies": { + "@parity/jsonrpc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz", + "integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==", + "dev": true + } } }, "@parity/plugin-signer-account": { @@ -391,13 +402,13 @@ } }, "@parity/ui": { - "version": "3.0.24", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.0.24.tgz", - "integrity": "sha512-NxrIbM9fq3SaPkdi2mtV/wMmKcl95PSyJHvcTL61lXxRmXTqa9OIOSuS4uCcHSKQARdtIoRlr9vq9SL1tj12Rg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.2.tgz", + "integrity": "sha512-GIrY/3NZd8VbNWs4QavK8wzoPzr5TFEsZAjKGYhnsk5FJGu9xj++a0CgcFiZ3Lrr4a3HxdCJvCCSaO+3moCiIA==", "requires": { "@parity/api": "2.1.15", "@parity/etherscan": "2.1.3", - "@parity/mobx": "1.0.7", + "@parity/mobx": "1.1.2", "@parity/shared": "2.2.24", "babel-runtime": "6.26.0", "bignumber.js": "4.1.0", @@ -432,6 +443,21 @@ "zxcvbn": "4.4.2" }, "dependencies": { + "@parity/jsonrpc": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz", + "integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==" + }, + "@parity/mobx": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz", + "integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==", + "requires": { + "@parity/jsonrpc": "2.1.5", + "@parity/ledger": "2.1.2", + "@parity/shared": "2.2.24" + } + }, "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", @@ -603,12 +629,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 +736,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": { @@ -1232,7 +1292,7 @@ "requires": { "find-up": "2.1.0", "istanbul-lib-instrument": "1.9.1", - "test-exclude": "4.1.1" + "test-exclude": "4.2.0" }, "dependencies": { "find-up": { @@ -1927,14 +1987,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 +2301,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 +3131,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 +3637,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", @@ -4388,7 +4508,7 @@ "integrity": "sha1-AB3fgWKM0ecGElxxdvU8zsVdkY4=", "dev": true, "requires": { - "urijs": "1.19.0" + "urijs": "1.19.1" } }, "dom-walk": { @@ -4429,9 +4549,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 +4579,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", @@ -5101,9 +5218,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 +5396,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 +5975,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 +7189,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 +7249,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 +7842,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 +7920,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 +7951,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 +7993,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" } } } @@ -8080,6 +8216,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", @@ -8494,7 +8640,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 +9290,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 +9304,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", @@ -10172,9 +10312,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 +10323,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 +10701,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 +10740,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 +13049,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 +13188,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 +13226,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 +13452,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 +13492,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 +13969,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 +14285,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 +15016,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 +15759,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 +15773,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 +15783,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 +15800,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,10 +15953,19 @@ "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", - "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.0.tgz", + "integrity": "sha512-8hMFzjxbPv6xSlwGhXSvOMJ/vTy3bkng+2pxmf6E1z6VF7I9nIyNfvHtaw+NBPgvz647gADBbMSbwLfZYppT/w==", "dev": true, "requires": { "arrify": "1.0.1", @@ -15951,9 +16063,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": { @@ -16321,6 +16433,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 +16486,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 +16546,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 +17308,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 +17394,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 +17421,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", diff --git a/package.json b/package.json index 6df7d49..dac8eee 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "@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", + "@parity/ui": "3.1.2", "keythereum": "1.0.2", "lodash.flatten": "4.4.0", "lodash.omitby": "4.6.0", diff --git a/src/SyncWarning/syncWarning.js b/src/SyncWarning/syncWarning.js index 8b36afc..1ea95e0 100644 --- a/src/SyncWarning/syncWarning.js +++ b/src/SyncWarning/syncWarning.js @@ -24,7 +24,7 @@ import styles from './syncWarning.css'; function SyncWarning ({ className }, { api }) { const statusStore = StatusIndicator.Store.get(api); - const isOk = !statusStore.health.overall || (!statusStore.health.overall.isNotReadyYet && statusStore.health.overall.status === 'ok'); + const isOk = !statusStore.nodeHealth.overall || (!statusStore.nodeHealth.overall.isNotReadyYet && statusStore.nodeHealth.overall.status === 'ok'); if (isOk) { return null; @@ -34,9 +34,9 @@ function SyncWarning ({ className }, { api }) {
{ - statusStore.health.overall.message.map((message) => ( + statusStore.nodeHealth.overall.message.map((message) => (

- { message } + {message}

)) } -- GitLab From 4ed1ab55fdb297f561ead91ac1be0d53b18b7e85 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 13 Feb 2018 16:28:06 +0100 Subject: [PATCH 2/8] Add new plugin signer account --- package-lock.json | 43 +++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- src/index.parity.js | 6 +++--- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e7028b..67ed76b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -316,7 +316,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz", "integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==", - "dev": true, "requires": { "@parity/jsonrpc": "2.1.5", "@parity/ledger": "2.1.2", @@ -326,13 +325,49 @@ "@parity/jsonrpc": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz", - "integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==", - "dev": true + "integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==" } } }, "@parity/plugin-signer-account": { - "version": "github:parity-js/plugin-signer-account#c1272caa242c8b97dac78e5d0b1e068614657fdc" + "version": "github:parity-js/plugin-signer-account#ed0ebc41745a3df379e7707f0c05174a8fa4a39e", + "requires": { + "@parity/mobx": "1.1.2", + "@parity/ui": "3.1.2", + "lodash": "4.17.5", + "prop-types": "15.6.0", + "react-intl": "2.4.0", + "semantic-ui-react": "0.78.2" + }, + "dependencies": { + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + }, + "prop-types": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", + "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "requires": { + "fbjs": "0.8.16", + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, + "semantic-ui-react": { + "version": "0.78.2", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.2.tgz", + "integrity": "sha512-GALhydmZTLfvPskNa1SrIvX4o71Yelp50z5nxcKgzNNnWjF1q6RQiVhISc0KG03LzWZWRBw8ye3YzCKLdLfclQ==", + "requires": { + "babel-runtime": "6.26.0", + "classnames": "2.2.5", + "fbjs": "0.8.16", + "lodash": "4.17.5", + "prop-types": "15.6.0" + } + } + } }, "@parity/plugin-signer-default": { "version": "github:parity-js/plugin-signer-default#9a47bded9d6d70b69bb2f719732bd6f7854d1842" diff --git a/package.json b/package.json index dac8eee..53c070f 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ }, "dependencies": { "@parity/api": "2.1.15", - "@parity/plugin-signer-account": "parity-js/plugin-signer-account#c1272caa242c8b97dac78e5d0b1e068614657fdc", + "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#ed0ebc41745a3df379e7707f0c05174a8fa4a39e", "@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", diff --git a/src/index.parity.js b/src/index.parity.js index 82459e8..b44f9b3 100644 --- a/src/index.parity.js +++ b/src/index.parity.js @@ -86,9 +86,9 @@ function renderUI (token) { // testing, signer plugins require('@parity/plugin-signer-account'); - require('@parity/plugin-signer-default'); - require('@parity/plugin-signer-hardware'); - require('@parity/plugin-signer-qr'); + // require('@parity/plugin-signer-default'); + // require('@parity/plugin-signer-hardware'); + // require('@parity/plugin-signer-qr'); } const token = retrieveToken(); -- GitLab From f86db63090bcf26b6f0bb59e599ec7b38267de75 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 13 Feb 2018 16:59:48 +0100 Subject: [PATCH 3/8] Remove redux from signer --- src/Signer/Embedded/embedded.js | 73 +++------------------- src/Signer/PendingItem/pendingItem.js | 27 ++------ src/Signer/PendingList/pendingList.js | 89 +++++++++++++++------------ 3 files changed, 62 insertions(+), 127 deletions(-) diff --git a/src/Signer/Embedded/embedded.js b/src/Signer/Embedded/embedded.js index 8fa0524..ae43544 100644 --- a/src/Signer/Embedded/embedded.js +++ b/src/Signer/Embedded/embedded.js @@ -14,12 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import { connect } from 'react-redux'; -import { bindActionCreators } from 'redux'; +import React from 'react'; -import * as RequestsActions from '@parity/shared/lib/redux/providers/signerActions'; import Container from '@parity/ui/lib/Container'; import PendingList from '../PendingList'; @@ -30,65 +26,10 @@ const CONTAINER_STYLE = { background: 'transparent' }; -class Embedded extends Component { - static contextTypes = { - api: PropTypes.object.isRequired - }; +const Embedded = () => + +; - static propTypes = { - accounts: PropTypes.object.isRequired, - actions: PropTypes.shape({ - startConfirmRequest: PropTypes.func.isRequired, - startRejectRequest: PropTypes.func.isRequired - }).isRequired, - gasLimit: PropTypes.object.isRequired, - netVersion: PropTypes.string.isRequired, - pending: PropTypes.array.isRequired - }; - - render () { - const { accounts, actions, gasLimit, netVersion, pending } = this.props; - - return ( - - - - ); - } -} - -function mapStateToProps (state) { - const { gasLimit, netVersion } = state.nodeStatus; - const { accounts } = state.personal; - const { pending } = state.signer; - const { actions } = state; - - // TODO: Use the pending store & actions inside that store to confirm/reject, get rid of the Redux interface - - return { - accounts, - actions, - gasLimit, - netVersion, - pending - }; -} - -function mapDispatchToProps (dispatch) { - return { - actions: bindActionCreators(RequestsActions, dispatch) - }; -} - -export default connect( - mapStateToProps, - mapDispatchToProps -)(Embedded); +export default Embedded; diff --git a/src/Signer/PendingItem/pendingItem.js b/src/Signer/PendingItem/pendingItem.js index 79981cc..d7b030e 100644 --- a/src/Signer/PendingItem/pendingItem.js +++ b/src/Signer/PendingItem/pendingItem.js @@ -31,7 +31,8 @@ const DEFAULT_ORIGIN = { details: '' }; -function PendingItem ({ accounts, className, data: { date, id, isSending, payload, origin }, gasLimit, isFocussed, netVersion, onConfirm, onReject }) { +function PendingItem ({ accounts, className, data, isFocused }) { + const { payload } = data; const Handler = pluginStore.findHandler(payload, accounts); if (!Handler) { @@ -47,24 +48,8 @@ function PendingItem ({ accounts, className, data: { date, id, isSending, payloa ); } - const _onConfirm = (data) => onConfirm(Object.assign({ id: id.toNumber(), payload }, data)); - const _onReject = () => onReject({ id: id.toNumber() }); - return ( - + ); } @@ -72,11 +57,7 @@ PendingItem.propTypes = { accounts: PropTypes.object.isRequired, className: PropTypes.string, data: PropTypes.object.isRequired, - gasLimit: PropTypes.object.isRequired, - netVersion: PropTypes.string.isRequired, - isFocussed: PropTypes.bool.isRequired, - onConfirm: PropTypes.func.isRequired, - onReject: PropTypes.func.isRequired + isFocused: PropTypes.bool }; export default observer(PendingItem); diff --git a/src/Signer/PendingList/pendingList.js b/src/Signer/PendingList/pendingList.js index 6dcd2a8..9cc982f 100644 --- a/src/Signer/PendingList/pendingList.js +++ b/src/Signer/PendingList/pendingList.js @@ -15,54 +15,67 @@ // along with Parity. If not, see . import BigNumber from 'bignumber.js'; -import React from 'react'; +import React, { Component } from 'react'; import { FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; +import { observer } from 'mobx-react'; +import AccountsStore from '../../ParityBar/accountStore'; import PendingItem from '../PendingItem'; +import PendingStore from '../pendingStore'; import styles from './pendingList.css'; -export default function PendingList ({ accounts, className, gasLimit, netVersion, onConfirm, onReject, pendingItems }) { - if (!pendingItems.length) { +@observer +class PendingList extends Component { + static contextTypes = { + api: PropTypes.object.isRequired + }; + + static propTypes = { + className: PropTypes.string + }; + + accountsStore = AccountsStore.get(this.context.api); + pendingStore = PendingStore.get(this.context.api); + + render () { + const { className } = this.props; + const { allAccounts } = this.accountsStore; // An array of accounts + const allAccountsInfo = allAccounts.reduce((acc, value) => { // We create a addr->account map + acc[value.address] = value; + return acc; + }, {}); + const { pending } = this.pendingStore; + + if (!pending.length) { + return ( +
+ +
+ ); + } + return ( -
- +
+ { + pending + .sort((a, b) => new BigNumber(a.id).cmp(b.id)) + .map((data, index) => ( + + )) + }
); } - - return ( -
- { - pendingItems - .sort((a, b) => new BigNumber(a.id).cmp(b.id)) - .map((data, index) => ( - - )) - } -
- ); } -PendingList.propTypes = { - accounts: PropTypes.object.isRequired, - className: PropTypes.string, - gasLimit: PropTypes.object.isRequired, - netVersion: PropTypes.string.isRequired, - onConfirm: PropTypes.func.isRequired, - onReject: PropTypes.func.isRequired, - pendingItems: PropTypes.array.isRequired -}; +export default PendingList; -- GitLab From 5f3ca69a6479f7ac24b32857d5a50d8235e47e4e Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 13 Feb 2018 17:39:22 +0100 Subject: [PATCH 4/8] Working prototype with account signer --- package-lock.json | 2 +- package.json | 2 +- src/SyncWarning/syncWarning.js | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67ed76b..351fe84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -330,7 +330,7 @@ } }, "@parity/plugin-signer-account": { - "version": "github:parity-js/plugin-signer-account#ed0ebc41745a3df379e7707f0c05174a8fa4a39e", + "version": "github:parity-js/plugin-signer-account#218ae96d618fd86f304d5a89e94e3aade04d4c14", "requires": { "@parity/mobx": "1.1.2", "@parity/ui": "3.1.2", diff --git a/package.json b/package.json index 53c070f..a6594fd 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ }, "dependencies": { "@parity/api": "2.1.15", - "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#ed0ebc41745a3df379e7707f0c05174a8fa4a39e", + "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#218ae96d618fd86f304d5a89e94e3aade04d4c14", "@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", diff --git a/src/SyncWarning/syncWarning.js b/src/SyncWarning/syncWarning.js index 1ea95e0..dd2518b 100644 --- a/src/SyncWarning/syncWarning.js +++ b/src/SyncWarning/syncWarning.js @@ -17,13 +17,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; - -import StatusIndicator from '@parity/ui/lib/StatusIndicator'; +import stores from '@parity/mobx'; +// import StatusIndicator from '@parity/ui/lib/StatusIndicator'; // TODO use this instead of @parity/mobx import styles from './syncWarning.css'; function SyncWarning ({ className }, { api }) { - const statusStore = StatusIndicator.Store.get(api); + const statusStore = stores.parity.nodeHealth().get(api); const isOk = !statusStore.nodeHealth.overall || (!statusStore.nodeHealth.overall.isNotReadyYet && statusStore.nodeHealth.overall.status === 'ok'); if (isOk) { -- GitLab From 8a13effe9a7c10f619207c72de917c5140b7ac13 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 14 Feb 2018 16:20:24 +0100 Subject: [PATCH 5/8] Update package versions --- package-lock.json | 74 ++++++++++++++++++++-------------- package.json | 6 +-- src/SyncWarning/syncWarning.js | 5 +-- src/index.parity.js | 2 +- 4 files changed, 49 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 351fe84..a498475 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "requires": { "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.2", + "@parity/ui": "3.1.3", "mobx": "3.5.1", "mobx-react": "4.3.5", "prop-types": "15.6.0", @@ -124,7 +124,7 @@ "requires": { "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.2", + "@parity/ui": "3.1.3", "mobx": "3.5.1", "mobx-react": "4.3.5", "prop-types": "15.6.0", @@ -218,7 +218,7 @@ "requires": { "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.2", + "@parity/ui": "3.1.3", "format-number": "3.0.0", "mobx": "3.5.1", "mobx-react": "4.3.5", @@ -330,10 +330,10 @@ } }, "@parity/plugin-signer-account": { - "version": "github:parity-js/plugin-signer-account#218ae96d618fd86f304d5a89e94e3aade04d4c14", + "version": "github:parity-js/plugin-signer-account#cfc3afcfbb7a75a513f240f93b64e4e73f7bd5fe", "requires": { "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.2", + "@parity/ui": "3.1.3", "lodash": "4.17.5", "prop-types": "15.6.0", "react-intl": "2.4.0", @@ -370,7 +370,32 @@ } }, "@parity/plugin-signer-default": { - "version": "github:parity-js/plugin-signer-default#9a47bded9d6d70b69bb2f719732bd6f7854d1842" + "version": "github:parity-js/plugin-signer-default#ac97ccb4b77a21395a269a91a398d4a84bdb7057", + "requires": { + "@parity/ui": "3.1.3", + "lodash": "4.17.5", + "react-intl": "2.4.0", + "semantic-ui-react": "0.78.2" + }, + "dependencies": { + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + }, + "semantic-ui-react": { + "version": "0.78.2", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.2.tgz", + "integrity": "sha512-GALhydmZTLfvPskNa1SrIvX4o71Yelp50z5nxcKgzNNnWjF1q6RQiVhISc0KG03LzWZWRBw8ye3YzCKLdLfclQ==", + "requires": { + "babel-runtime": "6.26.0", + "classnames": "2.2.5", + "fbjs": "0.8.16", + "lodash": "4.17.5", + "prop-types": "15.5.10" + } + } + } }, "@parity/plugin-signer-hardware": { "version": "github:parity-js/plugin-signer-hardware#4320d818a053d4efae890b74a7476e4c8dc6ba10" @@ -437,9 +462,9 @@ } }, "@parity/ui": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.2.tgz", - "integrity": "sha512-GIrY/3NZd8VbNWs4QavK8wzoPzr5TFEsZAjKGYhnsk5FJGu9xj++a0CgcFiZ3Lrr4a3HxdCJvCCSaO+3moCiIA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.3.tgz", + "integrity": "sha512-o0fhHqQ+JmI796C0D/SiIVSCwRpw8RAnUBVWsaOogHgNJAoMsWvY9CDtpvlEXjxqWnVQxJWf8SDeiK9TnCleBQ==", "requires": { "@parity/api": "2.1.15", "@parity/etherscan": "2.1.3", @@ -478,21 +503,6 @@ "zxcvbn": "4.4.2" }, "dependencies": { - "@parity/jsonrpc": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@parity/jsonrpc/-/jsonrpc-2.1.5.tgz", - "integrity": "sha512-M6aLgssTfqloNgVFuzxSQ3J5RJ5T9g4a4wka1QVumaud7e4ubFjuJgR0F+0aQ/H1zdiTSMDHSmoaeAp8UoE4fA==" - }, - "@parity/mobx": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@parity/mobx/-/mobx-1.1.2.tgz", - "integrity": "sha512-ctAYYGYVVWwoPjn1TdWMdKZRLEGgcgUvSLUFrHbr+IBq3T+2fUedMLcIxGzEOatd/Y7s+YKvk9S1TcT954GH8g==", - "requires": { - "@parity/jsonrpc": "2.1.5", - "@parity/ledger": "2.1.2", - "@parity/shared": "2.2.24" - } - }, "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", @@ -9230,9 +9240,6 @@ "verror": "1.10.0" } }, - "jsqr": { - "version": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70" - }, "jsx-ast-utils": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", @@ -13024,6 +13031,11 @@ "jsqr": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70", "prop-types": "15.5.10", "webrtc-adapter": "5.0.6" + }, + "dependencies": { + "jsqr": { + "version": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70" + } } }, "react-redux": { @@ -14608,9 +14620,9 @@ } }, "rtcpeerconnection-shim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.7.tgz", - "integrity": "sha512-7tYTolrsNQ2QZVhayA775v/RlG7bZ6D55iBan2Vkya6YslSlBr0hQim+6ire2qGDUxe9HwRvhGqBlbewMfvOyg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.8.tgz", + "integrity": "sha512-5Sx90FGru1sQw9aGOM+kHU4i6mbP8eJPgxliu2X3Syhg8qgDybx8dpDTxUwfJvPnubXFnZeRNl59DWr4AttJKQ==", "requires": { "sdp": "2.6.0" } @@ -17250,7 +17262,7 @@ "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz", "integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==", "requires": { - "rtcpeerconnection-shim": "1.2.7", + "rtcpeerconnection-shim": "1.2.8", "sdp": "2.6.0" } }, diff --git a/package.json b/package.json index a6594fd..f66ab7a 100644 --- a/package.json +++ b/package.json @@ -142,12 +142,12 @@ }, "dependencies": { "@parity/api": "2.1.15", - "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#218ae96d618fd86f304d5a89e94e3aade04d4c14", - "@parity/plugin-signer-default": "parity-js/plugin-signer-default#9a47bded9d6d70b69bb2f719732bd6f7854d1842", + "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#cfc3afcfbb7a75a513f240f93b64e4e73f7bd5fe", + "@parity/plugin-signer-default": "github:parity-js/plugin-signer-default#ac97ccb4b77a21395a269a91a398d4a84bdb7057", "@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.1.2", + "@parity/ui": "3.1.3", "keythereum": "1.0.2", "lodash.flatten": "4.4.0", "lodash.omitby": "4.6.0", diff --git a/src/SyncWarning/syncWarning.js b/src/SyncWarning/syncWarning.js index dd2518b..dd5c7f0 100644 --- a/src/SyncWarning/syncWarning.js +++ b/src/SyncWarning/syncWarning.js @@ -17,13 +17,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import { observer } from 'mobx-react'; -import stores from '@parity/mobx'; -// import StatusIndicator from '@parity/ui/lib/StatusIndicator'; // TODO use this instead of @parity/mobx +import StatusIndicator from '@parity/ui/lib/StatusIndicator'; // TODO use this instead of @parity/mobx import styles from './syncWarning.css'; function SyncWarning ({ className }, { api }) { - const statusStore = stores.parity.nodeHealth().get(api); + const statusStore = StatusIndicator.Store.get(api); const isOk = !statusStore.nodeHealth.overall || (!statusStore.nodeHealth.overall.isNotReadyYet && statusStore.nodeHealth.overall.status === 'ok'); if (isOk) { diff --git a/src/index.parity.js b/src/index.parity.js index b44f9b3..2bacd1e 100644 --- a/src/index.parity.js +++ b/src/index.parity.js @@ -86,7 +86,7 @@ function renderUI (token) { // testing, signer plugins require('@parity/plugin-signer-account'); - // require('@parity/plugin-signer-default'); + require('@parity/plugin-signer-default'); // require('@parity/plugin-signer-hardware'); // require('@parity/plugin-signer-qr'); } -- GitLab From 994a8e79fbe83300c9545a74127218a0acfb6f9b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 15 Feb 2018 10:50:22 +0100 Subject: [PATCH 6/8] Update plugin package references --- package-lock.json | 31 ++++++++++++++++++++++++++++--- package.json | 6 +++--- src/index.parity.js | 3 ++- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index a498475..9881f18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -330,7 +330,7 @@ } }, "@parity/plugin-signer-account": { - "version": "github:parity-js/plugin-signer-account#cfc3afcfbb7a75a513f240f93b64e4e73f7bd5fe", + "version": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", "requires": { "@parity/mobx": "1.1.2", "@parity/ui": "3.1.3", @@ -370,7 +370,7 @@ } }, "@parity/plugin-signer-default": { - "version": "github:parity-js/plugin-signer-default#ac97ccb4b77a21395a269a91a398d4a84bdb7057", + "version": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", "requires": { "@parity/ui": "3.1.3", "lodash": "4.17.5", @@ -398,7 +398,27 @@ } }, "@parity/plugin-signer-hardware": { - "version": "github:parity-js/plugin-signer-hardware#4320d818a053d4efae890b74a7476e4c8dc6ba10" + "version": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", + "requires": { + "@parity/ui": "3.1.3", + "lodash.pick": "4.4.0", + "react-intl": "2.4.0", + "semantic-ui-react": "0.78.2" + }, + "dependencies": { + "semantic-ui-react": { + "version": "0.78.2", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.2.tgz", + "integrity": "sha512-GALhydmZTLfvPskNa1SrIvX4o71Yelp50z5nxcKgzNNnWjF1q6RQiVhISc0KG03LzWZWRBw8ye3YzCKLdLfclQ==", + "requires": { + "babel-runtime": "6.26.0", + "classnames": "2.2.5", + "fbjs": "0.8.16", + "lodash": "4.17.4", + "prop-types": "15.5.10" + } + } + } }, "@parity/plugin-signer-qr": { "version": "github:parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c" @@ -9645,6 +9665,11 @@ "resolved": "https://registry.npmjs.org/lodash.omitby/-/lodash.omitby-4.6.0.tgz", "integrity": "sha1-XBX/R1StVVAWtTwEExHo8HkgR5E=" }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" + }, "lodash.pickby": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", diff --git a/package.json b/package.json index f66ab7a..ad289a8 100644 --- a/package.json +++ b/package.json @@ -142,9 +142,9 @@ }, "dependencies": { "@parity/api": "2.1.15", - "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#cfc3afcfbb7a75a513f240f93b64e4e73f7bd5fe", - "@parity/plugin-signer-default": "github:parity-js/plugin-signer-default#ac97ccb4b77a21395a269a91a398d4a84bdb7057", - "@parity/plugin-signer-hardware": "parity-js/plugin-signer-hardware#4320d818a053d4efae890b74a7476e4c8dc6ba10", + "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", + "@parity/plugin-signer-default": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", + "@parity/plugin-signer-hardware": "parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", "@parity/plugin-signer-qr": "parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c", "@parity/shared": "2.2.24", "@parity/ui": "3.1.3", diff --git a/src/index.parity.js b/src/index.parity.js index 2bacd1e..47f655c 100644 --- a/src/index.parity.js +++ b/src/index.parity.js @@ -86,8 +86,9 @@ function renderUI (token) { // testing, signer plugins require('@parity/plugin-signer-account'); + require('@parity/plugin-signer-hardware'); require('@parity/plugin-signer-default'); - // require('@parity/plugin-signer-hardware'); + // require('@parity/plugin-signer-qr'); } -- GitLab From 34b0411c97491597c37e3069760bd6021dfd1ab8 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Tue, 27 Feb 2018 17:12:02 +0100 Subject: [PATCH 7/8] Add qr plugin ref --- package-lock.json | 125 ++++++++++++++++++++++++++------------------ package.json | 4 +- src/index.parity.js | 3 +- 3 files changed, 76 insertions(+), 56 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9881f18..db3cc4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "@parity/ui": "3.1.3", "mobx": "3.5.1", "mobx-react": "4.3.5", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react": "16.2.0", "react-dom": "16.2.0", "react-intl": "2.4.0", @@ -69,9 +69,9 @@ "dev": true }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "dev": true, "requires": { "fbjs": "0.8.16", @@ -88,7 +88,7 @@ "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "react-dom": { @@ -100,7 +100,7 @@ "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "semantic-ui-react": { @@ -113,7 +113,7 @@ "classnames": "2.2.5", "fbjs": "0.8.16", "lodash": "4.17.4", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } } } @@ -127,7 +127,7 @@ "@parity/ui": "3.1.3", "mobx": "3.5.1", "mobx-react": "4.3.5", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react": "16.2.0", "react-dom": "16.2.0", "react-intl": "2.4.0", @@ -143,9 +143,9 @@ "dev": true }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "dev": true, "requires": { "fbjs": "0.8.16", @@ -162,7 +162,7 @@ "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "react-dom": { @@ -174,7 +174,7 @@ "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "semantic-ui-react": { @@ -187,7 +187,7 @@ "classnames": "2.2.5", "fbjs": "0.8.16", "lodash": "4.17.4", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } } } @@ -222,7 +222,7 @@ "format-number": "3.0.0", "mobx": "3.5.1", "mobx-react": "4.3.5", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react": "16.2.0", "react-dom": "16.2.0", "react-intl": "2.4.0", @@ -239,9 +239,9 @@ "dev": true }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "dev": true, "requires": { "fbjs": "0.8.16", @@ -258,7 +258,7 @@ "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "react-dom": { @@ -270,7 +270,7 @@ "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } } } @@ -335,9 +335,9 @@ "@parity/mobx": "1.1.2", "@parity/ui": "3.1.3", "lodash": "4.17.5", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react-intl": "2.4.0", - "semantic-ui-react": "0.78.2" + "semantic-ui-react": "0.78.3" }, "dependencies": { "lodash": { @@ -346,9 +346,9 @@ "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -356,15 +356,15 @@ } }, "semantic-ui-react": { - "version": "0.78.2", - "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.2.tgz", - "integrity": "sha512-GALhydmZTLfvPskNa1SrIvX4o71Yelp50z5nxcKgzNNnWjF1q6RQiVhISc0KG03LzWZWRBw8ye3YzCKLdLfclQ==", + "version": "0.78.3", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.3.tgz", + "integrity": "sha512-JRmuqjyigCehHfzrS2ir5nGoytZWCifU8G2T++G/CMdahUJBME7S6E9rU7WW9Qg2Fqn2aJIxfn6Ry/rlOTJDOw==", "requires": { "babel-runtime": "6.26.0", "classnames": "2.2.5", "fbjs": "0.8.16", "lodash": "4.17.5", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } } } @@ -375,7 +375,7 @@ "@parity/ui": "3.1.3", "lodash": "4.17.5", "react-intl": "2.4.0", - "semantic-ui-react": "0.78.2" + "semantic-ui-react": "0.78.3" }, "dependencies": { "lodash": { @@ -384,9 +384,9 @@ "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" }, "semantic-ui-react": { - "version": "0.78.2", - "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.2.tgz", - "integrity": "sha512-GALhydmZTLfvPskNa1SrIvX4o71Yelp50z5nxcKgzNNnWjF1q6RQiVhISc0KG03LzWZWRBw8ye3YzCKLdLfclQ==", + "version": "0.78.3", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.3.tgz", + "integrity": "sha512-JRmuqjyigCehHfzrS2ir5nGoytZWCifU8G2T++G/CMdahUJBME7S6E9rU7WW9Qg2Fqn2aJIxfn6Ry/rlOTJDOw==", "requires": { "babel-runtime": "6.26.0", "classnames": "2.2.5", @@ -403,13 +403,13 @@ "@parity/ui": "3.1.3", "lodash.pick": "4.4.0", "react-intl": "2.4.0", - "semantic-ui-react": "0.78.2" + "semantic-ui-react": "0.78.3" }, "dependencies": { "semantic-ui-react": { - "version": "0.78.2", - "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.2.tgz", - "integrity": "sha512-GALhydmZTLfvPskNa1SrIvX4o71Yelp50z5nxcKgzNNnWjF1q6RQiVhISc0KG03LzWZWRBw8ye3YzCKLdLfclQ==", + "version": "0.78.3", + "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-0.78.3.tgz", + "integrity": "sha512-JRmuqjyigCehHfzrS2ir5nGoytZWCifU8G2T++G/CMdahUJBME7S6E9rU7WW9Qg2Fqn2aJIxfn6Ry/rlOTJDOw==", "requires": { "babel-runtime": "6.26.0", "classnames": "2.2.5", @@ -421,7 +421,11 @@ } }, "@parity/plugin-signer-qr": { - "version": "github:parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c" + "version": "github:parity-js/plugin-signer-qr#084fa2a31f86407802d2002b55b50cb0a1c619d1", + "requires": { + "@parity/ui": "3.1.3", + "react-intl": "2.4.0" + } }, "@parity/shared": { "version": "2.2.24", @@ -8711,7 +8715,7 @@ "string-length": "1.0.1", "throat": "3.2.0", "which": "1.3.0", - "worker-farm": "1.5.2", + "worker-farm": "1.5.4", "yargs": "7.1.0" } }, @@ -8856,7 +8860,7 @@ "jest-docblock": "20.0.3", "micromatch": "2.3.11", "sane": "1.6.0", - "worker-farm": "1.5.2" + "worker-farm": "1.5.4" } }, "jest-jasmine2": { @@ -13524,7 +13528,7 @@ "dev": true, "requires": { "loader-utils": "1.1.0", - "postcss": "6.0.17", + "postcss": "6.0.19", "postcss-load-config": "1.2.0", "schema-utils": "0.3.0" }, @@ -13547,9 +13551,9 @@ "dev": true }, "postcss": { - "version": "6.0.17", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.17.tgz", - "integrity": "sha512-Bl1nybsSzWYbP8O4gAVD8JIjZIul9hLNOPTGBIlVmZNUnNAGL+W0cpYWzVwfImZOwumct4c1SDvSbncVWKtXUw==", + "version": "6.0.19", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz", + "integrity": "sha512-f13HRz0HtVwVaEuW6J6cOUCBLFtymhgyLPV7t4QEk2UD3twRI9IluDcQNdzQdBpiixkXj2OmzejhhTbSbDxNTg==", "dev": true, "requires": { "chalk": "2.3.1", @@ -15856,7 +15860,7 @@ "requires": { "del": "2.2.2", "sw-precache": "5.2.1", - "uglify-js": "3.3.10" + "uglify-js": "3.3.12" }, "dependencies": { "commander": { @@ -15872,9 +15876,9 @@ "dev": true }, "uglify-js": { - "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==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.12.tgz", + "integrity": "sha512-4jxrTXlV0HaXTsNILfXW0eey7Qo8qHYM6ih5ZNh45erDWU2GHmKDmekwBTskDb12h+kdd2DBvdzqVb47YzNmTA==", "dev": true, "requires": { "commander": "2.14.1", @@ -17433,13 +17437,30 @@ "dev": true }, "worker-farm": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.2.tgz", - "integrity": "sha512-XxiQ9kZN5n6mmnW+mFJ+wXjNNI/Nx4DIdaAKLX1Bn6LYBWlN/zaBhu34DQYPZ1AJobQuu67S2OfDdNSVULvXkQ==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.4.tgz", + "integrity": "sha512-ITyClEvcfv0ozqJl1vmWFWhvI+OIrkbInYqkEPE50wFPXj8J9Gd3FYf8+CkZJXJJsQBYe+2DvmoK9Zhx5w8W+w==", "dev": true, "requires": { - "errno": "0.1.4", + "errno": "0.1.7", "xtend": "4.0.1" + }, + "dependencies": { + "errno": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", + "dev": true, + "requires": { + "prr": "1.0.1" + } + }, + "prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", + "dev": true + } } }, "wrap-ansi": { diff --git a/package.json b/package.json index ad289a8..acfa6b1 100644 --- a/package.json +++ b/package.json @@ -144,8 +144,8 @@ "@parity/api": "2.1.15", "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", "@parity/plugin-signer-default": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", - "@parity/plugin-signer-hardware": "parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", - "@parity/plugin-signer-qr": "parity-js/plugin-signer-qr#2d1fafad347ba53eaf58c14265d4d07631d6a45c", + "@parity/plugin-signer-hardware": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", + "@parity/plugin-signer-qr": "github:parity-js/plugin-signer-qr#084fa2a31f86407802d2002b55b50cb0a1c619d1", "@parity/shared": "2.2.24", "@parity/ui": "3.1.3", "keythereum": "1.0.2", diff --git a/src/index.parity.js b/src/index.parity.js index 47f655c..5665340 100644 --- a/src/index.parity.js +++ b/src/index.parity.js @@ -87,9 +87,8 @@ function renderUI (token) { // testing, signer plugins require('@parity/plugin-signer-account'); require('@parity/plugin-signer-hardware'); + require('@parity/plugin-signer-qr'); require('@parity/plugin-signer-default'); - - // require('@parity/plugin-signer-qr'); } const token = retrieveToken(); -- GitLab From 769ae4e6373f1eb9c916facfd5ad9f24e64b8e0e Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 28 Feb 2018 09:42:06 +0100 Subject: [PATCH 8/8] Update QR reference --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index db3cc4e..b1eff12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", "@parity/ui": "3.1.3", - "mobx": "3.5.1", + "mobx": "3.6.0", "mobx-react": "4.3.5", "prop-types": "15.6.1", "react": "16.2.0", @@ -63,9 +63,9 @@ }, "dependencies": { "mobx": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz", - "integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.6.0.tgz", + "integrity": "sha1-IN4Hm34Vh0oQXVROnynbiiIp+eM=", "dev": true }, "prop-types": { @@ -125,7 +125,7 @@ "@parity/api": "2.1.15", "@parity/mobx": "1.1.2", "@parity/ui": "3.1.3", - "mobx": "3.5.1", + "mobx": "3.6.0", "mobx-react": "4.3.5", "prop-types": "15.6.1", "react": "16.2.0", @@ -137,9 +137,9 @@ }, "dependencies": { "mobx": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz", - "integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.6.0.tgz", + "integrity": "sha1-IN4Hm34Vh0oQXVROnynbiiIp+eM=", "dev": true }, "prop-types": { @@ -220,7 +220,7 @@ "@parity/mobx": "1.1.2", "@parity/ui": "3.1.3", "format-number": "3.0.0", - "mobx": "3.5.1", + "mobx": "3.6.0", "mobx-react": "4.3.5", "prop-types": "15.6.1", "react": "16.2.0", @@ -233,9 +233,9 @@ }, "dependencies": { "mobx": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.5.1.tgz", - "integrity": "sha1-jmguxTXPROBABbnjfi32asyXWkI=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.6.0.tgz", + "integrity": "sha1-IN4Hm34Vh0oQXVROnynbiiIp+eM=", "dev": true }, "prop-types": { @@ -421,7 +421,7 @@ } }, "@parity/plugin-signer-qr": { - "version": "github:parity-js/plugin-signer-qr#084fa2a31f86407802d2002b55b50cb0a1c619d1", + "version": "github:parity-js/plugin-signer-qr#c275ba13524e9f6759079fabd10faf49cc00cfc0", "requires": { "@parity/ui": "3.1.3", "react-intl": "2.4.0" diff --git a/package.json b/package.json index acfa6b1..ba7bb53 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", "@parity/plugin-signer-default": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", "@parity/plugin-signer-hardware": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", - "@parity/plugin-signer-qr": "github:parity-js/plugin-signer-qr#084fa2a31f86407802d2002b55b50cb0a1c619d1", + "@parity/plugin-signer-qr": "github:parity-js/plugin-signer-qr#c275ba13524e9f6759079fabd10faf49cc00cfc0", "@parity/shared": "2.2.24", "@parity/ui": "3.1.3", "keythereum": "1.0.2", -- GitLab