Fix react refresh for class components

CompuIves · CompuIves · commit b3633367c18b · 2020-04-02T20:08:50.000+02:00
diff --git a/packages/app/src/sandbox/eval/presets/create-react-app/v3.ts b/packages/app/src/sandbox/eval/presets/create-react-app/v3.ts
@@ -131,7 +131,7 @@ export default function initialize() {
           dependencies['react-dom'] &&
           isMinimalReactVersion(dependencies['react-dom'], '16.9.0')
         ) {
-          return { ...dependencies, 'react-refresh': '0.7.2' };
+          return { ...dependencies, 'react-refresh': '0.8.1' };
         }
 
         return dependencies;
diff --git a/packages/app/src/sandbox/eval/transpilers/react/refresh-transpiler.ts b/packages/app/src/sandbox/eval/transpilers/react/refresh-transpiler.ts
@@ -62,14 +62,34 @@ function isReactRefreshBoundary(moduleExports) {
   return hasExports && areAllExportsComponents;
 };
 
+var registerExportsForReactRefresh = (moduleExports, moduleID) => {
+  Refresh.register(moduleExports, moduleID + ' %exports%');
+  if (moduleExports == null || typeof moduleExports !== 'object') {
+    // Exit if we can't iterate over exports.
+    // (This is important for legacy environments.)
+    return;
+  }
+  for (const key in moduleExports) {
+    const desc = Object.getOwnPropertyDescriptor(moduleExports, key);
+    if (desc && desc.get) {
+      // Don't invoke getters as they may have side effects.
+      continue;
+    }
+    const exportValue = moduleExports[key];
+    const typeID = moduleID + ' %exports% ' + key;
+    Refresh.register(exportValue, typeID);
+  }
+};
+
 module.exports = {
   enqueueUpdate: debounce(enqueueUpdate, 30),
-  isReactRefreshBoundary
+  isReactRefreshBoundary,
+  registerExportsForReactRefresh
 };
 `.trim();
 
 /**
- * `var prevRefreshReg = window.$RefreshReg$;
+var prevRefreshReg = window.$RefreshReg$;
 var prevRefreshSig = window.$RefreshSig$;
 var RefreshRuntime = require('react-refresh/runtime');
 
@@ -90,6 +110,7 @@ try {
 const _csbRefreshUtils = require('${HELPER_PATH}');
 
 if (_csbRefreshUtils.isReactRefreshBoundary && _csbRefreshUtils.isReactRefreshBoundary(module.exports)) {
+  _csbRefreshUtils.registerExportsForReactRefresh(module.exports, module.id)
   module.hot.accept();
   _csbRefreshUtils.enqueueUpdate();
 }
@@ -101,9 +122,8 @@ if (_csbRefreshUtils.isReactRefreshBoundary && _csbRefreshUtils.isReactRefreshBo
  * to a single line so we don't mess with the source mapping when showing errors.
  */
 const getWrapperCode = (sourceCode: string) =>
-  `var prevRefreshReg=window.$RefreshReg$,prevRefreshSig=window.$RefreshSig$,RefreshRuntime=require("react-refresh/runtime");window.$RefreshReg$=(a,b)=>{const c=module.id+" "+b;RefreshRuntime.register(a,c)},window.$RefreshSig$=RefreshRuntime.createSignatureFunctionForTransform;try{${sourceCode}
-}finally{window.$RefreshReg$=prevRefreshReg,window.$RefreshSig$=prevRefreshSig}const _csbRefreshUtils=require("${HELPER_PATH}");_csbRefreshUtils.isReactRefreshBoundary&&_csbRefreshUtils.isReactRefreshBoundary(module.exports)&&(module.hot.accept(),_csbRefreshUtils.enqueueUpdate());
-`.trim();
+  `var prevRefreshReg=window.$RefreshReg$,prevRefreshSig=window.$RefreshSig$,RefreshRuntime=require("react-refresh/runtime");window.$RefreshReg$=((e,r)=>{const s=module.id+" "+r;RefreshRuntime.register(e,s)}),window.$RefreshSig$=RefreshRuntime.createSignatureFunctionForTransform;try{${sourceCode}
+}finally{window.$RefreshReg$=prevRefreshReg,window.$RefreshSig$=prevRefreshSig}const _csbRefreshUtils=require("${HELPER_PATH}");_csbRefreshUtils.isReactRefreshBoundary&&_csbRefreshUtils.isReactRefreshBoundary(module.exports)&&(_csbRefreshUtils.registerExportsForReactRefresh(module.exports,module.id),module.hot.accept(),_csbRefreshUtils.enqueueUpdate());`.trim();
 
 class RefreshTranspiler extends Transpiler {
   constructor() {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ export default function initialize() {`
`131`	`131`	`dependencies['react-dom'] &&`
`132`	`132`	`isMinimalReactVersion(dependencies['react-dom'], '16.9.0')`
`133`	`133`	`) {`
`134`		`- return { ...dependencies, 'react-refresh': '0.7.2' };`
	`134`	`+ return { ...dependencies, 'react-refresh': '0.8.1' };`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`return dependencies;`