separate assetList and bundle into phases

systemjs · Jul 7, 2016 · a362009 · a362009
1 parent 001803b
commit a362009
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/lib/compile.js b/lib/compile.js
@@ -210,22 +210,24 @@ function pluginBundleHook(loader, loads, compileOpts, outputOpts) {
     var loads = pluginLoads[pluginName];
     var loaderModule = loads[0].metadata.loaderModule;
 
-    return Promise.resolve()
-    .then(function() {
-      if (loaderModule.listAssets)
-        return Promise.resolve(loaderModule.listAssets.call(loader.pluginLoader, loads, compileOpts, outputOpts))
-        .then(function(_assetList) {
-          assetList = assetList.concat(_assetList.map(function(asset) {
-            return {
-              url: asset.url,
-              type: asset.type,
-              source: asset.source,
-              sourceMap: asset.sourceMap
-            };
-          }));
-        });
-    })
-    .then(function() {
+    if (loaderModule.listAssets)
+      return Promise.resolve(loaderModule.listAssets.call(loader.pluginLoader, loads, compileOpts, outputOpts))
+      .then(function(_assetList) {
+        assetList = assetList.concat(_assetList.map(function(asset) {
+          return {
+            url: asset.url,
+            type: asset.type,
+            source: asset.source,
+            sourceMap: asset.sourceMap
+          };
+        }));
+      });
+  }))
+  .then(function() {
+    return Promise.all(Object.keys(pluginLoads).map(function(pluginName) {
+      var loads = pluginLoads[pluginName];
+      var loaderModule = loads[0].metadata.loaderModule;
+
       if (compileOpts.inlinePlugins) {
         if (loaderModule.inline) {
           return Promise.resolve(loaderModule.inline.call(loader.pluginLoader, loads, compileOpts, outputOpts));
@@ -239,8 +241,8 @@ function pluginBundleHook(loader, loads, compileOpts, outputOpts) {
             return Promise.resolve(loaderModule.bundle.call(loader.pluginLoader, loads, compileOpts, outputOpts));
         }
       }
-    });
-  }))
+    }));
+  })
   .then(function(compiled) {
     var outputs = [];
     compiled = compiled || [];