Merge pull request #876 from citizensadvice/update-haml

Update haml, haml-rails & haml-lint

Author: KPobeeNorris

.haml-lint.yml

@@ -4,3 +4,7 @@ linters:
 
   ClassesBeforeIds:
     EnforcedStyle: "id"
+
+  RuboCop:
+    ignored_cops:
+      - Style/IfUnlessModifier

Gemfile.lock

@@ -235,20 +235,21 @@ GEM
     graphql-client (0.26.0)
       activesupport (>= 3.0)
       graphql (>= 1.13.0)
-    haml (6.3.0)
+    haml (7.3.0)
+      prism (>= 1.1.0)
       temple (>= 0.8.2)
       thor
       tilt
     haml-lint (0.999.999)
       haml_lint
-    haml-rails (3.0.0)
+    haml-rails (3.1.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.60.0)
+    haml_lint (0.77.0)
       haml (>= 5.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
@@ -334,7 +335,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
-    parallel (1.28.0)
+    parallel (2.1.0)
     parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
@@ -497,9 +498,9 @@ GEM
       ffi (~> 1.1)
       memoist3 (~> 1.0.0)
     sysexits (1.2.0)
-    temple (0.10.4)
+    temple (0.10.6)
     thor (1.5.0)
-    tilt (2.6.1)
+    tilt (2.8.0)
     timeout (0.6.1)
     tomlrb (2.0.3)
     tsort (0.2.0)

app/components/appliance_calculator/clear_list_component.html.haml

@@ -1,4 +1,3 @@
 %form{ action: appliance_calculator_clear_path, method: "GET" }
   = render CitizensAdviceComponents::Button.new(variant: :tertiary, type: :submit, attributes: attrs) do
     Clear list
-

app/components/appliance_calculator/last_added_appliance_component.html.haml

@@ -2,4 +2,4 @@
   = render CitizensAdviceComponents::SuccessMessage.new(message: message)
   .last-added-appliance__dismiss-wrapper
     %button{ dismiss_button_attrs }
-      = render CitizensAdviceComponents::Icons::Close.new
+      = render CitizensAdviceComponents::Icons::Close.new

app/components/appliance_calculator/usages_table_component.html.haml

@@ -5,4 +5,3 @@
 
 .cads-prose
   %p Calculated using a rate of #{formatted_unit_rate} p/kWh.
-

app/components/csr_table/star/half_component.html.haml

@@ -1,2 +1,2 @@
 %svg.star.star--half{ width: "17", height: "14", viewBox: "0 0 17 15", fill: "none", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": "true" }
-  %use{ href:"#halfStar" }
+  %use{ href: "#halfStar" }

app/components/csr_table/star/highlighted_half_component.html.haml

@@ -1,2 +1,2 @@
 %svg.star.star--half{ width: "17", height: "14", viewBox: "0 0 17 15", fill: "none", xmlns: "http://www.w3.org/2000/svg", "aria-hidden": "true" }
-  %use{ href:"#highlightedHalfStar" }
+  %use{ href: "#highlightedHalfStar" }

app/components/csr_table/unranked_suppliers/details_component.html.haml

@@ -2,10 +2,10 @@
   .unranked-supplier__title{ "data-testid": "unranked-supplier-details-#{supplier.name.parameterize}" }
     = title
   - if Feature.enabled? "FF_SMALL_SUPPLIER_STARS"
-    -if whitelabelled?
+    - if whitelabelled?
       %p
         = whitelabel_supplier_link
-    -else
+    - else
       = render CsrTable::UnrankedSuppliers::StarsSummaryComponent.new(supplier)
 
   = render CsrTable::DescriptionListComponent.new do |c|

app/views/appliance_calculator/daily_usage_creation/_cost_estimation.html.haml

@@ -16,4 +16,3 @@
 
   %p
     The actual usage can also depend on things like your appliance’s size or the type of technology it uses.
-

app/views/appliance_calculator/daily_usage_creation/steps/_cyclical_usage.html.haml

@@ -13,6 +13,6 @@
           = current_step.cycle_frequency_error
       .frequency-inputs
         .frequency-inputs__item
-          = form.cads_text_field :cycles, label: "Cycles", width: :two_chars, required: true, options: { additional_attributes: { "inputmode": "numeric",  id: "daily_usage_creation_steps_time_usage_base-input" } }
+          = form.cads_text_field :cycles, label: "Cycles", width: :two_chars, required: true, options: { additional_attributes: { inputmode: "numeric", id: "daily_usage_creation_steps_time_usage_base-input" } }
         .frequency-inputs__item
-          = form.cads_collection_select :frequency, label: "Frequency", required: true, collection: current_step.frequency_options, text_method: :text, value_method: :value
+          = form.cads_collection_select :frequency, label: "Frequency", required: true, collection: current_step.frequency_options, text_method: :text, value_method: :value