From 6c8aedfb8b499e02e07c81aa075b69a2c95bcaa4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 28 May 2020 12:28:58 -0700
Subject: [PATCH] =?UTF-8?q?Fix=20feature=20detection=20for=20module=20brow?=
 =?UTF-8?q?sers=20that=20do=20not=20support=20dynamic=E2=80=A6=20(#6069)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/html/index.html.template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/html/index.html.template b/src/html/index.html.template
index e549946f6e..7ce840a0e3 100644
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -52,20 +52,19 @@
     <%= renderTemplate('_js_base') %>
     <%= renderTemplate('_preload_roboto') %>
 
-    <script type="module" crossorigin="use-credentials">
+    <script>
       import("<%= latestCoreJS %>");
       import("<%= latestAppJS %>");
       window.customPanelJS = "<%= latestCustomPanelJS %>";
+      window.latestJS = true;
     </script>
     {% for extra_module in extra_modules -%}
     <script type="module" crossorigin="use-credentials" src="{{ extra_module }}"></script>
     {% endfor -%}
 
-
-    <script nomodule>
+    <script>
       (function() {
-        // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
-        if (!isS101) {
+        if (!window.latestJS) {
           window.customPanelJS = "<%= es5CustomPanelJS %>";
           _ls("/static/polyfills/custom-elements-es5-adapter.js");