From f751830e1403df7bc8a252701899a415d04562c1 Mon Sep 17 00:00:00 2001
From: jkuri <jkuri88@gmail.com>
Date: Fri, 5 Feb 2016 00:27:09 +0100
Subject: [PATCH] fix(vendor): fixed broccoli concat for vendor files

---
 .../blueprints/ng2/files/ember-cli-build.js   |  2 +-
 lib/broccoli/angular2-app.js                  | 30 +++++--------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/addon/ng2/blueprints/ng2/files/ember-cli-build.js b/addon/ng2/blueprints/ng2/files/ember-cli-build.js
index fb9c5f00225e..6485a5c3f8ad 100644
--- a/addon/ng2/blueprints/ng2/files/ember-cli-build.js
+++ b/addon/ng2/blueprints/ng2/files/ember-cli-build.js
@@ -4,7 +4,7 @@ var Angular2App = require('angular-cli/lib/broccoli/angular2-app');
 
 module.exports = function(defaults) {
   var app = new Angular2App(defaults, {
-    vendorFiles: []
+    vendorNpmFiles: []
   });
   return app.toTree();
 }
\ No newline at end of file
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
index a098d3db570d..e5bd46dbb469 100644
--- a/lib/broccoli/angular2-app.js
+++ b/lib/broccoli/angular2-app.js
@@ -4,7 +4,7 @@ var compileWithTypescript = require('./broccoli-typescript').default;
 var fs = require('fs');
 var Funnel = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
-var Project = require('ember-cli/lib//models/project');
+var Project = require('ember-cli/lib/models/project');
 
 module.exports = Angular2App;
 
@@ -17,10 +17,10 @@ function Angular2App(defaults, options) {
 Angular2App.prototype.toTree = function() {
     var sourceTree = 'src';
     var vendorNpmFiles = [
-      'es6-shim/es6-shim.js',
       'systemjs/dist/system-polyfills.js',
-      'angular2/bundles/angular2-polyfills.js',
       'systemjs/dist/system.src.js',
+      'es6-shim/es6-shim.js',
+      'angular2/bundles/angular2-polyfills.js',
       'rxjs/bundles/Rx.js',
       'angular2/bundles/angular2.dev.js',
       'angular2/bundles/http.dev.js',
@@ -55,18 +55,12 @@ Angular2App.prototype.toTree = function() {
       destDir: 'vendor'
     });
 
+    var vendorNpmInputFiles = vendorNpmFiles.map(function(file) {
+      return '**/' + file.substr(file.lastIndexOf('/') + 1);
+    });
+
     var vendorNpmJs = new Concat(vendorNpmTree, {
-      inputFiles: [ //TODO: figure out how to make it a glob that maintains the order of the files
-        '**/system-polyfills.js',
-        '**/system.src.js',
-        '**/es6-shim.js',
-        '**/angular2-polyfills.js',
-        '**/Rx.js',
-        '**/angular2.dev.js',
-        '**/http.dev.js',
-        '**/router.dev.js',
-        '**/upgrade.dev.js'
-      ],
+      inputFiles: vendorNpmInputFiles,
       outputFile: '/thirdparty/vendor.js'
     });
 
@@ -81,14 +75,6 @@ Angular2App.prototype.toTree = function() {
       allowNone: true
     });
 
-    // var appJs = new Concat(mergeTrees([tsTree, jsTree]), {
-    //     inputFiles: [
-    //         '*.js',
-    //         '**/*.js'
-    //     ],
-    //     outputFile: '/app.js'
-    // });
-
     return mergeTrees([
       assetTree,
       tsSrcTree,