From 6349da22ac670e7407e75028da30db2a6a283ad4 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 31 Jul 2017 11:24:25 +0200 Subject: [PATCH] Fix NODE_ENV=production build --- js/package-lock.json | 409 ++++++++++++++++----- js/package.json | 12 +- js/packages/dapp-dappreg/Button/button.css | 2 - js/packages/dapp-dappreg/Card/card.css | 2 - js/packages/dapp-dappreg/Modal/modal.css | 2 - js/webpack/app.js | 69 ++-- js/webpack/libraries.js | 15 +- js/webpack/npm.js | 6 +- js/webpack/shared.js | 39 -- 9 files changed, 384 insertions(+), 172 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index 6bc921999..71a0c873c 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -161,7 +161,7 @@ } }, "@parity/ui": { - "version": "github:paritytech/js-ui#73b6241d727afe6b1bc04d7b093093a5d542c5c8", + "version": "github:paritytech/js-ui#feb2030a22cb3568d887b2d9b72704786afccb88", "requires": { "@parity/api": "github:paritytech/js-api#1c7cc5561c4e8db0d0b58f22d8bc8baa243909a5", "@parity/etherscan": "github:paritytech/js-etherscan#efe859ac7d2a8a3cc05e01c689b7fa58f47f8b87", @@ -383,12 +383,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, - "any-promise": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz", - "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=", - "dev": true - }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", @@ -7757,13 +7751,13 @@ "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.0.26" + "uglify-js": "3.0.27" }, "dependencies": { "uglify-js": { - "version": "3.0.26", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.26.tgz", - "integrity": "sha512-+D/BjzuvT1oRMSkH0fuF3M/BCvDxDywmZasd1UTPPHsdsHZqJEAZSvrojgFlS7lrM3ZZWq5h7Bb5i96X1TbOJw==", + "version": "3.0.27", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz", + "integrity": "sha512-HD8CmxPXUI62v5tweiulMcP/apAtx1DXGcNZkhKQZyC+MTrTsoCBb8yPAwVrbvpgw3EpRU76bRe6axjIiCYcQg==", "dev": true, "requires": { "commander": "2.11.0", @@ -8015,7 +8009,7 @@ "file-type": "4.4.0", "globby": "6.1.0", "make-dir": "1.0.0", - "p-pipe": "1.1.0", + "p-pipe": "1.2.0", "pify": "2.3.0", "replace-ext": "1.0.0" }, @@ -8670,7 +8664,7 @@ "istanbul-lib-report": "1.1.1", "istanbul-lib-source-maps": "1.2.1", "istanbul-reports": "1.1.1", - "js-yaml": "3.9.0", + "js-yaml": "3.9.1", "mkdirp": "0.5.1", "once": "1.4.0" }, @@ -8691,9 +8685,9 @@ "dev": true }, "js-yaml": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz", - "integrity": "sha512-0LoUNELX4S+iofCT8f4uEHIiRBR+c2AINyC8qRWfC6QNruLtxVZRJaPcu/xwMgFIgDxF25tGHaDjvxzJCNE9yw==", + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz", + "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==", "dev": true, "requires": { "argparse": "1.0.9", @@ -10947,9 +10941,9 @@ } }, "p-pipe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.1.0.tgz", - "integrity": "sha1-Lp3HzFfOZ9LOLbNIygPyhzGFQHU=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz", + "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=", "dev": true }, "pako": { @@ -11387,17 +11381,64 @@ } }, "postcss-import": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-9.1.0.tgz", - "integrity": "sha1-lf6YdqHnmvSfvcNYnwH+WqfMHoA=", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-10.0.0.tgz", + "integrity": "sha1-TIXJewmRNsxeoCQNwd/b/eTi674=", "dev": true, "requires": { "object-assign": "4.1.1", - "postcss": "5.2.17", + "postcss": "6.0.8", "postcss-value-parser": "3.3.0", - "promise-each": "2.2.0", "read-cache": "1.0.0", "resolve": "1.4.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.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" + } + } } }, "postcss-input-style": { @@ -11451,15 +11492,63 @@ } }, "postcss-loader": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.3.2.tgz", - "integrity": "sha1-xWi2HC5I4nThwiSiWH+1ZvTsJvU=", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.6.tgz", + "integrity": "sha512-HIq7yy1hh9KI472Y38iSRV4WupZUNy6zObkxQM/ZuInoaE2+PyX4NcO6jjP5HG5mXL7j5kcNEl0fAG4Kva7O9w==", "dev": true, "requires": { "loader-utils": "1.1.0", - "object-assign": "4.1.1", - "postcss": "5.2.17", - "postcss-load-config": "1.2.0" + "postcss": "6.0.8", + "postcss-load-config": "1.2.0", + "schema-utils": "0.3.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.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" + } + } } }, "postcss-media-query-parser": { @@ -11784,12 +11873,61 @@ } }, "postcss-nested": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-1.0.0.tgz", - "integrity": "sha1-0Ta9S1dr1WMt8ULBKyGYqcz3lN8=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-2.1.0.tgz", + "integrity": "sha512-0DbCNWZSI8SapZkfY1Ni/3019ZQWTe3wair/5tFLzXMi8u8pNWbc+EJDq+ckakylF0WnSrKIlJAd1mG32jsE/A==", "dev": true, "requires": { - "postcss": "5.2.17" + "postcss": "6.0.8", + "postcss-selector-parser": "2.2.3" + }, + "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" + } + } } }, "postcss-normalize-charset": { @@ -11946,12 +12084,60 @@ } }, "postcss-simple-vars": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-3.0.0.tgz", - "integrity": "sha1-H6TMtLcVHZ8NUvuOoZoVwTGVmdY=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-4.0.0.tgz", + "integrity": "sha1-1J4IKJfZpIJPImj6kdlp2UPi6nY=", "dev": true, "requires": { - "postcss": "5.2.17" + "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" + } + } } }, "postcss-svgo": { @@ -12109,15 +12295,6 @@ "asap": "2.0.6" } }, - "promise-each": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz", - "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=", - "dev": true, - "requires": { - "any-promise": "0.1.0" - } - }, "promise-worker": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/promise-worker/-/promise-worker-1.1.1.tgz", @@ -14855,6 +15032,87 @@ "dev": true, "optional": true }, + "uglifyjs-webpack-plugin": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", + "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", + "dev": true, + "requires": { + "source-map": "0.5.6", + "uglify-js": "2.8.29", + "webpack-sources": "1.0.1" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "source-list-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "dev": true + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", + "dev": true, + "requires": { + "source-map": "0.5.6", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + } + }, + "webpack-sources": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==", + "dev": true, + "requires": { + "source-list-map": "2.0.0", + "source-map": "0.5.6" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, "uniq": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", @@ -15237,43 +15495,40 @@ "dev": true }, "webpack": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.4.1.tgz", - "integrity": "sha1-FakdvjSWbYpLmcfWVu/ZKi5ab2o=", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.3.0.tgz", + "integrity": "sha1-zi+eB2Vmq6kfdIhxM6iD/X2hh7w=", "dev": true, "requires": { "acorn": "5.1.1", "acorn-dynamic-import": "2.0.2", - "ajv": "4.11.8", - "ajv-keywords": "1.5.1", + "ajv": "5.2.2", + "ajv-keywords": "2.1.0", "async": "2.5.0", "enhanced-resolve": "3.4.1", + "escope": "3.6.0", "interpret": "1.0.3", "json-loader": "0.5.4", "json5": "0.5.1", "loader-runner": "2.3.0", - "loader-utils": "0.2.17", + "loader-utils": "1.1.0", "memory-fs": "0.4.1", "mkdirp": "0.5.1", "node-libs-browser": "2.0.0", "source-map": "0.5.6", "supports-color": "3.2.3", "tapable": "0.2.7", - "uglify-js": "2.8.22", + "uglifyjs-webpack-plugin": "0.4.6", "watchpack": "1.4.0", - "webpack-sources": "0.2.3", + "webpack-sources": "1.0.1", "yargs": "6.6.0" }, "dependencies": { - "ajv": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", - "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", - "dev": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } + "ajv-keywords": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz", + "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=", + "dev": true }, "async": { "version": "2.5.0", @@ -15284,22 +15539,10 @@ "lodash": "4.17.2" } }, - "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" - } - }, "source-list-map": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz", - "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", + "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", "dev": true }, "supports-color": { @@ -15312,12 +15555,12 @@ } }, "webpack-sources": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz", - "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", + "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==", "dev": true, "requires": { - "source-list-map": "1.1.2", + "source-list-map": "2.0.0", "source-map": "0.5.6" } } diff --git a/js/package.json b/js/package.json index 11e2e70db..1b3b81e04 100644 --- a/js/package.json +++ b/js/package.json @@ -128,10 +128,10 @@ "mock-local-storage": "1.0.2", "mock-socket": "6.0.4", "nock": "9.0.7", - "postcss-import": "9.1.0", - "postcss-loader": "1.3.2", - "postcss-nested": "1.0.0", - "postcss-simple-vars": "3.0.0", + "postcss-import": "10.0.0", + "postcss-loader": "2.0.6", + "postcss-nested": "2.1.0", + "postcss-simple-vars": "4.0.0", "progress": "1.1.8", "progress-bar-webpack-plugin": "1.9.3", "raw-loader": "0.5.1", @@ -151,7 +151,7 @@ "to-source": "2.0.3", "uglify-js": "2.8.22", "url-loader": "0.5.7", - "webpack": "2.4.1", + "webpack": "3.3.0", "webpack-bundle-size-analyzer": "2.5.0", "webpack-dev-middleware": "1.10.1", "webpack-error-notification": "0.1.6", @@ -166,7 +166,7 @@ "@parity/ledger": "file:packages/ledger", "@parity/shapeshift": "file:packages/shapeshift", "@parity/shared": "paritytech/js-shared#a83c71946d30d5b3bf976860a676add29c48ee24", - "@parity/ui": "paritytech/js-ui#73b6241d727afe6b1bc04d7b093093a5d542c5c8", + "@parity/ui": "paritytech/js-ui#feb2030a22cb3568d887b2d9b72704786afccb88", "@parity/wordlist": "1.0.1", "es6-error": "4.0.0", "es6-promise": "4.0.5", diff --git a/js/packages/dapp-dappreg/Button/button.css b/js/packages/dapp-dappreg/Button/button.css index be2028c7a..aa70e1b1b 100644 --- a/js/packages/dapp-dappreg/Button/button.css +++ b/js/packages/dapp-dappreg/Button/button.css @@ -19,8 +19,6 @@ @import '../_utils.css'; .button { - composes: bezier-transform; - background: $blue; border: none; border-radius: 0.25em; diff --git a/js/packages/dapp-dappreg/Card/card.css b/js/packages/dapp-dappreg/Card/card.css index 05f9710a7..4acad9f50 100644 --- a/js/packages/dapp-dappreg/Card/card.css +++ b/js/packages/dapp-dappreg/Card/card.css @@ -24,8 +24,6 @@ $imgSize: 6rem; } .card { - composes: bezier-transform; - align-items: center; background-color: rgba(240, 240, 240, 0.75); display: flex; diff --git a/js/packages/dapp-dappreg/Modal/modal.css b/js/packages/dapp-dappreg/Modal/modal.css index 73bffc9e7..e3ca05d81 100644 --- a/js/packages/dapp-dappreg/Modal/modal.css +++ b/js/packages/dapp-dappreg/Modal/modal.css @@ -48,8 +48,6 @@ } .close { - composes: bezier-transform; - color: white; display: inline-block; font-family: 'Roboto Mono', monospace; diff --git a/js/webpack/app.js b/js/webpack/app.js index d3cee56d3..fe92831e2 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -72,7 +72,7 @@ module.exports = { { test: /\.js$/, exclude: /(node_modules)/, - use: [ 'happypack/loader?id=babel-js' ] + use: [ 'babel-loader' ] }, { test: /\.json$/, @@ -85,7 +85,13 @@ module.exports = { { test: /\.html$/, use: [ - 'file-loader?name=[name].[ext]!extract-loader', + { + loader: 'file-loader', + options: { + name: '[name].[ext]' + } + }, + 'extract-loader', { loader: 'html-loader', options: { @@ -97,44 +103,52 @@ module.exports = { }, { test: /\.md$/, + use: [ 'html-loader', 'markdown-loader' ] + }, + { + test: /\.css$/, + include: [ /packages/, /src/, /@parity/ ], use: [ + 'style-loader', { - loader: 'html-loader', - options: {} + loader: 'css-loader', + options: { + importLoaders: 1, + localIdentName: '[name]_[local]_[hash:base64:5]' + } }, { - loader: 'markdown-loader', - options: {} + loader: 'postcss-loader', + options: { + 'postcss-import': {}, + 'postcss-nested': {}, + 'postcss-simple-vars': {} + } } ] }, { test: /\.css$/, - include: [ /packages/, /src/, /@parity/ ], - loader: (isProd && !isEmbed) - ? ExtractTextPlugin.extract([ - // 'style-loader', - 'css-loader?modules&sourceMap&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]', - 'postcss-loader' - ]) - : undefined, - use: (isProd && !isEmbed) - ? undefined - : [ 'happypack/loader?id=css' ] - }, - - { - test: /\.css$/, - exclude: [ /packages/, /src/ ], + exclude: [ /packages/, /src/, /@parity/ ], use: [ 'style-loader', 'css-loader' ] }, { test: /\.(png|jpg)$/, - use: [ 'file-loader?&name=assets/[name].[hash:10].[ext]' ] + use: [ { + loader: 'file-loader', + options: { + name: 'assets/[name].[hash:10].[ext]' + } + } ] }, { test: /\.(woff|woff2|ttf|eot|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/, - use: [ 'file-loader?name=fonts/[name][hash:10].[ext]' ] + use: [ { + loader: 'file-loader', + options: { + name: 'fonts/[name][hash:10].[ext]' + } + } ] }, { test: /parity-logo-white-no-text\.svg/, @@ -143,7 +157,12 @@ module.exports = { { test: /\.svg(\?v=[0-9]\.[0-9]\.[0-9])?$/, exclude: [ /parity-logo-white-no-text\.svg/ ], - use: [ 'file-loader?name=assets/[name].[hash:10].[ext]' ] + use: [ { + loader: 'file-loader', + options: { + name: 'assets/[name].[hash:10].[ext]' + } + } ] } ], noParse: [ diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js index 42eb21b33..6cdef103e 100644 --- a/js/webpack/libraries.js +++ b/js/webpack/libraries.js @@ -23,8 +23,6 @@ const rulesParity = require('./rules/parity'); const Shared = require('./shared'); const DEST = process.env.BUILD_DEST || '.build'; -const ENV = process.env.NODE_ENV || 'development'; -const isProd = ENV === 'production'; module.exports = { context: path.join(__dirname, '../src'), @@ -65,11 +63,7 @@ module.exports = { { test: /\.js$/, exclude: /node_modules/, - // use: [ 'happypack/loader?id=js' ] - use: isProd ? ['babel-loader'] : [ - // 'react-hot-loader', - 'babel-loader?cacheDirectory=true' - ] + use: [ 'babel-loader' ] }, { test: /\.json$/, @@ -77,7 +71,12 @@ module.exports = { }, { test: /\.html$/, - use: [ 'file-loader?name=[name].[ext]' ] + use: [ { + loader: 'file-loader', + options: { + name: '[name].[ext]' + } + } ] } ] }, diff --git a/js/webpack/npm.js b/js/webpack/npm.js index 3f09e3722..888952504 100644 --- a/js/webpack/npm.js +++ b/js/webpack/npm.js @@ -61,11 +61,7 @@ module.exports = { rulesEs6, { test: /(\.jsx|\.js)$/, - // use: [ 'happypack/loader?id=js' ], - use: isProd ? ['babel-loader'] : [ - // 'react-hot-loader', - 'babel-loader?cacheDirectory=true' - ], + use: [ 'babel-loader' ], exclude: /node_modules/ } ] diff --git a/js/webpack/shared.js b/js/webpack/shared.js index 5a622a2e9..2f5192e3d 100644 --- a/js/webpack/shared.js +++ b/js/webpack/shared.js @@ -17,12 +17,7 @@ const webpack = require('webpack'); const path = require('path'); const fs = require('fs'); -const HappyPack = require('happypack'); -const postcssImport = require('postcss-import'); -const postcssNested = require('postcss-nested'); -const postcssVars = require('postcss-simple-vars'); -const rucksack = require('rucksack-css'); const CircularDependencyPlugin = require('circular-dependency-plugin'); const ProgressBarPlugin = require('progress-bar-webpack-plugin'); const PackageJson = require('../package.json'); @@ -78,21 +73,6 @@ function getBabelrc () { } function getPlugins (_isProd = isProd) { - const postcss = [ - postcssImport({ - addDependencyTo: webpack - }), - postcssNested({}), - postcssVars({ - unknown: function (node, name, result) { - node.warn(result, `Unknown variable ${name}`); - } - }), - rucksack({ - autoprefixer: true - }) - ]; - const plugins = (isAnalize ? [] : [ @@ -100,24 +80,6 @@ function getPlugins (_isProd = isProd) { format: '[:msg] [:bar] ' + ':percent' + ' (:elapsed seconds)' }) ]).concat([ - new HappyPack({ - id: 'css', - threads: 4, - loaders: [ - 'style-loader', - 'css-loader?modules&sourceMap&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]', - 'postcss-loader' - ], - verbose: !isAnalize - }), - - new HappyPack({ - id: 'babel-js', - threads: 4, - loaders: [ isProd ? 'babel-loader' : 'babel-loader?cacheDirectory=true' ], - verbose: !isAnalize - }), - new webpack.DefinePlugin({ 'process.env': { EMBED: JSON.stringify(EMBED), @@ -135,7 +97,6 @@ function getPlugins (_isProd = isProd) { debug: !isProd, options: { context: path.join(__dirname, '../src'), - postcss: postcss, babel: getBabelrc() } })