use packaged USWDS assets

* improve accessibility of permissions page * update uswds to 3.11.0 * precompile assets in circleci * counter_cache for Service.cx_collections * update jquery ui
GSA · Jan 21, 2025 · 5e831fc · 5e831fc
1 parent ac68ceb
commit 5e831fc
Show file tree

Hide file tree

Showing 32 changed files with 3,607 additions and 15,526 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -52,6 +52,13 @@ jobs:
       - run: bundle exec rake db:create
       - run: bundle exec rake db:schema:load
 
+      # Precompile assets (to use npm packages specified in assets.rb)
+      - run:
+          name: Precompile assets
+          command: |
+            npm i
+            rails assets:precompile
+
       # run tests!
       - run:
           name: Run tests

diff --git a/Gemfile b/Gemfile
@@ -42,10 +42,6 @@ gem "sassc-rails"
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 gem "image_processing", "~> 1.12"
 
-gem "brakeman"
-gem "bundler-audit"
-gem "rubocop-rails"
-gem "rubocop-rspec"
 gem 'active_model_serializers'
 gem 'acts-as-list'
 gem 'aws-sdk-rails', '>= 3.8.0'
@@ -68,7 +64,6 @@ gem 'rack-cors', require: 'rack/cors'
 # Use Redis to cache Touchpoints in all envs
 gem 'redis-client'
 gem 'redis-namespace'
-gem 'sass-rails'
 gem 'sidekiq', '>= 6.5.0'
 gem 'json-jwt'
 gem 'aasm'
@@ -80,15 +75,17 @@ gem "rolify"
 group :development, :test do
   gem 'dotenv'
   gem 'pry'
-  gem 'rspec_junit_formatter'
 end
 
 group :development do
-  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'aasm-diagram'
+  gem "brakeman"
   gem 'bullet'
+  gem "bundler-audit"
   gem 'listen'
   gem 'rails-erd'
+  gem "rubocop-rails"
+  gem "rubocop-rspec"
   gem 'web-console'
 end
 
@@ -98,6 +95,7 @@ group :test do
   gem 'database_cleaner'
   gem 'factory_bot_rails'
   gem 'rails-controller-testing'
+  gem 'rspec_junit_formatter'
   gem 'rspec-rails'
   gem 'selenium-webdriver'
   gem 'simplecov', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -106,7 +106,7 @@ GEM
     aws-partitions (1.1029.0)
     aws-record (2.13.2)
       aws-sdk-dynamodb (~> 1, >= 1.85.0)
-    aws-sdk-core (3.214.0)
+    aws-sdk-core (3.214.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -128,7 +128,7 @@ GEM
       aws-sessionstore-dynamodb (~> 2)
       concurrent-ruby (~> 1.3, >= 1.3.1)
       railties (>= 7.0.0)
-    aws-sdk-s3 (1.170.1)
+    aws-sdk-s3 (1.176.1)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -240,16 +240,16 @@ GEM
       faraday (>= 1, < 3)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-aarch64-linux-musl)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm-linux-musl)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86-linux-musl)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-musl)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86-linux-gnu)
+    ffi (1.17.1-x86-linux-musl)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
     fog-aws (3.30.0)
       base64 (~> 0.2.0)
       fog-core (~> 2.6)
@@ -263,7 +263,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-xml (0.1.4)
+    fog-xml (0.1.5)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (1.1.0)
@@ -301,7 +301,7 @@ GEM
       faraday (~> 2.0)
       faraday-follow_redirects
     jsonapi-renderer (0.2.2)
-    jwt (2.9.3)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -359,24 +359,24 @@ GEM
       net-protocol
     newrelic_rpm (9.16.1)
     nio4r (2.7.4)
-    nokogiri (1.18.0)
+    nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.0-aarch64-linux-gnu)
+    nokogiri (1.18.1-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.0-aarch64-linux-musl)
+    nokogiri (1.18.1-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.0-arm-linux-gnu)
+    nokogiri (1.18.1-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.0-arm-linux-musl)
+    nokogiri (1.18.1-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.0-arm64-darwin)
+    nokogiri (1.18.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.0-x86_64-darwin)
+    nokogiri (1.18.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.0-x86_64-linux-gnu)
+    nokogiri (1.18.1-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.0-x86_64-linux-musl)
+    nokogiri (1.18.1-x86_64-linux-musl)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -539,8 +539,6 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (2.3.2)
-    sass-rails (6.0.0)
-      sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -683,7 +681,6 @@ DEPENDENCIES
   rspec_junit_formatter
   rubocop-rails
   rubocop-rspec
-  sass-rails
   sassc-rails
   selenium-webdriver
   sidekiq (>= 6.5.0)

diff --git a/app/assets/javascripts/app.js b/app/assets/javascripts/app.js
@@ -15,7 +15,7 @@
 //= require jquery3
 //= require jquery-ui
 //= require rails-ujs
-//= require uswds-init.min
+//= require @uswds/uswds/dist/js/uswds-init
 //= require heartbeat
 
 function generateUUID() {