From 1a319c39ac41d6168d4da1b37e101768f10efe82 Mon Sep 17 00:00:00 2001
From: Dylan Piercey <dpiercey@ebay.com>
Date: Fri, 14 Jun 2019 10:56:28 -0700
Subject: [PATCH] Remove empty layout-put tags

---
 src/core-tags/migrate/layout-put-tag.js         | 8 +++++++-
 test/migrate/fixtures/layout-put/template.marko | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/core-tags/migrate/layout-put-tag.js b/src/core-tags/migrate/layout-put-tag.js
index b2c4f423f8..b5b7473867 100644
--- a/src/core-tags/migrate/layout-put-tag.js
+++ b/src/core-tags/migrate/layout-put-tag.js
@@ -29,5 +29,11 @@ module.exports = function migrator(oldNode, context) {
     }
 
     oldNode.moveChildrenTo(newNode);
-    oldNode.replaceWith(newNode);
+    newNode._normalizeChildTextNodes(context, true, true);
+
+    if (newNode.childCount) {
+        oldNode.replaceWith(newNode);
+    } else {
+        oldNode.detach();
+    }
 };
diff --git a/test/migrate/fixtures/layout-put/template.marko b/test/migrate/fixtures/layout-put/template.marko
index 50c2ef6ade..964b91c6b1 100644
--- a/test/migrate/fixtures/layout-put/template.marko
+++ b/test/migrate/fixtures/layout-put/template.marko
@@ -1,2 +1,9 @@
 <layout-put into="body">BODY CONTENT</layout-put>
-<layout-put into="footer" value="FOOTER CONTENT"></layout-put>
\ No newline at end of file
+<layout-put into="footer" value="FOOTER CONTENT"></layout-put>
+
+<layout-put into="example-empty1" value=""/>
+<layout-put into="example-empty2"></layout-put>
+<layout-put into="example-empty3">
+
+</layout-put>
+<layout-put into="example-empty4"/>
\ No newline at end of file