Update jekyll and jekyll-assets (#238)

* Update jekyll-assets * Remove uswds jekyll plugin * Include fonts in asset pipeline * Update ruby deps * Decouple theme file paths from theme config files * Revert ruby version change
cloud-gov · Feb 16, 2022 · 5147183 · 5147183
1 parent f543121
commit 5147183
Show file tree

Hide file tree

Showing 28 changed files with 8,494 additions and 273 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,20 +1,17 @@
-ruby '>= 2.7.4'
-
 source "https://rubygems.org"
+ruby '>= 2.7.4'
 
-gem "jekyll", "~> 3.9"
-
-# See https://github.com/envygeeks/jekyll-assets/issues/622
-gem "sprockets", "~> 3.7"
-gem "kramdown-parser-gfm", "~> 1.1.0"
+gem "jekyll", "~> 4.0"
+gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99
+gem "autoprefixer-rails"
 
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.15"
   gem 'jekyll-redirect-from'
-  gem 'jekyll-paginate-v2', "3.0.0"  
+  gem 'jekyll-paginate-v2', "3.0.0"
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
-  gem "jekyll-assets", "~> 3.0", group: :jekyll_plugins
+  gem 'jekyll-assets', git: "https://github.com/envygeeks/jekyll-assets"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,63 +1,74 @@
+GIT
+  remote: https://github.com/envygeeks/jekyll-assets
+  revision: 056d2c88719ef3b1f90967a606dd1441581dd832
+  specs:
+    jekyll-assets (4.0.0.alpha)
+      activesupport (>= 5, < 7)
+      execjs (~> 2.7)
+      extras (~> 0.2)
+      fastimage (~> 2.0, >= 1.8)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sanity (~> 1.2)
+      liquid-tag-parser (>= 1, < 3)
+      nokogiri (~> 1.10)
+      pathutil (~> 0.16)
+      sassc (>= 1.11, < 3.0)
+      sprockets (~> 4.0.beta7)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    autoprefixer-rails (10.4.2.0)
+      execjs (~> 2)
     colorator (1.1.0)
-    concurrent-ruby (1.1.8)
-    em-websocket (0.5.2)
+    concurrent-ruby (1.1.9)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.14.0)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
+    execjs (2.7.0)
     extras (0.3.0)
       forwardable-extended (~> 2.5)
-    fastimage (2.2.3)
-    ffi (1.15.0)
+    fastimage (2.2.6)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.1)
+    html-proofer (3.19.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogumbo (~> 2.0)
+      nokogiri (~> 1.12)
       parallel (~> 1.3)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    http_parser.rb (0.8.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.1)
+    jekyll (4.2.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-assets (3.0.12)
-      activesupport (~> 5.0)
-      execjs (~> 2.7)
-      extras (~> 0.2)
-      fastimage (~> 2.0, >= 1.8)
-      jekyll (>= 3.5, < 4.0)
-      jekyll-sanity (~> 1.2)
-      liquid-tag-parser (~> 1.0)
-      nokogiri (~> 1.8)
-      pathutil (~> 0.16)
-      sprockets (>= 3.3, < 4.1.beta)
-    jekyll-feed (0.15.1)
+      terminal-table (~> 2.0)
+    jekyll-feed (0.16.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
@@ -66,9 +77,9 @@ GEM
     jekyll-sanity (1.6.0)
       jekyll (>= 3.1, < 5.0)
       pathutil (~> 0.16)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.7.1)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
@@ -79,66 +90,64 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    liquid-tag-parser (1.9.0)
+    liquid-tag-parser (2.0.2)
       extras (~> 0.3)
       liquid (>= 3.0, < 5.0)
-    listen (3.5.1)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    mercenary (0.4.0)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.20.1)
+    parallel (1.21.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.6)
     racc (1.6.0)
     rack (2.2.3)
-    rainbow (3.0.0)
-    rb-fsevent (0.11.0)
+    rainbow (3.1.1)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
+    rouge (3.28.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sprockets (3.7.2)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    thread_safe (0.3.6)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.8.0)
     yell (2.2.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autoprefixer-rails
+  execjs (= 2.7.0)
   html-proofer (~> 3.18)
-  jekyll (~> 3.9)
-  jekyll-assets (~> 3.0)
+  jekyll (~> 4.0)
+  jekyll-assets!
   jekyll-feed (~> 0.15)
   jekyll-paginate-v2 (= 3.0.0)
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
-  kramdown-parser-gfm (~> 1.1.0)
-  sprockets (~> 3.7)
   tzinfo-data
 
 RUBY VERSION
    ruby 2.7.4p191
 
 BUNDLED WITH
-   1.17.2
+   2.1.4
diff --git a/_assets/css/index.scss b/_assets/css/index.scss
diff --git a/_assets/css/overrides/_add-background-svg.scss b/_assets/css/overrides/_add-background-svg.scss
@@ -0,0 +1,7 @@
+// Override USWDS mixin to use jekyll-assets asset_url()
+
+@mixin add-background-svg($image-name, $image-path: $theme-image-path) {
+  background-image: asset_url("#{$image-path}/#{$image-name}.svg"),
+    linear-gradient(transparent, transparent);
+  background-repeat: no-repeat;
+}
diff --git a/_assets/css/overrides/_all.scss b/_assets/css/overrides/_all.scss
@@ -0,0 +1,4 @@
+@import "add-background-svg";
+@import "font-face";
+@import "hero";
+@import "icon";
diff --git a/_assets/css/overrides/_font-face.scss b/_assets/css/overrides/_font-face.scss
@@ -0,0 +1,13 @@
+// Override USWDS mixin to use jekyll-assets asset_url()
+
+@mixin at-font-face($display-name, $file-path, $font-weight, $font-style) {
+  @font-face {
+    font-family: $display-name;
+    font-style: unquote($font-style);
+    font-weight: $font-weight;
+    font-display: fallback;
+    src: asset_url("'#{$file-path}.woff2'") format("woff2"),
+      asset_url("'#{$file-path}.woff'") format("woff"),
+      asset_url("'#{$file-path}.ttf'") format("truetype");
+  }
+}
diff --git a/_assets/css/overrides/_hero.scss b/_assets/css/overrides/_hero.scss
@@ -0,0 +1,5 @@
+// Override USWDS mixin to use jekyll-assets asset_url()
+
+.usa-hero {
+  background-image: $theme-hero-image !important;
+}