From 454ddf366aa70d4c8a925dcbc42dbd5cb3487f81 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 22 Jun 2020 10:24:54 -0700
Subject: [PATCH] Use dynamic import for cast/demo to show latest build (#6202)

---
 cast/src/html/launcher-faq.html.template | 30 +++++++++++-------------
 cast/src/html/launcher.html.template     | 28 ++++++++++------------
 demo/src/html/index.html.template        | 30 ++++++++++++------------
 src/html/index.html.template             |  2 +-
 4 files changed, 43 insertions(+), 47 deletions(-)
diff --git a/cast/src/html/launcher-faq.html.template b/cast/src/html/launcher-faq.html.template
index 59eea6a3a0..e220a1e1ce 100644
--- a/cast/src/html/launcher-faq.html.template
+++ b/cast/src/html/launcher-faq.html.template
@@ -37,23 +37,21 @@
   <body>
     <%= renderTemplate('_js_base') %>
 
-    <script type="module" crossorigin="use-credentials">
-      import "<%= latestLauncherJS %>";
+    <script>
+      import("<%= latestLauncherJS %>");
+      window.latestJS = true;
     </script>
 
-    <script nomodule>
-      (function() {
-        // // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
-        if (!isS101) {
-          <% if (useRollup) { %>
-            _ls("/static/js/s.min.js").onload = function() {
-              System.import("<%= es5LauncherJS %>");
-            };
-          <% } else { %>
-            _ls("<%= es5LauncherJS %>");
-          <% } %>
-        }
-      })();
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5LauncherJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5LauncherJS %>");
+        <% } %>
+      }
     </script>
 
     <hc-layout subtitle="FAQ">
@@ -253,7 +251,7 @@ http:
 
     <script>
       var _gaq = [["_setAccount", "UA-57927901-9"], ["_trackPageview"]];
-      (function(d, t) {
+      (function (d, t) {
         var g = d.createElement(t),
           s = d.getElementsByTagName(t)[0];
         g.src =
diff --git a/cast/src/html/launcher.html.template b/cast/src/html/launcher.html.template
index 88de28b196..d6108c96b8 100644
--- a/cast/src/html/launcher.html.template
+++ b/cast/src/html/launcher.html.template
@@ -28,23 +28,21 @@
 
     <hc-connect></hc-connect>
 
-    <script type="module" crossorigin="use-credentials">
-      import "<%= latestLauncherJS %>";
+    <script>
+      import("<%= latestLauncherJS %>");
+      window.latestJS = true;
     </script>
 
-    <script nomodule>
-      (function() {
-        // // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
-        if (!isS101) {
-          <% if (useRollup) { %>
-            _ls("/static/js/s.min.js").onload = function() {
-              System.import("<%= es5LauncherJS %>");
-            };
-          <% } else { %>
-            _ls("<%= es5LauncherJS %>");
-          <% } %>
-        }
-      })();
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5LauncherJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5LauncherJS %>");
+        <% } %>
+      }
     </script>
     <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/demo/src/html/index.html.template b/demo/src/html/index.html.template
index 87f16397a1..05cabfe6e6 100644
--- a/demo/src/html/index.html.template
+++ b/demo/src/html/index.html.template
@@ -86,26 +86,26 @@
     <%= renderTemplate('_js_base') %>
     <%= renderTemplate('_preload_roboto') %>
 
-    <script type="module" src="<%= latestDemoJS %>"></script>
+    <script>
+      import("<%= latestDemoJS %>");
+      window.latestJS = true;
+    </script>
 
-    <script nomodule>
-      (function() {
-        // // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
-        if (!isS101) {
-          <% if (useRollup) { %>
-            _ls("/static/js/s.min.js").onload = function() {
-              System.import("<%= es5DemoJS %>");
-            };
-          <% } else { %>
-            _ls("<%= es5DemoJS %>");
-          <% } %>
-        }
-      })();
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5DemoJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5DemoJS %>");
+        <% } %>
+      }
     </script>
 
     <script>
       var _gaq = [["_setAccount", "UA-57927901-5"], ["_trackPageview"]];
-      (function(d, t) {
+      (function (d, t) {
         var g = d.createElement(t),
           s = d.getElementsByTagName(t)[0];
         g.src =
diff --git a/src/html/index.html.template b/src/html/index.html.template
index 93b146d5a5..a06641f19b 100644
--- a/src/html/index.html.template
+++ b/src/html/index.html.template
@@ -52,7 +52,7 @@
     <%= renderTemplate('_js_base') %>
     <%= renderTemplate('_preload_roboto') %>
 
-    <script>
+    <script crossorigin="use-credentials">
       import("<%= latestCoreJS %>");
       import("<%= latestAppJS %>");
       window.customPanelJS = "<%= latestCustomPanelJS %>";
