diff options
Diffstat (limited to 'juick-www')
| -rw-r--r-- | juick-www/package.json | 18 | ||||
| -rw-r--r-- | juick-www/webpack.config.js | 17 |
2 files changed, 14 insertions, 21 deletions
diff --git a/juick-www/package.json b/juick-www/package.json index 6ef22c445..8601f05cb 100644 --- a/juick-www/package.json +++ b/juick-www/package.json @@ -13,21 +13,21 @@ "license": "AGPLv3", "devDependencies": { "babel-core": "^6.0.20", - "babel-loader": "^6.0.1", + "babel-loader": "^7.0.0", "babel-preset-es2015": "^6.24.1", - "css-loader": "^0.23.1", + "css-loader": "^0.28.1", "csslint": "^1.0.5", "csslint-loader": "^1.0.0", "eslint": "^3.1.1", "eslint-loader": "^1.4.1", - "extract-text-webpack-plugin": "^1.0.1", - "file-loader": "^0.9.0", - "globby": "^4.1.0", + "extract-text-webpack-plugin": "^2.1.0", + "file-loader": "^0.11.1", + "globby": "^6.1.0", "script-loader": "^0.7.0", - "style-loader": "^0.13.1", - "uglify-loader": "^1.3.0", + "style-loader": "^0.17.0", + "uglify-loader": "^2.0.0", "url-loader": "^0.5.7", - "webpack": "^1.13.1" + "webpack": "^2.5.1" }, "dependencies": { "autosize": "^3.0.16", @@ -35,6 +35,6 @@ "element-closest": "^2.0.1", "evil-icons": "^1.8.0", "killy": "file:src/main/js/killy", - "whatwg-fetch": "^1.0.0" + "whatwg-fetch": "^2.0.3" } } diff --git a/juick-www/webpack.config.js b/juick-www/webpack.config.js index 0b833b047..cb36da080 100644 --- a/juick-www/webpack.config.js +++ b/juick-www/webpack.config.js @@ -15,24 +15,17 @@ module.exports = { filename: "[name].js" }, module: { - preLoaders: [ - { test: /\.jsx?$/, loader: 'eslint', exclude: /node_modules/ }, - { test: /\.css$/, loader: 'csslint?failOnWarning=false', exclude: /node_modules/ } - ], loaders: [ + { test: /\.jsx?$/, loader: 'eslint-loader', enforce: 'pre', exclude: /node_modules/, options: { failOnWarning: false, failOnError: true }}, + { test: /\.css$/, loader: 'csslint-loader?failOnWarning=false', enforce: 'pre', exclude: /node_modules/ }, { test: /killy.index\.js$/, loader: 'babel-loader', query: { presets: ['es2015'] }}, - { test: /\.css$/, loader: ExtractTextPlugin.extract("style-loader", "css-loader") }, + { test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: "style-loader", use: "css-loader" }) }, { test: /\.png$/, loader: "url-loader?limit=10000000000" }, { test: /\.svg$/, loader: "url-loader?limit=10000000000" } ] }, plugins: [ - new ExtractTextPlugin("style.css", { - allChunks: true - }) + new ExtractTextPlugin({ filename: "style.css", allChunks: true }) ], - eslint: { - failOnWarning: false, - failOnError: true - }, + }
\ No newline at end of file |