From 7291342d6d4c7a2897aca5093e3c3243329fcb25 Mon Sep 17 00:00:00 2001
From: Colin Rotherham <work@colinr.com>
Date: Mon, 18 Sep 2023 21:51:41 +0100
Subject: [PATCH] Use `<script type="module">` to defer inline scripts

Since `<script defer>` is not available for inline scripts, this change ensures inline scripts are also deferred until after `window.GOVUKPrototypeKit` is available
---
 .../install-plugin-via-cli-test.cypress.js    |  2 +-
 .../multi-combined-plugin-test.cypress.js     |  2 +-
 .../multi-plugin-test.cypress.js              |  2 +-
 .../single-plugin-test.cypress.js             |  2 +-
 .../views/error-handling/server-error.njk     |  2 +-
 .../plugin-install-or-uninstall.njk           | 25 +++++++++----------
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-cli-test.cypress.js b/cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-cli-test.cypress.js
index b820f4e64c..f5342c08f8 100644
--- a/cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-cli-test.cypress.js
+++ b/cypress/e2e/plugins/0-mock-plugin-tests/install-plugin-via-cli-test.cypress.js
@@ -21,7 +21,7 @@ const pluginBazViewMarkup = `
 {% endblock %}
 
 {% block pageScripts %}
-<script>
+<script type="module">
   window.GOVUKPrototypeKit.documentReady(() => {
     new window.BAZ.Modules.PluginBaz('.test-baz')
   })
diff --git a/cypress/e2e/plugins/0-mock-plugin-tests/multi-combined-plugin-test.cypress.js b/cypress/e2e/plugins/0-mock-plugin-tests/multi-combined-plugin-test.cypress.js
index a3e2a1a84f..eca59f4779 100644
--- a/cypress/e2e/plugins/0-mock-plugin-tests/multi-combined-plugin-test.cypress.js
+++ b/cypress/e2e/plugins/0-mock-plugin-tests/multi-combined-plugin-test.cypress.js
@@ -24,7 +24,7 @@ const pluginFooBarCombinedViewMarkup = `
 {% endblock %}
 
 {% block pageScripts %}
-<script>
+<script type="module">
   window.GOVUKPrototypeKit.documentReady(() => {
     new window.BAR.Modules.PluginBar('.test-bar')
     new window.FOO.Modules.PluginFoo('.test-foo')
diff --git a/cypress/e2e/plugins/0-mock-plugin-tests/multi-plugin-test.cypress.js b/cypress/e2e/plugins/0-mock-plugin-tests/multi-plugin-test.cypress.js
index 57c2127452..3ee8c0b8b6 100644
--- a/cypress/e2e/plugins/0-mock-plugin-tests/multi-plugin-test.cypress.js
+++ b/cypress/e2e/plugins/0-mock-plugin-tests/multi-plugin-test.cypress.js
@@ -22,7 +22,7 @@ const pluginFooBarSeparatedViewMarkup = `
 {% endblock %}
 
 {% block pageScripts %}
-<script>
+<script type="module">
   window.GOVUKPrototypeKit.documentReady(() => {
     new window.FOO.Modules.PluginFoo('.test-foo')
     new window.BAR.Modules.PluginBar('.test-bar')
diff --git a/cypress/e2e/plugins/0-mock-plugin-tests/single-plugin-test.cypress.js b/cypress/e2e/plugins/0-mock-plugin-tests/single-plugin-test.cypress.js
index 985e9da41b..ed1807dfc9 100644
--- a/cypress/e2e/plugins/0-mock-plugin-tests/single-plugin-test.cypress.js
+++ b/cypress/e2e/plugins/0-mock-plugin-tests/single-plugin-test.cypress.js
@@ -22,7 +22,7 @@ const pluginFooViewMarkup = `
 {% endblock %}
 
 {% block pageScripts %}
-<script>
+<script type="module">
   window.GOVUKPrototypeKit.documentReady(() => {
     new window.FOO.Modules.PluginFoo('.test-foo')
   })
diff --git a/lib/nunjucks/views/error-handling/server-error.njk b/lib/nunjucks/views/error-handling/server-error.njk
index 7359f7b682..30e634d909 100644
--- a/lib/nunjucks/views/error-handling/server-error.njk
+++ b/lib/nunjucks/views/error-handling/server-error.njk
@@ -55,7 +55,7 @@
 
 
 {% block pageScripts %}
-<script>
+<script type="module">
   ;(() => {
     const toggleErrorStack = (event) => {
       const button = event.target
diff --git a/lib/nunjucks/views/manage-prototype/plugin-install-or-uninstall.njk b/lib/nunjucks/views/manage-prototype/plugin-install-or-uninstall.njk
index 866ddbe1cb..1ab3f3eb2b 100644
--- a/lib/nunjucks/views/manage-prototype/plugin-install-or-uninstall.njk
+++ b/lib/nunjucks/views/manage-prototype/plugin-install-or-uninstall.njk
@@ -111,18 +111,17 @@
 {% endblock %}
 
 {% block pageScripts %}
-  <script>
-    if (window.Promise) {
-      // Dynamically load and execute the script
-      const managePluginsScript = document.createElement('script')
-      managePluginsScript.addEventListener('load', () => {
-        window.GOVUKPrototypeKit.documentReady(window.GOVUKPrototypeKit.internal.managePlugins.init)
-      })
-      managePluginsScript.setAttribute('src', '/plugin-assets/govuk-prototype-kit/lib/assets/javascripts/manage-prototype/manage-plugins.js')
-      document.body.appendChild(managePluginsScript)
-    } else {
-      // Display the page as if javascript was not enabled
-      document.body.classList.remove('js-enabled')
-    }
+  <script type="module">
+    // Dynamically load and execute the script
+    const managePluginsScript = document.createElement('script')
+    managePluginsScript.addEventListener('load', () => {
+      window.GOVUKPrototypeKit.documentReady(window.GOVUKPrototypeKit.internal.managePlugins.init)
+    })
+    managePluginsScript.setAttribute('src', '/plugin-assets/govuk-prototype-kit/lib/assets/javascripts/manage-prototype/manage-plugins.js')
+    document.body.appendChild(managePluginsScript)
+  </script>
+  <script nomodule>
+    // Display the page as if javascript was not enabled
+    document.body.classList.remove('js-enabled')
   </script>
 {% endblock %}