__esModule not to exclude default lifting, and to disable __useDefault

Author: guybedford

core/register-loader.js

@@ -613,10 +613,13 @@ function doEvaluate (loader, load, link, registry, state, seen) {
         moduleObj.default = module.exports;
 
       // __esModule flag extension support
-      if (moduleObj.default && moduleObj.default.__esModule)
-        for (var p in moduleObj.default)
-          if (Object.hasOwnProperty.call(moduleObj.default, p) && p !== 'default')
+      if (moduleObj.default && moduleObj.default.__esModule) {
+        moduleObj.__useDefault = false;
+        for (var p in moduleObj.default) {
+          if (Object.hasOwnProperty.call(moduleObj.default, p))
             moduleObj[p] = moduleObj.default[p];
+        }
+      }
     }
   }