From a25e89695590f87c44056bb42a40902abbc2c838 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 19 May 2017 17:19:58 +0300
Subject: juick-www: webpack 2

---
 juick-www/webpack.config.js | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'juick-www/webpack.config.js')

diff --git a/juick-www/webpack.config.js b/juick-www/webpack.config.js
index 0b833b04..cb36da08 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
-- 
cgit v1.2.3