Move es6-components.js back into application.js

alphagov · Sep 4, 2024 · 20bd6e3 · 20bd6e3
1 parent 1dd90de
commit 20bd6e3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 16 deletions.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,7 +1,6 @@
 //= link_tree ../images
 //= link application.js
 //= link test-dependencies.js
-//= link es6-components.js
 //= link live_search.js
 
 //= link_tree ../builds
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -10,10 +10,13 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //= require govuk_publishing_components/lib
+//= require govuk_publishing_components/components/checkboxes
+//= require govuk_publishing_components/components/error-summary
 //= require govuk_publishing_components/components/govspeak
 //= require govuk_publishing_components/components/intervention
 //= require govuk_publishing_components/components/metadata
 //= require govuk_publishing_components/components/option-select
+//= require govuk_publishing_components/components/radio
 //
 //= require support
 //

diff --git a/app/assets/javascripts/es6-components.js b/app/assets/javascripts/es6-components.js
diff --git a/app/views/layouts/development_layout.html.erb b/app/views/layouts/development_layout.html.erb
@@ -16,7 +16,6 @@
       render_component_stylesheets
     %>
     <%= javascript_include_tag "application", integrity: false, type: "module" %>
-    <%= javascript_include_tag 'es6-components', integrity: false, type: "module" %>
     <meta name="robots" content="noindex">
   </head>
 

diff --git a/app/views/layouts/finder_layout.html.erb b/app/views/layouts/finder_layout.html.erb
@@ -17,7 +17,6 @@
     %>
     <%= javascript_include_tag 'test-dependencies.js', type: "module" if Rails.env.test? %>
     <%= javascript_include_tag 'application', integrity: false, type: "module" %>
-    <%= javascript_include_tag 'es6-components', integrity: false, type: "module" %>
     <%= csrf_meta_tags %>
     <%= yield :head %>
 

diff --git a/app/views/layouts/search_layout.html.erb b/app/views/layouts/search_layout.html.erb
@@ -7,7 +7,6 @@
     <title><%= yield :title %> - GOV.UK</title>
     <link title="Search" rel="search" type="application/opensearchdescription+xml" href="/search/opensearch.xml"/>
     <%= stylesheet_link_tag "application", media: "all", integrity: false %>
-    <%= javascript_include_tag 'es6-components', integrity: false, type: "module" %>
     <%=
       render_component_stylesheets
     %>