Skip to content

Commit

Permalink
fix(build): don't ignore js in public (#1129)
Browse files Browse the repository at this point in the history
Fix #540
  • Loading branch information
filipesilva authored and hansl committed Jul 12, 2016
1 parent 03fd4c4 commit 00e111a
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions lib/broccoli/angular2-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,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 @@ -167,6 +160,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

0 comments on commit 00e111a

Please sign in to comment.