govuk_publishing_components 64.1.2 → 65.0.0

data/app/assets/stylesheets/govuk_publishing_components/components/_step-by-step-nav.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 $stroke-width: 1px;
 $number-circle-size: 30px;
 $number-circle-size-large: 35px;

data/app/assets/stylesheets/govuk_publishing_components/components/_subscription-links.scss

@@ -1,6 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-@import "mixins/css3";
-
 .gem-c-subscription-links {
   @include govuk-text-colour;
   @include govuk-font(19, $weight: bold);

data/app/assets/stylesheets/govuk_publishing_components/components/_success-alert.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/notification-banner/notification-banner";
 
 // stylelint-disable declaration-no-important

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

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-summary-banner {
   direction: ltr;
   background: $govuk-brand-colour;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/summary-list/summary-list";
 
 .gem-c-summary-card {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/summary-list/summary-list";
 
 .gem-c-summary-list {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/table/table";
 
 $table-border-width: 1px;

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/tabs/tabs";
 
 .govuk-frontend-supported {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/tag/tag";
 
 .gem-c-tag {

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

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/textarea/textarea";
 
 .gem-c-textarea {

data/app/assets/stylesheets/govuk_publishing_components/components/_translation-nav.scss

@@ -1,5 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
-
 .gem-c-translation-nav {
   margin-bottom: govuk-spacing(6);
   border-bottom: 1px solid $govuk-border-colour;

data/app/assets/stylesheets/govuk_publishing_components/components/_warning-text.scss

@@ -1,4 +1,3 @@
-@import "govuk_publishing_components/individual_component_support";
 @import "govuk/components/warning-text/warning-text";
 
 .gem-c-warning-text .govuk-warning-text__text {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_charts.scss

@@ -283,26 +283,6 @@
     text-align: left;
   }
 
-  .mc-toggle-button {
-    border: 1px solid $govuk-border-colour;
-    color: $govuk-link-colour;
-    cursor: pointer;
-    margin: govuk-spacing(0);
-    padding: govuk-spacing(2);
-    background-color: govuk-colour("white");
-
-    &:hover {
-      background-color: govuk-colour("light-grey");
-      color: $govuk-link-hover-colour;
-    }
-
-    &:focus {
-      background-color: $govuk-focus-colour;
-      border-color: transparent;
-      @include govuk-focused-text;
-    }
-  }
-
   // Hides the original table
   .mc-hidden,
   .mc-hidden caption {

data/app/assets/stylesheets/govuk_publishing_components/components/govspeak/_typography.scss

@@ -1,4 +1,3 @@
-@import "../helpers/markdown-typography";
 // Govspeak typography
 // https://components.publishing.service.gov.uk/component-guide/govspeak/heading_levels
 // https://components.publishing.service.gov.uk/component-guide/govspeak/lists
@@ -10,6 +9,7 @@
 // - alphagov/govspeak: ✔︎
 
 // stylelint-disable max-nesting-depth
+@import "../helpers/markdown-typography";
 
 .govspeak, // Legacy class name that's still used in some content items - needs to be kept until `.govspeak` is removed from the content items.
 .gem-c-govspeak {

data/app/assets/stylesheets/govuk_publishing_components/{govuk_frontend_support.scss → components/helpers/_colours.scss}

@@ -1,14 +1,3 @@
-// This file should be included in an application prior to specific components
-// It provides govuk-frontend but adds no weight to the compiled CSS
-@import "components/helpers/govuk-frontend-settings";
-@import "govuk/base";
-
-@import "components/mixins/margins";
-
-$govuk-suppressed-warnings: (
-  organisation-colours
-);
-
 $gem-secondary-button-colour: #00823b;
 $gem-secondary-button-hover-colour: darken($gem-secondary-button-colour, 5%);
 $gem-secondary-button-background-colour: govuk-colour("white");
@@ -17,10 +6,7 @@ $gem-secondary-button-hover-background-colour: govuk-colour("light-grey");
 $gem-quiet-button-colour: govuk-colour("dark-grey");
 $gem-quiet-button-hover-colour: darken($gem-quiet-button-colour, 5%);
 
-$gem-hover-dark-background: #dddcdb;
-
 // Brand refresh
-
 $govuk-blue-tint-95: govuk-tint($govuk-brand-colour, 95%);
 $govuk-blue-tint-80: govuk-tint(govuk-colour("blue"), 80%);
 $govuk-blue-tint-50: govuk-tint(govuk-colour("blue"), 50%);

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/_index.scss

@@ -0,0 +1,4 @@
+@import "grid-helper";
+@import "margins";
+@import "prefixed-transform";
+@import "scale";

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/{_css3.scss → _prefixed-transform.scss}

@@ -1,9 +1,3 @@
-@mixin scale($size) {
-  -webkit-transform: scale($size);  // Chrome, Opera 15+, Safari 3.1+
-  -ms-transform: scale($size);  // IE 9
-  transform: scale($size);  // Firefox 16+, IE 10+, Opera
-}
-
 @mixin prefixed-transform($translateY: 0, $rotate: 0, $scale: 1) {
   -webkit-transform: translateY($translateY) rotate($rotate) scale($scale);
   -ms-transform: translateY($translateY) rotate($rotate) scale($scale);

data/app/assets/stylesheets/govuk_publishing_components/components/mixins/_scale.scss

@@ -0,0 +1,5 @@
+@mixin scale($size) {
+  -webkit-transform: scale($size);  // Chrome, Opera 15+, Safari 3.1+
+  -ms-transform: scale($size);  // IE 9
+  transform: scale($size);  // Firefox 16+, IE 10+, Opera
+}

data/app/assets/stylesheets/govuk_publishing_components/settings/_app-font-url.scss

@@ -0,0 +1,7 @@
+// Custom font URL function
+// https://github.com/alphagov/govuk-frontend/blob/9f05cea739d14d4cbf18e79b17228045ca84b3ba/packages/govuk-frontend/src/govuk/settings/_assets.scss#L57-L82
+
+@function app-font-url($filename) {
+  @return url("#{$filename}");
+}
+$govuk-font-url-function: "app-font-url";

data/app/assets/stylesheets/govuk_publishing_components/settings/_app-image-url.scss

@@ -0,0 +1,7 @@
+// Custom image URL function
+// https://github.com/alphagov/govuk-frontend/blob/9f05cea739d14d4cbf18e79b17228045ca84b3ba/packages/govuk-frontend/src/govuk/settings/_assets.scss#L30-L55
+
+@function app-image-url($filename) {
+  @return url("#{$filename}");
+}
+$govuk-image-url-function: "app-image-url";

data/app/assets/stylesheets/govuk_publishing_components/settings/_colours.scss

@@ -0,0 +1,5 @@
+$govuk-new-organisation-colours: true;
+
+$govuk-suppressed-warnings: (
+  organisation-colours
+);

data/app/assets/stylesheets/govuk_publishing_components/settings/_index.scss

@@ -0,0 +1,4 @@
+@import "app-font-url";
+@import "app-image-url";
+@import "colours";
+@import "typography";

data/app/assets/stylesheets/govuk_publishing_components/settings/_typography.scss

@@ -0,0 +1 @@
+$govuk-new-typography-scale: true;

data/app/assets/stylesheets/govuk_publishing_components/specific-components.scss

@@ -0,0 +1,11 @@
+@import "base";
+
+@import "govuk/core/index";
+@import "govuk/objects/index";
+@import "govuk/utilities/index";
+@import "govuk/overrides/index";
+
+@import "govuk_publishing_components/components/helpers/brand-colours";
+@import "govuk_publishing_components/components/helpers/contents-list-helper";
+@import "govuk_publishing_components/lib/link";
+@import "govuk_publishing_components/lib/print_support";

data/app/controllers/govuk_publishing_components/applications_page_controller.rb

@@ -8,11 +8,11 @@ module GovukPublishingComponents
         },
         {
           type: "publishing",
-          apps: %w[content-data-admin collections-publisher travel-advice-publisher whitehall datagovuk_find local-links-manager places-manager support manuals-publisher service-manual-publisher short-url-manager specialist-publisher content-tagger publisher transition search-admin].sort,
+          apps: %w[content-data-admin collections-publisher travel-advice-publisher whitehall datagovuk_find local-links-manager places-manager support manuals-publisher service-manual-publisher short-url-manager specialist-publisher content-tagger publisher transition search-admin fact-check-manager content-block-manager].sort,
         },
         {
           type: "utility",
-          apps: %w[account-api signon govspeak govspeak-preview release govuk-developer-docs govuk-chat].sort,
+          apps: %w[account-api signon govspeak govspeak-preview release govuk-developer-docs govuk-chat govuk_web_banners].sort,
         },
       ]
 
@@ -41,6 +41,9 @@ module GovukPublishingComponents
             gem_version_status: app.gem_version == GovukPublishingComponents::VERSION ? "green" : "red",
             sass_version: app.sass_version,
             ruby_version: app.ruby_version,
+            ruby_version_status: app.ruby_status(app.ruby_version),
+            yarn_version: app.yarn_version,
+            yarn_version_status: app.yarn_version.to_f >= 4 ? "green" : "red",
           }
         end
       end

data/app/controllers/govuk_publishing_components/audit_controller.rb

@@ -5,11 +5,12 @@ module GovukPublishingComponents
         account-api
         collections
         collections-publisher
+        content-block-manager
         content-data-admin
-        content-publisher
         content-tagger
         datagovuk_find
         email-alert-frontend
+        fact-check-manager
         feedback
         finder-frontend
         frontend
@@ -18,13 +19,13 @@ module GovukPublishingComponents
         govspeak-preview
         govuk-chat
         govuk-developer-docs
+        govuk_web_banners
         local-links-manager
         manuals-publisher
         places-manager
         publisher
         release
         search-admin
-        search-v2-evaluator
         service-manual-publisher
         short-url-manager
         signon

data/app/models/govuk_publishing_components/applications_page.rb

@@ -1,12 +1,14 @@
 module GovukPublishingComponents
   class ApplicationsPage
-    attr_reader :source
+    attr_reader :source, :ruby_version
 
     def initialize(application)
       @application = application
       @dir = get_directory
       @gemfilelock = get_file("Gemfile.lock")
-      @rubyfile = get_file(".ruby-version")
+      rubyfile = get_file(".ruby-version")
+      @ruby_version = rubyfile.strip if rubyfile
+      @packagejson = get_file("package.json")
     end
 
     def readable_name
@@ -21,8 +23,41 @@ module GovukPublishingComponents
       parse_file(@gemfilelock, /sass-embedded \(([^)>=~ ]+)\)/)
     end
 
-    def ruby_version
-      @rubyfile.strip if @rubyfile
+    def ruby_status(version)
+      version = version.to_f # to_f ignores non-numbers on the string end, so 3.3.1 becomes 3.1
+      versions = [
+        {
+          version: 3.3,
+          eol: "2027-03-31",
+        },
+        {
+          version: 3.2,
+          eol: "2026-03-31",
+        },
+        {
+          version: 3.1,
+          eol: "2024-04-23",
+        },
+      ]
+      today = Date.today # rubocop:disable Rails/Date
+      result = "not set"
+
+      versions.each do |v|
+        next unless version >= v[:version]
+
+        version_eol = Date.parse(v[:eol])
+        age = version_eol - today
+        result = "green"
+        result = "orange" if age < 100
+        result = "red" if age.negative?
+        break
+      end
+
+      result
+    end
+
+    def yarn_version
+      parse_file(@packagejson, /"packageManager"\s*:\s*"yarn@(\d+(?:\.\d+)*)"/)
     end
 
   private

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -18,7 +18,7 @@ module GovukPublishingComponents
 
         find_components = /(?<=govuk_publishing_components\/components\/)[a-zA-Z_-]+(?=['"])/
 
-        @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components/ # if using the all stylesheets option
+        @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all-components/ # if using the all stylesheets option
         find_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/)(?!print\/)+[a-zA-Z_-]+(?=['"])/
 
         @find_all_javascripts = /\/\/ *= require govuk_publishing_components\/all_components/

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

@@ -32,6 +32,15 @@
       <% if app[:ruby_version] %>
         <%= render "govuk_publishing_components/components/tag", {
           text: app[:ruby_version],
+          colour: app[:ruby_version_status],
+        } %>
+      <% end %>
+    </td>
+    <td class="govuk-table__cell">
+      <% if app[:yarn_version] %>
+        <%= render "govuk_publishing_components/components/tag", {
+          text: app[:yarn_version],
+          colour: app[:yarn_version_status],
         } %>
       <% end %>
     </td>

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

@@ -25,6 +25,7 @@
         <th scope="col" class="govuk-table__header sticky-table-header">Gem version</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Sass version</th>
         <th scope="col" class="govuk-table__header sticky-table-header">Ruby version</th>
+        <th scope="col" class="govuk-table__header sticky-table-header">Yarn version</th>
       </tr>
     </thead>
     <tbody class="govuk-table__body">

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

@@ -31,7 +31,7 @@
         <% if navigation_items.present? %>
           <nav aria-label="<%= navigation_aria_label %>" class="govuk-service-navigation__wrapper">
             <% if collapse_navigation_on_mobile %>
-              <button type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" hidden>
+              <button type="button" class="govuk-service-navigation__toggle govuk-js-service-navigation-toggle" aria-controls="navigation" hidden aria-hidden="true">
                 Menu
               </button>
             <% end %>

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

@@ -4,8 +4,7 @@ body: |
   This component shows a link to a document that is attached to GOV.UK content
   along with a thumbnail and relevant file data.
 
-  It is intended to be rendered in Govspeak and as an attachment 'preview' in
-  Content Publisher.
+  It is intended to be rendered in Govspeak.
 
   It is not as rich in features as the [attachment rendering][Whitehall]
   provided by Whitehall, it lacks support for multiple languages, CSV previews

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

@@ -1,5 +1,6 @@
 name: Details
 description: Make a page easier to scan by letting users reveal more detailed information only if they need it
+uses_component_wrapper_helper: true
 shared_accessibility_criteria:
   - link
 accessibility_criteria: |
@@ -38,14 +39,6 @@ examples:
         <p class="govuk-body">Attorney General's office</p>
         <%= component %>
       </div>
-  with_GTM_tracking:
-    description: Applies a tracking attribute specifically for use by Google Tag Manager in [Content Publisher](https://github.com/alphagov/content-publisher).
-    data:
-      title: Help with nationality
-      data_attributes:
-        tracking: GTM-123AB
-      block: |
-        We need to know your nationality so we can work out which elections you’re entitled to vote in. If you can’t provide your nationality, you’ll have to send copies of identity documents through the post.
   with_ga4_tracking:
     description: |
       GA4 tracking is mostly handled internally by the component, apart from the required attribute `index_section_count`. This records the number of details components on the page and must be passed by the hosting application. Other GA4 attributes can also be passed if required, including to override attributes set by the component (for some reason this doesn't work in the component guide but works in applications).

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

@@ -24,14 +24,12 @@ examples:
         Nullam sed neque quis turpis.
   with_data_attributes:
     description: |
-      The example shown applies a tracking attribute specifically for use by Google Tag Manager in [Content Publisher](https://github.com/alphagov/content-publisher).
-
-      Other data attributes can also be applied as required. Note that the component does not include built in tracking. If this is required consider using the [GA4 link tracker](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/trackers/ga4-link-tracker.md).
+      Note that the component does not include built in tracking. If this is required consider using the [GA4 link tracker](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/trackers/ga4-link-tracker.md).
     data:
       message: Message to alert the user to a unsuccessful action goes here
       description: A further description
       data_attributes:
-        tracking: GTM-123AB
+        hello: world
   with_specified_id_attribute:
     data:
       id: test-id

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

@@ -317,7 +317,7 @@ examples:
         </section>
         <section class="attachment embedded" id="attachment_1399344">
           <div class="attachment-thumb">
-            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/world-location-news/294043.es-419"><img alt="" src="https://assets.digital.cabinet-office.gov.uk/government/assets/pub-cover-doc-afe3b0a8a9511beeca890340170aee8b5649413f948e512c9b8ce432d8513d32.png"></a>
+            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/world-location-news/294043.es-419"><img alt="" src="#"></a>
           </div>
           <div class="attachment-details">
             <h2 class="title"><a href="https://www.gov.uk/government/world-location-news/294043.es-419">Document attachment</a></h2>
@@ -345,7 +345,7 @@ examples:
         </section>
         <section class="attachment embedded" id="attachment_1399348">
           <div class="attachment-thumb">
-            <img alt="" src="https://assets.digital.cabinet-office.gov.uk/government/assets/pub-cover-spreadsheet-471052e0d03e940bbc62528a05ac204a884b553e4943e63c8bffa6b8baef8967.png">
+            <img alt="" src="#">
           </div>
           <div class="attachment-details">
             <h2 class="title">Previewable online example</h2>
@@ -366,7 +366,7 @@ examples:
         </section>
         <section class="attachment embedded" id="attachment_1243761">
           <div class="attachment-thumb">
-            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/statistical-data-sets/env24-fly-tipping-incidents-and-actions-taken-in-england"><img alt="" src="https://assets.digital.cabinet-office.gov.uk/government/assets/pub-cover-spreadsheet-471052e0d03e940bbc62528a05ac204a884b553e4943e63c8bffa6b8baef8967.png"></a>
+            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/statistical-data-sets/env24-fly-tipping-incidents-and-actions-taken-in-england"><img alt="" src="#"></a>
           </div>
           <div class="attachment-details">
             <h2 class="title"><a aria-describedby="attachment-1243761-accessibility-help" href="https://www.gov.uk/government/statistical-data-sets/env24-fly-tipping-incidents-and-actions-taken-in-england">Fly-tipping incidents and actions reported by local authorities in 2014 to 2015</a></h2>
@@ -391,7 +391,7 @@ examples:
         </section>
         <section class="attachment embedded" id="attachment_1112527">
           <div class="attachment-thumb">
-            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/publications/summer-budget-2015/summer-budget-2015"><img alt="" src="https://assets.digital.cabinet-office.gov.uk/government/assets/pub-cover-html-b0465911e56983d98c70f0e25fba24bc206d37e8c83d4addf6421dcf6022c6cd.png"></a>
+            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/publications/summer-budget-2015/summer-budget-2015"><img alt="" src="#"></a>
           </div>
           <div class="attachment-details">
             <h2 class="title"><a href="https://www.gov.uk/government/publications/summer-budget-2015/summer-budget-2015">Summer Budget 2015</a></h2>
@@ -402,7 +402,7 @@ examples:
         </section>
         <section class="attachment hosted-externally" id="attachment_1425055">
           <div class="attachment-thumb">
-            <a aria-hidden="true" class="thumbnail" href="http://example.com"><img alt="" src="//www.gov.uk/government/assets/pub-cover-a380604bb953dc22ac9dcfbf3cc65598327f493c37b09ac497c45148cbaa21b1.png"></a>
+            <a aria-hidden="true" class="thumbnail" href="http://example.com"><img alt="" src="#"></a>
           </div>
           <div class="attachment-details">
             <h2 class="title"><a rel="external" href="https://www.arcgis.com/apps/opsdashboard/index.html#/f94c3c90da5b4e9f9a0b19484dd4bb14">Track coronavirus cases</a></h2>
@@ -413,7 +413,7 @@ examples:
         </section>
         <section class="attachment hosted-externally" id="attachment_1425056">
           <div class="attachment-thumb">
-            <a aria-hidden="true" class="thumbnail" href="http://example.com"><img alt="" src="//www.gov.uk/government/assets/pub-cover-a380604bb953dc22ac9dcfbf3cc65598327f493c37b09ac497c45148cbaa21b1.png"></a>
+            <a aria-hidden="true" class="thumbnail" href="http://example.com"><img alt="" src="#"></a>
           </div>
           <div class="attachment-details">
             <h2 class="title"><a rel="external" href="http://example.com">An external link (with all possible metadata)</a></h2>
@@ -431,7 +431,7 @@ examples:
         </section>
         <section class="attachment embedded" id="attachment_1398523">
           <div class="attachment-thumb">
-            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/consultations/environmental-permitting-updating-the-standards-for-petrol-vapour-recovery-at-service-stations"><img alt="" src="https://assets.digital.cabinet-office.gov.uk/government/uploads/system/uploads/attachment_data/file/498443/thumbnail_petrol-vapour-recovery-consult-sum-resp.pdf.png"></a>
+            <a aria-hidden="true" class="thumbnail" href="https://www.gov.uk/government/consultations/environmental-permitting-updating-the-standards-for-petrol-vapour-recovery-at-service-stations"><img alt="" src="#"></a>
           </div>
           <div class="attachment-details">
             <h2 class="title"><a href="https://www.gov.uk/government/consultations/environmental-permitting-updating-the-standards-for-petrol-vapour-recovery-at-service-stations">Consultation outcome with published date</a></h2>

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

@@ -10,7 +10,7 @@ body: |
 
   Modal components must be a direct descendant of the `<body>` element; we recommend placing it toward the end of the document for performance considerations.
 
-  This component is currently experimental. If you are using it, please feed back any research findings to the Content Publisher team.
+  This component is currently experimental. If you are using it, please feed back any research findings to #govuk-ruby-frontenders on Slack.
 accessibility_criteria: |
   The modal dialogue box must:
 

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

@@ -90,7 +90,7 @@ examples:
     description: |
       This option allows links to be added to the table headers for sorting. Sorting must be handled server side, it is not done by the component.
 
-      The example shown applies a tracking attribute specifically for use by Google Tag Manager in [Content Publisher](https://github.com/alphagov/content-publisher).
+      The example shown applies a data attribute too.
 
       Other data attributes can also be applied as required. Note that the component does not include built in tracking. If this is required consider using the [GA4 link tracker](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/trackers/ga4-link-tracker.md).
     data:
@@ -102,7 +102,7 @@ examples:
           sort_direction: descending
           href: /?sort_direction=desc
           data_attributes:
-            tracking: "UTM-123A"
+            hello: world
         - text: Rate for vehicles
           format: numeric
           href: /?sort_direction=desc

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

@@ -75,24 +75,20 @@ examples:
           content: |
             <p class="govuk-body-m">Here is a single piece of content, there should be no tabs.</p>
   with_data_attributes:
-    description: |
-      The example shown applies a tracking attribute specifically for use by Google Tag Manager in [Content Publisher](https://github.com/alphagov/content-publisher).
-
-      Other data attributes can also be applied as required. Note that the component does not include built in tracking. If this is required consider using the [GA4 link tracker](https://github.com/alphagov/govuk_publishing_components/blob/main/docs/analytics-ga4/trackers/ga4-link-tracker.md).
     data:
       tabs:
         - id: "tab-with-data-attributes-1"
           label: "First section"
           title: "First section"
           tab_data_attributes:
-            tracking: GTM-123AB
+            hello: world
           content: |
             <p class="govuk-body-m">Fusce at dictum tellus, ac accumsan est. Nulla vitae turpis in nulla gravida tincidunt. Duis lectus felis, tempus id bibendum sit amet, posuere ut elit. Donec enim odio, eleifend in urna a, sagittis egestas est. Proin id ex ultricies, porta eros id, vehicula quam. Morbi non sagittis velit.</p>
         - id: "tab-with-data-attributes-2"
           label: "Second section"
           title: "Second section"
           tab_data_attributes:
-            tracking: GTM-123AB
+            hello: world
           content: |
             <p class="govuk-body-m">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam congue elementum commodo. Vestibulum elit turpis, efficitur quis posuere vitae, commodo vitae augue. Donec ut pharetra ligula. Phasellus ac mauris eu felis bibendum dapibus rutrum sed quam. Pellentesque posuere ante id consequat pretium.</p>
   without_ga4_tracking_on_tabs:

data/lib/govuk_publishing_components/presenters/contents_list_helper.rb

@@ -26,10 +26,9 @@ module GovukPublishingComponents
         output = clean_string(link_text)
         # Must start with a number
         # Number must be between 1 and 999 (ie not 2014)
-        # Must be followed by a space
-        # May contain a period `1.`
+        # Must contain at least one period
         # May be a decimal `1.2`
-        number = /^\d{1,3}(\.?|\.\d{1,2})(?=\s)/.match(output)
+        number = /^\d{1,3}\.(\d{1,2})?(?=\s)/.match(output)
 
         if number
           words = output.sub(number.to_s, "").strip # remove the number from the text

data/lib/govuk_publishing_components/presenters/pagination_helper.rb

@@ -43,7 +43,7 @@ module GovukPublishingComponents
       def pages_link_helper
         return unless has_pages?
 
-        page_links = @items.each_with_index.map do |item, index|
+        page_links = @items.reject(&:blank?).each_with_index.map do |item, index|
           { href: nil, ellipsis: nil, current: nil, number: nil, visually_hidden_text: nil, **item.symbolize_keys } => { href:, ellipsis:, current:, number:, visually_hidden_text: }
 
           raise ArgumentError, "Number or ellipsis value required for item #{index}" if ellipsis.blank? && number.blank?

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "64.1.2".freeze
+  VERSION = "65.0.0".freeze
 end