From 88ff4c2fa8b3003aea975566c97ca0844784f63a Mon Sep 17 00:00:00 2001
From: Steve Repsher <steverep@users.noreply.github.com>
Date: Tue, 15 Aug 2023 13:48:51 -0400
Subject: [PATCH] Fix synchronous loading for ES5 build (#17174)

---
 src/html/_js_base.html.template         | 41 ++++++++++++++-----------
 src/html/_script_load_es5.html.template |  2 +-
 src/html/index.html.template            |  2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/html/_js_base.html.template b/src/html/_js_base.html.template
index e2fc752b4a..06ae256045 100644
--- a/src/html/_js_base.html.template
+++ b/src/html/_js_base.html.template
@@ -1,18 +1,23 @@
-    <script>
-      function _ls(src) {
-        var doc = document.documentElement;
-        var script = doc.insertBefore(
-          document.createElement("script"),
-          doc.lastChild
-        );
-        script.defer = true;
-        script.src = src;
-        return script;
-      }
-      window.polymerSkipLoadingFontRoboto = true;
-      if (!("customElements" in window &&
-            "content" in document.createElement("template"))) {
-        document.write("<script src='/static/polyfills/webcomponents-bundle.js'><"+"/script>");
-      }
-      var isS11_12 = /(?:.*(?:iPhone|iPad).*OS (?:11|12)_\d)|(?:.*Version\/(?:11|12)(?:\.\d+)*.*Safari\/)/.test(navigator.userAgent);
-    </script>
\ No newline at end of file
+<script>
+  function _ls(src, sync) {
+    var script = document.createElement("script");
+    if (sync) {
+      script.async = false;
+    }
+    script.src = src;
+    return document.head.appendChild(script);
+  }
+  window.polymerSkipLoadingFontRoboto = true;
+  if (
+    !(
+      "customElements" in window &&
+      "content" in document.createElement("template")
+    )
+  ) {
+    _ls("/static/polyfills/webcomponents-bundle.js", true);
+  }
+  var isS11_12 =
+    /(?:.*(?:iPhone|iPad).*OS (?:11|12)_\d)|(?:.*Version\/(?:11|12)(?:\.\d+)*.*Safari\/)/.test(
+      navigator.userAgent
+    );
+</script>
diff --git a/src/html/_script_load_es5.html.template b/src/html/_script_load_es5.html.template
index 68458ce9b4..cb72d05e5a 100644
--- a/src/html/_script_load_es5.html.template
+++ b/src/html/_script_load_es5.html.template
@@ -9,7 +9,7 @@
         }
       <% } else { %>
         <% for (const entry of es5EntryJS) { %>
-          _ls("<%= entry %>");
+          _ls("<%= entry %>", true);
         <% } %>
       <% } %>
     }
diff --git a/src/html/index.html.template b/src/html/index.html.template
index 977da8f617..a74297f024 100644
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -112,7 +112,7 @@
             }
           <% } else { %>
             <% for (const entry of es5EntryJS) { %>
-              _ls("<%= entry %>");
+              _ls("<%= entry %>", true);
             <% } %>
           <% } %>
         }