Upgrade Ruby to 3.3 and Jekyll to 4.3

Jekyll comes with the jekyll-sass-converter plugin, so most of the work
in this commit is switching to that gem, which expects an _sass
directory by default. Also, that gem does not support sprockets, so we
need to do some manual handling of the various sass gems to include
their stylesheets and other assets (fonts) in the proper directories.

Fixes #878

Author: Fryguy

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.3'
           bundler-cache: true
         timeout-minutes: 30
       - name: Build

Gemfile

@@ -1,12 +1,14 @@
 source 'https://rubygems.org'
 
+ruby "~> 3.3.6"
+
 gem "activesupport", ">= 5.2.7", :require => false
 gem "bootstrap-sass", "~> 3.x"
 gem "font-awesome-sass", "~> 4.x"
-gem "jekyll", "~> 3.x"
-gem "jekyll-assets", "< 3" # jekyll-assets 3.0.12 brings in sprockets 4 which has a bug: See https://github.com/envygeeks/jekyll-assets/pull/636
+gem "jekyll", "~> 4.3"
 gem "jekyll-coffeescript"
 gem "jekyll-paginate"
+gem "jekyll-sass-converter"
 gem "jekyll-sitemap"
 gem "jemoji"
 gem "kramdown-parser-gfm"

lib/miq/executor.rb

@@ -52,7 +52,7 @@ def run_cmd_with_bundle_env(cmd, clean)
       success =
         if clean || (cmd =~ /cd\ /)
           env = ENV.to_h.slice("BUNDLE_WITHOUT", "MIQ_DEBUG", "MIQ_ENV")
-          Bundler.clean_system(env, cmd)
+          Bundler.unbundled_system(env, cmd)
         else
           system(cmd)
         end

site/_config.yml

@@ -7,8 +7,8 @@
 
 plugins:
   - jekyll-coffeescript
-  - jekyll-assets
   - jekyll-paginate
+  - jekyll-sass-converter
   - jekyll-sitemap
   - jemoji
 

site/_includes/head.html

@@ -21,7 +21,7 @@
     }
   </script>
 
-  {% css main %}
+  <link rel="stylesheet" href="/assets/css/main.css">
   <link rel="canonical" href="{{ page.canonical_url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
 

site/_plugins/font_generator.rb

@@ -0,0 +1,23 @@
+require "font-awesome-sass"
+
+module Jekyll
+  module FontAwesomeSass
+    class Generator < Jekyll::Generator
+      def generate(site)
+        @site = site
+        @site.static_files.concat(font_files)
+      end
+
+      def font_files
+        assets_path = FontAwesome::Sass.assets_path
+        source = FontAwesome::Sass.gem_path
+        Dir.glob(File.join(assets_path, "fonts/font-awesome/*")).map do |font|
+          font = font.sub(assets_path, "assets")
+          dir = File.dirname(font)
+          file_name = File.basename(font)
+          Jekyll::StaticFile.new(@site, source, dir, file_name)
+        end
+      end
+    end
+  end
+end

site/_plugins/sass_loader.rb

@@ -0,0 +1,16 @@
+require "jekyll/converters/scss"
+require "bootstrap-sass"
+require "font-awesome-sass"
+
+# sass/load_paths configuration in _config.yml only supports hardcoded paths,
+# so we override to add in the paths from the gems dynamically.
+module SassLoader
+  def user_sass_load_paths
+    super + [
+      Bootstrap.stylesheets_path,
+      FontAwesome::Sass.stylesheets_path
+    ]
+  end
+end
+
+Jekyll::Converters::Scss.prepend(SassLoader)

site/_assets/css/_appliances.scss site/_sass/_appliances.scss

@@ -1,10 +1,10 @@
+---
+---
+
 @charset "utf-8";
 
 $font-size-base: 16px;
 
-@import "font-awesome-sprockets";
-@import "bootstrap-sprockets";
-
 @import "font-awesome";
 @import "twbs_custom";
 @import "twbs_overrides";