runtime plugin fix

systemjs · Oct 15, 2015 · d5520a1 · d5520a1
1 parent 68cef2e
commit d5520a1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/compile.js b/lib/compile.js
@@ -116,7 +116,10 @@ function compileTree(loader, tree, compileOpts, outputOpts, cache) {
   // get entrypoints from graph algorithm
   var entryPoints = ordered.entryPoints;
   var modules = ordered.modules.filter(function(moduleName) {
-    return tree[moduleName] && !tree[moduleName].conditional;
+    var load = tree[moduleName];
+    if (load.runtimePlugin && compileOpts.static)
+      throw new TypeError('Plugin ' + load.runtimePlugin + ' does not support static builds, compiling ' + load.name + '.');
+    return load && !load.conditional && !load.runtimePlugin;
   });
 
   if (compileOpts.encodeNames)
@@ -139,9 +142,6 @@ function compileTree(loader, tree, compileOpts, outputOpts, cache) {
       if (load === true)
         throw new TypeError(name + ' was defined via a bundle, so can only be used for subtraction or union operations.');
 
-      if (compileOpts.static && load.runtimePlugin)
-        throw new TypeError('Plugin ' + load.runtimePlugin + ' does not support static builds, compiling ' + load.name + '.');
-
       // store plugin loads for bundle hook
       if (load.metadata.loader && load.metadata.loaderModule.bundle) {
         var pluginLoad = extend({}, load);