Skip to content

chore(): remove the concatenating of vendor files. #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansl merged 1 commit into from
Feb 20, 2016
Merged

chore(): remove the concatenating of vendor files. #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion addon/ng2/blueprints/ng2/files/src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
11 changes: 1 addition & 10 deletions lib/broccoli/angular2-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand All @@ -89,7 +80,7 @@ Angular2App.prototype.toTree = function() {
tsTree,
jsTree,
this.index(),
vendorNpmJs,
vendorNpmTree,
thirdPartyJs
], { overwrite: true });

Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/e2e_workflow.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down