diff --git a/.gitignore b/.gitignore index a0d481bd..fc0f879e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ assets/fonts assets/js/uswds.js assets/js/uswds.min.js assets/js/uswds.min.js.map +assets/js/uswds-init.js +assets/js/uswds-init.min.js +assets/js/uswds-init.min.js.map \ No newline at end of file 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..846a0b97 100644 --- a/_config.yml +++ b/_config.yml @@ -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 @@