Merge pull request #6166 from NHSDigital/upgrade-govuk-components

Upgrade GOV.UK components and form builder

Author: thomasleese

Gemfile

@@ -40,9 +40,7 @@ gem "flipper"
 gem "flipper-active_record"
 gem "flipper-ui"
 gem "govuk-components"
-gem "govuk_design_system_formbuilder",
-    github: "x-govuk/govuk-form-builder",
-    ref: "main" #TODO: replace with version > 5.13.0 when released
+gem "govuk_design_system_formbuilder"
 gem "govuk_markdown"
 gem "indefinite_article"
 gem "jsonb_accessor"

Gemfile.lock

@@ -22,17 +22,6 @@ GIT
       activerecord (>= 5.2, < 8.2)
       activesupport (>= 5.2, < 8.2)
 
-GIT
-  remote: https://github.com/x-govuk/govuk-form-builder.git
-  revision: 8fb16627dec7d2786e481029e1645a85e4d7df15
-  ref: main
-  specs:
-    govuk_design_system_formbuilder (5.13.0)
-      actionview (>= 6.1)
-      activemodel (>= 6.1)
-      activesupport (>= 6.1)
-      html-attributes-utils (~> 1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -296,10 +285,15 @@ GEM
       raabro (~> 1.4)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    govuk-components (5.13.1)
+    govuk-components (6.0.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (>= 6, < 10)
-      view_component (>= 4.0, < 4.2)
+      view_component (>= 4.0, < 4.3)
+    govuk_design_system_formbuilder (6.0.0)
+      actionview (>= 6.1)
+      activemodel (>= 6.1)
+      activesupport (>= 6.1)
+      html-attributes-utils (~> 1)
     govuk_markdown (2.0.3)
       activesupport
       redcarpet
@@ -763,9 +757,9 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    view_component (4.1.1)
-      actionview (>= 7.1.0, < 8.2)
-      activesupport (>= 7.1.0, < 8.2)
+    view_component (4.2.0)
+      actionview (>= 7.1.0)
+      activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)
     warden (1.2.9)
       rack (>= 2.0.9)
@@ -849,7 +843,7 @@ DEPENDENCIES
   flipper-active_record
   flipper-ui
   govuk-components
-  govuk_design_system_formbuilder!
+  govuk_design_system_formbuilder
   govuk_markdown
   hotwire-livereload
   indefinite_article