restore react 15 compact

gaearon · Dec 11, 2018 · bdd2659 · bdd2659
1 parent af1aa39
commit bdd2659
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/errorReporter.js b/src/errorReporter.js
@@ -25,21 +25,21 @@ const overlayStyle = {
 const listStyle = {}
 
 const mapError = ({ error, errorInfo }) => (
-  <React.Fragment>
+  <div>
     <p style={{ color: 'red' }}>
       {error.toString ? error.toString() : error.message || 'undefined error'}
     </p>
     {errorInfo && (
-      <React.Fragment>
+      <div>
         <div>Stacktrace:</div>
         <ul style={{ color: 'red', marginTop: '10px' }}>
           {errorInfo.componentStack
             .split('\n')
             .map((line, i) => <li key={String(i)}>{line}</li>)}
         </ul>
-      </React.Fragment>
+      </div>
     )}
-  </React.Fragment>
+  </div>
 )
 
 class ErrorOverlay extends React.Component {

diff --git a/src/global/modules.js b/src/global/modules.js
@@ -19,8 +19,8 @@ export const isOpened = sourceModule =>
   sourceModule && !!openedModules[sourceModule.id]
 
 export const enter = sourceModule => {
-  lastModuleOpened = sourceModule.id
   if (sourceModule && sourceModule.id) {
+    lastModuleOpened = sourceModule.id
     openedModules[sourceModule.id] = true
   } else {
     logger.warn(

diff --git a/test/hot.dev.test.js b/test/hot.dev.test.js
@@ -104,6 +104,7 @@ describe('hot (dev)', () => {
 
   it('should trigger error in unmount in opened state', () => {
     const sourceModule = { id: 'error42_unmount' }
+    logger.error.mockClear()
     enterModule(sourceModule)
     const Component = () => <div>123</div>
     const HotComponent = hot(sourceModule)(Component)