From 5305db740d56c06260cfeb00cae0764985b93196 Mon Sep 17 00:00:00 2001 From: Luna Wang Date: Tue, 12 Mar 2024 16:40:49 -0400 Subject: [PATCH 1/9] updated jekyll and uswds --- Gemfile | 5 +- _config.yml | 6 +- _includes/footer.html | 8 +- _includes/highlights.html | 7 +- _pages/Community-News/index.html | 206 - _pages/Guideance-and-Resources/index.html | 205 - _plugins/asset-helper.rb | 6 +- _plugins/jekyll_copy_uswds.rb | 2 +- assets/css/index.scss | 26 +- assets/js/uswds-init.js | 24 + assets/js/uswds-init.min.js | 2 + assets/js/uswds-init.min.js.map | 1 + blog/index.html | 111 +- index.html | 2 - package-lock.json | 5681 +++++++-------------- package.json | 4 +- 16 files changed, 1898 insertions(+), 4398 deletions(-) delete mode 100644 _pages/Community-News/index.html delete mode 100644 _pages/Guideance-and-Resources/index.html create mode 100644 assets/js/uswds-init.js create mode 100644 assets/js/uswds-init.min.js create mode 100644 assets/js/uswds-init.min.js.map diff --git a/Gemfile b/Gemfile index fdde5cdc..598d90c0 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ ruby '>= 3.1.3' source "https://rubygems.org" -gem "jekyll", "~> 3.8" # pinned awaiting release of https://github.com/jekyll/jekyll/pull/9304 +gem 'jekyll', '~> 4.3.3' gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99 gem "mini_racer" gem "autoprefixer-rails" @@ -15,7 +15,7 @@ gem "kramdown-parser-gfm" 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' gem 'jekyll-sitemap' gem 'jekyll-seo-tag' gem 'jekyll-autoprefixer' @@ -28,3 +28,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "wdm", "~> 0.1.0" if Gem.win_platform? gem "html-proofer", "~> 3.15" +gem 'jekyll-sass-converter', '~> 3.0' diff --git a/_config.yml b/_config.yml index 6c1d48af..29713c75 100644 --- a/_config.yml +++ b/_config.yml @@ -212,7 +212,7 @@ pagination: # Site-wide kill switch, disabled here it doesn't run at all enabled: true # Set to 'true' to enable pagination debugging. This can be enabled in the site config or only for individual pagination pages - debug: false + debug: true # The default document collection to paginate if nothing is specified ('posts' is default) collection: "posts" # How many objects per paginated page, used to be `paginate` (default: 0, means all) @@ -243,10 +243,8 @@ pagination: after: 2 # Optional, the default file extension for generated pages (e.g html, json, xml). # Internally this is set to html by default - extension: html # Optional, the default name of the index file for generated pages (e.g. 'index.html') # Without file extension - indexpage: "index.html" exclude: - package.json @@ -272,7 +270,7 @@ autoprefixer: sass: sass_dir: _sass load_paths: - - node_modules/uswds/dist/ + - node_modules/@uswds/uswds/packages sourcemap: development quiet_deps: true style: compressed diff --git a/_includes/footer.html b/_includes/footer.html index 91f08e22..750050bd 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -62,17 +62,17 @@