Skip to content

fix(serve): rebuilds after new typings are installed #295

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

Closed
wants to merge 1 commit into from
Closed

fix(serve): rebuilds after new typings are installed #295

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
13 changes: 3 additions & 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,8 @@ Angular2App.prototype.toTree = function() {
destDir: 'vendor'
});

var thirdPartyJsTree = new Funnel('node_modules', {
include: ['ng2*/bundles/*.js'],
exclude: ['ng2*/bundles/*.min.js', 'ng2*/bundles/*.standalone.js'],
});

var thirdPartyJs = new Concat(thirdPartyJsTree, {
inputFiles: ['**/*.js'],
outputFile: '/thirdparty/libs.js',
allowNone: true
var typingsTree = new Funnel('typings', {
exclude: ['**/*.d.ts']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this tree include? typings should only contain .d.ts files.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its checking typings directory for changes but does not copy .d.ts files.

});

var merged = mergeTrees([
Expand All @@ -81,7 +74,7 @@ Angular2App.prototype.toTree = function() {
jsTree,
this.index(),
vendorNpmTree,
thirdPartyJs
typingsTree
], { overwrite: true });

return mergeTrees([merged, new SwManifest(merged)]);
Expand Down
1 change: 0 additions & 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 @@ -79,7 +79,6 @@ describe('Basic end-to-end Workflow', function () {

// Check that a few critical files have been detected.
expect(lines).to.include(`${path.sep}index.html`);
expect(lines).to.include(`${path.sep}thirdparty${path.sep}libs.js`);
});

it('Perform `ng test` after initial build', function() {
Expand Down