Merge pull request #1344 from sul-dlss/bl8

UI upgrade

.github/workflows/ruby.yml

@@ -4,7 +4,9 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, bl8 ]
+    branches:
+      - main
+      - bl8
 
 jobs:
   tests:
@@ -13,13 +15,13 @@ jobs:
       matrix:
         ruby: ['3.3']
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Prepare application
-      run: bin/setup
-    - name: Run tests
-      run: bundle exec rake ci
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Prepare application
+        run: bin/rails test:prepare
+      - name: Run tests
+        run: bundle exec rake ci

.gitignore

@@ -24,3 +24,8 @@ config/environments/*.local.yml
 # Ignore JavaScript packaging.
 node_modules/
 yarn.lock
+
+/app/assets/builds/*
+!/app/assets/builds/.keep
+
+/node_modules

.rubocop.yml

@@ -32,6 +32,13 @@ RSpec/MultipleMemoizedHelpers:
   Exclude:
     - "spec/lib/earthworks/harvester_spec.rb"
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
+Metrics/ClassLength:
+  Exclude:
+    - "app/controllers/catalog_controller.rb"
+
 Gemspec/DeprecatedAttributeAssignment: # new in 1.30
   Enabled: true
 Gemspec/RequireMFA: # new in 1.23

.solr_wrapper

@@ -3,4 +3,4 @@
 collection:
   dir: config/solr_configs/
   name: blacklight-core
-version: 9.6.1
+version: 8.11.2

Gemfile

@@ -3,18 +3,12 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.1'
 
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
-gem "sprockets-rails"
+# Successor to sprockets. https://github.com/rails/propshaft
+gem "propshaft"
 
 # Use Puma as the app server
 gem 'puma', '~> 6'
 
-# Use SCSS for stylesheets
-gem 'sassc-rails'
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.5'
 # Reduces boot times through caching; required in config/boot.rb
@@ -44,12 +38,13 @@ group :development, :test do
   gem 'rspec-rails'
   gem 'capybara'
   gem 'selenium-webdriver', '!= 3.13.0'
-  gem 'factory_bot_rails', '~> 6.4'
+  gem 'factory_bot_rails'
   gem 'database_cleaner'
   gem 'dotenv'
   gem 'simplecov', require: false
   gem 'solr_wrapper'
   gem 'sqlite3', '~> 1.7'
+  gem "axe-core-rspec"
 end
 
 group :deployment do
@@ -67,9 +62,10 @@ group :production do
   gem 'pg'
 end
 
-gem 'blacklight', '~> 7.33'
+#gem 'blacklight', '~> 8.3'
+gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'main'
 gem 'rsolr' # required for Blacklight
-gem 'geoblacklight','~> 4.4'
+gem 'geoblacklight', github: 'geoblacklight/geoblacklight', branch: 'main'
 gem 'faraday', '~> 2.0'
 gem "devise"
 gem "devise-guests", ">= 0.3.3"
@@ -87,7 +83,11 @@ gem 'redis', '~> 5.0'
 gem 'geo_combine', '>= 0.9' # For OpenGeoMetadata indexing
 gem 'sidekiq', '~> 7.0'
 gem 'whenever', require: false
-gem 'bootstrap', '~> 4.0'
+gem 'bootstrap', '~> 5.3'
 gem 'rack-attack' # For throttle configuration
 gem 'recaptcha', '>= 5.4.1'
 gem 'http'
+gem "cssbundling-rails", "~> 1.4"
+gem "importmap-rails", "~> 2.0"
+gem "stimulus-rails", "~> 1.3"
+gem "turbo-rails", "~> 2.0"