From 3f7d4e6f79ea1178df2ea594033a49258185a0bf Mon Sep 17 00:00:00 2001
From: Victor Nakoryakov <nail.xx@gmail.com>
Date: Fri, 7 Oct 2016 12:39:03 +0300
Subject: [PATCH] fix(client): repair webpack dev server

---
 package.json                                   |  5 +++++
 packages/xod-client-browser/webpack/base.js    |  6 ------
 packages/xod-client-browser/webpack/web-dev.js | 16 ++++++++++++++--
 packages/xod-client/package.json               |  1 -
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 65008c07..a23b3b53 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,9 @@
     "build:pkg:xod-client-electron": "cd packages/xod-client-electron && npm run build",
     "build": "npm-run-all build:pkg:xod-core build:pkg:xod-espruino build:pkg:xod-client build:pkg:xod-client-browser build:pkg:xod-client-electron build:pkg:xod-client-chrome",
     "rebuild": "npm-run-all clean:dist build",
+    "dev:pkg:xod-core": "npm run build:pkg:xod-core -- --watch",
+    "dev:pkg:xod-client": "npm run build:pkg:xod-client -- --watch",
+    "dev:pkg:xod-client-browser": "webpack-dev-server --watch --colors --inline --hot --config packages/xod-client-browser/webpack/web-dev.js",
     "start:pkg:xod-client-electron": "cd packages/xod-client-electron && npm run start",
     "test:pkg:xod-core": "mocha --require babel-register \"packages/xod-core/test/**/*.spec.js\"",
     "test:pkg:xod-client": "mocha --require babel-register \"packages/xod-client/test/**/*.spec.js\"",
@@ -53,9 +56,11 @@
     "null-loader": "^0.1.1",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.4",
+    "react-hot-loader": "^1.3.0",
     "sass-loader": "^4.0.2",
     "style-loader": "^0.13.1",
     "webpack": "^1.13.2",
+    "webpack-dev-server": "^1.16.2",
     "webpack-merge": "^0.14.1",
     "webpack-validator": "^2.2.8"
   }
diff --git a/packages/xod-client-browser/webpack/base.js b/packages/xod-client-browser/webpack/base.js
index 40f896b1..5a9390bb 100644
--- a/packages/xod-client-browser/webpack/base.js
+++ b/packages/xod-client-browser/webpack/base.js
@@ -17,12 +17,6 @@ module.exports = {
     path: pkgpath('dist'),
     publicPath: '',
   },
-  devServer: {
-    hot: true,
-    host: 'localhost',
-    port: 8080,
-    contentBase: './dist/',
-  },
   resolve: {
     modulesDirectories: [
       pkgpath('node_modules'),
diff --git a/packages/xod-client-browser/webpack/web-dev.js b/packages/xod-client-browser/webpack/web-dev.js
index 37c43d2d..870caae8 100644
--- a/packages/xod-client-browser/webpack/web-dev.js
+++ b/packages/xod-client-browser/webpack/web-dev.js
@@ -1,16 +1,28 @@
 
 const path = require('path');
-const webpack = require('webpack');
 const validate = require('webpack-validator');
 const merge = require('webpack-merge');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
 
 const baseConfig = require('./base.js');
+const pkgpath = subpath => path.join(__dirname, '..', subpath);
 
 const config = merge.smart(baseConfig, {
   output: {
     publicPath: 'http://localhost:8080/',
   },
+  devServer: {
+    hot: true,
+    host: 'localhost',
+    port: 8080,
+    contentBase: pkgpath('dist'),
+  },
+  resolve: {
+    modulesDirectories: [
+      // search top-level node_modules for webpack-hot-loader
+      pkgpath('../../node_modules'), 
+    ],
+    extensions: ['', '.js', '.jsx', '.scss'],
+  },
   module: {
     loaders: [
       {
diff --git a/packages/xod-client/package.json b/packages/xod-client/package.json
index 7409a681..b1e0e51d 100644
--- a/packages/xod-client/package.json
+++ b/packages/xod-client/package.json
@@ -50,7 +50,6 @@
   "devDependencies": {
     "chai": "^3.5.0",
     "dirty-chai": "^1.2.2",
-    "react-hot-loader": "^1.3.0",
     "redux-devtools": "^3.3.1",
     "redux-devtools-dispatch": "^2.2.0",
     "redux-devtools-dock-monitor": "^1.1.1",