From 3717e94814cd1f36099404dd229a7469a79fe581 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 12 Oct 2020 14:10:15 +0000
Subject: [PATCH] Switch onboarding and auth to dynamic import

---
 src/html/authorize.html.template  | 10 +++++-----
 src/html/onboarding.html.template | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/html/authorize.html.template b/src/html/authorize.html.template
index 46bca88dd4..0a94c58498 100644
--- a/src/html/authorize.html.template
+++ b/src/html/authorize.html.template
@@ -44,17 +44,17 @@
     <%= renderTemplate('_js_base') %>
     <%= renderTemplate('_preload_roboto') %>
 
-    <script type="module" crossorigin="use-credentials">
-      import "<%= latestPageJS %>";
+    <script crossorigin="use-credentials">
+      import("<%= latestPageJS %>");
+      window.latestJS = true;
       window.providersPromise = fetch("/auth/providers", {
         credentials: "same-origin",
       });
     </script>
 
-    <script nomodule>
+    <script>
       (function() {
-        // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
-        if (!isS101) {
+        if (!window.latestJS) {
           <% if (useRollup) { %>
             _ls("/static/js/s.min.js").onload = function() {
               System.import("<%= es5PageJS %>");
diff --git a/src/html/onboarding.html.template b/src/html/onboarding.html.template
index f4bc333ede..e3b3fbf2f1 100644
--- a/src/html/onboarding.html.template
+++ b/src/html/onboarding.html.template
@@ -52,17 +52,17 @@
     <%= renderTemplate('_js_base') %>
     <%= renderTemplate('_preload_roboto') %>
 
-    <script type="module" crossorigin="use-credentials">
-      import "<%= latestPageJS %>";
+    <script crossorigin="use-credentials">
+      import("<%= latestPageJS %>");
+      window.latestJS = true;
       window.stepsPromise = fetch("/api/onboarding", {
         credentials: "same-origin",
       });
     </script>
 
-    <script nomodule>
+    <script>
       (function() {
-        // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
-        if (!isS101) {
+        if (!window.latestJS) {
           <% if (useRollup) { %>
             _ls("/static/js/s.min.js").onload = function() {
               System.import("<%= es5PageJS %>");