ccs-frontend_helpers 3.5.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bf265f14acc642010d47b175977bdffa353900061e2264145423e8bb03000c9
-  data.tar.gz: 1fc0369b330f35bbdfe8106c34e96fab791c59ffa796633fdfdc246095b6fdbb
+  metadata.gz: 49646be5e9102840f23e97d929277451d84c657605ae3df6de9b71f98bb7257b
+  data.tar.gz: 9175d8a8ab1400f7b2f6f6b8dd738ec23764d05a940832cb9ce0025d753f2f29
 SHA512:
-  metadata.gz: 12a68aa2aa3af988e6272c89b9d71d3dea4e745958f873c9dae96a16418ea3d6057b298e87952fc536744d3a63f3b3ab3f8e33a4ac378670a9acd9c838acdab1
-  data.tar.gz: 25d9bcb35a00bde3588ffae2a214d6d3c09970e2dd2c1cfdb04da7f3682b022b3ba6eb4e4daaba18303eab53ae5a7126bb16c68720d90bde5a9f901572201796
+  metadata.gz: c20e68cd8b64f663c3f7154008accd235ee39f51e27a311277f0a02cd59fe421062358a83b3754373806f54c1b6e31bdb85c08df106f295d6319d88ce596c098
+  data.tar.gz: 48d79cbd22737749075376c3b7a99d511b5f453ad1bd7c9543206ba516be5c977041813fb491f88c331c56233f4af74dac1ac2b4dcf94c9496f74d74c34fe136

data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.0] - 2026-03-12
+
+### Added
+
+- Updated CCS Frontend to v3.0.0
+- Updated GOV.UK Frontend to v6.1.0
+- Updated CCS Frontend to v3.1.0
+
 ## [3.5.0] - 2026-02-02
 
 ### Added

data/Gemfile

@@ -16,7 +16,7 @@ gem 'simplecov', '~> 0.21'
 gem 'nokogiri-diff', '~> 0.3.0'
 
 # Gems for linting/formatting the package
-gem 'rubocop', '~> 1.84'
+gem 'rubocop', '~> 1.85'
 gem 'rubocop-capybara', '~> 2.22'
 gem 'rubocop-rails', '~> 2.34'
 gem 'rubocop-rake', '~> 0.7'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ccs-frontend_helpers (3.5.0)
+    ccs-frontend_helpers (4.0.0)
       rails (>= 7.2)
 
 GEM
@@ -81,8 +81,8 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
     bigdecimal (4.0.1)
@@ -114,7 +114,10 @@ GEM
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.0)
+    json (2.19.0)
+    json-schema (6.2.0)
+      addressable (~> 2.8)
+      bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -129,6 +132,8 @@ GEM
       net-smtp
     marcel (1.1.0)
     matrix (0.4.2)
+    mcp (0.8.0)
+      json-schema (>= 4.1)
     mini_mime (1.1.5)
     minitest (6.0.1)
       prism (~> 1.5)
@@ -152,7 +157,7 @@ GEM
       nokogiri (~> 1.5)
       tdiff (~> 0.4)
     parallel (1.27.0)
-    parser (3.3.10.1)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     pp (0.6.3)
@@ -162,7 +167,7 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (5.0.4)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rack (3.2.4)
     rack-session (2.1.1)
@@ -224,10 +229,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.6)
-    rubocop (1.84.0)
+    rubocop (1.85.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
@@ -298,7 +304,7 @@ DEPENDENCIES
   nokogiri-diff (~> 0.3.0)
   rake (~> 13.3)
   rspec (~> 3.13)
-  rubocop (~> 1.84)
+  rubocop (~> 1.85)
   rubocop-capybara (~> 2.22)
   rubocop-rails (~> 2.34)
   rubocop-rake (~> 0.7)

data/README.md

@@ -14,6 +14,7 @@ The following table shows the version of CCS Frontend Helpers that you should us
 
 | CCS Frontend Helpers Version  | Target GOV.UK Frontend Version | Target CCS Frontend Version |
 | ----------------------------- | ------------------------------ | --------------------------- |
+| [4.0.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v4.0.0) | [6.1.0](https://github.com/alphagov/govuk-frontend/releases/tag/v6.1.0) | [3.1.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v3.1.0) |
 | [3.5.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.5.0) | [5.14.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0) | [2.5.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.5.0) |
 | [3.4.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.4.0) | [5.14.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.14.0) | [2.4.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.4.0) |
 | [3.3.0](https://github.com/Crown-Commercial-Service/ccs-frontend_helpers/releases/tag/v3.3.0) | [5.13.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.13.0) | [2.3.0](https://github.com/Crown-Commercial-Service/ccs-frontend-project/releases/tag/v2.3.0) |

data/bun.lock

@@ -4,15 +4,15 @@
   "workspaces": {
     "": {
       "devDependencies": {
-        "ccs-frontend": "2.5.0",
-        "govuk-frontend": "5.14.0",
+        "ccs-frontend": "3.1.0",
+        "govuk-frontend": "6.1.0",
       },
     },
   },
   "packages": {
-    "ccs-frontend": ["ccs-frontend@2.5.0", "", { "peerDependencies": { "govuk-frontend": "^5.14.0", "jquery": "^4.x" } }, "sha512-RlHbYbuzkbEgAtWaLvptMGxKIJrxvjg6VtESLmAAjeW8NxxsErmQudTGrnX1ATsn5UdfH9/sEkmChpjJRikHpQ=="],
+    "ccs-frontend": ["ccs-frontend@3.1.0", "", { "peerDependencies": { "govuk-frontend": "^6.1.0", "jquery": "^4.x" } }, "sha512-5O/QVDt06qB6goQ1lXvI532WNRChxvFDUDT98oKcVQ6nHMsokAk2TYENmUlmTePUPo4tAqGx8OvyEIuR0Go02g=="],
 
-    "govuk-frontend": ["govuk-frontend@5.14.0", "", {}, "sha512-MgfaXswIM6KpXS2T5gltEnzgVLgfM3UoE9+rYkhBiR0suaJ8Let31VZXQZqz9QhiPDbv28fW1nRjIyLujfZIBA=="],
+    "govuk-frontend": ["govuk-frontend@6.1.0", "", {}, "sha512-sqivexZFa82LiDIDVMItsUlqEXE/wEUWWBqzEoxHvUFLBH7bY0C8lVrj1qsDThSnj5JEUMS7isBAbKnfQ5Qp6g=="],
 
     "jquery": ["jquery@3.7.1", "", {}, "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="],
   }

data/lib/ccs/components/ccs/footer.rb

@@ -53,7 +53,7 @@ module CCS
         # @return [ActiveSupport::SafeBuffer]
 
         def render
-          tag.footer(**options[:attributes]) do
+          tag.div(**options[:attributes]) do
             tag.div(class: "govuk-width-container #{options[:container_classes]}".rstrip) do
               if navigation
                 concat(tag.div(class: 'ccs-footer__navigation') do

data/lib/ccs/components/ccs/header.rb

@@ -41,7 +41,7 @@ module CCS
         # @return [ActiveSupport::SafeBuffer]
 
         def render
-          tag.header(**options[:attributes]) do
+          tag.div(**options[:attributes]) do
             concat(tag.div(class: "ccs-header__container #{options[:container_classes]}".rstrip) do
               concat(header_logo)
             end)

data/lib/ccs/components/govuk/footer.rb

@@ -35,7 +35,6 @@ module CCS
         # @option options [String] :container_class classes that can be added to the inner container
         # @option options [ActiveSupport::SafeBuffer,String] :content_licence The content licence information, see {CCS::Components::GovUK::Footer#footer_content_licence footer_content_licence} for default
         # @option options [ActiveSupport::SafeBuffer,String] :copyright The copyright information, (default: '© Crown copyright')
-        # @option options [Boolean] :rebrand flag to use the rebrand footer which includes the logo
         # @option options [Hash] :attributes additional attributes that will added as part of the HTML
 
         def initialize(navigation: nil, meta: nil, **)
@@ -43,7 +42,7 @@ module CCS
 
           @options[:copyright] ||= '© Crown copyright'
 
-          @logo = Logo.new(rebrand: true, use_logotype: false, classes: 'govuk-footer__crown', context: @context) if @options[:rebrand]
+          @logo = Logo.new(use_logotype: false, classes: 'govuk-footer__crown', context: @context)
           @navigation = navigation&.map { |navigation_item| Navigation.new(context: @context, **navigation_item) }
           @meta = Meta.new(context: @context, **meta) if meta
         end
@@ -55,7 +54,7 @@ module CCS
         # @return [ActiveSupport::SafeBuffer]
 
         def render
-          tag.footer(**options[:attributes]) do
+          tag.div(**options[:attributes]) do
             tag.div(class: "govuk-width-container #{options[:container_classes]}".rstrip) do
               concat(logo.render) if logo
               if navigation.present?

data/lib/ccs/components/govuk/header.rb

@@ -1,5 +1,4 @@
 require_relative '../base'
-require_relative 'header/navigation'
 require_relative 'logo'
 
 module CCS
@@ -38,20 +37,15 @@ module CCS
         # @option options [String] :container_classes classes for the container
         # @option options [String] :homepage_url URL of the homepage. Defaults to +/+
         # @option options [String] :product_name product name, used when the product name follows on directly from ‘GOV.UK
-        # @option options [Boolean] :use_tudor_crown flag to use the new tudor crown for the GOV.UK Logo
-        # @option options [Boolean] :rebrand flag to use the rebrand logo
         # @option options [Hash] :attributes additional attributes that will added as part of the header HTML
 
-        def initialize(navigation: nil, menu_button: nil, service: nil, **)
-          super(**)
+        def initialize(**)
+          super
 
           @options[:container_classes] ||= 'govuk-width-container'
-          @options[:homepage_url] ||= '/'
-          @options[:use_tudor_crown] = true if @options[:use_tudor_crown].nil?
+          @options[:homepage_url] ||= '//gov.uk'
 
-          @logo = Logo.new(rebrand: @options[:rebrand], use_tudor_crown: @options[:use_tudor_crown], classes: 'govuk-header__logotype', attributes: { aria: { label: 'GOV.UK' } }, context: @context)
-          @navigation = Navigation.new(navigation: navigation, menu_button: menu_button, context: @context) if navigation && navigation[:items].present?
-          @service = service
+          @logo = Logo.new(classes: 'govuk-header__logotype', attributes: { aria: { label: 'GOV.UK' } }, context: @context)
         end
 
         # Generates the HTML for the GOV.UK Header component
@@ -59,22 +53,16 @@ module CCS
         # @return [ActiveSupport::SafeBuffer]
 
         def render
-          tag.header(**options[:attributes]) do
+          tag.div(**options[:attributes]) do
             tag.div(class: "govuk-header__container #{options[:container_classes]}") do
               concat(header_logo)
-              if service || navigation
-                concat(tag.div(class: 'govuk-header__content') do
-                  concat(header_service_name) if service
-                  concat(navigation.render) if navigation
-                end)
-              end
             end
           end
         end
 
         # The default attributes for the breadcrumbs
 
-        DEFAULT_ATTRIBUTES = { class: 'govuk-header', data: { module: 'govuk-header' } }.freeze
+        DEFAULT_ATTRIBUTES = { class: 'govuk-header' }.freeze
 
         private
 
@@ -84,24 +72,12 @@ module CCS
 
         def header_logo
           tag.div(class: 'govuk-header__logo') do
-            link_to(options[:homepage_url], class: 'govuk-header__link govuk-header__link--homepage') do
+            link_to(options[:homepage_url], class: 'govuk-header__homepage-link') do
               concat(logo.render)
               concat(tag.span(options[:product_name], class: 'govuk-header__product-name')) if options[:product_name]
             end
           end
         end
-
-        # Generates the service name section
-        #
-        # @return [ActiveSupport::SafeBuffer]
-
-        def header_service_name
-          if service[:href]
-            link_to(service[:name], service[:href], class: 'govuk-header__link govuk-header__service-name')
-          else
-            tag.span(service[:name], class: 'govuk-header__service-name')
-          end
-        end
       end
     end
   end

data/lib/ccs/components/govuk/logo.rb

@@ -8,12 +8,8 @@ module CCS
       # This is used to generate the logo component from the
       # {https://github.com/alphagov/govuk-frontend/blob/main/packages/govuk-frontend/src/govuk/macros/logo.njk GDS - Macros - Logo}
       #
-      # @!attribute [r] rebrand
-      #   @return [Boolean] flag for rebrand
       # @!attribute [r] use_logotype
       #   @return [Boolean] flag for logotype
-      # @!attribute [r] use_tudor_crown
-      #   @return [Boolean] flag for tudor crown
 
       class Logo < Base
         include ActionView::Context
@@ -21,27 +17,23 @@ module CCS
 
         private
 
-        attr_reader :rebrand, :use_logotype, :use_tudor_crown
+        attr_reader :use_logotype
 
         public
 
-        # @param rebrand [Boolean] Flag for rebrand
         # @param use_logotype [Boolean] Flag for logotyp
-        # @param use_tudor_crown [Boolean] Flag for tudor crown
         # @param options [Hash] options that will be used in customising the HTML
         #
         # @option options [String] :classes additional CSS classes for the logo HTML
         # @option options [Hash] :attributes additional attributes that will added as part of the logo HTML
 
-        def initialize(rebrand: false, use_logotype: true, use_tudor_crown: true, **)
+        def initialize(use_logotype: true, **)
           super(**)
 
-          @rebrand = rebrand
           @use_logotype = use_logotype
-          @use_tudor_crown = rebrand ? true : use_tudor_crown
 
-          svg_width = @use_tudor_crown ? 32 : 36
-          svg_width = rebrand ? svg_width + 130 : svg_width + 116 if @use_logotype
+          svg_width = 32
+          svg_width += 130 if @use_logotype
 
           @options[:attributes][:focusable] = 'false'
           @options[:attributes][:role] = @options[:attributes].dig(:aria, :label) ? 'img' : 'presentation'
@@ -59,8 +51,8 @@ module CCS
         def render
           tag.svg(**options[:attributes]) do
             concat(tag.title(@options[:attributes].dig(:aria, :label))) if @options[:attributes].dig(:aria, :label)
-            concat(use_tudor_crown ? tudor_crown : st_edwards_crown)
-            concat(rebrand ? dot_logotype : logotype) if use_logotype
+            concat(tudor_crown)
+            concat(logotype) if use_logotype
           end
         end
 
@@ -70,14 +62,6 @@ module CCS
 
         private
 
-        # Generates the St Edwards Crown HTML
-        #
-        # @return [ActiveSupport::SafeBuffer]
-
-        def st_edwards_crown
-          tag.path(d: 'M13.4,22.3c2,.8,4.2-.2,5-2s-.2-4.2-2-5c-2-.8-4.2.2-5,2-.8,2,0,4.2,2,5M4.8,27.3c2,.8,4.2-.2,5-2s-.2-4.2-2-5c-2-.8-4.2.2-5,2-1,2,0,4.2,2,5M2.2,36.9c2,.8,4.2-.2,5-2,.8-2-.2-4.2-2-5-2-.8-4.2.2-5,2-.8,2,0,4.2,2,5M23,25.3c2,.8,4.2-.2,5-2s-.2-4.2-2-5c-2-.8-4.2.2-5,2s0,4.2,2,5M57.8,22.3c-2,.8-4.2-.2-5-2s.2-4.2,2-5c2-.8,4.2.2,5,2,1,2,0,4.2-2,5M66.4,27.3c-2,.8-4.2-.2-5-2s.2-4.2,2-5c2-.8,4.2.2,5,2,1,2,0,4.2-2,5M69,36.9c-2,.8-4.2-.2-5-2-.8-2,.2-4.2,2-5,2-.8,4.2.2,5,2,.8,2,0,4.2-2,5M48.2,25.3c-2,.8-4.2-.2-5-2s.2-4.2,2-5c2-.8,4.2.2,5,2s0,4.2-2,5M37.6,15.5l4.8,2.6v-7.2l-4.8,1.6c-.2-.2-.2-.4-.4-.4s2-6,2-6h-6.8l2,6c-.2.2-.4.2-.4.4-.2.2-4.8-1.4-4.8-1.4v7l4.8-2.6c-.2.2,0,.4.2.6l-2.8,8.4c-.2.4-.2.8-.2,1.4,0,2.2,1.6,4.2,3.8,4.4h1.2c2.2-.4,3.8-2.2,3.8-4.4s0-.8-.2-1.4l-2.8-8.4c.4-.2.6-.4.6-.6M35.6,56.1c9.2,0,17.8.6,25.6,1.8,2.2-9.2,4.8-14.4,7.6-18.2l-5.2-1.8c.6,2.6.6,3.8,0,5.6-.8-.8-1.6-2.4-2.2-4.8l-2.4,8.4c1.6-1,2.8-1.8,4-1.8-2.4,5.2-5.4,6.4-7.2,6-2.4-.4-3.4-2.6-3-4.4.6-2.6,3.2-3.2,4.4-.2,2.4-4.8-1.6-6.2-4.2-4.8,3.8-3.8,4.4-7.2,1.2-11.4-4.4,3.4-4.4,6.6-2.4,11.2-2.6-3-6.6-1.4-5,3.4,1.8-2.8,4.2-1,4,1.6-.4,2.4-3.4,4.2-7.4,4-5.6-.4-6-4.4-6-7.4,1.4-.2,3.8,1,6,4l.8-8.8c-2.2,2.4-4.4,2.8-6.6,2.8.8-2.4,4.2-6.2,4.2-6.2h-11s3.6,4,4.2,6.2c-2.2,0-4.4-.6-6.6-2.8l.8,8.8c2.2-3,4.6-4.2,6-4-.2,3.2-.4,7-6,7.4-3.8.4-7-1.6-7.4-4-.4-2.6,2-4.4,3.8-1.6,1.4-4.8-2.6-6.2-5.2-3.4,2-4.6,2-8-2.4-11.2-3.2,4.2-2.6,7.6,1.2,11.4-2.6-1.4-6.4,0-4.2,4.8,1.2-3,3.8-2.2,4.4.2.4,1.8-.8,3.8-3,4.4-2,.4-5-1-7.4-6,1.4,0,2.6.8,4,1.8l-3-8.4c-.6,2.4-1.4,3.8-2.4,4.8-.6-1.6-.4-3,0-5.6l-5.2,1.8c3,3.8,5.6,9,7.8,18.2,7.6-1,16.4-1.8,25.4-1.8')
-        end
-
         # rubocop:disable Metrics/AbcSize
 
         # Generates the Tudor Crown HTML
@@ -100,24 +84,11 @@ module CCS
 
         # rubocop:enable Metrics/AbcSize
 
-        # Generates the HTML for logotype with standard dot
-        #
-        # @return [ActiveSupport::SafeBuffer]
-
-        def logotype
-          path_kwargs = {
-            d: 'M88.6,33.2c0,1.8.2,3.4.6,5s1.2,3,2,4.4c1,1.2,2,2.2,3.4,3s3,1.2,5,1.2,3.4-.2,4.6-.8,2.2-1.4,3-2.2,1.2-1.8,1.6-3c.2-1,.4-2,.4-3v-.4h-10.6v-6.4h18.8v23h-7.4v-5c-.6.8-1.2,1.6-2,2.2-.8.6-1.6,1.2-2.6,1.8-1,.4-2,.8-3.2,1.2s-2.4.4-3.6.4c-3,0-5.8-.6-8-1.6-2.4-1.2-4.4-2.6-6-4.6s-2.8-4.2-3.6-6.8c-.6-2.8-1-5.6-1-8.6s.4-5.8,1.4-8.4,2.2-4.8,4-6.8,3.8-3.4,6.2-4.6c2.4-1.2,5.2-1.6,8.2-1.6s3.8.2,5.6.6c1.8.4,3.4,1.2,4.8,2s2.8,1.8,3.8,3c1.2,1.2,2,2.6,2.8,4l-7.4,4.2c-.4-.8-1-1.8-1.6-2.4-.6-.8-1.2-1.4-2-2s-1.6-1-2.6-1.4-2.2-.4-3.4-.4c-2,0-3.6.4-5,1.2-1.4.8-2.6,1.8-3.4,3-1,1.2-1.6,2.8-2,4.4-.6,1.6-.8,3.8-.8,5.4ZM161.4,24.6c-.8-2.6-2.2-4.8-4-6.8s-3.8-3.4-6.2-4.6c-2.4-1.2-5.2-1.6-8.4-1.6s-5.8.6-8.4,1.6c-2.2,1.2-4.4,2.8-6,4.6-1.8,2-3,4.2-4,6.8-.8,2.6-1.4,5.4-1.4,8.4s.4,5.8,1.4,8.4c.8,2.6,2.2,4.8,4,6.8s3.8,3.4,6.2,4.6c2.4,1.2,5.2,1.6,8.4,1.6s5.8-.6,8.4-1.6c2.4-1.2,4.6-2.6,6.2-4.6,1.8-2,3-4.2,4-6.8.8-2.6,1.4-5.4,1.4-8.4-.2-3-.6-5.8-1.6-8.4h0ZM154,33.2c0,2-.2,3.8-.8,5.4-.4,1.6-1.2,3.2-2.2,4.4s-2.2,2.2-3.4,2.8c-1.4.6-3,1-4.8,1s-3.4-.4-4.8-1-2.6-1.6-3.4-2.8c-1-1.2-1.6-2.6-2.2-4.4-.4-1.6-.8-3.4-.8-5.4v-.2c0-2,.2-3.8.8-5.4.4-1.6,1.2-3.2,2.2-4.4,1-1.2,2.2-2.2,3.4-2.8,1.4-.6,3-1,4.8-1s3.4.4,4.8,1,2.6,1.6,3.4,2.8c1,1.2,1.6,2.6,2.2,4.4.4,1.6.8,3.4.8,5.4v.2ZM177.8,54l-11.8-42h9.4l8,31.4h.2l8-31.4h9.4l-11.8,42h-11.4,0ZM235.4,46.7c1.2,0,2.4-.2,3.4-.6,1-.4,2-.8,2.8-1.6s1.4-1.6,1.8-2.8c.4-1.2.6-2.4.6-4V11.8h8.2v27.2c0,2.4-.4,4.4-1.2,6.2s-2,3.4-3.6,4.8c-1.4,1.4-3.2,2.4-5.4,3-2,.8-4.4,1-6.8,1s-4.8-.4-6.8-1c-2-.8-3.8-1.8-5.4-3-1.6-1.4-2.6-3-3.6-4.8-.8-1.8-1.2-4-1.2-6.2V11.7h8.4v26c0,1.6.2,2.8.6,4,.4,1.2,1,2,1.8,2.8s1.6,1.2,2.8,1.6c1.2.4,2.2.6,3.6.6h0ZM261.4,11.9h8.4v18.2l14.8-18.2h10.4l-14.4,16.8,15.4,25.2h-9.8l-11-18.8-5.4,6v12.8h-8.4V11.9h0ZM206.2,44.2c-3,0-5.4,2.4-5.4,5.4s2.4,5.4,5.4,5.4,5.4-2.4,5.4-5.4-2.4-5.4-5.4-5.4Z'
-          }
-          path_kwargs[:transform] = 'translate(8 0)' unless use_tudor_crown
-
-          tag.path(**path_kwargs)
-        end
-
         # Generates the HTML for logotype with raised and coloured dot
         #
         # @return [ActiveSupport::SafeBuffer]
 
-        def dot_logotype
+        def logotype
           capture do
             concat(tag.circle(class: 'govuk-logo-dot', cx: '226', cy: '36', r: '7.3'))
             concat(tag.path(d: 'M93.94 41.25c.4 1.81 1.2 3.21 2.21 4.62 1 1.4 2.21 2.41 3.61 3.21s3.21 1.2 5.22 1.2 3.61-.4 4.82-1c1.4-.6 2.41-1.4 3.21-2.41.8-1 1.4-2.01 1.61-3.01s.4-2.01.4-3.01v.14h-10.86v-7.02h20.07v24.08h-8.03v-5.56c-.6.8-1.38 1.61-2.19 2.41-.8.8-1.81 1.2-2.81 1.81-1 .4-2.21.8-3.41 1.2s-2.41.4-3.81.4a18.56 18.56 0 0 1-14.65-6.63c-1.6-2.01-3.01-4.41-3.81-7.02s-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83a20.45 20.45 0 0 1 19.46-13.65c3.21 0 4.01.2 5.82.8 1.81.4 3.61 1.2 5.02 2.01 1.61.8 2.81 2.01 4.01 3.21s2.21 2.61 2.81 4.21l-7.63 4.41c-.4-1-1-1.81-1.61-2.61-.6-.8-1.4-1.4-2.21-2.01-.8-.6-1.81-1-2.81-1.4-1-.4-2.21-.4-3.61-.4-2.01 0-3.81.4-5.22 1.2-1.4.8-2.61 1.81-3.61 3.21s-1.61 2.81-2.21 4.62c-.4 1.81-.6 3.71-.6 5.42s.8 5.22.8 5.22Zm57.8-27.9c3.21 0 6.22.6 8.63 1.81 2.41 1.2 4.82 2.81 6.62 4.82S170.2 24.39 171 27s1.4 5.62 1.4 8.83-.4 6.02-1.4 8.83-2.41 5.02-4.01 7.02-4.01 3.61-6.62 4.82-5.42 1.81-8.63 1.81-6.22-.6-8.63-1.81-4.82-2.81-6.42-4.82-3.21-4.41-4.01-7.02-1.4-5.62-1.4-8.83.4-6.02 1.4-8.83 2.41-5.02 4.01-7.02 4.01-3.61 6.42-4.82 5.42-1.81 8.63-1.81Zm0 36.73c1.81 0 3.61-.4 5.02-1s2.61-1.81 3.61-3.01 1.81-2.81 2.21-4.41c.4-1.81.8-3.61.8-5.62 0-2.21-.2-4.21-.8-6.02s-1.2-3.21-2.21-4.62c-1-1.2-2.21-2.21-3.61-3.01s-3.21-1-5.02-1-3.61.4-5.02 1c-1.4.8-2.61 1.81-3.61 3.01s-1.81 2.81-2.21 4.62c-.4 1.81-.8 3.61-.8 5.62 0 2.41.2 4.21.8 6.02.4 1.81 1.2 3.21 2.21 4.41s2.21 2.21 3.61 3.01c1.4.8 3.21 1 5.02 1Zm36.32 7.96-12.24-44.15h9.83l8.43 32.77h.4l8.23-32.77h9.83L200.3 58.04h-12.24Zm74.14-7.96c2.18 0 3.51-.6 3.51-.6 1.2-.6 2.01-1 2.81-1.81s1.4-1.81 1.81-2.81a13 13 0 0 0 .8-4.01V13.9h8.63v28.15c0 2.41-.4 4.62-1.4 6.62-.8 2.01-2.21 3.61-3.61 5.02s-3.41 2.41-5.62 3.21-4.62 1.2-7.02 1.2-5.02-.4-7.02-1.2c-2.21-.8-4.01-1.81-5.62-3.21s-2.81-3.01-3.61-5.02-1.4-4.21-1.4-6.62V13.9h8.63v26.95c0 1.61.2 3.01.8 4.01.4 1.2 1.2 2.21 2.01 2.81.8.8 1.81 1.4 2.81 1.81 0 0 1.34.6 3.51.6Zm34.22-36.18v18.92l15.65-18.92h10.82l-15.03 17.32 16.03 26.83h-10.21l-11.44-20.21-5.62 6.22v13.99h-8.83V13.9'))

data/lib/ccs/components/govuk/phase_banner.rb

@@ -62,7 +62,7 @@ module CCS
 
         # The default attributes for the phase banner
 
-        DEFAULT_ATTRIBUTES = { class: 'govuk-phase-banner' }.freeze
+        DEFAULT_ATTRIBUTES = { class: 'govuk-phase-banner govuk-width-container' }.freeze
       end
     end
   end

data/lib/ccs/frontend_helpers/version.rb

@@ -2,6 +2,6 @@
 
 module CCS
   module FrontendHelpers
-    VERSION = '3.5.0'
+    VERSION = '4.0.0'
   end
 end

data/lib/ccs/frontend_helpers.rb

@@ -10,7 +10,7 @@ module CCS
   #
   # The CCS Frontend Helperss module contains view helpers based on:
   # - {https://design-system.service.gov.uk/components GDS components}
-  # - {https://github.com/tim-s-ccs/ts-ccs-frontend CCS components}
+  # - {https://github.com/Crown-Commercial-Service/ccs-frontend-project CCS components}
   # that can be used in Ruby on Rails projects within CCS.
 
   module FrontendHelpers

data/package.json

@@ -5,7 +5,7 @@
   "author": "CCS",
   "license": "MIT",
   "devDependencies": {
-    "govuk-frontend": "5.14.0",
-    "ccs-frontend": "2.5.0"
+    "govuk-frontend": "6.1.0",
+    "ccs-frontend": "3.1.0"
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ccs-frontend_helpers
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Crown Commercial Service
@@ -99,8 +99,6 @@ files:
 - lib/ccs/components/govuk/footer/navigation.rb
 - lib/ccs/components/govuk/form_group.rb
 - lib/ccs/components/govuk/header.rb
-- lib/ccs/components/govuk/header/link.rb
-- lib/ccs/components/govuk/header/navigation.rb
 - lib/ccs/components/govuk/hint.rb
 - lib/ccs/components/govuk/inset_text.rb
 - lib/ccs/components/govuk/label.rb

data/lib/ccs/components/govuk/header/link.rb

@@ -1,56 +0,0 @@
-require_relative '../../base'
-
-module CCS
-  module Components
-    module GovUK
-      class Header < Base
-        # = GOV.UK Header link
-        #
-        # The individual header link item
-        #
-        # @!attribute [r] text
-        #   @return [String] Text for the header link
-        # @!attribute [r] href
-        #   @return [String] The href for the header link
-
-        class Link < Base
-          private
-
-          attr_reader :text, :href
-
-          public
-
-          # @param text [String] the text for the header link
-          # @param href [String] the href for the header link
-          # @param options [Hash] options that will be used in customising the HTML
-          #
-          # @option options [Boolean] :active flag to mark the navigation item as active or not
-          # @option options [Hash] :attributes any additional attributes that will added as part of the HTML
-
-          def initialize(text:, href: nil, **)
-            super(**)
-
-            @text = text
-            @href = href
-          end
-
-          # Generates the HTML for the GOV.UK Header link
-          #
-          # @return [ActiveSupport::SafeBuffer]
-
-          def render
-            tag.li(class: "govuk-header__navigation-item #{'govuk-header__navigation-item--active' if options[:active]}".rstrip) do
-              if href
-                options[:attributes][:class] = 'govuk-header__link'
-
-                link_to(text, href, **options[:attributes])
-              else
-                text
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ccs/components/govuk/header/navigation.rb

@@ -1,73 +0,0 @@
-require_relative 'link'
-
-module CCS
-  module Components
-    module GovUK
-      class Header < Base
-        # = GOV.UK Header navigation
-        #
-        # The header navigation section
-        #
-        # @!attribute [r] navigation_links
-        #   @return [Array<Link>] An array of the initialised navigation links
-        # @!attribute [r] navigation_label
-        #   @return [String] The aria label for the navigation
-        # @!attribute [r] navigation_classes
-        #   @return [String] The classes for the navigation
-        # @!attribute [r] menu_button
-        #   @return [Hash] The options for the menu button
-
-        class Navigation
-          include ActionView::Context
-          include ActionView::Helpers
-
-          private
-
-          attr_reader :navigation_links, :navigation_label, :navigation_classes, :menu_button
-
-          public
-
-          # @param navigation [Hash] options for the navigation
-          # @param context [ActionView::Base] the view context
-          # @param menu_button [Hash] options for the menu button
-          #
-          # @option navigation [Array] :items an array of links for the navigation section.
-          #                            See {Components::GovUK::Header::Link#initialize Link#initialize} for details of the items in the array.
-          # @option navigation [String] :classes additional CSS classes for the navigation HTML
-          # @option navigation [String] :label text for the aria-label attribute of the navigation. Defaults to the menu button text
-          #
-          # @option menu_button [String] :text text for the button that opens the mobile navigation menu.
-          #                                    By default, this is set to +Menu+.
-          # @option menu_button [String] :label text for the aria-label attribute of the button that opens the mobile navigation.
-          #                                     Defaults to +Show or hide menu+.
-
-          def initialize(navigation:, context:, menu_button: nil)
-            menu_button ||= {}
-            menu_button[:text] ||= 'Menu'
-
-            menu_button[:aria] = { controls: 'navigation' }
-            menu_button[:aria][:label] = menu_button[:label] if menu_button[:label]
-
-            @menu_button = menu_button
-            @navigation_links = navigation[:items].map { |navigation_link| Link.new(context: context, **navigation_link) }
-            @navigation_label = navigation[:label] || menu_button[:text]
-            @navigation_classes = "govuk-header__navigation #{navigation[:classes]}".rstrip
-          end
-
-          # Generates the HTML for the GOV.UK Navigation
-          #
-          # @return [ActiveSupport::SafeBuffer]
-
-          def render
-            tag.nav(aria: { label: navigation_label }, class: navigation_classes) do
-              concat(button_tag(menu_button[:text], type: :button, class: 'govuk-header__menu-button govuk-js-header-toggle', aria: menu_button[:aria], hidden: true))
-              concat(tag.ul(id: 'navigation', class: 'govuk-header__navigation-list') do
-                navigation_links.each { |navigation_link| concat(navigation_link.render) }
-              end)
-            end
-          end
-        end
-      end
-    end
-  end
-end