diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index f0129695752..76efd1af5b0 100644 --- 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 index f6bd27004bf..d5947d87632 100644 --- 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 deleted file mode 100644 index 3154e236ee7..00000000000 --- 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/checkboxes -//= require govuk_publishing_components/components/error-summary -//= require govuk_publishing_components/components/radio diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 79b7bbb250a..afe689b1744 100644 --- 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 %>