Merge pull request #43 from speedy1812/december-update

January Update

.tool-versions

@@ -1,2 +1,2 @@
-ruby 2.7.6
-nodejs 16.17.1
+ruby 3.1.2
+nodejs 16.19.0

Gemfile

@@ -18,12 +18,6 @@ gem "middleman-s3_sync", "~> 4.0"
 # https://github.com/fredjean/middleman-s3_sync/issues/123
 gem "mime-types", "~> 3.0"
 
-# Temporary fix for https://github.com/middleman/middleman/issues/2569
-gem 'haml', '~> 5.0'
-
-# Thor 1.2.1 is throwing an error as of Oct 2022
-gem 'thor', '1.1.0'
-
 group :development do
   gem "capybara", "~> 3.3"
   gem "launchy", "~> 2.4"

Gemfile.lock

@@ -1,18 +1,17 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
     backports (3.23.0)
     builder (3.2.4)
-    capybara (3.37.1)
+    capybara (3.38.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -25,17 +24,17 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
-    contracts (0.13.0)
+    concurrent-ruby (1.2.0)
+    contracts (0.17)
     diff-lcs (1.5.0)
     dotenv (2.8.1)
     erubis (2.7.0)
-    excon (0.93.0)
+    excon (0.97.2)
     execjs (2.8.1)
     fast_blank (1.0.1)
     fastimage (2.2.6)
     ffi (1.15.5)
-    fog-aws (3.15.0)
+    fog-aws (3.16.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -62,32 +61,32 @@ GEM
       concurrent-ruby (~> 1.0)
     kramdown (2.4.0)
       rexml
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     map (6.6.0)
     matrix (0.4.2)
     memoist (0.16.2)
-    middleman (4.4.2)
+    middleman (4.4.3)
       coffee-script (~> 2.2)
-      haml (>= 4.0.5)
+      haml (>= 4.0.5, < 6.0)
       kramdown (>= 2.3.0)
-      middleman-cli (= 4.4.2)
-      middleman-core (= 4.4.2)
+      middleman-cli (= 4.4.3)
+      middleman-core (= 4.4.3)
     middleman-blog (4.0.3)
       addressable (~> 2.3)
       middleman-core (>= 4.0.0)
       tzinfo (>= 0.3.0)
-    middleman-cli (4.4.2)
+    middleman-cli (4.4.3)
       thor (>= 0.17.0, < 2.0)
-    middleman-core (4.4.2)
-      activesupport (>= 6.1, < 7.0)
+    middleman-core (4.4.3)
+      activesupport (>= 6.1, < 7.1)
       addressable (~> 2.4)
       backports (~> 3.6)
       bundler (~> 2.0)
-      contracts (~> 0.13.0)
+      contracts (~> 0.13)
       dotenv
       erubis
       execjs (~> 2.0)
@@ -96,7 +95,7 @@ GEM
       hamster (~> 3.0)
       hashie (~> 3.4)
       i18n (~> 1.6.0)
-      listen (~> 3.0.0)
+      listen (~> 3.0)
       memoist (~> 0.14)
       padrino-helpers (~> 0.15.0)
       parallel
@@ -126,49 +125,49 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
     multi_json (1.15.0)
-    nokogiri (1.13.8)
+    nokogiri (1.14.0)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    padrino-helpers (0.15.1)
+    padrino-helpers (0.15.2)
       i18n (>= 0.6.7, < 2)
-      padrino-support (= 0.15.1)
+      padrino-support (= 0.15.2)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.15.1)
+    padrino-support (0.15.2)
     parallel (1.22.1)
     parslet (2.0.0)
-    public_suffix (5.0.0)
-    racc (1.6.0)
-    rack (2.2.4)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
-    regexp_parser (2.6.0)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby-progressbar (1.11.0)
     sassc (2.4.0)
       ffi (~> 1.9)
     servolux (0.13.0)
-    temple (0.8.2)
-    thor (1.1.0)
+    temple (0.10.0)
+    thor (1.2.1)
     tilt (2.0.11)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
@@ -182,15 +181,13 @@ GEM
     webrick (1.7.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   builder (~> 3.0)
   capybara (~> 3.3)
-  haml (~> 5.0)
   launchy (~> 2.4)
   middleman (~> 4.1)
   middleman-blog
@@ -200,7 +197,6 @@ DEPENDENCIES
   mime-types (~> 3.0)
   redcarpet (~> 3.3, >= 3.3.3)
   rspec (~> 3.6)
-  thor (= 1.1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.4.5