govuk_publishing_components 63.3.1 → 64.0.0

data/app/views/govuk_publishing_components/components/_heading.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("heading")
-
   brand ||= false
   context ||= false
   context_locale ||= false

data/app/views/govuk_publishing_components/components/_hint.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("hint")
-
   local_assigns[:id] ||= "hint-#{SecureRandom.hex(4)}"
   is_radio_label_hint ||= false
   right_to_left ||= false

data/app/views/govuk_publishing_components/components/_image_card.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("image-card")
-
   sizes ||= false
   brand ||= false
 

data/app/views/govuk_publishing_components/components/_input.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("input")
-
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   autocomplete ||= nil

data/app/views/govuk_publishing_components/components/_inset_text.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("inset-text")
-
   id ||= "inset-text-#{SecureRandom.hex(4)}"
   local_assigns[:margin_bottom] ||= 6
 

data/app/views/govuk_publishing_components/components/_intervention.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("intervention")
-
   name ||= ""
   dismiss_text ||= false
   suggestion_link_text ||= false

data/app/views/govuk_publishing_components/components/_inverse_header.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("inverse-header")
-
   padding_top ||= nil
   padding_bottom ||= nil
   subtext ||= nil

data/app/views/govuk_publishing_components/components/_label.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("label")
-
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   hint_text ||= ""

data/app/views/govuk_publishing_components/components/_layout_footer.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("layout-footer")
-
   meta ||= []
   navigation ||= []
   hide_licence ||= false

data/app/views/govuk_publishing_components/components/_layout_for_admin.html.erb

@@ -1,5 +1,4 @@
 <%
-  add_gem_component_stylesheet("layout-for-admin")
   js_filename ||= "application"
   js_module_filename ||= "es6-components"
   css_filename ||= "application"

data/app/views/govuk_publishing_components/components/_layout_for_public.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("layout-for-public")
-
   emergency_banner ||= nil
   global_banner ||= nil
   html_lang ||= "en"

data/app/views/govuk_publishing_components/components/_layout_header.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("layout-header")
-
   environment ||= nil
   full_width ||= false
   navigation_aria_label ||= t("components.layout_header.top_level")

data/app/views/govuk_publishing_components/components/_layout_super_navigation_header.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("layout-super-navigation-header")
-
   logo_link ||= "https://www.gov.uk/"
   logo_link_title ||= t("components.layout_super_navigation_header.logo_link_title")
 

data/app/views/govuk_publishing_components/components/_lead_paragraph.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("lead-paragraph")
-
   text ||= ""
   inverse ||= false
 

data/app/views/govuk_publishing_components/components/_metadata.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("metadata")
-
   title ||= ""
 
   from ||= []

data/app/views/govuk_publishing_components/components/_modal_dialogue.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("modal-dialogue")
-
   id ||= "modal-dialogue-#{SecureRandom.hex(4)}"
   wide ||= false
   aria_label ||= nil

data/app/views/govuk_publishing_components/components/_notice.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("notice")
-
   title ||= false
   description_text ||= false
   description_govspeak ||= false

data/app/views/govuk_publishing_components/components/_option_select.html.erb

@@ -1,7 +1,4 @@
 <%
-  add_gem_component_stylesheet("option-select")
-  add_gem_component_stylesheet("input")
-
   title_id = "option-select-title-#{title.parameterize}"
   checkboxes_id = "checkboxes-#{SecureRandom.hex(4)}"
   checkboxes_count_id = checkboxes_id + "-count"

data/app/views/govuk_publishing_components/components/_organisation_logo.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("organisation-logo")
-
   logo_helper = GovukPublishingComponents::Presenters::OrganisationLogoHelper.new(local_assigns)
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(organisation[:brand])
 

data/app/views/govuk_publishing_components/components/_pagination.html.erb

@@ -1,5 +1,4 @@
 <%
-  add_gem_component_stylesheet("pagination")
   disable_ga4 ||= false
   items ||= nil
 

data/app/views/govuk_publishing_components/components/_panel.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("panel")
-
   description ||= false
   prepend ||= false
   append ||= false

data/app/views/govuk_publishing_components/components/_password_input.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("password-input")
-
   label_text ||= t("components.password_input.label")
   local_assigns[:margin_bottom] ||= 3
   error_text ||= nil

data/app/views/govuk_publishing_components/components/_phase_banner.html.erb

@@ -1,6 +1,4 @@
 <%
-add_gem_component_stylesheet("phase-banner")
-
 app_name ||= nil
 phase ||= nil
 message ||= nil

data/app/views/govuk_publishing_components/components/_print_link.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("print-link")
-
   text ||= t("components.print_link.text")
   href ||= nil
   child_data_attributes ||= {}

data/app/views/govuk_publishing_components/components/_published_dates.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("published-dates")
-
   published ||= false
   history ||= []
   history = Array(history)

data/app/views/govuk_publishing_components/components/_radio.html.erb

@@ -1,7 +1,4 @@
 <%
-  add_gem_component_stylesheet("label")
-  add_gem_component_stylesheet("radio")
-
   local_assigns[:margin_bottom] ||= 6
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   id ||= nil

data/app/views/govuk_publishing_components/components/_related_navigation.html.erb

@@ -9,8 +9,6 @@
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
   component_helper.add_class("gem-c-related-navigation govuk-!-display-none-print")
   component_helper.add_data_attribute({ module: "ga4-link-tracker" }) unless disable_ga4
-
-  add_gem_component_stylesheet("related-navigation")
 %>
 <% if related_nav_helper.related_navigation? %>
   <% random = SecureRandom.hex(4) %>

data/app/views/govuk_publishing_components/components/_reorderable_list.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("reorderable-list")
-
   items ||= []
   input_name ||= "ordering"
   disable_ga4 ||= false

data/app/views/govuk_publishing_components/components/_search.html.erb

@@ -1,7 +1,4 @@
 <%
-  add_gem_component_stylesheet("search")
-  add_gem_component_stylesheet("label")
-
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
 
   aria_controls ||= nil

data/app/views/govuk_publishing_components/components/_search_with_autocomplete.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("search-with-autocomplete")
-
   source_url = local_assigns[:source_url]
   source_key = local_assigns[:source_key]
 

data/app/views/govuk_publishing_components/components/_secondary_navigation.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("secondary-navigation")
-
   id ||= nil
   items ||= []
 

data/app/views/govuk_publishing_components/components/_select.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("select")
-
   # select_helper.css_classes generates "gem-c-select"
   id ||= false
   label ||= false

data/app/views/govuk_publishing_components/components/_select_with_search.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("select-with-search")
-
   # select_helper.select_classes generates "gem-c-select-with-search"
   select_helper = GovukPublishingComponents::Presenters::SelectWithSearchHelper.new(local_assigns)
 

data/app/views/govuk_publishing_components/components/_service_navigation.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("service-navigation")
-
   service_name ||= nil
   service_name_url ||= nil
   navigation_items ||= []

data/app/views/govuk_publishing_components/components/_share_links.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("share-links")
-
   links ||= []
   title ||= false
   track_as_sharing ||= false

data/app/views/govuk_publishing_components/components/_signup_link.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("signup-link")
-
   local_assigns[:heading_level] ||= 3
   local_assigns[:margin_bottom] ||= 0
   link_text ||= false

data/app/views/govuk_publishing_components/components/_single_page_notification_button.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("single-page-notification-button")
-
   local_assigns[:margin_bottom] ||= 3
   js_enhancement ||= false
 

data/app/views/govuk_publishing_components/components/_skip_link.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("skip-link")
-
   href ||= "#main-content"
   text ||= t("components.skip_link.text")
 

data/app/views/govuk_publishing_components/components/_step_by_step_nav.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("step-by-step-nav")
-
   options = {}
   options[:heading_level] = heading_level ||= 2
 

data/app/views/govuk_publishing_components/components/_step_by_step_nav_header.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("step-by-step-nav-header")
-
   title ||= false
   path ||= false
   disable_ga4 ||= false

data/app/views/govuk_publishing_components/components/_step_by_step_nav_related.html.erb

@@ -1,5 +1,4 @@
 <%
-  add_gem_component_stylesheet("step-by-step-nav-related")
   disable_ga4 ||= false
   links ||= []
   pretitle_heading =

data/app/views/govuk_publishing_components/components/_subscription_links.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("subscription-links")
-
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
 

data/app/views/govuk_publishing_components/components/_success_alert.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("success-alert")
-
   description ||= nil
   title_id ||= "govuk-notification-banner-title-#{SecureRandom.hex(4)}"
 

data/app/views/govuk_publishing_components/components/_summary_banner.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("summary-banner")
-
   title ||= false
   title_id = "summary-banner-title-#{SecureRandom.hex(4)}"
   text ||= false

data/app/views/govuk_publishing_components/components/_summary_card.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("summary-card")
-
   id ||= nil
   title ||= nil
   summary_card_actions ||= []

data/app/views/govuk_publishing_components/components/_summary_list.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("summary-list")
-
   local_assigns[:heading_level] ||= 3
   shared_helper = GovukPublishingComponents::Presenters::SharedHelper.new(local_assigns)
   heading_size = "m" unless shared_helper.valid_heading_size?(heading_size)

data/app/views/govuk_publishing_components/components/_table.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("table")
-
   caption ||= nil
   head ||= []
   rows ||= []

data/app/views/govuk_publishing_components/components/_tabs.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("tabs")
-
   tabs ||= []
   panel_border ||= true unless panel_border == false
   panel_css_classes = %w(govuk-tabs__panel)

data/app/views/govuk_publishing_components/components/_tag.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("tag")
-
   text ||= nil
   if text.blank?
     raise ArgumentError, "The tag component requires text"

data/app/views/govuk_publishing_components/components/_textarea.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("textarea")
-
   textarea_id ||= "textarea-#{SecureRandom.hex(4)}"
   value ||= nil
   rows ||= 5

data/app/views/govuk_publishing_components/components/_translation_nav.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("translation-nav")
-
   brand ||= false
   brand_helper = GovukPublishingComponents::AppHelpers::BrandHelper.new(brand)
   translation_helper = GovukPublishingComponents::Presenters::TranslationNavHelper.new(local_assigns)

data/app/views/govuk_publishing_components/components/_warning_text.html.erb

@@ -1,6 +1,4 @@
 <%
-  add_gem_component_stylesheet("warning-text")
-
   id ||= "warning-text-#{SecureRandom.hex(4)}"
   text_assistive ||= "Warning"
   text_icon ||= "!"

data/app/views/govuk_publishing_components/components/docs/govspeak_html_publication.yml

@@ -2,8 +2,6 @@ name: "Govspeak content (HTML Publications)"
 description: "To display long form text with numbered parts, which has been converted from Govspeak"
 body: |
   This component calls the standard [Govspeak component](/components/govspeak), and layers a set of overriding styles on top. Styles for numbered parts are added, and heading sizes are increased.
-
-  Requires Slimmer >= 9.1.0 for nested component support.
 accessibility_criteria: |
   - headings must be part of a correct heading structure for the page
   - text should have a text contrast ratio higher than 4.5:1 against the background colour to meet WCAG AA

data/app/views/govuk_publishing_components/components/docs/organisation_logo.yml

@@ -18,6 +18,10 @@ shared_accessibility_criteria:
   - link
 examples:
   default:
+    data:
+      organisation:
+        name: 'Organisation<br>Name'
+  with_a_link:
     data:
       organisation:
         name: 'Organisation<br>Name'
@@ -142,7 +146,6 @@ examples:
   land_registry:
     data:
       organisation:
-        name: 'Land Registry'
         url: '/government/organisations/land-registry'
         brand: 'department-for-business-innovation-skills'
         crest: "custom"
@@ -158,12 +161,6 @@ examples:
         image:
           url: 'https://assets.publishing.service.gov.uk/media/6850134301d3b0e7b62da740/hmps_25_gov_240x188.png'
           alt_text: 'HM Prison Service'
-  without_a_link:
-    data:
-      organisation:
-        name: Cabinet Office
-        brand: cabinet-office
-        crest: 'single-identity'
   as_a_heading:
     description: The `heading_level` option takes a number from 1 to 6.
     data:

data/lib/govuk_publishing_components/config.rb

@@ -18,12 +18,6 @@ module GovukPublishingComponents
     mattr_accessor :application_javascript
     self.application_javascript = "application"
 
-    mattr_accessor :custom_css_exclude_list
-    self.custom_css_exclude_list = []
-
-    mattr_accessor :exclude_css_from_static
-    self.exclude_css_from_static = true
-
     mattr_accessor :use_es6_components
     self.use_es6_components = false
 

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -28,8 +28,6 @@ module GovukPublishingComponents
 
     private
 
-      # other meta tags are inserted by slimmer here:
-      # https://github.com/alphagov/slimmer/blob/82144be372aa4afc1f8ff30917c96c2ee3a47ed8/lib/slimmer/processors/metadata_inserter.rb#L15
       def add_core_tags(meta_tags)
         meta_tags["govuk:format"] = content_item[:document_type] if content_item[:document_type]
         meta_tags["govuk:publishing-app"] = content_item[:publishing_app] if content_item[:publishing_app]

data/lib/govuk_publishing_components/presenters/organisation_logo_helper.rb

@@ -4,40 +4,38 @@ module GovukPublishingComponents
       include ActionView::Helpers
       include ActionView::Context
 
-      attr_reader :name, :url, :crest, :image, :logo_image_src, :logo_image_alt, :hide_underline
-
       def initialize(local_assigns)
         @name = local_assigns[:organisation][:name]
         @url = local_assigns[:organisation][:url]
         @crest = local_assigns[:organisation][:crest]
         @image = local_assigns[:organisation][:image] || false
         if @image
-          @logo_image_src = local_assigns[:organisation][:image][:url] || false
-          @logo_image_alt = local_assigns[:organisation][:image][:alt_text] || false
+          @logo_image_src = local_assigns[:organisation][:image][:url] || nil
+          @logo_image_alt = local_assigns[:organisation][:image][:alt_text] || nil
         end
         @hide_underline = local_assigns[:hide_underline] || false
       end
 
       def logo_content
-        if image
-          image_tag(logo_image_src, alt: logo_image_alt, class: "gem-c-organisation-logo__image")
+        if @image
+          image_tag(@logo_image_src, alt: @logo_image_alt, class: "gem-c-organisation-logo__image")
         else
-          content_tag("span", name, class: "gem-c-organisation-logo__name")
+          content_tag("span", @name, class: "gem-c-organisation-logo__name")
         end
       end
 
       def logo_container_class
-        logo_class = "gem-c-organisation-logo__container"
-        logo_class = "#{logo_class} gem-c-organisation-logo__link" if url
-        logo_class = "#{logo_class} gem-c-organisation-logo__link-hide-underline" if hide_underline
-        logo_class = "#{logo_class} gem-c-organisation-logo__crest gem-c-organisation-logo__crest--#{crest}" if crest_has_visual_identity?
-        logo_class
+        logo_class = %w[gem-c-organisation-logo__container]
+        logo_class << "gem-c-organisation-logo__link" if @url
+        logo_class << "gem-c-organisation-logo__link-hide-underline" if @hide_underline
+        logo_class << "gem-c-organisation-logo__crest gem-c-organisation-logo__crest--#{@crest}" if crest_has_visual_identity?
+        logo_class.join(" ")
       end
 
     private
 
       def crest_has_visual_identity?
-        crest.present? && !%w[no-identity custom].include?(crest)
+        @crest.present? && !%w[no-identity custom].include?(@crest)
       end
     end
   end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "63.3.1".freeze
+  VERSION = "64.0.0".freeze
 end

data/lib/govuk_publishing_components.rb

@@ -45,7 +45,6 @@ require "govuk_publishing_components/app_helpers/taxon_breadcrumbs"
 require "govuk_publishing_components/app_helpers/table_helper"
 require "govuk_publishing_components/app_helpers/brand_helper"
 require "govuk_publishing_components/app_helpers/environment"
-require "govuk_publishing_components/app_helpers/asset_helper"
 
 # Add i18n paths and views for usage outside of a Rails app
 I18n.load_path.unshift(
@@ -58,10 +57,6 @@ ActiveSupport.on_load(:action_controller) do
   )
 end
 
-ActiveSupport.on_load(:action_view) do
-  include GovukPublishingComponents::AppHelpers::AssetHelper
-end
-
 module GovukPublishingComponents
   def self.render(component, options = {})
     I18n.with_locale(options.fetch(:locale, "en")) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 63.3.1
+  version: 64.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -537,7 +537,6 @@ files:
 - app/assets/javascripts/govuk_publishing_components/modules.js
 - app/assets/javascripts/govuk_publishing_components/rum-custom-data.js
 - app/assets/javascripts/govuk_publishing_components/rum-loader.js
-- app/assets/javascripts/govuk_publishing_components/single-consent-functions.js
 - app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-measurer.js
 - app/assets/javascripts/govuk_publishing_components/vendor/lux/lux-reporter.js
 - app/assets/stylesheets/component_guide/application.scss
@@ -982,7 +981,6 @@ files:
 - lib/generators/govuk_publishing_components/templates/_component.scss
 - lib/generators/govuk_publishing_components/templates/component.yml.erb
 - lib/govuk_publishing_components.rb
-- lib/govuk_publishing_components/app_helpers/asset_helper.rb
 - lib/govuk_publishing_components/app_helpers/brand_helper.rb
 - lib/govuk_publishing_components/app_helpers/environment.rb
 - lib/govuk_publishing_components/app_helpers/table_helper.rb
@@ -2085,12 +2083,6 @@ files:
 - node_modules/govuk-frontend/dist/govuk/utilities/_visually-hidden.scss.map
 - node_modules/govuk-frontend/govuk-prototype-kit.config.json
 - node_modules/govuk-frontend/package.json
-- node_modules/govuk-single-consent/README.md
-- node_modules/govuk-single-consent/dist/singleconsent.cjs.js
-- node_modules/govuk-single-consent/dist/singleconsent.esm.js
-- node_modules/govuk-single-consent/dist/singleconsent.iife.js
-- node_modules/govuk-single-consent/dist/singleconsent.iife.min.js
-- node_modules/govuk-single-consent/package.json
 - node_modules/sortablejs/LICENSE
 - node_modules/sortablejs/README.md
 - node_modules/sortablejs/Sortable.js