Fix HMR statuses

Author: Ives van Hoorne

packages/app/src/sandbox/eval/manager.js

@@ -85,7 +85,7 @@ export default class Manager {
   dependencies: Object;
   webpackHMR: boolean;
   hardReload: boolean;
-  hmrStatus: 'idle' | 'check' | 'apply' | 'fail' = 'idle';
+  hmrStatus: 'idle' | 'check' | 'apply' | 'fail' | 'dispose' = 'idle';
   testRunner: TestRunner;
 
   // List of modules that are being transpiled, to prevent duplicate jobs.
@@ -201,8 +201,6 @@ export default class Manager {
       return {};
     }
 
-    this.hmrStatus = 'apply';
-
     // Evaluate the *changed* HMR modules first
     this.getTranspiledModules()
       .filter(t => t.hmrConfig && t.hmrConfig.isDirty())

packages/app/src/sandbox/eval/transpiled-module.js

@@ -666,9 +666,13 @@ export default class TranspiledModule {
     }
 
     if (this.hmrConfig) {
+      /* eslint-disable no-param-reassign */
+      manager.hmrStatus = 'dispose';
       // Call module.hot.dispose handler
       // https://webpack.js.org/api/hot-module-replacement/#dispose-or-adddisposehandler-
       this.hmrConfig.callDisposeHandler();
+      manager.hmrStatus = 'idle';
+      /* eslint-enable */
     }
 
     const hotData = this.hmrConfig ? this.hmrConfig.data : undefined;
@@ -784,11 +788,15 @@ export default class TranspiledModule {
         { asUMD }
       );
 
+      /* eslint-disable no-param-reassign */
+      manager.hmrStatus = 'apply';
       const hmrConfig = this.hmrConfig;
       if (hmrConfig && hmrConfig.isHot()) {
         hmrConfig.setDirty(false);
         hmrConfig.callAcceptCallback();
       }
+      manager.hmrStatus = 'idle';
+      /* eslint-enable */
 
       return exports;
     } catch (e) {