Skip to content

Commit ed4c6f6

Browse files
committed
fix(serve): rebuilds after new typings are installed
1 parent 6607ebb commit ed4c6f6

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

lib/broccoli/angular2-app.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,8 @@ Angular2App.prototype.toTree = function() {
6363
destDir: 'vendor'
6464
});
6565

66-
var thirdPartyJsTree = new Funnel('node_modules', {
67-
include: ['ng2*/bundles/*.js'],
68-
exclude: ['ng2*/bundles/*.min.js', 'ng2*/bundles/*.standalone.js'],
69-
});
70-
71-
var thirdPartyJs = new Concat(thirdPartyJsTree, {
72-
inputFiles: ['**/*.js'],
73-
outputFile: '/thirdparty/libs.js',
74-
allowNone: true
66+
var typingsTree = new Funnel('typings', {
67+
exclude: ['**/*.d.ts']
7568
});
7669

7770
var merged = mergeTrees([
@@ -81,7 +74,7 @@ Angular2App.prototype.toTree = function() {
8174
jsTree,
8275
this.index(),
8376
vendorNpmTree,
84-
thirdPartyJs
77+
typingsTree
8578
], { overwrite: true });
8679

8780
return mergeTrees([merged, new SwManifest(merged)]);

tests/e2e/e2e_workflow.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ describe('Basic end-to-end Workflow', function () {
7979

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

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

0 commit comments

Comments
 (0)