From 081804ef3865a61e80e59556ce9415def59305bf 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/config/manifest.js                      |  1 -
 app/assets/javascripts/application.js              |  3 +++
 app/assets/javascripts/es6-components.js           | 12 ------------
 config/initializers/govuk_publishing_components.rb |  3 ---
 4 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 app/assets/javascripts/es6-components.js
 delete mode 100644 config/initializers/govuk_publishing_components.rb

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index adc4268c8..9f5b1cf07 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,6 +1,5 @@
 //= link_tree ../images
 //= link application.js
-//= link es6-components.js
 //= link test-dependencies.js
 //= link modules/base-target.js
 //= link_tree ../builds
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b1d04039f..ed3a488c3 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,10 +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
 
diff --git a/app/assets/javascripts/es6-components.js b/app/assets/javascripts/es6-components.js
deleted file mode 100644
index b1fd62528..000000000
--- a/app/assets/javascripts/es6-components.js
+++ /dev/null
@@ -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
deleted file mode 100644
index 4b0e5a014..000000000
--- a/config/initializers/govuk_publishing_components.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-GovukPublishingComponents.configure do |config|
-  config.use_es6_components = true
-end