From cc578dbc12e4133eb49c07daeb36ecd99220fab4 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 31 Mar 2016 11:04:20 -0700
Subject: [PATCH] fix: if there's no public/ directory, do not merge it in
 build

---
 lib/broccoli/angular2-app.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
index 725b62d6b167..22927ca5782d 100644
--- a/lib/broccoli/angular2-app.js
+++ b/lib/broccoli/angular2-app.js
@@ -87,18 +87,22 @@ Angular2App.prototype.toTree = function () {
     destDir: 'vendor'
   });
 
-  var publicDirTree = new Funnel('public', {
-    allowEmpty: true
-  });
-
-  var merged = mergeTrees([
+  var allTrees = [
     assetTree,
     tsTree,
     jsTree,
-    publicDirTree,
     this.index(),
     vendorNpmTree
-  ], { overwrite: true });
+  ];
+
+  if (fs.existsSync('public')) {
+    allTrees.push(new Funnel('public', {
+      exclude: ['**/.*'],  // Remove dot files.
+      allowEmpty: true
+    }));
+  }
+
+  var merged = mergeTrees(allTrees, { overwrite: true });
 
   return mergeTrees([merged, new SwManifest([merged])]);
 };