Add HMR status handlers

Author: CompuIves

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

@@ -73,6 +73,8 @@ const SHIMMED_MODULE: Module = {
 };
 const debug = _debug('cs:compiler:manager');
 
+type HMRStatus = 'idle' | 'check' | 'apply' | 'fail' | 'dispose';
+
 export default class Manager {
   id: string;
   transpiledModules: {
@@ -91,7 +93,8 @@ export default class Manager {
   dependencies: Object;
   webpackHMR: boolean;
   hardReload: boolean;
-  hmrStatus: 'idle' | 'check' | 'apply' | 'fail' | 'dispose' = 'idle';
+  hmrStatus: HMRStatus = 'idle';
+  hmrStatusChangeListeners: Set<Function>;
   testRunner: TestRunner;
   isFirstLoad: boolean;
 
@@ -114,6 +117,7 @@ export default class Manager {
     this.webpackHMR = false;
     this.hardReload = false;
     this.hmrStatus = 'idle';
+    this.hmrStatusChangeListeners = new Set();
     this.isFirstLoad = true;
     this.transpiledModulesByHash = {};
     this.configurations = {};
@@ -230,7 +234,7 @@ export default class Manager {
     try {
       const exports = this.evaluateTranspiledModule(transpiledModule);
 
-      this.hmrStatus = 'idle';
+      this.setHmrStatus('idle');
 
       return exports;
     } catch (e) {
@@ -357,7 +361,7 @@ export default class Manager {
    * @param {*} entry
    */
   async transpileModules(entry: Module, isTestFile: boolean = false) {
-    this.hmrStatus = 'check';
+    this.setHmrStatus('check');
     this.setEnvironmentVariables();
     const transpiledModule = this.getTranspiledModule(entry);
 
@@ -565,6 +569,21 @@ export default class Manager {
     }
   };
 
+  setHmrStatus = (status: HMRStatus) => {
+    this.hmrStatusChangeListeners.forEach(v => {
+      v(status);
+    });
+    this.hmrStatus = status;
+  };
+
+  addStatusHandler = (cb: Function) => {
+    this.hmrStatusChangeListeners.add(cb);
+  };
+
+  removeStatusHandler = (cb: Function) => {
+    this.hmrStatusChangeListeners.delete(cb);
+  };
+
   /**
    * Resolve the transpiled module from the path, note that the path can actually
    * include loaders. That's why we're focussing on first extracting this query
@@ -729,7 +748,7 @@ export default class Manager {
    * continuing
    */
   markHardReload() {
-    this.hmrStatus = 'fail';
+    this.setHmrStatus('fail');
     this.hardReload = true;
   }
 

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

@@ -719,11 +719,11 @@ export default class TranspiledModule {
 
     if (this.hmrConfig) {
       /* eslint-disable no-param-reassign */
-      manager.hmrStatus = 'dispose';
+      manager.setHmrStatus('dispose');
       // Call module.hot.dispose handler
       // https://webpack.js.org/api/hot-module-replacement/#dispose-or-adddisposehandler-
       this.hmrConfig.callDisposeHandler();
-      manager.hmrStatus = 'idle';
+      manager.setHmrStatus('idle');
       /* eslint-enable */
     }
 
@@ -734,7 +734,10 @@ export default class TranspiledModule {
       exports: {},
       hot: {
         accept: (path: string | Array<string>, cb) => {
-          if (typeof path === 'undefined') {
+          if (
+            typeof path === 'undefined' ||
+            (typeof path !== 'string' || !Array.isArray(path))
+          ) {
             // Self mark hot
             this.hmrConfig = this.hmrConfig || new HMR();
             if (this.hmrConfig) {
@@ -784,6 +787,8 @@ export default class TranspiledModule {
         },
         data: hotData,
         status: () => manager.hmrStatus,
+        addStatusHandler: manager.addStatusHandler,
+        removeStatusHandler: manager.removeStatusHandler,
       },
     };
     this.compilation.hot.data = hotData;
@@ -845,13 +850,13 @@ export default class TranspiledModule {
       );
 
       /* eslint-disable no-param-reassign */
-      manager.hmrStatus = 'apply';
+      manager.setHmrStatus('apply');
       const hmrConfig = this.hmrConfig;
       if (hmrConfig && hmrConfig.isHot()) {
         hmrConfig.setDirty(false);
         hmrConfig.callAcceptCallback();
       }
-      manager.hmrStatus = 'idle';
+      manager.setHmrStatus('idle');
       /* eslint-enable */
 
       return exports;