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

Move es6-components.js back into application.js
alphagov · Sep 9, 2024 · 9abc41e · 9abc41e
2 parents b23ca71 + 7ebe2dc
commit 9abc41e
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
@@ -2,7 +2,6 @@
 
 //= link joint.css
 //= link application.js
-//= link es6-components.js
 //= link dagre.js
 //= link joint.layout.DirectedGraph.js
 //= link joint.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -1,6 +1,9 @@
 //= 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/print-link
+//= require govuk_publishing_components/components/radio
 //= require govuk_publishing_components/components/step-by-step-nav
 //= require govuk_publishing_components/components/table
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
@@ -27,7 +27,6 @@
     <%= csp_meta_tag %>
     <%= stylesheet_link_tag "application", :media => "all" %>
     <%= javascript_include_tag "test-dependencies", type: "module" if Rails.env.test? %>
-    <%= javascript_include_tag "es6-components", type: "module" %>
     <%= javascript_include_tag "application", defer: true, type: "module" %>
     <%= yield :head %>
     <% if content_item %>