Skip to content

Commit 2efc9a1

Browse files
committed
fix(vendors): concat the files properly
1 parent b8dfe0c commit 2efc9a1

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

lib/broccoli/angular2-app.js

+16-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,21 @@ Angular2App.prototype.toTree = function() {
5454
files: vendorNpmFiles,
5555
destDir: 'vendor'
5656
});
57+
58+
var vendorNpmJs = new Concat(vendorNpmTree, {
59+
inputFiles: [ //TODO: figure out how to make it a glob that maintains the order of the files
60+
'**/angular2-polyfills.js',
61+
'**/system.src.js',
62+
'**/system-polyfills.js',
63+
'**/es6-shim.js',
64+
'**/angular2.dev.js',
65+
'**/http.dev.js',
66+
'**/router.dev.js',
67+
'**/upgrade.dev.js',
68+
'**/Rx.js'
69+
],
70+
outputFile: '/thirdparty/vendor.js'
71+
});
5772

5873
var thirdPartyJsTree = new Funnel('node_modules', {
5974
include: ['ng2*/bundles/*.js'],
@@ -80,7 +95,7 @@ Angular2App.prototype.toTree = function() {
8095
tsTree,
8196
jsTree,
8297
this.index(),
83-
vendorNpmTree,
98+
vendorNpmJs,
8499
thirdPartyJs
85100
], { overwrite: true });
86101
};

0 commit comments

Comments
 (0)