Merge pull request #3320 from alphagov/type-module-cleanup

Move es6-components.js back into application.js
alphagov · Sep 9, 2024 · c84dc30 · c84dc30
2 parents 40c1bed + e154f88
commit c84dc30
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,5 +1,4 @@
 //= link_tree ../images
 //= link application.js
-//= link es6-components.js
 //= link webchat.js
 //= link_tree ../builds
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -1,9 +1,12 @@
 //= require govuk_publishing_components/lib
+//= require govuk_publishing_components/components/accordion
+//= require govuk_publishing_components/components/error-summary
 //= require govuk_publishing_components/components/govspeak
 //= require govuk_publishing_components/components/image-card
 //= require govuk_publishing_components/components/intervention
 //= require govuk_publishing_components/components/metadata
 //= require govuk_publishing_components/components/print-link
+//= require govuk_publishing_components/components/radio
 //= require govuk_publishing_components/components/single-page-notification-button
 //= require govuk_publishing_components/components/step-by-step-nav
 

diff --git a/app/assets/javascripts/es6-components.js b/app/assets/javascripts/es6-components.js
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -53,7 +53,6 @@
 
   <%= stylesheet_link_tag "application", :media => "all", integrity: false %>
   <%= javascript_include_tag "application", integrity: false, type: "module" %>
-  <%= javascript_include_tag 'es6-components', type: "module" %>
   <%= csrf_meta_tags %>
   <%= render 'govuk_publishing_components/components/meta_tags', content_item: @content_item.content_item %>