Merge pull request #314 from cloud-gov/remove-jekyll-assets

Remove jekyll assets

.github/workflows/build-and-test.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install ruby.
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.1
           bundler-cache: true
 
       - name: Install node.js.
@@ -36,8 +36,8 @@ jobs:
       - name: Install NPM dependencies.
         run: npm install
 
-      - name: Build and start up jekyll server.
-        run: npm run build && npm run start-detached
+      - name: Start up jekyll server.
+        run: npm run start-detached
 
       - name: Run pa11y-ci.
         run: npm run pa11y-ci:sitemap

.gitignore

@@ -4,3 +4,6 @@ _site
 node_modules
 .bundle
 .jekyll-cache/
+assets/uswds/*
+!assets/uswds/.gitkeep
+assets/js/uswds*

.ruby-version

@@ -0,0 +1 @@
+3.1.3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.4
+FROM ruby:3.1.3
 
 RUN apt-get update && \
   apt-get install --reinstall -y locales && \

Gemfile

@@ -1,16 +1,16 @@
 source "https://rubygems.org"
 
-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
@@ -19,4 +19,4 @@ 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.18"
+gem "html-proofer", "~> 5"

Gemfile.lock

@@ -1,58 +1,44 @@
-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.5.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      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)
+    Ascii85 (1.1.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    afm (0.2.2)
+    async (2.5.1)
+      console (~> 1.10)
+      io-event (~> 1.1)
+      timers (~> 4.1)
+    autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
+    console (1.16.2)
+      fiber-local
     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)
+    fiber-local (1.0.0)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.3)
+    hashery (2.1.2)
+    html-proofer (5.0.7)
       addressable (~> 2.3)
-      mercenary (~> 0.3)
-      nokogiri (~> 1.12)
-      parallel (~> 1.3)
+      async (~> 2.1)
+      nokogiri (~> 1.13)
+      pdf-reader (~> 2.11)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
+      zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.10.0)
+    i18n (1.13.0)
       concurrent-ruby (~> 1.0)
+    io-event (1.2.2)
     jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
@@ -68,15 +54,12 @@ 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.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.8.0)
@@ -89,62 +72,61 @@ GEM
       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.0)
-    minitest (5.15.0)
-    nokogiri (1.13.4)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.2)
+    nokogiri (1.15.0)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.22.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3)
+    pdf-reader (2.11.0)
+      Ascii85 (~> 1.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
+    public_suffix (5.0.1)
+    racc (1.6.2)
     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)
+    ruby-rc4 (0.1.5)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sprockets (4.0.3)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    timers (4.3.5)
+    ttfunk (1.7.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
+    webrick (1.8.1)
     yell (2.2.2)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   autoprefixer-rails
   execjs (= 2.7.0)
-  html-proofer (~> 3.18)
-  jekyll (~> 4.0)
-  jekyll-assets!
+  html-proofer (~> 5)
+  jekyll (= 4.2.2)
   jekyll-feed (~> 0.15)
   jekyll-paginate-v2 (= 3.0.0)
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
   tzinfo-data
+  webrick
 
 BUNDLED WITH
-   2.1.4
+   2.4.12

README.md

@@ -118,7 +118,7 @@ ga:
 
 - We try to keep configuration options to a minimum so you can easily change functionality. You should review `_config.yml` to see the options that are available to you. There are a few values on top that you **need** to change. They refer to the agency name and contact information. The rest of `_config.yml` has a range of more advanced options.
 
-- The contents inside `assets/` folder store your Javascript, SCSS/CSS, images, and other media assets are managed by  [jekyll-assets](https://github.com/envygeeks/jekyll-assets).  Assets are combined, compressed, and automatically available in your theme
+- The `assets/` folder stores your Javascript, CSS, images, and other media assets. Additional SASS partials should be added to the `_sass/` folder where they can be imported. USWDS assets are automatically copied into the `assets/` folder when running `jekyll serve` or `jekyll build`
 
 - If you look at `package.json` you will see that the `npm run federalist` command that will run when running on the Federalist platform.
 

_config.yml

@@ -186,14 +186,18 @@ exclude:
   - docker-compose.yml
   - Dockerfile
 
-assets:
-  autoprefixer:
-    browsers:
-      - "> 2%"
-      - "last 2 versions"
-      - "IE 11"
-      - "not dead"
-  compression: true
-  sources:
-    - node_modules/uswds/dist
-    - node_modules/netlify-cms/dist
+autoprefixer:
+  browsers:
+    - "> 2%"
+    - "last 2 versions"
+    - "IE 11"
+    - "not dead"
+
+sass:
+  source_dir: _sass
+  load_paths:
+    - node_modules/uswds/dist/
+  sourcemap: development
+  quiet_deps: true
+  style: compressed
+  verbose: true