add default skipping for getESModule

systemjs · May 16, 2016 · 2c33f88 · 2c33f88
1 parent cb71254
commit 2c33f88
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/proto.js b/lib/proto.js
@@ -61,13 +61,17 @@ function getESModule(exports) {
   var esModule = {};
   // don't trigger getters/setters in environments that support them
   if ((typeof exports == 'object' || typeof exports == 'function') && exports !== __global) {
-    if (getOwnPropertyDescriptor) {
-      for (var p in exports)
-        defineOrCopyProperty(esModule, exports, p);
-    }
-    else {
-      extend(esModule, exports);
-    }
+      if (getOwnPropertyDescriptor) {
+        for (var p in exports) {
+          // The default property is copied to esModule later on
+          if (p === 'default')
+            continue;
+          defineOrCopyProperty(esModule, exports, p);
+        }
+      }
+      else {
+        extend(esModule, exports);
+      }
   }
   esModule['default'] = exports;
   defineProperty(esModule, '__useDefault', {