fix: do not update hooks while updating hooks, fixes #1294

gaearon · Jul 10, 2019 · 867441b · 867441b
1 parent b0ee8db
commit 867441b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/global/generation.js b/src/global/generation.js
@@ -64,5 +64,9 @@ export const get = () => generation;
 
 // These counters tracks HMR generations, and probably should be used instead of the old one
 let hotReplacementGeneration = 0;
-export const incrementHotGeneration = () => hotReplacementGeneration++;
+export const incrementHotGeneration = () => {
+  if (!hotComparisonOpen()) {
+    hotReplacementGeneration++;
+  }
+};
 export const getHotGeneration = () => hotReplacementGeneration;
diff --git a/test/hot/react-dom.integration.spec.js b/test/hot/react-dom.integration.spec.js
@@ -119,6 +119,7 @@ describe(`🔥-dom`, () => {
       ReactDom.render(<Fun1 />, el);
 
       expect(el.innerHTML).toEqual('fun1');
+      configureGeneration(0, 0);
       incrementHotGeneration();
       {
         const Fun1 = () => {