update sfx core for latest interop

systemjs · Sep 18, 2017 · fcffb23 · fcffb23
1 parent acbb0a3
commit fcffb23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/templates/sfx-core.js b/templates/sfx-core.js
@@ -235,13 +235,18 @@
       if (output !== undefined)
         moduleObj.default = moduleObj.__useDefault = output;
 
-      var defaultExport = moduleObj.__useDefault;
+      if (module.exports !== moduleObj.__useDefault)
+        moduleObj.default = moduleObj.__useDefault = module.exports;
+
+      var moduleDefault = moduleObj.default;
 
       // __esModule flag extension support
-      if (defaultExport && defaultExport.__esModule)
-        for (var p in defaultExport)
-          if (Object.hasOwnProperty.call(defaultExport, p))
-            moduleObj[p] = defaultExport[p];
+      if (moduleDefault && moduleDefault.__esModule) {
+        for (var p in moduleDefault)
+          if (Object.hasOwnProperty.call(moduleDefault, p))
+            moduleObj[p] = moduleDefault[p];
+      }
+
     }
 
     var module = load.module = new Module(link.moduleObj);

diff --git a/templates/sfx-core.min.js b/templates/sfx-core.min.js