fix: ensure node exists before clearing on error

marko-js · Feb 26, 2024 · 9567d57 · 9567d57
1 parent 9c1d247
commit 9567d57
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/...frame-sse/__tests__/__snapshots__/micro-frame-sse/ssr-404/renders.expected/loading.1.html b/...frame-sse/__tests__/__snapshots__/micro-frame-sse/ssr-404/renders.expected/loading.1.html
@@ -15,6 +15,6 @@
   id="GENERATED-2"
 >
   <script>
-    document.getElementById("s0-9-0").textContent=""
+    (function(e){if(e)e.textContent=""})(document.getElementById("s0-9-0"))
   </script>
 </div>
diff --git a/...frame-sse/__tests__/__snapshots__/micro-frame-sse/ssr-404/renders.expected/loading.3.html b/...frame-sse/__tests__/__snapshots__/micro-frame-sse/ssr-404/renders.expected/loading.3.html
@@ -22,6 +22,6 @@
   id="GENERATED-3"
 >
   <script>
-    document.getElementById("s0-10-0").textContent=""
+    (function(e){if(e)e.textContent=""})(document.getElementById("s0-10-0"))
   </script>
 </div>
diff --git a/..._tests__/__snapshots__/micro-frame-sse/ssr-behind-reorder/renders.expected/loading.1.html b/..._tests__/__snapshots__/micro-frame-sse/ssr-behind-reorder/renders.expected/loading.1.html
@@ -26,7 +26,7 @@
     id="GENERATED-5"
   >
     <script>
-      document.getElementById("s0-10-0").textContent=""
+      (function(e){if(e)e.textContent=""})(document.getElementById("s0-10-0"))
     </script>
   </div>
 </div>
diff --git a/..._tests__/__snapshots__/micro-frame-sse/ssr-behind-reorder/renders.expected/loading.3.html b/..._tests__/__snapshots__/micro-frame-sse/ssr-behind-reorder/renders.expected/loading.3.html
@@ -33,7 +33,7 @@
     id="GENERATED-6"
   >
     <script>
-      document.getElementById("s0-11-0").textContent=""
+      (function(e){if(e)e.textContent=""})(document.getElementById("s0-11-0"))
     </script>
   </div>
 </div>
diff --git a/...e-sse/__tests__/__snapshots__/micro-frame-sse/ssr-timeout/renders.expected/loading.2.html b/...e-sse/__tests__/__snapshots__/micro-frame-sse/ssr-timeout/renders.expected/loading.2.html
@@ -18,6 +18,6 @@
     test_html for slot_1
   </p>
   <script>
-    document.getElementById("s0-9-0").textContent=""
+    (function(e){if(e)e.textContent=""})(document.getElementById("s0-9-0"))
   </script>
 </div>
diff --git a/src/node_modules/@internal/micro-frame-component/node.marko b/src/node_modules/@internal/micro-frame-component/node.marko
@@ -117,11 +117,7 @@ static async function fetchStream(input, out) {
           <@catch|err|>
             <if(input.catch)>
               <!-- Remove everything in the container and render our catch handler -->
-              <script>
-                document.getElementById(
-                  ${JSON.stringify(component.id)},
-                ).textContent = "";
-              </script>
+              <script>(function(e){if(e)e.textContent=""})(document.getElementById(${JSON.stringify(component.id)}))</script>
               <${input.catch}(err)/>
             </if>
             <else>

diff --git a/src/node_modules/@internal/micro-frame-slot-component/node.marko b/src/node_modules/@internal/micro-frame-slot-component/node.marko
@@ -24,7 +24,7 @@ $ {
       </@then>
       <@catch|e|>
         $ finishLoading && finishLoading();
-        <script>document.getElementById(${JSON.stringify(component.id)}).textContent=""</script>
+        <script>(function(e){if(e)e.textContent=""})(document.getElementById(${JSON.stringify(component.id)}))</script>
         <${input.catch}(e)/>
       </@catch>
     </await>