allow an @empty plugin module to imply a runtimePlugin

systemjs · Jun 14, 2016 · 5c59fdb · 5c59fdb
1 parent db4b3a8
commit 5c59fdb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/trace.js b/lib/trace.js
@@ -407,7 +407,11 @@ Trace.prototype.getLoadRecord = function(canonical, traceOpts, parentStack) {
           .then(function(pluginNormalized) {
             load.plugin = getCanonicalName(loader, pluginNormalized);
 
-            if (pluginNormalized.indexOf('!') == -1 && load.metadata.loaderModule.build !== false && getPackage(loader.packages, pluginNormalized)) {
+            if (load.metadata.loaderModule && 
+                (load.metadata.loaderModule.build === false || Object.keys(load.metadata.loaderModule).length == 0))
+              load.runtimePlugin = true;
+
+            if (pluginNormalized.indexOf('!') == -1 && !load.runtimePlugin && getPackage(loader.packages, pluginNormalized)) {
               var packageConfigPath = getPackageConfigPath(loader.packageConfigPaths, pluginNormalized);
               if (packageConfigPath) {
                 load.pluginConfig = getCanonicalName(loader, packageConfigPath);
@@ -417,10 +421,8 @@ Trace.prototype.getLoadRecord = function(canonical, traceOpts, parentStack) {
           });
       })
       .then(function() {
-        if (load.metadata.loaderModule && load.metadata.loaderModule.build === false) {
-          load.runtimePlugin = true;
+        if (load.runtimePlugin)
           return load;
-        }
 
         curHook = 'fetch';