From 19470410a079c63501906dead96f0d07729a5119 Mon Sep 17 00:00:00 2001
From: Saleh Hamadeh <saleh.hamadeh@redfin.com>
Date: Tue, 24 Oct 2017 19:41:23 -0700
Subject: [PATCH] Upgrade react-hot-loader to v3.1.1

---
 packages/react-server-cli/package.json          | 4 ++--
 packages/react-server-cli/src/compileClient.js  | 2 +-
 packages/react-server-test-pages/.reactserverrc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-server-cli/package.json b/packages/react-server-cli/package.json
index 6bd6e543f..99fb2c778 100644
--- a/packages/react-server-cli/package.json
+++ b/packages/react-server-cli/package.json
@@ -43,7 +43,7 @@
     "pem": "^1.8.1",
     "q": "1.4.1",
     "raw-loader": "^0.5.1",
-    "react-hot-loader": "~1.3.0",
+    "react-hot-loader": "^3.1.1",
     "react-server-core-middleware": "^0.6.0",
     "sass-loader": "^4.0.0",
     "style-loader": "^0.13.1",
@@ -70,7 +70,7 @@
     "output-file-sync": "^1.1.2",
     "react": "~0.14.2 || ^15.1.0 || ^16.0.0",
     "react-dom": "~0.14.2 || ^15.1.0 || ^16.0.0",
-    "react-hot-loader": "^1.3.1",
+    "react-hot-loader": "^3.1.1",
     "react-server": "^0.7.3",
     "react-server-gulp-module-tagger": "^0.6.0",
     "rimraf": "^2.5.4",
diff --git a/packages/react-server-cli/src/compileClient.js b/packages/react-server-cli/src/compileClient.js
index 9bbd009a7..31a6e4f32 100755
--- a/packages/react-server-cli/src/compileClient.js
+++ b/packages/react-server-cli/src/compileClient.js
@@ -256,7 +256,7 @@ function packageCodeForBrowser(entrypoints, outputDir, outputUrl, hot, minify, l
 		webpackConfig.module.loaders = [
 			{
 				test: /\.jsx?$/,
-				loader: "react-hot",
+				loader: "react-hot-loader/webpack",
 				exclude: /node_modules/,
 			},
 			...webpackConfig.module.loaders,
diff --git a/packages/react-server-test-pages/.reactserverrc b/packages/react-server-test-pages/.reactserverrc
index 834c274ee..baa4051f1 100644
--- a/packages/react-server-test-pages/.reactserverrc
+++ b/packages/react-server-test-pages/.reactserverrc
@@ -1,4 +1,4 @@
 {
   "routesFile": "./routes.js",
-  "hot": false
+  "hot": true
 }