entry point build fix, array build fix

systemjs · Feb 18, 2016 · 8e73240 · 8e73240
1 parent 0d4ddd7
commit 8e73240
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/lib/builder.js b/lib/builder.js
@@ -535,7 +535,7 @@ Builder.prototype.bundle = function(expressionOrTree, outFile, opts) {
   return Promise.resolve()
   .then(function() {
     if (expressionOrTree instanceof Array)
-      expressionOrTree = '[' + expressionOrTree.join('] [') + ']';
+      expressionOrTree = '[' + expressionOrTree.join('] + [') + ']';
 
     if (typeof expressionOrTree != 'string')
       return expressionOrTree;
@@ -571,9 +571,14 @@ Builder.prototype.buildStatic = function(expressionOrTree, outFile, opts) {
   if (opts && opts.config)
     this.config(opts.config);
 
+  // if only one module is provided, it is an entry point
+  var entryPoints;
+  if (typeof expressionOrTree == 'string' && expressionOrTree.indexOf(/ [\+\&\-] /) == -1)
+    entryPoints = [expressionOrTree];
+
   var outputOpts = processOutputOpts(opts, { outFile: outFile });
   var traceOpts = processTraceOpts(opts, { tracePackageConfig: false });
-  var compileOpts = processCompileOpts(opts, { static: true });
+  var compileOpts = processCompileOpts(opts, { static: true, entryPoints: entryPoints });
   var inlineMap;
 
   // override the fetch function if given
@@ -583,7 +588,7 @@ Builder.prototype.buildStatic = function(expressionOrTree, outFile, opts) {
   return Promise.resolve()
   .then(function() {
     if (expressionOrTree instanceof Array)
-      expressionOrTree = '[' + expressionOrTree.join('] [') + ']';
+      expressionOrTree = '[' + expressionOrTree.join('] + [') + ']';
 
     if (typeof expressionOrTree != 'string')
       return expressionOrTree;

diff --git a/lib/compile.js b/lib/compile.js
@@ -188,8 +188,15 @@ function compileTree(loader, tree, traceOpts, compileOpts, outputOpts, cache) {
 
   var ordered = getTreeModulesPostOrder(tree, traceOpts);
 
+  // compileOpts.entryPoints can be unnormalized
+  var inputEntryPoints;
+  if (compileOpts.entryPoints)
+    inputEntryPoints = compileOpts.entryPoints.map(function(entryPoint) {
+      return loader.getCanonicalName(loader.normalizeSync(entryPoint));
+    });
+
   // get entrypoints from graph algorithm
-  var entryPoints = compileOpts.entryPoints || [];
+  var entryPoints = inputEntryPoints || [];
 
   ordered.entryPoints.forEach(function(entryPoint) {
     if (entryPoints.indexOf(entryPoint == -1))