From 8c0c0592e29b11a70bfcbda88887e8099215cf73 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 15 Jun 2020 07:18:58 -0700
Subject: [PATCH] Move Jinja directives to own script block (#6166)

---
 src/html/index.html.template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/html/index.html.template b/src/html/index.html.template
index d61595003c..93b146d5a5 100644
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -58,12 +58,13 @@
       window.customPanelJS = "<%= latestCustomPanelJS %>";
       window.latestJS = true;
     </script>
+    <script>
     {% for extra_module in extra_modules -%}
-    <script type="module" crossorigin="use-credentials" src="{{ extra_module }}"></script>
+    import("{{ extra_module }}");
     {% endfor -%}
+    </script>
 
     <script>
-      (function() {
         if (!window.latestJS) {
           window.customPanelJS = "<%= es5CustomPanelJS %>";
 
@@ -79,11 +80,14 @@
             _ls("<%= es5CoreJS %>");
             _ls("<%= es5AppJS %>");
           <% } %>
-          {% for extra_script in extra_js_es5 -%}
-          _ls("{{ extra_script }}");
-          {% endfor -%}
         }
-      })();
+    </script>
+    <script>
+      if (!window.latestJS) {
+        {% for extra_script in extra_js_es5 -%}
+        _ls("{{ extra_script }}");
+        {% endfor -%}
+      }
     </script>
 
     {% for extra_url in extra_urls -%}