[patch] resolve react/lib/ReactMount issue for hot reload (#679)

* resolve react/lib/ReactMount issue for hot reload * resolve react/lib/ReactMount issue for hot reload * fix linter issue
electrode-io · Jan 15, 2018 · d73327f · d73327f
1 parent d234937
commit d73327f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/packages/electrode-archetype-react-app-dev/config/babel/babelrc-client b/packages/electrode-archetype-react-app-dev/config/babel/babelrc-client
@@ -4,6 +4,7 @@
     "react"
   ],
   "plugins": [
+    "react-hot-loader/babel",
     "transform-es2015-template-literals",
     "transform-es2015-literals",
     "transform-es2015-function-name",

diff --git a/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js b/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js
@@ -7,6 +7,10 @@ const _ = require("lodash");
 const logger = require("electrode-archetype-react-app/lib/logger");
 
 module.exports = function(options) {
+  if (options.HotModuleReload) {
+    require("react-hot-loader/patch");
+  }
+
   const clientVendor = Path.join(AppMode.src.client, "vendor/");
   const babelExclude = x => {
     if (x.indexOf("/node_modules") >= 0) return true;
@@ -19,7 +23,6 @@ module.exports = function(options) {
     test: /\.jsx?$/,
     exclude: babelExclude,
     use: [
-      options.HotModuleReload && "react-hot-loader",
       {
         loader: "babel-loader",
         options: options.babel

diff --git a/packages/electrode-archetype-react-app-dev/package.json b/packages/electrode-archetype-react-app-dev/package.json
@@ -95,7 +95,7 @@
     "postcss-loader": "^0.11.1",
     "prop-types": "^15.5.6",
     "raw-loader": "^0.5.1",
-    "react-hot-loader": "^1.2.8",
+    "react-hot-loader": "^3.1.3",
     "react-intl": "^2.1.0",
     "react-test-renderer": "^16.1.1",
     "require-at": "^1.0.0",