From 298f27bf3ffd8328fcd567e86e7bbbe54103121a Mon Sep 17 00:00:00 2001
From: David Kaltschmidt <david.kaltschmidt@gmail.com>
Date: Mon, 5 Dec 2016 11:30:06 +0100
Subject: [PATCH] Remove polling for webpack (was CPU heavy) and HMR for
 vendors

---
 client/server.js               | 4 ----
 client/webpack.local.config.js | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/server.js b/client/server.js
index 84e186b85..b761a44bb 100644
--- a/client/server.js
+++ b/client/server.js
@@ -56,10 +56,6 @@ if (process.env.NODE_ENV !== 'production') {
     publicPath: config.output.publicPath,
     // options
     noInfo: true,
-    watchOptions: {
-      aggregateTimeout: 500,
-      poll: true
-    },
     stats: 'errors-only',
   }));
 
diff --git a/client/webpack.local.config.js b/client/webpack.local.config.js
index 57bf5f0c3..3f8908ec9 100644
--- a/client/webpack.local.config.js
+++ b/client/webpack.local.config.js
@@ -38,7 +38,9 @@ module.exports = {
     ],
     vendors: ['babel-polyfill', 'classnames', 'dagre', 'filesize', 'immutable', 'lodash',
       'moment', 'page', 'react', 'react-dom', 'react-motion', 'react-redux', 'redux',
-      'redux-thunk', 'reqwest', 'xterm']
+      'redux-thunk', 'reqwest', 'xterm',
+      'webpack-hot-middleware/client'
+    ]
   },
 
   // Used by Webpack Dev Middleware
@@ -51,6 +53,7 @@ module.exports = {
   // Necessary plugins for hot load
   plugins: [
     new webpack.optimize.CommonsChunkPlugin('vendors', 'vendors.js'),
+    new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoErrorsPlugin(),
     new webpack.IgnorePlugin(/^\.\/locale$/, [/moment$/]),