From 599426a1f9ef69e322e4269b9567f4354acc0b23 Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Fri, 12 Oct 2018 15:20:59 +0300 Subject: [PATCH] Clean static folder on build --- client/.eslintrc | 9 +++- client/package-lock.json | 88 ++++++++++++++++++++++++++++------------ client/package.json | 3 +- client/webpack.common.js | 6 +++ 4 files changed, 77 insertions(+), 29 deletions(-) diff --git a/client/.eslintrc b/client/.eslintrc index cb0bff72..98799db6 100644 --- a/client/.eslintrc +++ b/client/.eslintrc @@ -13,6 +13,13 @@ "commonjs": true }, + "settings": { + "react": { + "pragma": "React", + "version": "16.4" + } + }, + "rules": { "indent": ["error", 4, { "SwitchCase": 1, @@ -43,6 +50,6 @@ }], "no-console": ["warn", { "allow": ["warn", "error"] }], "import/no-extraneous-dependencies": ["error", { "devDependencies": true }], - "import/prefer-default-export": "off", + "import/prefer-default-export": "off" } } diff --git a/client/package-lock.json b/client/package-lock.json index 7c27b39b..8ca931bf 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -181,18 +181,32 @@ "glob-to-regexp": "^0.3.0" } }, + "@nivo/axes": { + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.49.1.tgz", + "integrity": "sha512-2ZqpKtnZ9HE30H+r565VCrypKRQzAoMbAg1hsht88dlNQRtghBSxbAS0Y4IUW/wgN/AzvOIBJHvxH7bgaB8Oow==", + "requires": { + "@nivo/core": "0.49.0", + "d3-format": "^1.3.2", + "d3-time-format": "^2.1.3", + "lodash": "^4.17.4", + "react-motion": "^0.5.2", + "recompose": "^0.26.0" + } + }, "@nivo/core": { - "version": "0.42.1", - "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.42.1.tgz", - "integrity": "sha512-T3DgbV9x6snbHxNQ2vWZYJRCnI6iUqh9A6Kn1Fsy1L7Sn97fsf89e1qMp0CpILhyJu7Fj+VXRYtJwby0wH6GAA==", + "version": "0.49.0", + "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.49.0.tgz", + "integrity": "sha512-TCPMUO2aJ7fI+ZB6t3d3EBQtNxJnTzaxLJsrVyn/3AQIjUwccAeo2aIy81wLBGWGtlGNUDNdAbnFzXiJosH0yg==", "requires": { "d3-color": "^1.0.3", - "d3-format": "^1.2.0", - "d3-hierarchy": "^1.1.5", - "d3-interpolate": "^1.1.5", - "d3-scale": "^1.0.6", - "d3-scale-chromatic": "^1.1.1", - "d3-shape": "^1.2.0", + "d3-format": "^1.3.2", + "d3-hierarchy": "^1.1.8", + "d3-interpolate": "^1.3.2", + "d3-scale": "^2.1.2", + "d3-scale-chromatic": "^1.3.3", + "d3-shape": "^1.2.2", + "d3-time-format": "^2.1.3", "lodash": "^4.17.4", "react-measure": "^2.0.2", "react-motion": "^0.5.2", @@ -200,29 +214,41 @@ } }, "@nivo/legends": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.42.0.tgz", - "integrity": "sha512-t82aKNaFtbY0mlE12caiSkXml73APMibH+gKsXECwhSutfGfgQzUbqBjPsNKJcMiWfG46noJ1MrFhDB3a6204g==", + "version": "0.49.0", + "resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.49.0.tgz", + "integrity": "sha512-8KbUFYozqwD+/rj4in0mnF9b9CuyNFjVgXqm2KW3ODVlWIgYgjTVlEhlg9VZIArFPlIyyAjEYC88YSRcALHugg==", "requires": { "lodash": "^4.17.4", "recompose": "^0.26.0" } }, "@nivo/line": { - "version": "0.42.1", - "resolved": "https://registry.npmjs.org/@nivo/line/-/line-0.42.1.tgz", - "integrity": "sha512-X/nvNvwMqz10hACBL/owCONDeG78occ6Er0ay6/1n2h+Dm6zn2p6hiFyvu7QtsdwGeHOC5sePcz9O44bycbtoQ==", + "version": "0.49.1", + "resolved": "https://registry.npmjs.org/@nivo/line/-/line-0.49.1.tgz", + "integrity": "sha512-wKkOmpnwK2psmZbJReDq+Eh/WV9r1JA8V4Vl4eIRuf971CW0KUT9nCAoc/FcKio0qsiq5wyFt3J5LuAhfzlV/w==", "requires": { - "@nivo/core": "0.42.1", - "@nivo/legends": "0.42.0", - "d3-format": "^1.2.0", - "d3-scale": "^1.0.6", - "d3-shape": "^1.2.0", + "@nivo/axes": "0.49.1", + "@nivo/core": "0.49.0", + "@nivo/legends": "0.49.0", + "@nivo/scales": "0.49.0", + "d3-format": "^1.3.2", + "d3-scale": "^2.1.2", + "d3-shape": "^1.2.2", "lodash": "^4.17.4", "react-motion": "^0.5.2", "recompose": "^0.26.0" } }, + "@nivo/scales": { + "version": "0.49.0", + "resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.49.0.tgz", + "integrity": "sha512-+5Leu4zX6mDSAunf4ZJHeqVlT+ZsqiKXLB6hT/u7r3GjxZP9A+n3rHePhIzikBiBRMlLjyiBlylLzhKBAYbGWQ==", + "requires": { + "d3-scale": "^2.1.2", + "d3-time-format": "^2.1.3", + "lodash": "^4.17.4" + } + }, "@nodelib/fs.stat": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz", @@ -2675,6 +2701,15 @@ "source-map": "~0.6.0" } }, + "clean-webpack-plugin": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz", + "integrity": "sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA==", + "dev": true, + "requires": { + "rimraf": "^2.6.1" + } + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -3509,13 +3544,12 @@ "integrity": "sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA==" }, "d3-scale": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz", - "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.1.2.tgz", + "integrity": "sha512-bESpd64ylaKzCDzvULcmHKZTlzA/6DGSVwx7QSDj/EnX9cpSevsdiwdHFYI9ouo9tNBbV3v5xztHS2uFeOzh8Q==", "requires": { "d3-array": "^1.2.0", "d3-collection": "1", - "d3-color": "1", "d3-format": "1", "d3-interpolate": "1", "d3-time": "1", @@ -12839,9 +12873,9 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-measure": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-measure/-/react-measure-2.1.0.tgz", - "integrity": "sha512-nHdoq1eTbGVg/jWWAEtxXSHH51j09d1nPabj6PwS+pNSCYYf1H5XLMfcfU2ZTnkDU/Xg0fGY79Xud2Gsp3VsmQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/react-measure/-/react-measure-2.1.2.tgz", + "integrity": "sha512-2xgrlj77Pv8MIYhm+S5s4Q+QnsYFT3CXzoUkx2mWZBIWzQnT7ubMtmsVtCoNdYV5PGKjTlwo9iGAtS3SrTG/Gg==", "requires": { "get-node-dimensions": "^1.2.0", "prop-types": "^15.5.10", diff --git a/client/package.json b/client/package.json index 1e160b99..c790ae93 100644 --- a/client/package.json +++ b/client/package.json @@ -9,7 +9,7 @@ "lint": "eslint frontend/" }, "dependencies": { - "@nivo/line": "^0.42.1", + "@nivo/line": "^0.49.1", "axios": "^0.18.0", "classnames": "^2.2.6", "date-fns": "^1.29.0", @@ -45,6 +45,7 @@ "babel-preset-react": "^6.24.1", "babel-preset-stage-2": "^6.24.1", "babel-runtime": "6.26.0", + "clean-webpack-plugin": "^0.1.19", "compression-webpack-plugin": "^1.1.11", "css-loader": "^0.28.11", "eslint": "^4.19.1", diff --git a/client/webpack.common.js b/client/webpack.common.js index d1cfa6d0..4ca3b1e4 100644 --- a/client/webpack.common.js +++ b/client/webpack.common.js @@ -4,6 +4,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const webpack = require('webpack'); const flexBugsFixes = require('postcss-flexbugs-fixes'); +const CleanWebpackPlugin = require('clean-webpack-plugin'); const RESOURCES_PATH = path.resolve(__dirname); const ENTRY_REACT = path.resolve(RESOURCES_PATH, 'src/index.js'); @@ -92,6 +93,11 @@ const config = { new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), }), + new CleanWebpackPlugin(['*.*'], { + root: PUBLIC_PATH, + verbose: false, + dry: false, + }), new HtmlWebpackPlugin({ inject: true, cache: false,