ModuleLoader · guybedford · Jun 1, 2015 · Jun 2, 2015 · maxnordlund · Jun 2, 2015
diff --git a/dist/es6-module-loader-dev.js b/dist/es6-module-loader-dev.js
diff --git a/dist/es6-module-loader-dev.js.map b/dist/es6-module-loader-dev.js.map
diff --git a/dist/es6-module-loader-sans-promises.src.js → dist/es6-module-loader-dev.src.js b/dist/es6-module-loader-sans-promises.src.js → dist/es6-module-loader-dev.src.js
diff --git a/dist/es6-module-loader-sans-promises.js b/dist/es6-module-loader-sans-promises.js
diff --git a/dist/es6-module-loader-sans-promises.js.map b/dist/es6-module-loader-sans-promises.js.map
diff --git a/dist/es6-module-loader.js b/dist/es6-module-loader.js
diff --git a/dist/es6-module-loader.js.map b/dist/es6-module-loader.js.map
diff --git a/dist/es6-module-loader.src.js b/dist/es6-module-loader.src.js
diff --git a/src/declarative.js b/src/declarative.js
@@ -134,15 +134,24 @@
       //    By disaling this module write-protection we gain performance.
       //    It could be useful to allow an option to enable or disable this.
       module.locked = true;
-      moduleObj[name] = value;
+
+      // export({name: value})
+      if (typeof name == 'object') {
+        for (var p in name)
+          moduleObj[p] = name[p];
+      }
+      // export(name, value)
+      else {
+        moduleObj[name] = value;
+      }
 
       for (var i = 0, l = module.importers.length; i < l; i++) {
         var importerModule = module.importers[i];
         if (!importerModule.locked) {
-          for (var j = 0; j < importerModule.dependencies.length; ++j) {
-            if (importerModule.dependencies[j] === module) {
-              importerModule.setters[j](moduleObj);
-            }
+          for (var j = 0; j < importerModule.dependencies.length; ++j) {
+            if (importerModule.dependencies[j] === module) {
+              importerModule.setters[j](moduleObj);
+            }
           }
         }
       }