Skip to content
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

Jump to bottom

fix(build): don't ignore js in public #1129

Merged
merged 1 commit into from
Jul 12, 2016
Merged

fix(build): don't ignore js in public #1129

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
16 changes: 9 additions & 7 deletions lib/broccoli/angular2-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,6 @@ class Angular2App extends BroccoliPlugin {
}));
}

// Add the public folder in.
buildTrees.push(new BroccoliFunnel(this._inputNode, {
allowEmpty: true,
srcDir: 'public',
name: 'PublicFolderFunnel'
}));

var merged = new BroccoliMergeTrees(buildTrees, { overwrite: true });

if (this.ngConfig.apps[0].mobile) {
Expand All @@ -159,6 +152,15 @@ class Angular2App extends BroccoliPlugin {
merged = this._getBundleTree(merged);
}

// Public folder funnel
var publicFolder = new BroccoliFunnel(this._inputNode, {
allowEmpty: true,
srcDir: 'public',
name: 'PublicFolderFunnel'
});

merged = new BroccoliMergeTrees([merged, publicFolder]);

return new BroccoliFunnel(merged, {
destDir: this._destDir,
overwrite: true
Expand Down