Bump middleman to 4.6.0

Author: chadlwilson

Gemfile

@@ -4,20 +4,18 @@ ruby '~> 3.4'
 gem 'html-proofer'
 
 # Middleman
-gem "middleman", "~> 4.5"
-gem "mutex_m"
+gem 'middleman'
 gem 'sassc', github: 'sass/sassc-ruby', ref: 'refs/pull/233/head'
 gem 'sassc-embedded'
-gem "middleman-gh-pages", "~> 0.4.1"
-gem "middleman-syntax", "~> 3.4.0"
-gem "haml", "< 6.0" # Middleman syntax needs support https://github.com/middleman/middleman-syntax/issues/80
-gem "middleman-autoprefixer", "~> 3.0"
-gem "middleman-sprockets", "~> 4.1.1"
-gem 'rouge', '~> 3.30.0'
-gem 'redcarpet', '~> 3.6.0'
-gem "sass", "~> 3.7"
+gem 'middleman-gh-pages'
+gem 'middleman-syntax'
+gem 'haml'
+gem 'middleman-autoprefixer'
+gem 'middleman-sprockets'
+gem 'rouge'
+gem 'redcarpet'
 
-gem "middleman-livereload", "~> 3.4.0"
+gem 'middleman-livereload'
 gem 'rake', '~> 13.2.1'
 gem 'aws-sdk-s3'
 gem 'parallel'

Gemfile.lock

@@ -9,11 +9,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (2.0.1)
-    activesupport (7.0.8.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.0.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
@@ -42,24 +50,26 @@ GEM
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    backports (3.25.0)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.9)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     console (1.30.0)
       fiber-annotation
       fiber-local (~> 1.1)
       json
-    contracts (0.16.1)
+    contracts (0.17.2)
     dotenv (3.1.7)
+    drb (2.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    erubis (2.7.0)
+    erubi (1.13.1)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
@@ -82,13 +92,14 @@ GEM
     google-protobuf (4.30.0-x86_64-linux)
       bigdecimal
       rake (>= 13)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashery (2.1.2)
-    hashie (3.6.0)
+    hashie (5.0.0)
     html-proofer (5.0.10)
       addressable (~> 2.3)
       async (~> 2.1)
@@ -99,7 +110,7 @@ GEM
       yell (~> 2.0)
       zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.6.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-event (1.9.0)
     jmespath (1.6.2)
@@ -112,41 +123,41 @@ GEM
     logger (1.6.6)
     memoist (0.16.2)
     metrics (0.12.1)
-    middleman (4.5.1)
-      coffee-script (~> 2.2)
-      haml (>= 4.0.5)
-      kramdown (>= 2.3.0)
-      middleman-cli (= 4.5.1)
-      middleman-core (= 4.5.1)
+    middleman (4.6.0)
+      middleman-cli (= 4.6.0)
+      middleman-core (= 4.6.0)
     middleman-autoprefixer (3.0.0)
       autoprefixer-rails (~> 10.0)
       middleman-core (>= 4.0.0)
-    middleman-cli (4.5.1)
+    middleman-cli (4.6.0)
       thor (>= 0.17.0, < 1.3.0)
-    middleman-core (4.5.1)
-      activesupport (>= 6.1, < 7.1)
+    middleman-core (4.6.0)
+      activesupport (>= 6.1)
       addressable (~> 2.4)
-      backports (~> 3.6)
       bundler (~> 2.0)
-      contracts (~> 0.13, < 0.17)
+      coffee-script (~> 2.2)
+      contracts
       dotenv
-      erubis
+      erubi
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
+      haml (>= 4.0.5)
       hamster (~> 3.0)
-      hashie (~> 3.4)
-      i18n (~> 1.6.0)
+      hashie (>= 3.4, < 6.0)
+      i18n (>= 1.6, < 1.15)
+      kramdown (~> 2.4)
       listen (~> 3.0)
       memoist (~> 0.14)
       padrino-helpers (~> 0.15.0)
       parallel
-      rack (>= 1.4.5, < 3)
+      rack (>= 3)
+      rackup
       sassc (~> 2.0)
       servolux
-      tilt (~> 2.0.9)
+      tilt (~> 2.2)
       toml
-      uglifier (~> 3.0)
+      uglifier (>= 3, < 5)
       webrick
     middleman-gh-pages (0.4.1)
       rake (> 0.9.3)
@@ -166,7 +177,6 @@ GEM
     mime-types-data (3.2025.0304)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
-    mutex_m (0.3.0)
     nokogiri (1.18.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -189,9 +199,11 @@ GEM
       ttfunk
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (2.2.12)
+    rack (3.1.11)
     rack-livereload (0.3.17)
       rack
+    rackup (2.2.1)
+      rack (>= 3)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
@@ -201,27 +213,23 @@ GEM
     rexml (3.4.1)
     rouge (3.30.0)
     ruby-rc4 (0.1.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
     sass-embedded (1.85.1)
       google-protobuf (~> 4.29)
       rake (>= 13)
     sass-embedded (1.85.1-arm64-darwin)
       google-protobuf (~> 4.29)
     sass-embedded (1.85.1-x86_64-linux-gnu)
       google-protobuf (~> 4.29)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
     sassc-embedded (1.80.4)
       sass-embedded (~> 1.80)
+    securerandom (0.4.1)
     servolux (0.13.0)
-    sprockets (3.7.2)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     temple (0.10.3)
     thor (1.2.2)
-    tilt (2.0.11)
+    tilt (2.6.0)
     toml (0.3.0)
       parslet (>= 1.8.0, < 3.0.0)
     traces (0.15.2)
@@ -231,8 +239,9 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uglifier (3.2.0)
+    uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
+    uri (1.0.3)
     webrick (1.9.1)
     yell (2.2.2)
     zeitwerk (2.7.2)
@@ -244,22 +253,20 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk-s3
-  haml (< 6.0)
+  haml
   html-proofer
   listen (= 3.9.0)
-  middleman (~> 4.5)
-  middleman-autoprefixer (~> 3.0)
-  middleman-gh-pages (~> 0.4.1)
-  middleman-livereload (~> 3.4.0)
-  middleman-sprockets (~> 4.1.1)
-  middleman-syntax (~> 3.4.0)
+  middleman
+  middleman-autoprefixer
+  middleman-gh-pages
+  middleman-livereload
+  middleman-sprockets
+  middleman-syntax
   mime-types
-  mutex_m
   parallel
   rake (~> 13.2.1)
-  redcarpet (~> 3.6.0)
-  rouge (~> 3.30.0)
-  sass (~> 3.7)
+  redcarpet
+  rouge
   sassc!
   sassc-embedded
 

config.rb

@@ -26,7 +26,10 @@
 activate :syntax
 
 # Activate the sprocket pipeline
-activate :sprockets
+activate :sprockets do |config|
+  # No idea why this is needed or helps fix sass imports, but it did... https://github.com/middleman/middleman-sprockets/issues/127#issuecomment-736958140
+  config.supported_output_extensions = ['.js']
+end
 
 # Livereload in dev mode
 activate :livereload

source/stylesheets/print.css.scss

@@ -1,7 +1,7 @@
 @charset "utf-8";
-@import './_normalize';
-@import './_variables';
-@import './_icon-font';
+@import 'normalize';
+@import 'variables';
+@import 'icon-font';
 
 /*
 Copyright 2008-2013 Concur Technologies, Inc.

source/stylesheets/screen.css.scss

@@ -1,7 +1,7 @@
 @charset "utf-8";
-@import './_normalize';
-@import './_variables';
-@import './_icon-font';
+@import 'normalize';
+@import 'variables';
+@import 'icon-font';
 
 /*
 Copyright 2008-2013 Concur Technologies, Inc.
@@ -625,4 +625,4 @@ html, body {
   background-color: $code-bg;
 }
 
-@import './_gocd-overrides';
+@import 'gocd-overrides';