From 2efc9a150fe84a38d479ed062e6454f3e3a14970 Mon Sep 17 00:00:00 2001
From: Ciro Nunes <ciroanunes@gmail.com>
Date: Sun, 31 Jan 2016 12:08:05 -0200
Subject: [PATCH] fix(vendors): concat the files properly

---
 lib/broccoli/angular2-app.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
index a4cdebc86682..af3ce5faff04 100644
--- a/lib/broccoli/angular2-app.js
+++ b/lib/broccoli/angular2-app.js
@@ -54,6 +54,21 @@ Angular2App.prototype.toTree = function() {
       files: vendorNpmFiles,
       destDir: 'vendor'
     });
+    
+    var vendorNpmJs = new Concat(vendorNpmTree, {
+      inputFiles: [ //TODO: figure out how to make it a glob that maintains the order of the files
+        '**/angular2-polyfills.js',
+        '**/system.src.js',
+        '**/system-polyfills.js',
+        '**/es6-shim.js',
+        '**/angular2.dev.js',
+        '**/http.dev.js',
+        '**/router.dev.js',
+        '**/upgrade.dev.js',
+        '**/Rx.js'
+      ],
+      outputFile: '/thirdparty/vendor.js'
+    });
 
     var thirdPartyJsTree = new Funnel('node_modules', {
       include: ['ng2*/bundles/*.js'],
@@ -80,7 +95,7 @@ Angular2App.prototype.toTree = function() {
       tsTree, 
       jsTree, 
       this.index(), 
-      vendorNpmTree,
+      vendorNpmJs,
       thirdPartyJs
     ], { overwrite: true });
 };