Initial v4.4 support (#589)

* Initial v4.4 support Vite, COGs, PMTiles * Update ci.yml Bump Node.js * Update ci.yml Just Ruby v3.3 * IIIF Manifest: BTAA not using Clover * Update show_page_test.rb New map default is positron.
geobtaa · Apr 15, 2024 · 2dae170 · 2dae170
1 parent 0f4180f
commit 2dae170
Show file tree

Hide file tree

Showing 26 changed files with 1,659 additions and 67 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
+        ruby: ['3.3']
         rails_version: [7.0.8]
 
     services:
@@ -47,10 +47,10 @@ jobs:
       env:
         RAILS_VERSION: ${{ matrix.rails_version }}
 
-    - name: Node - v14
-      uses: actions/setup-node@v2
+    - name: Set up Node
+      uses: actions/setup-node@v4
       with:
-        node-version: '14'
+        node-version: '20.x'
 
     - name: Yarn - Setup
       run: exec "yarnpkg"

diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,11 @@ public/data.json
 yarn-debug.log*
 .yarn-integrity
 .byebug_history
+
+# Vite Ruby
+/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
+
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.0.3
+3.3.0
diff --git a/Gemfile b/Gemfile
@@ -79,7 +79,7 @@ gem 'chosen-rails', '~> 1.10' #  jquery multiselect plugin for advanced search
 gem 'bootstrap', '~> 4.0'
 gem 'popper_js'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
-gem 'geoblacklight', '4.1'
+gem 'geoblacklight', '4.4'
 
 # GBL Admin - Not ready for GBL v4.2/Vite yet
 gem 'geoblacklight_admin', '0.4.1'
@@ -147,3 +147,5 @@ end
 
 gem 'net-ftp'
 gem 'rexml'
+
+gem "vite_rails", "~> 3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -103,7 +103,7 @@ GEM
     activerecord (7.0.8.1)
       activemodel (= 7.0.8.1)
       activesupport (= 7.0.8.1)
-    activerecord-import (1.5.1)
+    activerecord-import (1.6.0)
       activerecord (>= 4.2)
     activestorage (7.0.8.1)
       actionpack (= 7.0.8.1)
@@ -124,16 +124,16 @@ GEM
       faraday (>= 1.0, < 3.0)
       faraday-net_http_persistent
       net-http-persistent
-    amazing_print (1.5.0)
+    amazing_print (1.6.0)
     ansi (1.5.0)
-    appsignal (3.6.0)
+    appsignal (3.6.4)
       rack
     attr_json (2.3.0)
       activerecord (>= 6.0.0, < 7.2)
     autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
     awesome_print (1.9.2)
-    axe-core-api (4.8.2)
+    axe-core-api (4.9.0)
       dumb_delegator
       virtus
     axiom-types (0.1.1)
@@ -143,7 +143,7 @@ GEM
     base64 (0.2.0)
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     bindex (0.8.1)
     blacklight (7.33.1)
       deprecation
@@ -190,6 +190,7 @@ GEM
       capybara
       selenium-webdriver
     chartkick (5.0.6)
+    childprocess (5.0.0)
     chosen-rails (1.10.0)
       coffee-rails (>= 3.2)
       railties (>= 3.0)
@@ -213,7 +214,7 @@ GEM
     connection_pool (2.4.1)
     content_disposition (1.0.0)
     crass (1.0.6)
-    csv (3.2.8)
+    csv (3.3.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -226,7 +227,7 @@ GEM
       activesupport
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -248,6 +249,7 @@ GEM
       railties (>= 3.2)
     down (5.4.1)
       addressable (~> 2.8)
+    dry-cli (1.0.0)
     dry-configurable (1.1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
@@ -298,36 +300,41 @@ GEM
     faraday-net_http_persistent (2.1.0)
       faraday (~> 2.5)
       net-http-persistent (~> 4.0)
-    fastimage (2.3.0)
+    faraday-retry (2.2.1)
+      faraday (~> 2.0)
+    fastimage (2.3.1)
     ffi (1.16.3)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
     flamegraph (0.9.5)
-    foreman (0.87.2)
+    foreman (0.88.1)
     fx (0.8.0)
       activerecord (>= 6.0.0)
       railties (>= 6.0.0)
-    geo_combine (0.8.0)
+    geo_combine (0.9.0)
       activesupport
       faraday-net_http_persistent (~> 2.0)
+      faraday-retry (~> 2.2)
       git
       json-schema
       nokogiri
       rsolr
       sanitize
       thor
-    geoblacklight (4.1.0)
-      blacklight (~> 7.33)
+    geoblacklight (4.4.0)
+      blacklight (~> 7.0)
       coderay
       config
       deprecation
-      faraday (>= 1.0)
-      geo_combine (~> 0.8)
+      faraday (~> 2.0)
+      geo_combine (~> 0.9)
       handlebars_assets
       mime-types
-      rails (>= 6.1, < 7.1)
+      rails (>= 6.1, < 7.2)
       rgeo-geojson
+      sprockets-rails (~> 3.0)
+      vite_rails (~> 3.0)
     geoblacklight_admin (0.4.1)
       active_storage_validations (~> 1.0)
       amazing_print
@@ -387,7 +394,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     image_processing (1.12.2)
@@ -403,7 +410,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json-schema (4.1.1)
+    json-schema (4.3.0)
       addressable (>= 2.8)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -432,15 +439,16 @@ GEM
       simple_form (>= 4.0, < 6.0)
       traject (~> 3.0, >= 3.1.0.rc1)
       tty-command (>= 0.8.2, < 2)
-    launchy (2.5.2)
+    launchy (3.0.0)
       addressable (~> 2.8)
+      childprocess (~> 5.0)
     ldpath (1.2.0)
       nokogiri (~> 1.8)
       parslet
       rdf (~> 3.0)
       rdf-vocab (~> 3.0)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
     link_header (0.0.8)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -465,21 +473,21 @@ GEM
       unf
     marc-fastxmlwriter (1.1.0)
       marc (~> 1.0)
-    marcel (1.0.3)
+    marcel (1.0.4)
     matrix (0.4.2)
     memory_profiler (0.9.14)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
+    mime-types-data (3.2024.0305)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_magick (4.9.5)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitar (0.9)
-    minitest (5.22.2)
+    minitest (5.22.3)
     minitest-ci (3.4.0)
       minitest (>= 5.0.6)
     minitest-reporters (1.6.1)
@@ -503,10 +511,10 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.2)
+    nio4r (2.7.1)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     noticed (1.6.3)
@@ -527,14 +535,14 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.5)
+    pg (1.5.6)
     pointless_feedback (4.1.5)
       airrecord (~> 1.0)
       jquery-rails (>= 4.0)
       rails (>= 4.0)
       typhoeus (~> 0.7, >= 0.7.3)
     popper_js (1.16.1)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (5.6.8)
       nio4r (~> 2.0)
     qa (5.11.0)
@@ -547,8 +555,8 @@ GEM
       rails (>= 5.0, < 7.2)
       rdf
     racc (1.7.3)
-    rack (2.2.8.1)
-    rack-cors (2.0.1)
+    rack (2.2.9)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
@@ -584,7 +592,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -606,7 +614,7 @@ GEM
     rgeo (3.0.1)
     rgeo-geojson (2.1.1)
       rgeo (>= 1.0.0)
-    rsolr (2.5.0)
+    rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
     rspec-core (3.9.3)
@@ -656,7 +664,7 @@ GEM
       tilt
     scrub_rb (1.0.1)
     sd_notify (0.1.1)
-    selenium-webdriver (4.18.1)
+    selenium-webdriver (4.19.0)
       base64 (~> 0.2)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -681,20 +689,21 @@ GEM
     sitemap_generator (6.0.2)
       builder (~> 3.0)
     slop (4.10.1)
-    spring (4.1.3)
-    sprockets (3.7.2)
+    spring (4.2.0)
+    sprockets (3.7.3)
+      base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.7.2)
+    sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
     stackprof (0.2.26)
     statesman (10.0.0)
     temple (0.10.3)
-    terser (1.2.0)
+    terser (1.2.2)
       execjs (>= 0.3.0, < 3)
     tether-rails (1.4.0)
       rails (>= 3.1)
@@ -715,7 +724,8 @@ GEM
       nokogiri (~> 1.9)
       slop (~> 4.0)
       yell
-    ttfunk (1.7.0)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     tty-color (0.6.0)
     tty-command (0.10.1)
       pastel (~> 0.8)
@@ -742,6 +752,13 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
+    vite_rails (3.0.17)
+      railties (>= 5.1, < 8)
+      vite_ruby (~> 3.0, >= 3.2.2)
+    vite_ruby (3.5.0)
+      dry-cli (>= 0.7, < 2)
+      rack-proxy (~> 0.6, >= 0.6.1)
+      zeitwerk (~> 2.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)
@@ -798,7 +815,7 @@ DEPENDENCIES
   factory_bot_rails
   flamegraph (~> 0.9.5)
   foreman
-  geoblacklight (= 4.1)
+  geoblacklight (= 4.4)
   geoblacklight-icons!
   geoblacklight_admin (= 0.4.1)
   geoblacklight_sidecar_images!
@@ -846,6 +863,7 @@ DEPENDENCIES
   terser
   turbolinks
   twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
+  vite_rails (~> 3.0)
   web-console
   webpacker (~> 5.x)
   whenever (~> 1.0.0)

diff --git a/Procfile.dev b/Procfile.dev
@@ -0,0 +1,3 @@
+
+vite: bin/vite dev
+web: bin/rails s
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -348,7 +348,7 @@ class CatalogController < ApplicationController
     # 'mapquest' http://developer.mapquest.com/web/products/open/map
     # 'positron' http://cartodb.com/basemaps/
     # 'darkMatter' http://cartodb.com/basemaps/
-    config.basemap_provider = 'esri'
+    config.basemap_provider = 'positron'
 
     # Configuration for autocomplete suggestor
     config.autocomplete_enabled = true