@@ -4,7 +4,7 @@ var compileWithTypescript = require('./broccoli-typescript').default;
4
4
var fs = require ( 'fs' ) ;
5
5
var Funnel = require ( 'broccoli-funnel' ) ;
6
6
var mergeTrees = require ( 'broccoli-merge-trees' ) ;
7
- var Project = require ( 'ember-cli/lib// models/project' ) ;
7
+ var Project = require ( 'ember-cli/lib/models/project' ) ;
8
8
9
9
module . exports = Angular2App ;
10
10
@@ -17,10 +17,10 @@ function Angular2App(defaults, options) {
17
17
Angular2App . prototype . toTree = function ( ) {
18
18
var sourceTree = 'src' ;
19
19
var vendorNpmFiles = [
20
- 'es6-shim/es6-shim.js' ,
21
20
'systemjs/dist/system-polyfills.js' ,
22
- 'angular2/bundles/angular2-polyfills.js' ,
23
21
'systemjs/dist/system.src.js' ,
22
+ 'es6-shim/es6-shim.js' ,
23
+ 'angular2/bundles/angular2-polyfills.js' ,
24
24
'rxjs/bundles/Rx.js' ,
25
25
'angular2/bundles/angular2.dev.js' ,
26
26
'angular2/bundles/http.dev.js' ,
@@ -55,18 +55,12 @@ Angular2App.prototype.toTree = function() {
55
55
destDir : 'vendor'
56
56
} ) ;
57
57
58
+ var vendorNpmInputFiles = vendorNpmFiles . map ( function ( file ) {
59
+ return '**/' + file . substr ( file . lastIndexOf ( '/' ) + 1 ) ;
60
+ } ) ;
61
+
58
62
var vendorNpmJs = new Concat ( vendorNpmTree , {
59
- inputFiles : [ //TODO: figure out how to make it a glob that maintains the order of the files
60
- '**/system-polyfills.js' ,
61
- '**/system.src.js' ,
62
- '**/es6-shim.js' ,
63
- '**/angular2-polyfills.js' ,
64
- '**/Rx.js' ,
65
- '**/angular2.dev.js' ,
66
- '**/http.dev.js' ,
67
- '**/router.dev.js' ,
68
- '**/upgrade.dev.js'
69
- ] ,
63
+ inputFiles : vendorNpmInputFiles ,
70
64
outputFile : '/thirdparty/vendor.js'
71
65
} ) ;
72
66
@@ -81,14 +75,6 @@ Angular2App.prototype.toTree = function() {
81
75
allowNone : true
82
76
} ) ;
83
77
84
- // var appJs = new Concat(mergeTrees([tsTree, jsTree]), {
85
- // inputFiles: [
86
- // '*.js',
87
- // '**/*.js'
88
- // ],
89
- // outputFile: '/app.js'
90
- // });
91
-
92
78
return mergeTrees ( [
93
79
assetTree ,
94
80
tsSrcTree ,
0 commit comments