Support ^@@redux/REPLACE last action for hot reload (#533)

* Bump redux-devtools-instrument to v1.9 * Support ^@@redux/REPLACE for isHotReloaded
zalmoxisus · Jul 18, 2018 · 9228812 · 9228812
1 parent 0f5bac0
commit 9228812
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -80,8 +80,8 @@
     "react-json-tree": "^0.10.9",
     "react-redux": "^4.4.5",
     "redux": "^3.5.2",
-    "redux-devtools": "^3.4.0",
-    "redux-devtools-instrument": "^1.8.3",
+    "redux-devtools": "^3.4.1",
+    "redux-devtools-instrument": "^1.9.0",
     "remotedev-app": "^0.10.8",
     "remotedev-monitor-components": "^0.0.5",
     "remotedev-serialize": "^0.1.1",

diff --git a/src/app/service/Monitor.js b/src/app/service/Monitor.js
@@ -23,7 +23,7 @@ export default class Monitor {
     this.active = false;
     clearTimeout(this.waitingTimeout);
   };
-  isHotReloaded = () => this.lastAction.indexOf('@@redux/INIT') === 0;
+  isHotReloaded = () => this.lastAction && /^@@redux\/(INIT|REPLACE)/.test(this.lastAction);
   isMonitorAction = () => this.lastAction && this.lastAction !== 'PERFORM_ACTION';
   isTimeTraveling = () => this.lastAction === 'JUMP_TO_STATE';
   isPaused = () => {

diff --git a/yarn.lock b/yarn.lock
@@ -6360,9 +6360,9 @@ redux-devtools-chart-monitor@^1.6.1:
     react-pure-render "^1.0.2"
     redux-devtools-themes "^1.0.0"
 
-redux-devtools-instrument@^1.0.1, redux-devtools-instrument@^1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.8.3.tgz#c510d67ab4e5e4525acd6e410c25ab46b85aca7c"
+redux-devtools-instrument@^1.0.1, redux-devtools-instrument@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/redux-devtools-instrument/-/redux-devtools-instrument-1.9.0.tgz#2faed9ac3292c783284b21843edfaa0567764a0c"
   dependencies:
     lodash "^4.2.0"
     symbol-observable "^1.0.2"
@@ -6394,9 +6394,9 @@ redux-devtools-themes@^1.0.0:
   dependencies:
     base16 "^1.0.0"
 
-redux-devtools@^3.0.0, redux-devtools@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/redux-devtools/-/redux-devtools-3.4.0.tgz#9bf8415154301f56906f26a36f5bc1f5ca913bb5"
+redux-devtools@^3.0.0, redux-devtools@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/redux-devtools/-/redux-devtools-3.4.1.tgz#09d342ce0ab6087be679e953a1d7c530efa1138e"
   dependencies:
     lodash "^4.2.0"
     prop-types "^15.5.7"