Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 22:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jkuri 2016-02-03 08:48:16 +01:00
parent 2991dd7c56
commit 10eb75c19c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/broccoli/angular2-app.js vendored
View File

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