govuk_publishing_components 63.1.2 → 63.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69822fdce4a621596d707d34006154c108e1f98fceec83c42f2fb79e5a06c53a
-  data.tar.gz: 763173cb626bcde1135818f5d43998e2d8fab60e6e91b48ccfc4439d7a62361f
+  metadata.gz: a21156257b5e597ea82c72a0c2d50ee9c1aa716b7ac8f266e9aefa07c46580e2
+  data.tar.gz: 5304c6a976883f19ee7077ea326894c424a56d8d1e288502892f0245a9a331d1
 SHA512:
-  metadata.gz: ef764e6e4ae2bd257effc2830983fb388605ef4f1d4b0a2410b43835f67753cabbf6885fd7b65a0af14d7e22c64eb2703122f71e42fbceaf1ea8dadea120607d
-  data.tar.gz: 36d11809f4b629784cdafef3ebab1702c142657854adb31ccedc7443621fb1ad67c29c214540f7c7baa4c6351c1d09fd80b225e6583607b7e3dbc7a0493b9d78
+  metadata.gz: 8e2f7d8055249839b700a30d2621e5a8383013f8d09b73f48fe316b595f487234a5f2e2908a93cbc385fbc5eb3533090d28d66aa915bb19ebf7db3568379c0e7
+  data.tar.gz: a07a2387f95f2c00321326973d3fa17a18d472cc22b2ff834d5f40f5eddb32a502d2e94a1759659400cc42737671d38b7dfc8cebca2e386eedd4df9a997cbd30

data/app/assets/javascripts/govuk_publishing_components/analytics-ga4/ga4-page-views.js

@@ -172,8 +172,8 @@ window.GOVUK.analyticsGa4.analyticsModules = window.GOVUK.analyticsGa4.analytics
       return this.PIIRemover.stripPIIWithOverride(document.title, false, true)
     },
 
-    // window.httpStatusCode is set in the source of the error page in static
-    // https://github.com/alphagov/static/blob/1c734451f2dd6fc0c7e80beccbdcbfa5aaffd0e4/app/views/root/_error_page.html.erb#L41-L43
+    // window.httpStatusCode is set in the source of the error page
+    // https://github.com/alphagov/frontend/blob/1d92fe5f0ada726d1c95dae645e1dc2195d9d3fe/app/views/static_error_pages/_error_page.html.erb#L26
     getStatusCode: function () {
       if (window.httpStatusCode) {
         return window.httpStatusCode.toString()

data/app/assets/stylesheets/govuk_publishing_components/components/_feedback.scss

@@ -248,16 +248,3 @@ $feedback-prompt-border-top-colour: $govuk-blue-tint-50;
     color: $govuk-focus-text-colour;
   }
 }
-
-// static.css on GOV.UK overwrites the component styles using input[type="text"]
-// so we need to apply  govuk-input styles using a stronger selector
-.gem-c-feedback .gem-c-input[type="text"] {
-  margin: 0;
-  padding: govuk-spacing(1);
-  border: $govuk-border-width-form-element solid $govuk-input-border-colour;
-  @include govuk-font($size: 19);
-
-  &:focus {
-    outline: $govuk-focus-width solid $govuk-focus-colour;
-  }
-}

data/app/assets/stylesheets/govuk_publishing_components/components/_input.scss

@@ -14,17 +14,3 @@ $search-icon-size: 40px;
   height: govuk-px-to-rem($search-icon-size);
   background: url("govuk_publishing_components/icon-search.svg") no-repeat -3px center;
 }
-
-// this overrides styles from static that break the look of the component
-// unfortunately we then need to override the override for the search icon variant
-// TODO: remove these styles once static is made less aggressive
-.gem-c-input.govuk-input {
-  margin: 0;
-  min-width: 0;
-  padding: govuk-spacing(1);
-  box-sizing: border-box;
-
-  &.gem-c-input--with-search-icon {
-    padding-left: govuk-spacing(6);
-  }
-}

data/app/assets/stylesheets/govuk_publishing_components/components/_summary-list.scss

@@ -2,21 +2,11 @@
 @import "govuk/components/summary-list/summary-list";
 
 .gem-c-summary-list {
-  border-bottom: 1px solid $govuk-border-colour;
-
+  margin-bottom: govuk-spacing(6);
   @include govuk-font(19);
-  @include govuk-responsive-margin(6, "top");
-
-  &:nth-of-type(1) {
-    margin-top: govuk-spacing(0);
-  }
-
-  &:nth-last-of-type(1) {
-    border-bottom: 0;
-  }
 
   .govuk-summary-list {
-    clear: both;
+    margin-bottom: 0;
   }
 }
 

data/app/controllers/govuk_publishing_components/applications_page_controller.rb

@@ -4,7 +4,7 @@ module GovukPublishingComponents
       applications = [
         {
           type: "public-facing",
-          apps: %w[collections email-alert-frontend feedback finder-frontend frontend government-frontend smart-answers static].sort,
+          apps: %w[collections email-alert-frontend feedback finder-frontend frontend government-frontend smart-answers].sort,
         },
         {
           type: "publishing",
@@ -39,7 +39,6 @@ module GovukPublishingComponents
             source: app.source,
             gem_version: app.gem_version,
             gem_version_status: app.gem_version == GovukPublishingComponents::VERSION ? "green" : "red",
-            slimmer_version: app.slimmer_version,
             sass_version: app.sass_version,
           }
         end

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -20,7 +20,6 @@ module GovukPublishingComponents
         govuk-developer-docs
         local-links-manager
         manuals-publisher
-        maslow
         places-manager
         publisher
         release
@@ -31,7 +30,6 @@ module GovukPublishingComponents
         signon
         smart-answers
         specialist-publisher
-        static
         support
         transition
         travel-advice-publisher

data/app/models/govuk_publishing_components/applications_page.rb

@@ -16,10 +16,6 @@ module GovukPublishingComponents
       parse_file(@gemfilelock, /govuk_publishing_components \(([^)>=~ ]+)\)/)
     end
 
-    def slimmer_version
-      parse_file(@gemfilelock, /slimmer \(([^)>=~ ]+)\)/)
-    end
-
     def sass_version
       parse_file(@gemfilelock, /sass-embedded \(([^)>=~ ]+)\)/)
     end

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -4,15 +4,6 @@ module GovukPublishingComponents
 
     def initialize(gem_data, results)
       if gem_data[:gem_found]
-        @applications_using_static = %w[
-          collections
-          finder-frontend
-          government-frontend
-          service-manual-frontend
-          smart-answers
-        ]
-
-        @static_data = find_static(results)
         @gem_data = gem_data
         @applications_data = sort_results(results)
         @gem_data[:components_by_application] = get_components_by_application || []
@@ -23,23 +14,6 @@ module GovukPublishingComponents
 
   private
 
-    # find static to check for global includes, reduce false warnings
-    def find_static(results)
-      results.each do |result|
-        if result[:name] == "static" && result[:application_found] == true
-          return clean_static(result)
-        end
-      end
-
-      false
-    end
-
-    # turn static data into an object so locations can be easily referenced
-    # should give object of form { "template" => [], "stylesheet" => [] }
-    def clean_static(data)
-      Hash[data[:components_found].map { |d| [d[:location], d[:components]] }]
-    end
-
     def prettify_key(key)
       key.to_s.gsub("_", " ").capitalize
     end
@@ -50,20 +24,19 @@ module GovukPublishingComponents
       results.each do |result|
         if result[:application_found]
           @current_uses_individual_asset_model = result[:uses_individual_asset_model]
-          application_uses_static = @applications_using_static.include?(result[:name])
           templates = result[:components_found].find { |c| c[:location] == "template" }
           stylesheets = result[:components_found].find { |c| c[:location] == "stylesheet" }
           javascripts = result[:components_found].find { |c| c[:location] == "javascript" }
           ruby = result[:components_found].find { |c| c[:location] == "ruby" }
 
           templates[:components] = include_any_components_within_components(templates[:components])
+          ruby[:components] = include_any_components_within_components(ruby[:components])
 
           warnings = []
           warnings << warn_about_missing_components(result[:components_found])
           warnings << warn_about_missing_assets(result[:components_found])
           warnings << warn_about_style_overrides(result[:gem_style_references])
           warnings << warn_about_jquery_references(result[:jquery_references])
-          warnings << check_for_assets_already_in_static(result[:components_found]) if @static_data && application_uses_static
           warnings = warnings.flatten
 
           summary = [
@@ -89,7 +62,6 @@ module GovukPublishingComponents
             name: result[:name],
             dir: result[:dir],
             application_found: result[:application_found],
-            uses_static: application_uses_static,
             summary:,
             warnings:,
             warning_count: warnings.length,
@@ -155,12 +127,10 @@ module GovukPublishingComponents
               asset_in_gem = false
             end
 
-            check_static = @static_data && second_location != "code"
-            asset_in_static = asset_already_in_static(second_location, component) if check_static
             suppress_warning = @current_uses_individual_asset_model && second_location == "stylesheet"
-            raise_warning = asset_in_gem && !asset_in_static && !suppress_warning
+            raise_warning = asset_in_gem && !suppress_warning
 
-            # this raises a warning if the asset exists and isn't included either in the application or static
+            # this raises a warning if the asset exists and isn't included in the application
             warnings << create_warning(component, "Included in #{first_location} but not #{second_location}") if raise_warning
           end
         end
@@ -169,27 +139,6 @@ module GovukPublishingComponents
       warnings
     end
 
-    def asset_already_in_static(location, component)
-      return true if @static_data[location].include?(component)
-
-      false
-    end
-
-    def check_for_assets_already_in_static(locations)
-      warnings = []
-
-      locations.each do |location|
-        next if %w[template ruby].include?(location[:location])
-
-        location[:components].each do |component|
-          raise_warning = asset_already_in_static(location[:location], component)
-          warnings << create_warning(component, "Included in #{location[:location]} but already included in static") if raise_warning
-        end
-      end
-
-      warnings
-    end
-
     def warn_about_missing_assets(components)
       warnings = []
 

data/app/views/govuk_publishing_components/applications_page/_table-content.html.erb

@@ -21,13 +21,6 @@
         } %>
       <% end %>
     </td>
-    <td class="govuk-table__cell">
-      <% if app[:slimmer_version] %>
-        <%= render "govuk_publishing_components/components/tag", {
-          text: app[:slimmer_version],
-        } %>
-      <% end %>
-    </td>
     <td class="govuk-table__cell">
       <% if app[:sass_version] %>
         <%= render "govuk_publishing_components/components/tag", {

data/app/views/govuk_publishing_components/applications_page/show.html.erb

@@ -24,7 +24,6 @@
         <th scope="col" class="govuk-table__header sticky-table-header">Type</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Source</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Gem version</th>
-        <th scope="col" class="govuk-table__header sticky-table-header">Slimmer version</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Sass version</th>
       </tr>
     </thead>

data/app/views/govuk_publishing_components/audit/_applications.html.erb

@@ -43,12 +43,6 @@
             } %>
           <% end %>
 
-          <% if application[:uses_static] %>
-            <%= render "govuk_publishing_components/components/warning_text", {
-              text: raw("This application uses <a href=\"https://github.com/alphagov/static\" class=\"govuk-link\">static</a>, which can contain assets for components used in more than one application. Warnings for missing component assets in this application that are already included in static have been suppressed."),
-            } %>
-          <% end %>
-
           <% application[:warnings].each do |warning| %>
             <p class="govuk-body">
               <strong class="govuk-tag">Warn</strong>
@@ -66,6 +60,8 @@
           heading_level: 3,
         } %>
 
+        <p class="govuk-body">Note that this information includes components within components - the application may not directly reference them.</p>
+
         <% items = [] %>
         <% application[:summary].each do |item| %>
           <% content = capture do %>

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

@@ -5,6 +5,7 @@
   title ||= nil
   summary_card_actions ||= []
   rows ||=[]
+  block ||= yield
 
   component_helper = GovukPublishingComponents::Presenters::ComponentWrapperHelper.new(local_assigns)
   component_helper.add_class("gem-c-summary-card")
@@ -26,8 +27,8 @@
         <% end %>
       <% end %>
 
-      <% if rows.present? %>
-        <%= tag.div class: "govuk-summary-card__content" do %>
+      <%= tag.div class: "govuk-summary-card__content" do %>
+        <% if rows.any? %>
           <%= tag.dl class: "govuk-summary-list" do %>
             <% rows.each do |row| %>
               <%
@@ -62,6 +63,7 @@
             <% end %>
           <% end %>
         <% end %>
+        <%= tag.div block, class: "gem-c-summary__block" if block.present? %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -136,6 +136,6 @@
       <% end %>
     <% end %>
 
-    <%= tag.div block, class: "gem-c-summary__block" if block %>
-    <% end %>
+    <%= tag.div block, class: "gem-c-summary__block" if block.length > 0 %>
+  <% end %>
 <% end %>

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

@@ -4,7 +4,7 @@ govuk_frontend_components:
   - accordion
 body: |
   This component is based on the [GOV.UK Design System accordion component](https://design-system.service.gov.uk/components/accordion/)
-  and is currently experimental because more research is needed to validate it.  If using this component, [please feed back any research findings to the Design System team](https://design-system.service.gov.uk/get-in-touch/).
+  and is currently experimental because more research is needed to validate it.  If using this component, [please feed back any research findings to the Design System team](https://design-system.service.gov.uk/contact/).
 
 accessibility_criteria: |
   The accordion must:

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

@@ -102,3 +102,10 @@ examples:
           value: value1
           data:
             module: "something"
+
+  with_block:
+    description: Use the summary card with a block when you need to show an empty state message or load another component.
+    data:
+      title: "Topics"
+      block: |
+        <p class="govuk-body">No topics specified for this document.</p>

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

@@ -2,7 +2,7 @@ name: "Tabs (experimental)"
 description: "The tabs component lets users toggle between related sections of content."
 body: |
   This component is based on the [GOV.UK Design System tabs component](https://design-system.service.gov.uk/components/tabs/)
-  and is currently experimental. If using this component, please feed back any research findings to the [GOV.UK Design System team](https://design-system.service.gov.uk/get-in-touch/).
+  and is currently experimental. If using this component, please feed back any research findings to the [GOV.UK Design System team](https://design-system.service.gov.uk/contact/).
 
   The tabs component lets users navigate between related sections of content on a single page,
   displaying one section at a time. Note that they are not intended to be used to navigate

data/lib/govuk_publishing_components/app_helpers/asset_helper.rb

@@ -10,32 +10,6 @@ module GovukPublishingComponents
         "govuk_publishing_components/components/_#{component_name}.css"
       }.freeze
 
-      # This list includes components already included in Static; taken from
-      # https://github.com/alphagov/static/blob/198a598682df40ce4a2c3c286c06244297c18cf0/app/assets/stylesheets/application.scss
-
-      # This is used to dedupe stylesheets.
-      STATIC_STYLESHEET_LIST = %w[
-        breadcrumbs
-        button
-        error-message
-        heading
-        hint
-        input
-        label
-        search
-        search-with-autocomplete
-        skip-link
-        textarea
-        title
-        cookie-banner
-        cross-service-header
-        feedback
-        layout-footer
-        layout-for-public
-        layout-header
-        layout-super-navigation-header
-      ].freeze
-
       def add_stylesheet_path(component_path)
         unless is_already_used?(component_path)
           all_component_stylesheets_being_used << component_path
@@ -86,7 +60,6 @@ module GovukPublishingComponents
       def css_exclude_list
         return [] if viewing_component_guide?
         return GovukPublishingComponents::Config.custom_css_exclude_list if GovukPublishingComponents::Config.custom_css_exclude_list&.any?
-        return STATIC_STYLESHEET_LIST if GovukPublishingComponents::Config.exclude_css_from_static
 
         []
       end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "63.1.2".freeze
+  VERSION = "63.2.0".freeze
 end

data/node_modules/axe-core/axe.d.ts

@@ -386,8 +386,10 @@ declare namespace axe {
     frameContext: FrameContextObject;
   }
 
-  interface RawCheckResult
-    extends Omit<CheckResult, 'relatedNodes' | 'impact'> {
+  interface RawCheckResult extends Omit<
+    CheckResult,
+    'relatedNodes' | 'impact'
+  > {
     relatedNodes?: Array<SerialDqElement | DqElement>;
     impact?: ImpactValue;
   }