[webpack] upgraded to v2

Author: zurfyx

.gitignore

@@ -4,7 +4,7 @@ config/*
 !config/test.js
 
 # Public (distribution).
-public/bundle.js
+public/*bundle.js
 
 # DBs.
 data/

package.json

@@ -44,7 +44,7 @@
       }
     },
     "start-dev-frontend": {
-      "command": "webpack-dev-server --config webpack/dev.config.js --require babel-polyfill",
+      "command": "webpack-dev-server --config webpack/dev.config.js",
       "env": {
         "NODE_ENV": "development",
         "PORT": 3000,
@@ -169,8 +169,8 @@
     "style-loader": "^0.13.1",
     "superagent": "^3.1.0",
     "url-loader": "^0.5.7",
-    "webpack": "^1.14.0",
-    "webpack-dev-server": "^1.16.2"
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^2.3.0"
   },
   "engines": {
     "node": ">=6.0",

webpack/dev.config.js

@@ -1,3 +1,5 @@
+/* eslint-disable import/no-extraneous-dependencies, no-var, prefer-template */
+
 var webpack = require('webpack');
 var path = require('path');
 
@@ -6,100 +8,61 @@ var API_PORT = process.env.API_PORT;
 
 module.exports = {
   entry: [
-    "react-hot-loader/patch",
-    "webpack-dev-server/client?http://0.0.0.0:" + PORT,
-    "webpack/hot/only-dev-server",
-    path.join(__dirname, "..", "frontend", "app.jsx")
+    'react-hot-loader/patch',
+    'webpack-dev-server/client?http://0.0.0.0:' + PORT,
+    'webpack/hot/only-dev-server',
+    path.resolve('frontend', 'app.jsx'),
   ],
   output: {
-    filename: "bundle.js",
-    publicPath: "/"
+    filename: 'bundle.js',
+    publicPath: '/',
   },
-  devtool: "#eval-source-map",
+  devtool: '#eval-source-map',
   devServer: {
     host: '0.0.0.0',
     port: PORT,
-    colors: true,
-    contentBase: path.join(__dirname, "..", "public"),
+    contentBase: path.resolve('public'),
     historyApiFallback: {
-      index: "index.html"
+      index: 'index.html',
     },
     hot: true,
     inline: false,
-    progress: true,
     proxy: {
-      "/api/": {
-        target: "http://localhost:" + API_PORT,
-        pathRewrite: {"^/api": ""},
+      '/api/': {
+        target: 'http://localhost:' + API_PORT,
+        pathRewrite: { '^/api': '' },
         changeOrigin: false,
         xfwd: true,
-      }
+      },
     },
-    stats: "errors-only"
+    stats: 'errors-only',
   },
   module: {
     loaders: [
-      {
-        test: /\.jsx?$/,
-        exclude: /node_modules/,
-        loader: "babel",
-        query: {
-          "presets": ["es2015", "es2016", "es2017", "react"],
-          "plugins": ["react-hot-loader/babel"]
-        }
-      },
-      {
-        test: /\.scss$/,
+      { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader' },
+      { test: /\.scss$/,
         loaders: [
-          "style-loader",
-          "css-loader?modules&importLoaders=1&localIdentName=[name]__[local]--[hash:base64:5]", // TODO
-          // "css-loader?modules&importLoaders=1",
-          "sass"
-        ]
-      },
-      {
-        test: /\.css$/,
-        loaders: [
-          "style-loader",
-          // "css-loader?modules&importLoaders=1&localIdentName=[name]__[local]--[hash:base64:5]" // TODO
-          "css-loader"
-        ]
-      },
-      {
-        test: /\.png$/,
-        loader: "url-loader?limit=100000"
+          'style-loader',
+          'css-loader?modules&importLoaders=1&localIdentName=[name]__[local]--[hash:base64:5]', // TODO
+          // 'css-loader?modules&importLoaders=1',
+          'sass-loader',
+        ],
       },
-      {
-        test: /\.jpg$/,
-        loader: "file-loader"
-      },
-      {
-        test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/,
-        loader: 'url?limit=10000&mimetype=application/font-woff'
-      },
-      {
-        test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
-        loader: 'url?limit=10000&mimetype=application/octet-stream'
-      },
-      {
-        test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
-        loader: 'file'
-      },
-      {
-        test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
-        loader: 'url?limit=10000&mimetype=image/svg+xml'
-      }
-    ]
+      { test: /\.css$/, loaders: ['style-loader', 'css-loader'] },
+      { test: /\.png$/, loader: 'url-loader?limit=100000' },
+      { test: /\.jpg$/, loader: 'file-loader' },
+      { test: /\.(woff|woff2)(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' },
+    ],
   },
   resolve: {
-    root: [
-      path.resolve('./frontend')
-    ],
-    extensions: ["", ".js", ".jsx"]
+    modules: [path.resolve('frontend'), 'node_modules'],
+    extensions: ['.js', '.jsx'],
   },
   plugins: [
-    new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoErrorsPlugin()
+    new webpack.NoEmitOnErrorsPlugin(),
   ],
-};
+};