rollup optimization to exclude entry points optimized out

systemjs · Apr 22, 2016 · 548879c · 548879c
1 parent ad17437
commit 548879c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/compilers/cjs.js b/compilers/cjs.js
@@ -84,14 +84,14 @@ exports.CJSRequireTransformer = CJSRequireTransformer;
 
 
 // convert CommonJS into System.registerDynamic
-function CJSRegisterTransformer(name, deps, path, optimize, static, globals, systemGlobal) {
+function CJSRegisterTransformer(name, deps, path, optimize, isStatic, globals, systemGlobal) {
   this.name = name;
   this.deps = deps;
   this.path = path;
   this.usesFilePaths = false;
   this.usesRequireResolve = false;
   this.optimize = optimize;
-  this.static = static;
+  this.static = isStatic;
   this.globals = globals;
   this.systemGlobal = systemGlobal;
   return ParseTreeTransformer.call(this);

diff --git a/lib/compile.js b/lib/compile.js
@@ -45,7 +45,7 @@ function getCompileHash(load, compileOpts) {
 
 function getEncoding(canonical, encodings) {
   // dont encode system modules
-  if (canonical[0] == '@')
+  if (canonical[0] == '@' && canonical != '@dummy-entry-point')
     return canonical;
 
   // return existing encoding if present
@@ -219,8 +219,8 @@ function compileTree(loader, tree, traceOpts, compileOpts, outputOpts, cache) {
       });
     }))
     .filter(function(inputEntryPoint) {
-      // skip conditional entry points
-      return !inputEntryPoint.match(/\#\:|\#\?|\#{/);
+      // skip conditional entry points and entry points not in the tree (eg rollup optimized out)
+      return !inputEntryPoint.match(/\#\:|\#\?|\#{/) && tree[inputEntryPoint];
     })
   })
   .then(function(inputEntryPoints) {