Improved ESM/CJS compat for new loadImport() API

Author: swernerx

src/client/loadImport.js

@@ -7,5 +7,11 @@
  * @returns {Promise} Promise which resolves with the default import of imported file (asynchronous, lazy loaded).
  */
 export default function loadImport(wrapped, load = true) {
-  return load ? wrapped.then((module) => module.default) : Promise.resolve(null)
+  if (load) {
+    return wrapped.then((module) => {
+      return module && module.__esModule ? module.default : module
+    })
+  } else {
+    return Promise.resolve(null)
+  }
 }

src/server/loadImport.js

@@ -11,5 +11,10 @@ import { CHUNK_NAMES } from "react-universal-component"
  */
 export default function loadImport(wrapped, load = true) {
   CHUNK_NAMES.add(wrapped.chunkName())
-  return load ? __webpack_require__(wrapped.resolve()).default : null
+  if (load) {
+    const module = __webpack_require__(wrapped.resolve())
+    return module && module.__esModule ? module.default : module
+  } else {
+    return null
+  }
 }