systemjs · joeldenning · May 9, 2020 · May 8, 2020 · May 8, 2020 · May 8, 2020
diff --git a/src/extras/named-exports.js b/src/extras/named-exports.js
@@ -3,7 +3,7 @@
  */
 (function (global) {
   var systemJSPrototype = global.System.constructor.prototype;
-  
+
   // hook System.register to know the last declaration binding
   var lastRegisterDeclare;
   var systemRegister = systemJSPrototype.register;
@@ -19,7 +19,7 @@
     // -> dont add named exports
     if (!register || register[1] === lastRegisterDeclare || register[1].length === 0)
       return register;
-    
+
     // otherwise it was provided by a custom instantiator
     // -> extend the registration with named exports support
     var registerDeclare = register[1];
@@ -42,10 +42,13 @@
           execute.call(this);
           // do a bulk export of the default export object
           // to export all its names as named exports
-          if (hasDefaultExport && typeof defaultExport === 'object')
+
+          if (hasDefaultExport)
             for (var exportName in defaultExport) {
-              // default is not a named export
-              if (exportName !== 'default') {
+              if (
+                Object.prototype.hasOwnProperty.call(defaultExport,  exportName) // Check if epoxrt name is not inherited, safe for Object.create(null)
+                && exportName !== 'default' // default is not a named export
+              ) {
                 _export(exportName, defaultExport[exportName]);
               }
             }

diff --git a/test/browser/named-exports.js b/test/browser/named-exports.js
@@ -17,6 +17,33 @@ suite('Named exports', function () {
     });
   });
 
+  test('Loading an UMD module with default function and named exports', function () {
+    return System.import('fixtures/umd-default-function-with-named-exports-module.js').then(function (m) {
+      assert.ok(m.default);
+      assert.equal(m.default.name, 'umdExportFunctionName')
+      assert.equal(m.dep, m.default.dep);
+      assert.equal(m.umd, true);
+    });
+  });
+
+  test('Loading an UMD module with default object and named exports', function () {
+    return System.import('fixtures/umd-default-object-with-named-exports-module.js').then(function (m) {
+      assert.ok(m.default);
+      assert.equal(m.dep, m.default.dep);
+      assert.equal(m.umd, true);
+      assert.equal(m.default.hasOwnProperty, Object.prototype.hasOwnProperty)
+    });
+  });
+
+  test('Loading an UMD module with default with object null prototype', function () {
+    return System.import('fixtures/umd-default-object-with-null-prototype-module.js').then(function (m) {
+      assert.ok(m.default);
+      assert.equal(m.dep, m.default.dep);
+      assert.equal(m.umd, true);
+      assert.equal(m.default.hasOwnProperty, undefined)
+    });
+  });
+
   test('Loading a global with named exports support', function () {
     return System.import('fixtures/global3.js').then(function (m) {
       assert.ok(m.default);

diff --git a/test/fixtures/browser/umd-default-function-with-named-exports-module.js b/test/fixtures/browser/umd-default-function-with-named-exports-module.js
@@ -0,0 +1,12 @@
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+      define(['./amd-dep.js'], factory);
+  } else {
+    throw 'Test suit only supports amd';
+  }
+}(typeof self !== 'undefined' ? self : this, function (amdDep) {
+  function umdExportFunctionName() {};
+  umdExportFunctionName.dep = amdDep;
+  umdExportFunctionName.umd = true;
+  return umdExportFunctionName;
+}));
diff --git a/test/fixtures/browser/umd-default-object-with-named-exports-module.js b/test/fixtures/browser/umd-default-object-with-named-exports-module.js
@@ -0,0 +1,13 @@
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+      define(['./amd-dep.js'], factory);
+  } else {
+    throw 'Test suit only supports amd';
+  }
+}(typeof self !== 'undefined' ? self : this, function (amdDep) {
+  const umdExportObject = {
+    dep: amdDep,
+    umd: true,
+  };
+  return umdExportObject;
+}));
diff --git a/test/fixtures/browser/umd-default-object-with-null-prototype-module.js b/test/fixtures/browser/umd-default-object-with-null-prototype-module.js
@@ -0,0 +1,12 @@
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+      define(['./amd-dep.js'], factory);
+  } else {
+    throw 'Test suit only supports amd';
+  }
+}(typeof self !== 'undefined' ? self : this, function (amdDep) {
+  const umdExportObject = Object.create(null);
+  umdExportObject.dep = amdDep;
+  umdExportObject.umd = true;
+  return umdExportObject;
+}));