From b1b328bb34285b7b7c425e68b0e1ff204a638ace Mon Sep 17 00:00:00 2001
From: AshGDS <8880610+AshGDS@users.noreply.github.com>
Date: Mon, 2 Sep 2024 12:39:45 +0100
Subject: [PATCH] Move es6-components.js back into application.js

---
 app/assets/javascripts/application.js              |  4 +++-
 app/assets/javascripts/es6-components.js           | 12 ------------
 config/initializers/govuk_publishing_components.rb |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b1d04039f..f6971864e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,11 +12,13 @@
 // depend on any modules from govuk-frontend so can be
 // included here:
 //
+//= require govuk_publishing_components/components/button
 //= require govuk_publishing_components/components/cookie-banner
 //= require govuk_publishing_components/components/cross-service-header
 //= require govuk_publishing_components/components/feedback
+//= require govuk_publishing_components/components/layout-header
 //= require govuk_publishing_components/components/layout-super-navigation-header
-
+//= require govuk_publishing_components/components/skip-link
 //= require modules/global-bar
 
 //= require global-bar-init
diff --git a/app/assets/javascripts/es6-components.js b/app/assets/javascripts/es6-components.js
index b1fd62528..e69de29bb 100644
--- a/app/assets/javascripts/es6-components.js
+++ b/app/assets/javascripts/es6-components.js
@@ -1,12 +0,0 @@
-// These modules from govuk_publishing_components
-// depend on govuk-frontend modules. govuk-frontend
-// now targets browsers that support `type="module"`.
-//
-// To gracefully prevent execution of these scripts
-// on browsers that don't support ES6, this script
-// should be included in a `type="module"` script tag
-// which will ensure they are never loaded.
-
-//= require govuk_publishing_components/components/button
-//= require govuk_publishing_components/components/layout-header
-//= require govuk_publishing_components/components/skip-link
diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb
index 4b0e5a014..11f9447b4 100644
--- a/config/initializers/govuk_publishing_components.rb
+++ b/config/initializers/govuk_publishing_components.rb
@@ -1,3 +1,3 @@
 GovukPublishingComponents.configure do |config|
-  config.use_es6_components = true
+  config.use_es6_components = false
 end