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

chore(): remove the concatenating of vendor files.

Browse Source
This commit is contained in:
Hans Larsen 2016-02-19 15:58:13 -08:00
parent e2e4f563f4
commit 59ca775429
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addon/ng2/blueprints/ng2/files/src/index.html
View File

@ -22,7 +22,16 @@
<body>
<<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
<script src="thirdparty/vendor.js"></script>
<script src="vendor/es6-shim/es6-shim.js"></script>
<script src="vendor/systemjs/dist/system-polyfills.js"></script>
<script src="vendor/angular2/bundles/angular2-polyfills.js"></script>
<script src="vendor/systemjs/dist/system.src.js"></script>
<script src="vendor/rxjs/bundles/Rx.js"></script>
<script src="vendor/angular2/bundles/angular2.dev.js"></script>
<script src="vendor/angular2/bundles/http.dev.js"></script>
<script src="vendor/angular2/bundles/router.dev.js"></script>
<script src="thirdparty/libs.js"></script>
<script>
System.config({

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

@ -63,15 +63,6 @@ Angular2App.prototype.toTree = function() {
destDir: 'vendor'
});
var vendorNpmInputFiles = vendorNpmFiles.map(function(file) {
return '**/' + file.substr(file.lastIndexOf('/') + 1);
});
var vendorNpmJs = new Concat(vendorNpmTree, {
inputFiles: vendorNpmInputFiles,
outputFile: '/thirdparty/vendor.js'
});
var thirdPartyJsTree = new Funnel('node_modules', {
include: ['ng2*/bundles/*.js'],
exclude: ['ng2*/bundles/*.min.js', 'ng2*/bundles/*.standalone.js'],
@ -89,7 +80,7 @@ Angular2App.prototype.toTree = function() {
tsTree,
jsTree,
this.index(),
vendorNpmJs,
vendorNpmTree,
thirdPartyJs
], { overwrite: true });

2
tests/e2e/e2e_workflow.spec.js
View File

@ -78,7 +78,7 @@ describe('Basic end-to-end Workflow', function () {
// Check that a few critical files have been detected.
expect(lines).to.include('/index.html');
expect(lines).to.include('/thirdparty/vendor.js');
expect(lines).to.include('/thirdparty/libs.js');
});
it('Perform `ng test` after initial build', function() {