Updated to Ruby 3.1.3 and USWDS 3.5.0

.pa11yci

@@ -0,0 +1,7 @@
+{
+  "defaults": {
+    "concurrency": 4,
+    "standard": "WCAG2AA",
+    "runners": ["axe"]
+  }
+}

.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.3

Dockerfile

@@ -5,6 +5,8 @@ RUN apt-get update && \
   sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
   locale-gen en_US.UTF-8
 
+RUN apt-get install nodejs -y
+
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US
 ENV LC_ALL en_US.UTF-8

Gemfile

@@ -1,17 +1,16 @@
 source "https://rubygems.org"
-ruby '>= 2.7.5'
 
-gem "jekyll", "~> 4.0"
+gem "jekyll", "4.2.2" # pinned awaiting release of https://github.com/jekyll/jekyll/pull/9304 
 gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99
 gem "autoprefixer-rails"
+gem "webrick" # not included in jekyll directly until 4.3.0 https://github.com/jekyll/jekyll/pull/8524
 
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.15"
   gem 'jekyll-redirect-from'
   gem 'jekyll-paginate-v2', "3.0.0"
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
-  gem 'jekyll-assets', git: "https://github.com/envygeeks/jekyll-assets"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -20,6 +19,7 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
 
-gem "html-proofer", "~> 3.19", ">= 3.19.4"
+#gem "html-proofer", "~> 3.19", ">= 3.19.4"
+gem "html-proofer", "~> 3.18"
 
 

Gemfile.lock

@@ -1,45 +1,19 @@
-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 (6.1.7.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    autoprefixer-rails (10.4.2.0)
+    autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     colorator (1.1.0)
     concurrent-ruby (1.2.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    extras (0.3.0)
-      forwardable-extended (~> 2.5)
-    fastimage (2.2.6)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
     html-proofer (3.19.4)
@@ -51,9 +25,9 @@ GEM
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    jekyll (4.2.1)
+    jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -68,86 +42,70 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 2.0)
-    jekyll-feed (0.16.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sanity (1.6.0)
-      jekyll (>= 3.1, < 5.0)
-      pathutil (~> 0.16)
-    jekyll-sass-converter (2.1.0)
+    jekyll-sass-converter (2.2.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)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    liquid-tag-parser (2.0.2)
-      extras (~> 0.3)
-      liquid (>= 3.0, < 5.0)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.1)
-    minitest (5.18.0)
+    mini_portile2 (2.8.2)
     nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    parallel (1.22.1)
+    parallel (1.23.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
     racc (1.6.2)
-    rack (3.0.6.1)
     rainbow (3.1.1)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.28.0)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sprockets (4.2.0)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
+    webrick (1.8.1)
     yell (2.2.2)
-    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   autoprefixer-rails
   execjs (= 2.7.0)
-  html-proofer (~> 3.19, >= 3.19.4)
-  jekyll (~> 4.0)
-  jekyll-assets!
+  html-proofer (~> 3.18)
+  jekyll (= 4.2.2)
   jekyll-feed (~> 0.15)
   jekyll-paginate-v2 (= 3.0.0)
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
   tzinfo-data
-
-RUBY VERSION
-   ruby 2.7.4p191
+  webrick
 
 BUNDLED WITH
-   2.1.4
+   2.4.12

_config.yml

@@ -155,6 +155,7 @@ collections:
     output: true
     permalink: /ficam/:path/
 
+
 # Leaving in place: 
 # Unsure of placement in new site.
 
@@ -233,26 +234,21 @@ exclude:
   - Gemfile
   - Gemfile.lock
   - docker-compose.yml
-  - staging-ficam-playbooks
+
 assets:
   autoprefixer:
     browsers:
       - "> 2%"
       - "last 2 versions"
       - "IE 11"
       - "not dead"
-  sources:
-  ## Updated to @uswds 3.0
-    - node_modules/@uswds/uswds/dist/css
-    - node_modules/@uswds/uswds/dist/fonts
-    - node_modules/@uswds/uswds/dist/img
-    - node_modules/@uswds/uswds/dist/img/favicons
-    - node_modules/@uswds/uswds/dist/img/material-icons
-    - node_modules/@uswds/uswds/dist/img/usa-icons
-    - node_modules/@uswds/uswds/dist/img/usa-icons-bg
-    - node_modules/@uswds/uswds/dist/img/uswds-icons
-    - node_modules/@uswds/uswds/dist/js
-    - node_modules/@uswds/uswds/dist/scss
-    - node_modules/@uswds/uswds/dist/theme
-    - node_modules/@uswds/uswds/packages
-    - node_modules/netlify-cms/dist
+
+sass:
+  source_dir: _sass
+  load_paths:
+    - node_modules/@uswds/uswds/dist/
+  sourcemap: development
+  quiet_deps: true
+  style: compressed
+  verbose: true
+

_includes/header.html

@@ -9,7 +9,7 @@
       <header class="usa-banner__header">
         <div class="usa-banner__inner">
           <div class="grid-col-auto">
-            {% asset us_flag_small.png class="usa-banner__header-flag" alt="U.S. flag" %}
+            <img src="{{site.baseurl}}/assets/img/us_flag_small.png"  class="usa-banner__header-flag" alt="U.S. flag">
           </div>
           <div class="grid-col-fill tablet:grid-col-auto">
             <p class="usa-banner__header-text">An official website of the United States government</p>
@@ -23,7 +23,7 @@
       <div class="usa-banner__content usa-accordion__content" id="gov-banner">
         <div class="grid-row grid-gap-lg">
           <div class="usa-banner__guidance tablet:grid-col-6">
-            {% asset icon-dot-gov.svg class="usa-banner__icon usa-media-block__img" alt="Dot gov" %}
+            <img src="{{site.baseurl}}/assets/img/icon-dot-gov.svg" class="usa-banner__icon usa-media-block__img" alt="Dot gov">
             <div class="usa-media-block__body">
               <p>
                 <strong>The .gov means it’s official.</strong>
@@ -34,7 +34,7 @@
             </div>
           </div>
           <div class="usa-banner__guidance tablet:grid-col-6">
-            {% asset icon-https.svg class="usa-banner__icon usa-media-block__img" alt="Https" %}
+            <img src="{{site.baseurl}}/assets/img/icon-https.svg" class="usa-banner__icon usa-media-block__img" alt="Https">
             <div class="usa-media-block__body">
               <p>
                 <strong>The site is secure.</strong>

_includes/menu.html

@@ -10,7 +10,7 @@
   </div>
   <nav role="navigation" class="usa-nav">
     <div class="usa-nav__inner">
-      <button class="usa-nav__close">{% asset close.svg alt="close" %}</button>
+      <button class="usa-nav__close"><img src="{{site.baseurl}}/assets/img/usa-icons/close.svg" alt="close"></button>
       <ul class="usa-nav__primary usa-accordion">
         {% for nav_item in include.primary_navigation %}
         {% unless nav_item.children %}

_includes/messagecenter.html

@@ -1,5 +1,5 @@
-<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>
+<!-- <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script> -->
 {% if include.messages.size > 0 %}
 <!-- Message Center will shows when messagecenter has messages -->
 <div id="gsaMessageCenter" class="carousel slide carousel-fade  grid-container"  data-bs-ride="carousel">