Skip to content

Commit cc578db

Browse files
committed
fix: if there's no public/ directory, do not merge it in build
1 parent 5110e7d commit cc578db

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

lib/broccoli/angular2-app.js

+11-7
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,22 @@ Angular2App.prototype.toTree = function () {
8787
destDir: 'vendor'
8888
});
8989

90-
var publicDirTree = new Funnel('public', {
91-
allowEmpty: true
92-
});
93-
94-
var merged = mergeTrees([
90+
var allTrees = [
9591
assetTree,
9692
tsTree,
9793
jsTree,
98-
publicDirTree,
9994
this.index(),
10095
vendorNpmTree
101-
], { overwrite: true });
96+
];
97+
98+
if (fs.existsSync('public')) {
99+
allTrees.push(new Funnel('public', {
100+
exclude: ['**/.*'], // Remove dot files.
101+
allowEmpty: true
102+
}));
103+
}
104+
105+
var merged = mergeTrees(allTrees, { overwrite: true });
102106

103107
return mergeTrees([merged, new SwManifest([merged])]);
104108
};

0 commit comments

Comments
 (0)