Skip to content

Commit f751830

Browse files
committed
fix(vendor): fixed broccoli concat for vendor files
1 parent 6856a87 commit f751830

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

addon/ng2/blueprints/ng2/files/ember-cli-build.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Angular2App = require('angular-cli/lib/broccoli/angular2-app');
44

55
module.exports = function(defaults) {
66
var app = new Angular2App(defaults, {
7-
vendorFiles: []
7+
vendorNpmFiles: []
88
});
99
return app.toTree();
1010
}

lib/broccoli/angular2-app.js

+8-22
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var compileWithTypescript = require('./broccoli-typescript').default;
44
var fs = require('fs');
55
var Funnel = require('broccoli-funnel');
66
var mergeTrees = require('broccoli-merge-trees');
7-
var Project = require('ember-cli/lib//models/project');
7+
var Project = require('ember-cli/lib/models/project');
88

99
module.exports = Angular2App;
1010

@@ -17,10 +17,10 @@ function Angular2App(defaults, options) {
1717
Angular2App.prototype.toTree = function() {
1818
var sourceTree = 'src';
1919
var vendorNpmFiles = [
20-
'es6-shim/es6-shim.js',
2120
'systemjs/dist/system-polyfills.js',
22-
'angular2/bundles/angular2-polyfills.js',
2321
'systemjs/dist/system.src.js',
22+
'es6-shim/es6-shim.js',
23+
'angular2/bundles/angular2-polyfills.js',
2424
'rxjs/bundles/Rx.js',
2525
'angular2/bundles/angular2.dev.js',
2626
'angular2/bundles/http.dev.js',
@@ -55,18 +55,12 @@ Angular2App.prototype.toTree = function() {
5555
destDir: 'vendor'
5656
});
5757

58+
var vendorNpmInputFiles = vendorNpmFiles.map(function(file) {
59+
return '**/' + file.substr(file.lastIndexOf('/') + 1);
60+
});
61+
5862
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,
7064
outputFile: '/thirdparty/vendor.js'
7165
});
7266

@@ -81,14 +75,6 @@ Angular2App.prototype.toTree = function() {
8175
allowNone: true
8276
});
8377

84-
// var appJs = new Concat(mergeTrees([tsTree, jsTree]), {
85-
// inputFiles: [
86-
// '*.js',
87-
// '**/*.js'
88-
// ],
89-
// outputFile: '/app.js'
90-
// });
91-
9278
return mergeTrees([
9379
assetTree,
9480
tsSrcTree,

0 commit comments

Comments
 (0)