diff --git a/js/package-lock.json b/js/package-lock.json index 71a0c873c..81050e1c7 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -13,7 +13,7 @@ } }, "@parity/api": { - "version": "github:paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", + "version": "github:paritytech/js-api#ade4a6750292a2918676039ea53eea20c4c728bc", "requires": { "@parity/abi": "github:paritytech/js-abi#414765a476d88b6fb9f3398c99a946021957d07a", "@parity/jsonrpc": "github:paritytech/js-jsonrpc#89a6e441370f55d8fe995e27007f60da29b6672b", @@ -104,11 +104,46 @@ "whatwg-fetch": "2.0.3" }, "dependencies": { + "@parity/api": { + "version": "github:paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", + "requires": { + "@parity/abi": "github:paritytech/js-abi#414765a476d88b6fb9f3398c99a946021957d07a", + "@parity/jsonrpc": "github:paritytech/js-jsonrpc#89a6e441370f55d8fe995e27007f60da29b6672b", + "@parity/wordlist": "1.1.0", + "bignumber.js": "3.0.1", + "blockies": "0.0.2", + "es6-error": "4.0.0", + "ethereumjs-tx": "1.3.3", + "eventemitter3": "2.0.3", + "isomorphic-fetch": "2.2.1", + "js-sha3": "0.5.5", + "keythereum": "0.4.6", + "lodash": "4.17.4", + "node-fetch": "1.6.3", + "secp256k1": "3.2.5", + "store": "2.0.12" + } + }, + "@parity/wordlist": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.1.0.tgz", + "integrity": "sha1-np7Tq3g39WM7WETmCjVenmPkJ64=" + }, "es6-promise": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "store": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz", + "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM=" + }, "whatwg-fetch": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", @@ -161,7 +196,7 @@ } }, "@parity/ui": { - "version": "github:paritytech/js-ui#feb2030a22cb3568d887b2d9b72704786afccb88", + "version": "github:paritytech/js-ui#037782bd16e8abf1c169143aa61749a44b94489b", "requires": { "@parity/api": "github:paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", "@parity/etherscan": "github:paritytech/js-etherscan#efe859ac7d2a8a3cc05e01c689b7fa58f47f8b87", @@ -200,6 +235,38 @@ "zxcvbn": "4.4.1" }, "dependencies": { + "@parity/api": { + "version": "github:paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", + "requires": { + "@parity/abi": "github:paritytech/js-abi#414765a476d88b6fb9f3398c99a946021957d07a", + "@parity/jsonrpc": "github:paritytech/js-jsonrpc#89a6e441370f55d8fe995e27007f60da29b6672b", + "@parity/wordlist": "1.1.0", + "bignumber.js": "3.0.1", + "blockies": "0.0.2", + "es6-error": "4.0.0", + "ethereumjs-tx": "1.3.3", + "eventemitter3": "2.0.3", + "isomorphic-fetch": "2.2.1", + "js-sha3": "0.5.5", + "keythereum": "0.4.6", + "lodash": "4.17.4", + "node-fetch": "1.6.3", + "secp256k1": "3.2.5", + "store": "2.0.12" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + } + } + }, + "@parity/wordlist": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.1.0.tgz", + "integrity": "sha1-np7Tq3g39WM7WETmCjVenmPkJ64=" + }, "babel-runtime": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", @@ -228,6 +295,11 @@ "lodash": "4.17.2", "prop-types": "15.5.8" } + }, + "store": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz", + "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM=" } } }, @@ -1016,29 +1088,14 @@ } }, "babel-loader": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.3.2.tgz", - "integrity": "sha1-GN5FZjhVeMG0+P/my8Zo9eKl7wM=", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.1.tgz", + "integrity": "sha1-uHE0yLEuPkwqlOBUYIW8aAorhIg=", "dev": true, "requires": { - "find-cache-dir": "0.1.1", - "loader-utils": "0.2.17", - "mkdirp": "0.5.1", - "object-assign": "4.1.1" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } + "find-cache-dir": "1.0.0", + "loader-utils": "1.1.0", + "mkdirp": "0.5.1" } }, "babel-messages": { @@ -3845,15 +3902,16 @@ "dev": true }, "css-loader": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.1.tgz", - "integrity": "sha1-K6fyATG5NZdJaz6btQB4WknNKeo=", + "version": "0.28.4", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz", + "integrity": "sha1-bPNXkZLONV6LONX0Ldeh8uyJjQ8=", "dev": true, "requires": { "babel-code-frame": "6.22.0", "css-selector-tokenizer": "0.7.0", "cssnano": "3.10.0", - "loader-utils": "0.2.17", + "icss-utils": "2.1.0", + "loader-utils": "1.1.0", "lodash.camelcase": "4.3.0", "object-assign": "4.1.1", "postcss": "5.2.17", @@ -3861,21 +3919,8 @@ "postcss-modules-local-by-default": "1.2.0", "postcss-modules-scope": "1.1.0", "postcss-modules-values": "1.3.0", + "postcss-value-parser": "3.3.0", "source-list-map": "0.1.8" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } } }, "css-rule-stream": { @@ -5875,14 +5920,14 @@ } }, "find-cache-dir": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", - "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "dev": true, "requires": { "commondir": "1.0.1", - "mkdirp": "0.5.1", - "pkg-dir": "1.0.0" + "make-dir": "1.0.0", + "pkg-dir": "2.0.0" } }, "find-parent-dir": { @@ -7943,6 +7988,63 @@ "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", "dev": true }, + "icss-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", + "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", + "dev": true, + "requires": { + "postcss": "6.0.8" + }, + "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.0" + } + }, + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "postcss": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", + "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", + "dev": true, + "requires": { + "chalk": "2.0.1", + "source-map": "0.5.6", + "supports-color": "4.2.1" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, "ieee754": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", @@ -9066,54 +9168,6 @@ "integrity": "sha512-UTCzU28rRI9wkb8qSGoZa9pgWvxr4LjP2MEhi9XHb/1XMOJy0uTnIxaxzj8My/PORG+kQG6VzAcGvRw66eIOfA==", "dev": true }, - "laggard": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/laggard/-/laggard-0.1.0.tgz", - "integrity": "sha1-Lv1kX38tjz0nrICAOcqGqO40EHU=", - "dev": true, - "requires": { - "minimist": "1.2.0", - "pixrem": "3.0.2", - "postcss": "5.2.17", - "postcss-color-rgba-fallback": "2.2.0", - "postcss-opacity": "3.0.0", - "postcss-pseudoelements": "3.0.0", - "postcss-reporter": "1.4.1", - "postcss-vmin": "2.0.0", - "postcss-will-change": "1.1.0", - "read-file-stdin": "0.2.1", - "write-file-stdout": "0.0.2" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "postcss-opacity": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-opacity/-/postcss-opacity-3.0.0.tgz", - "integrity": "sha1-eHm8xzRAW/dKpsgcORdiBS/FWyk=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-reporter": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz", - "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "lodash": "4.17.2", - "log-symbols": "1.0.2", - "postcss": "5.2.17" - } - } - } - }, "lazy-cache": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", @@ -11166,24 +11220,24 @@ "synesthesia": "1.0.1" } }, - "pixrem": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz", - "integrity": "sha1-MNG6+0w73Ojpu0vVahOYVhkyDDQ=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "postcss": "5.2.17", - "reduce-css-calc": "1.3.0" - } - }, "pkg-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", - "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + } } }, "plur": { @@ -11235,15 +11289,6 @@ } } }, - "postcss-alias": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postcss-alias/-/postcss-alias-1.0.0.tgz", - "integrity": "sha1-Bwxh7hGXr27l63XSat9IiZudL3s=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-calc": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", @@ -11255,26 +11300,6 @@ "reduce-css-calc": "1.3.0" } }, - "postcss-clearfix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postcss-clearfix/-/postcss-clearfix-1.0.0.tgz", - "integrity": "sha1-r+xqDgHSXaw2pUrbif/Uv+HSGa8=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-color-rgba-fallback": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz", - "integrity": "sha1-bSlJG+WZCpMXPUfnx29YELCUAro=", - "dev": true, - "requires": { - "postcss": "5.2.17", - "postcss-value-parser": "3.3.0", - "rgb-hex": "1.0.0" - } - }, "postcss-colormin": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", @@ -11342,15 +11367,6 @@ "uniqs": "2.0.0" } }, - "postcss-easings": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/postcss-easings/-/postcss-easings-0.3.0.tgz", - "integrity": "sha1-I9zL+XWH4o1doZw7rktQaYxarV4=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-filter-plugins": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", @@ -11361,25 +11377,6 @@ "uniqid": "4.1.1" } }, - "postcss-fontpath": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/postcss-fontpath/-/postcss-fontpath-0.3.0.tgz", - "integrity": "sha1-KBQqed0Y8snwv1yH96PreUxTkp4=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "postcss": "5.2.17" - } - }, - "postcss-hexrgba": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/postcss-hexrgba/-/postcss-hexrgba-0.2.1.tgz", - "integrity": "sha1-XGGrukOcCjjknn+8CzzZNhGewiU=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-import": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-10.0.0.tgz", @@ -11441,15 +11438,6 @@ } } }, - "postcss-input-style": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/postcss-input-style/-/postcss-input-style-0.3.0.tgz", - "integrity": "sha1-47T9sKpEG+0ZMMu0TYrVY0zzhUA=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-less": { "version": "0.14.0", "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-0.14.0.tgz", @@ -11951,15 +11939,6 @@ "postcss-value-parser": "3.3.0" } }, - "postcss-opacity": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-opacity/-/postcss-opacity-4.0.0.tgz", - "integrity": "sha1-qlYgQ9ozlMlKOs7c9D8MMj0JhqE=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-ordered-values": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", @@ -11970,42 +11949,6 @@ "postcss-value-parser": "3.3.0" } }, - "postcss-position": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/postcss-position/-/postcss-position-0.5.0.tgz", - "integrity": "sha1-hlPU8LhP+wflRPt/fq4IxlUbc6A=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-pseudoelements": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz", - "integrity": "sha1-bGghd8eQC6BTtt8X+MWQKEx7i7w=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-quantity-queries": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/postcss-quantity-queries/-/postcss-quantity-queries-0.4.0.tgz", - "integrity": "sha1-vhNwp76TEqFzY5wIaapCECRPhs4=", - "dev": true, - "requires": { - "balanced-match": "0.2.1", - "postcss": "5.2.17" - }, - "dependencies": { - "balanced-match": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz", - "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=", - "dev": true - } - } - }, "postcss-reduce-idents": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", @@ -12037,9 +11980,9 @@ } }, "postcss-reporter": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-2.0.0.tgz", - "integrity": "sha1-0l50un/OkR4qpy7BrlkvrebsNnE=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-3.0.0.tgz", + "integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=", "dev": true, "requires": { "chalk": "1.1.3", @@ -12054,15 +11997,6 @@ "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=", "dev": true }, - "postcss-responsive-type": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-0.5.1.tgz", - "integrity": "sha1-J0EzvARjWeVCpYu8YhhH0ED9EOY=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-scss": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.4.1.tgz", @@ -12169,24 +12103,6 @@ "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", "dev": true }, - "postcss-vmin": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-vmin/-/postcss-vmin-2.0.0.tgz", - "integrity": "sha1-UyfCEZE3ElaGj9enOZF/FHTVf+4=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, - "postcss-will-change": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-will-change/-/postcss-will-change-1.1.0.tgz", - "integrity": "sha1-plHdWoHoLEEtOabPkKkrsyaa8Yw=", - "dev": true, - "requires": { - "postcss": "5.2.17" - } - }, "postcss-zindex": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", @@ -13396,12 +13312,6 @@ "onetime": "1.1.0" } }, - "rgb-hex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz", - "integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E=", - "dev": true - }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -13434,42 +13344,6 @@ "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz", "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=" }, - "rucksack-css": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/rucksack-css/-/rucksack-css-0.9.1.tgz", - "integrity": "sha1-2n66TGe9BbAMv0yDQwXF/lU3XeE=", - "dev": true, - "requires": { - "autoprefixer": "6.7.7", - "laggard": "0.1.0", - "minimist": "1.2.0", - "postcss": "5.2.17", - "postcss-alias": "1.0.0", - "postcss-clearfix": "1.0.0", - "postcss-color-rgba-fallback": "2.2.0", - "postcss-easings": "0.3.0", - "postcss-fontpath": "0.3.0", - "postcss-hexrgba": "0.2.1", - "postcss-input-style": "0.3.0", - "postcss-opacity": "4.0.0", - "postcss-position": "0.5.0", - "postcss-pseudoelements": "3.0.0", - "postcss-quantity-queries": "0.4.0", - "postcss-reporter": "2.0.0", - "postcss-responsive-type": "0.5.1", - "postcss-vmin": "2.0.0", - "read-file-stdin": "0.2.1", - "write-file-stdout": "0.0.2" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, "run-async": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", @@ -14251,26 +14125,13 @@ } }, "style-loader": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.1.tgz", - "integrity": "sha1-RoKA77wEcwI806bNVuM7Wh1/w6k=", + "version": "0.18.2", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz", + "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==", "dev": true, "requires": { - "loader-utils": "0.2.17" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } + "loader-utils": "1.1.0", + "schema-utils": "0.3.0" } }, "style-search": { @@ -14418,18 +14279,6 @@ "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true }, - "postcss-reporter": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-3.0.0.tgz", - "integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "lodash": "4.17.4", - "log-symbols": "1.0.2", - "postcss": "5.2.17" - } - }, "resolve-from": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", diff --git a/js/package.json b/js/package.json index 1b3b81e04..5b392f70a 100644 --- a/js/package.json +++ b/js/package.json @@ -29,19 +29,16 @@ "analize": "npm run analize:lib && npm run analize:dll && npm run analize:app", "analize:app": "WPANALIZE=1 webpack --config webpack/app --json > .build/analize.app.json && cat .build/analize.app.json | webpack-bundle-size-analyzer", "analize:lib": "WPANALIZE=1 webpack --config webpack/libraries --json > .build/analize.lib.json && cat .build/analize.lib.json | webpack-bundle-size-analyzer", - "analize:dll": "WPANALIZE=1 webpack --config webpack/vendor --json > .build/analize.dll.json && cat .build/analize.dll.json | webpack-bundle-size-analyzer", - "build": "npm run build:lib && npm run build:dll && npm run build:app && npm run build:embed", + "build": "npm run build:lib && npm run build:app && npm run build:embed", "build:app": "webpack --config webpack/app", "build:lib": "webpack --config webpack/libraries", - "build:dll": "webpack --config webpack/vendor", "build:markdown": "babel-node ./scripts/build-rpc-markdown.js", "build:json": "babel-node ./scripts/build-rpc-json.js", "build:embed": "EMBED=1 node webpack/embed", "build:i18n": "npm run clean && npm run build && babel-node ./scripts/build-i18n.js", - "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app && npm run ci:build:embed", + "ci:build": "npm run ci:build:lib && npm run ci:build:app && npm run ci:build:embed", "ci:build:app": "NODE_ENV=production webpack --config webpack/app", "ci:build:lib": "NODE_ENV=production webpack --config webpack/libraries", - "ci:build:dll": "NODE_ENV=production webpack --config webpack/vendor", "ci:build:npm": "NODE_ENV=production webpack --config webpack/npm", "ci:build:jsonrpc": "babel-node ./scripts/build-rpc-json.js --output .npmjs/jsonrpc", "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed", @@ -55,7 +52,7 @@ "lint:js": "eslint --ignore-path .gitignore ./src/", "lint:js:cached": "eslint --cache --ignore-path .gitignore ./src/", "lint:js:fix": "eslint --fix --ignore-path .gitignore ./src/", - "start": "npm run clean && npm install && npm run build:lib && npm run build:dll && npm run start:app", + "start": "npm run clean && npm install && npm run build:lib && npm run start:app", "start:app": "node webpack/dev.server", "test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js' 'packages/**/*.spec.js'", "test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js' 'packages/**/*.spec.js'", @@ -68,7 +65,7 @@ "babel-cli": "6.23.0", "babel-core": "6.23.1", "babel-eslint": "7.1.1", - "babel-loader": "6.3.2", + "babel-loader": "7.1.1", "babel-plugin-lodash": "3.2.11", "babel-plugin-react-intl": "2.3.1", "babel-plugin-recharts": "1.1.0", @@ -95,7 +92,7 @@ "copy-webpack-plugin": "4.0.1", "core-js": "2.4.1", "coveralls": "2.11.16", - "css-loader": "0.26.1", + "css-loader": "0.28.4", "ejs-loader": "0.3.0", "ejsify": "1.0.0", "empty-module": "0.0.2", @@ -139,13 +136,12 @@ "react-addons-test-utils": "15.4.2", "react-hot-loader": "3.0.0-beta.6", "react-intl-aggregate-webpack-plugin": "0.0.1", - "rucksack-css": "0.9.1", "script-ext-html-webpack-plugin": "1.7.1", "serviceworker-webpack-plugin": "0.2.0", "sinon": "1.17.7", "sinon-as-promised": "4.0.2", "sinon-chai": "2.8.0", - "style-loader": "0.13.1", + "style-loader": "0.18.2", "stylelint": "7.11.0", "stylelint-config-standard": "16.0.0", "to-source": "2.0.3", @@ -160,13 +156,13 @@ "yargs": "6.6.0" }, "dependencies": { - "@parity/api": "paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", + "@parity/api": "paritytech/js-api#ade4a6750292a2918676039ea53eea20c4c728bc", "@parity/dapps": "file:packages/dapps", "@parity/etherscan": "paritytech/js-etherscan#efe859ac7d2a8a3cc05e01c689b7fa58f47f8b87", "@parity/ledger": "file:packages/ledger", "@parity/shapeshift": "file:packages/shapeshift", "@parity/shared": "paritytech/js-shared#a83c71946d30d5b3bf976860a676add29c48ee24", - "@parity/ui": "paritytech/js-ui#feb2030a22cb3568d887b2d9b72704786afccb88", + "@parity/ui": "paritytech/js-ui#037782bd16e8abf1c169143aa61749a44b94489b", "@parity/wordlist": "1.0.1", "es6-error": "4.0.0", "es6-promise": "4.0.5", diff --git a/js/packages/dapps/index.ejs b/js/packages/dapps/index.ejs index c0ef5a8a5..8b65fbf19 100644 --- a/js/packages/dapps/index.ejs +++ b/js/packages/dapps/index.ejs @@ -28,6 +28,5 @@
Loading
- diff --git a/js/src/Dapps/dapps.js b/js/src/Dapps/dapps.js index 23097615e..693213baf 100644 --- a/js/src/Dapps/dapps.js +++ b/js/src/Dapps/dapps.js @@ -27,6 +27,8 @@ import DappsStore from './dappsStore'; import styles from './dapps.css'; +console.log('styles', styles); + @observer class Dapps extends Component { static contextTypes = { diff --git a/js/src/index.ejs b/js/src/index.ejs index 1bf9ab726..7009ce0ee 100644 --- a/js/src/index.ejs +++ b/js/src/index.ejs @@ -31,6 +31,5 @@
Loading
- diff --git a/js/webpack/app.js b/js/webpack/app.js index 6a9e29ad5..be1120ed0 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -15,24 +15,23 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -const webpack = require('webpack'); const path = require('path'); // const ReactIntlAggregatePlugin = require('react-intl-aggregate-webpack-plugin'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); const WebpackErrorNotificationPlugin = require('webpack-error-notification'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); const ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin'); -const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin'); const rulesEs6 = require('./rules/es6'); const rulesParity = require('./rules/parity'); const Shared = require('./shared'); -const DAPPS_BUILTIN = require('@parity/shared/config/dappsBuiltin.json'); -const DAPPS_VIEWS = require('@parity/shared/config/dappsViews.json').map((dapp) => { - dapp.commons = true; - return dapp; -}); +const DAPPS_BUILTIN = []; // require('@parity/shared/config/dappsBuiltin.json'); +const DAPPS_VIEWS = []; // require('@parity/shared/config/dappsViews.json').map((dapp) => { +// dapp.commons = true; +// return dapp; +// }); const FAVICON = path.resolve(__dirname, '../node_modules/@parity/shared/assets/images/parity-logo-black-no-text.png'); @@ -59,9 +58,8 @@ module.exports = { context: path.join(__dirname, '../src'), entry: entry, output: { - // publicPath: '/', path: path.join(__dirname, '../', DEST), - filename: '[name].[hash:10].js' + filename: '[name].js' }, module: { @@ -106,31 +104,24 @@ module.exports = { }, { test: /\.css$/, - include: [ /packages/, /src/, /@parity/ ], use: [ 'style-loader', { loader: 'css-loader', options: { - importLoaders: 1, - localIdentName: '[name]_[local]_[hash:base64:5]' + importLoaders: 1 } }, { loader: 'postcss-loader', options: { 'postcss-import': {}, - 'postcss-nested': {}, + 'postcss-neted': {}, 'postcss-simple-vars': {} } } ] }, - { - test: /\.css$/, - exclude: [ /packages/, /src/, /@parity/ ], - use: [ 'style-loader', 'css-loader' ] - }, { test: /\.(png|jpg)$/, use: [ { @@ -204,12 +195,16 @@ module.exports = { template: '../packages/dapps/index.ejs', favicon: FAVICON, secure: dapp.secure, - chunks: [ !isProd || dapp.commons ? 'commons' : null, dapp.url ] + chunks: [ dapp.url ] }); }); let plugins = Shared.getPlugins().concat( - new WebpackErrorNotificationPlugin() + new WebpackErrorNotificationPlugin(), + new ExtractTextPlugin({ + filename: 'styles/[name].[hash:10].css', + allChunks: true + }) ); if (!isEmbed) { @@ -221,10 +216,7 @@ module.exports = { filename: 'index.html', template: './index.ejs', favicon: FAVICON, - chunks: [ - isProd ? null : 'commons', - 'index' - ] + chunks: [ 'index' ] }), new ServiceWorkerWebpackPlugin({ @@ -233,16 +225,6 @@ module.exports = { DappsHTMLInjection, - new webpack.DllReferencePlugin({ - context: '.', - manifest: require(`../${DEST}/vendor-manifest.json`) - }), - - new ScriptExtHtmlWebpackPlugin({ - sync: [ 'commons', 'vendor.js' ], - defaultAttribute: 'defer' - }), - new CopyWebpackPlugin([ { from: './error_pages.css', to: 'styles.css' }, { from: '../packages/dapps/static' } @@ -257,10 +239,7 @@ module.exports = { filename: 'embed.html', template: './index.ejs', favicon: FAVICON, - chunks: [ - isProd ? null : 'commons', - 'embed' - ] + chunks: [ 'embed' ] }) ); } @@ -273,12 +252,6 @@ module.exports = { // messagesPattern: DEST_I18N + '/i18n/**/*.json', // aggregateOutputDir: DEST_I18N + '/i18n/', // aggregateFilename: 'en' - // }), - // - // new webpack.optimize.CommonsChunkPlugin({ - // filename: 'commons.[hash:10].js', - // name: 'commons', - // minChunks: 2 // }) // ); // } diff --git a/js/webpack/shared.js b/js/webpack/shared.js index 2f5192e3d..f39c7790a 100644 --- a/js/webpack/shared.js +++ b/js/webpack/shared.js @@ -19,7 +19,6 @@ const path = require('path'); const fs = require('fs'); const CircularDependencyPlugin = require('circular-dependency-plugin'); -const ProgressBarPlugin = require('progress-bar-webpack-plugin'); const PackageJson = require('../package.json'); const UI_VERSION = PackageJson @@ -36,7 +35,6 @@ const UI_VERSION = PackageJson const EMBED = process.env.EMBED; const ENV = process.env.NODE_ENV || 'development'; const isProd = ENV === 'production'; -const isAnalize = process.env.WPANALIZE === '1'; function getBabelrc () { const babelrc = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../.babelrc'))); @@ -73,34 +71,19 @@ function getBabelrc () { } function getPlugins (_isProd = isProd) { - const plugins = (isAnalize - ? [] - : [ - new ProgressBarPlugin({ - format: '[:msg] [:bar] ' + ':percent' + ' (:elapsed seconds)' - }) - ]).concat([ - new webpack.DefinePlugin({ - 'process.env': { - EMBED: JSON.stringify(EMBED), - NODE_ENV: JSON.stringify(ENV), - RPC_ADDRESS: JSON.stringify(process.env.RPC_ADDRESS), - PARITY_URL: JSON.stringify(process.env.PARITY_URL), - DAPPS_URL: JSON.stringify(process.env.DAPPS_URL), - LOGGING: JSON.stringify(!isProd), - UI_VERSION: JSON.stringify(UI_VERSION) - } - }), - - new webpack.LoaderOptionsPlugin({ - minimize: isProd, - debug: !isProd, - options: { - context: path.join(__dirname, '../src'), - babel: getBabelrc() - } - }) - ]); + const plugins = [ + new webpack.DefinePlugin({ + 'process.env': { + EMBED: JSON.stringify(EMBED), + NODE_ENV: JSON.stringify(ENV), + RPC_ADDRESS: JSON.stringify(process.env.RPC_ADDRESS), + PARITY_URL: JSON.stringify(process.env.PARITY_URL), + DAPPS_URL: JSON.stringify(process.env.DAPPS_URL), + LOGGING: JSON.stringify(!isProd), + UI_VERSION: JSON.stringify(UI_VERSION) + } + }) + ]; if (_isProd) { plugins.push( @@ -130,6 +113,8 @@ function getDappsEntry () { const builtins = require('@parity/shared/config/dappsBuiltin.json'); const views = require('@parity/shared/config/dappsViews.json'); + return {}; + return Object.assign( [] .concat( diff --git a/js/webpack/vendor.js b/js/webpack/vendor.js deleted file mode 100644 index 64de5ee36..000000000 --- a/js/webpack/vendor.js +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2015-2017 Parity Technologies (UK) Ltd. -// This file is part of Parity. - -// Parity is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Parity is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Parity. If not, see . - -const webpack = require('webpack'); -const path = require('path'); - -const Shared = require('./shared'); - -const ENV = process.env.NODE_ENV || 'development'; -const DEST = process.env.BUILD_DEST || '.build'; - -let modules = [ - 'bignumber.js', - 'blockies', - 'brace', - 'browserify-aes', - 'ethereumjs-tx', - 'lodash', - 'material-ui', - 'mobx', - 'mobx-react', - 'moment', - 'phoneformat.js', - 'react', - 'react-dom', - 'react-redux', - 'react-router', - 'react-router-redux', - 'recharts', - 'redux', - 'redux-thunk', - 'semantic-ui-css', - 'semantic-ui-react', - 'scryptsy', - 'zxcvbn' -]; - -module.exports = { - entry: { - vendor: modules - }, - module: { - rules: [ - { - test: /\.json$/, - use: [ 'json-loader' ] - }, - { - test: /\.js$/, - include: /(ethereumjs-tx)/, - use: [ 'babel-loader' ] - } - ] - }, - - resolve: { - alias: { - '~': path.resolve(__dirname, '..') - } - }, - - output: { - filename: '[name].js', - path: path.resolve(__dirname, '../', `${DEST}/`), - library: '[name]_lib' - }, - plugins: Shared.getPlugins().concat([ - new webpack.DllPlugin({ - name: '[name]_lib', - path: path.resolve(__dirname, '../', `${DEST}/[name]-manifest.json`) - }), - - new webpack.DefinePlugin({ - 'process.env': { - NODE_ENV: JSON.stringify(ENV) - } - }) - ]) -};