Merge pull request #119 from cul/dev-v2.0.0

Dev v2.0.0

.eslintrc.cjs

@@ -0,0 +1,28 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+  },
+  extends: 'airbnb',
+  overrides: [
+    {
+      env: {
+        node: true,
+      },
+      files: [
+        '.eslintrc.{js,cjs}',
+      ],
+      parserOptions: {
+        sourceType: 'script',
+      },
+    },
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+  },
+  rules: {
+    'max-len': ['warn', { code: 120 }],
+    'no-unused-vars': 'warn',
+  },
+};

.github/workflows/ci.yml

@@ -10,13 +10,14 @@ jobs:
     strategy:
       matrix:
         ruby-version: ['3.1.3']
+        node: ['20']
     env:
       RAILS_ENV: test
       FONT_AWESOME_TOKEN: ${{ secrets.FONT_AWESOME_TOKEN }}
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install libxslt for nokogiri gem (required for version < 1.11)
         run: sudo apt-get install -y libxml2-dev libxslt-dev
       - name: Add --no-document option to .gemrc file to speed up bundle install
@@ -26,5 +27,12 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+      - run: npm install -g yarn
+      - run: yarn install
+      - run: yarn run lint
       - name: Run CI task
-        run: bundle exec rspec
+        run: bundle exec rspec

.gitignore

@@ -41,6 +41,7 @@ blacklight.yml
 credentials.yml.enc
 database.yml
 finding_aids.yml
+index_api.yml
 master.key
 redis.yml
 repositories.yml
@@ -51,3 +52,11 @@ secrets.yml
 # Ignore local fixture files
 /spec/fixtures/asi/local_dev_fixtures/*
 !/spec/fixtures/asi/local_dev_fixtures/.keep
+
+# Vite
+/public/vite*
+node_modules
+# Vite uses dotenv and suggests to ignore local-only env files. See
+# https://vitejs.dev/guide/env-and-mode.html#env-files
+*.local
+

.nvmrc

@@ -0,0 +1 @@
+v20.10.0

Capfile

@@ -1,9 +1,17 @@
-# default requires
+# Load DSL and set up stages
 require 'capistrano/setup'
+
+# Include default deployment tasks
 require 'capistrano/deploy'
-# additional optional modules used by clio
-require 'capistrano/rvm'
-require 'capistrano/bundler'
-require 'capistrano/rails/assets'
-require 'capistrano/rails/migrations'
+
+# Git SCM plugin
+require 'capistrano/scm/git'
+install_plugin Capistrano::SCM::Git
+
+# additional modules
+require 'capistrano/rails'
 require 'capistrano/passenger'
+require 'capistrano/cul'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -30,8 +30,8 @@ gem 'terser'
 # Use Puma as the app server
 gem 'puma', '~> 5.2'
 
-# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
-gem "importmap-rails"
+# Use JavaScript with Vite [https://github.com/sergii/vite_rails]
+gem 'vite_rails'
 
 # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
 gem "turbo-rails"
@@ -67,14 +67,17 @@ gem 'iso-639'
 gem 'nokogiri', '~> 1.15.2'
 gem 'loofah', '~> 2.19.1'
 
-gem 'arclight', '~> 1.0.0'
+gem 'arclight', '~> 1.1.4'
+gem 'blacklight', '~> 8.2.2'
 
 gem "font-awesome-sass", "~> 6.4.0"
 fa_token = font_awesome_token
 if fa_token
   source "https://token:#{fa_token}@dl.fontawesome.com/basic/fontawesome-pro/ruby/" do
     gem "font-awesome-pro-sass", "~> 6.4.0"
   end
+else
+  raise 'ERROR: You are missing font_awesome_token in secrets.yml.  It is required for `bundle install` to work.'
 end
 gem "rsolr", ">= 1.0", "< 3"
 gem "bootstrap", "\~\>\ 5.1"
@@ -95,10 +98,10 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem "capistrano", "~> 3.11", require: false
-  gem "capistrano-rails", "~> 1.4", require: false
-  gem 'capistrano-rvm', '~> 0.1', require: false
-  gem 'capistrano-passenger', '~> 0.2', require: false
+  gem 'capistrano', '~> 3.18.0', require: false
+  gem 'capistrano-cul', require: false
+  gem 'capistrano-passenger', '~> 0.1', require: false
+  gem 'capistrano-rails', '~> 1.4', require: false
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem