fix(vendors): reorder vendor libraries to work properly with routes

Author: jkuri

lib/broccoli/angular2-app.js

@@ -17,17 +17,17 @@ 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',
+      'rxjs/bundles/Rx.js',
       'angular2/bundles/angular2.dev.js',
       'angular2/bundles/http.dev.js',
       'angular2/bundles/router.dev.js',
-      'angular2/bundles/upgrade.dev.js',
-      'es6-shim/es6-shim.js',
-      'rxjs/bundles/Rx.js',
-      'systemjs/dist/system.src.js',
-      'systemjs/dist/system-polyfills.js'
+      'angular2/bundles/upgrade.dev.js'
     ];
-    
+
     if (this.options.vendorNpmFiles) {
       vendorNpmFiles = vendorNpmFiles.concat(this.options.vendorNpmFiles);
     }
@@ -49,23 +49,23 @@ Angular2App.prototype.toTree = function() {
         exclude: ['**/*.ts', '**/*.js', 'src/tsconfig.json'],
         allowEmpty: true
     });
-    
+
     var vendorNpmTree = new Funnel('node_modules', {
-      files: vendorNpmFiles,
+      include: 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',
+        '**/system.src.js',
         '**/es6-shim.js',
+        '**/angular2-polyfills.js',
+        '**/Rx.js',
         '**/angular2.dev.js',
         '**/http.dev.js',
         '**/router.dev.js',
-        '**/upgrade.dev.js',
-        '**/Rx.js'
+        '**/upgrade.dev.js'
       ],
       outputFile: '/thirdparty/vendor.js'
     });
@@ -90,11 +90,11 @@ Angular2App.prototype.toTree = function() {
     // });
 
     return mergeTrees([
-      assetTree, 
-      tsSrcTree, 
-      tsTree, 
-      jsTree, 
-      this.index(), 
+      assetTree,
+      tsSrcTree,
+      tsTree,
+      jsTree,
+      this.index(),
       vendorNpmJs,
       thirdPartyJs
     ], { overwrite: true });