From 5fcfb478ba7f4fe0823a5d8091eac2f095dc90a8 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Mon, 4 Nov 2024 10:00:02 -0600 Subject: [PATCH 1/2] JS: fix customized viewer initialization error (#624) * JS: fix customized viewer initialization error by adding all GBL viewers locally Fixes #623 * Gems: bump GBLSCI to latest --- Gemfile | 2 +- Gemfile.lock | 10 ++++---- app/assets/javascripts/application.js | 5 ++-- .../javascripts/geoportal/viewers/cog.js | 5 ++++ .../javascripts/geoportal/viewers/iiif.js | 25 +++++++++++++++++++ .../javascripts/geoportal/viewers/oembed.js | 13 ++++++++++ .../javascripts/geoportal/viewers/pmtiles.js | 5 ++++ 7 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 app/assets/javascripts/geoportal/viewers/cog.js create mode 100644 app/assets/javascripts/geoportal/viewers/iiif.js create mode 100644 app/assets/javascripts/geoportal/viewers/oembed.js create mode 100644 app/assets/javascripts/geoportal/viewers/pmtiles.js diff --git a/Gemfile b/Gemfile index c6b3f53fe..18087d27a 100644 --- a/Gemfile +++ b/Gemfile @@ -100,7 +100,7 @@ gem 'noticed' gem 'paper_trail' # Image migration -gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geoblacklight_sidecar_images.git", branch: "feature/statesman-update" +gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geoblacklight_sidecar_images.git", branch: "develop" gem 'mini_magick', '~> 4.9.4' gem "image_processing", ">= 1.2" diff --git a/Gemfile.lock b/Gemfile.lock index 93f4ac296..f626c61fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,17 +27,17 @@ GIT GIT remote: https://github.com/geoblacklight/geoblacklight_sidecar_images.git - revision: 089e2a4a677a5d522b9d88fef0ef46cfa69961a0 - branch: feature/statesman-update + revision: ca23e5ef8eb4fa90d5c9cb955943deeb0dcba6f5 + branch: develop specs: - geoblacklight_sidecar_images (1.0.0) + geoblacklight_sidecar_images (1.1.0) faraday (>= 2.0) geoblacklight (~> 4.0) image_processing (~> 1.6) mimemagic (~> 0.3) mini_magick (~> 4.9.4) - rails (>= 5.2, < 7.1) - statesman (~> 10.0.0) + rails (>= 5.2, < 8.0) + statesman (>= 3.4) GIT remote: https://github.com/geobtaa/geoblacklight_admin.git diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5cf3ccc07..b9d596114 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -40,6 +40,7 @@ //= require geoblacklight/viewers/viewer //= require ./geoportal/viewers/map //= require ./geoportal/viewers/b1g_image +//= require ./geoportal/viewers/cog //= require ./geoportal/viewers/download //= require ./geoportal/viewers/esri //= require ./geoportal/viewers/esri/dynamic_map_layer @@ -50,10 +51,10 @@ //= require ./geoportal/viewers/iiif_manifest //= require ./geoportal/viewers/index_map //= require geoblacklight/viewers/oembed - -//= require ./geoportal/viewers/wms +//= require ./geoportal/viewers/pmtiles //= require ./geoportal/viewers/tilejson //= require ./geoportal/viewers/tms +//= require ./geoportal/viewers/wms //= require ./geoportal/viewers/wmts //= require ./geoportal/viewers/xyz diff --git a/app/assets/javascripts/geoportal/viewers/cog.js b/app/assets/javascripts/geoportal/viewers/cog.js new file mode 100644 index 000000000..639d33e88 --- /dev/null +++ b/app/assets/javascripts/geoportal/viewers/cog.js @@ -0,0 +1,5 @@ +//= require geoblacklight/viewers/viewer + +GeoBlacklight.Viewer.Cog = GeoBlacklight.Viewer.extend({ + load: function() {} +}); \ No newline at end of file diff --git a/app/assets/javascripts/geoportal/viewers/iiif.js b/app/assets/javascripts/geoportal/viewers/iiif.js new file mode 100644 index 000000000..e50ca262b --- /dev/null +++ b/app/assets/javascripts/geoportal/viewers/iiif.js @@ -0,0 +1,25 @@ +//= require geoblacklight/viewers/viewer + +GeoBlacklight.Viewer.Iiif = GeoBlacklight.Viewer.extend({ + load: function() { + this.adjustLayout(); + + this.map = L.map(this.element, { + center: [0, 0], + crs: L.CRS.Simple, + zoom: 0 + }); + this.loadControls(); + this.iiifLayer = L.tileLayer.iiif(this.data.url) + .addTo(this.map); + }, + + adjustLayout: function() { + + // hide attribute table + $('#table-container').hide(); + + // expand viewer element + $(this.element).parent().attr('class', 'col-md-12'); + } +}); diff --git a/app/assets/javascripts/geoportal/viewers/oembed.js b/app/assets/javascripts/geoportal/viewers/oembed.js new file mode 100644 index 000000000..004d6d371 --- /dev/null +++ b/app/assets/javascripts/geoportal/viewers/oembed.js @@ -0,0 +1,13 @@ +//= require geoblacklight/viewers/viewer + +GeoBlacklight.Viewer.Oembed = GeoBlacklight.Viewer.extend({ + load: function() { + var $el = $(this.element); + $.getJSON(this.data.url, function(data){ + if (data === null){ + return; + } + $el.html(data.html); + }); + }, +}); diff --git a/app/assets/javascripts/geoportal/viewers/pmtiles.js b/app/assets/javascripts/geoportal/viewers/pmtiles.js new file mode 100644 index 000000000..359a0bbc4 --- /dev/null +++ b/app/assets/javascripts/geoportal/viewers/pmtiles.js @@ -0,0 +1,5 @@ +//= require geoblacklight/viewers/viewer + +GeoBlacklight.Viewer.Pmtiles = GeoBlacklight.Viewer.extend({ + load: function() {} +}); \ No newline at end of file From dc0862b9cf265150aeaaae46111e666a5ac82f10 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Tue, 5 Nov 2024 10:45:31 -0600 Subject: [PATCH 2/2] GBL Admin upgrade --- Gemfile | 2 +- Gemfile.lock | 257 +++++++++++++++++++++++++++------------------------ yarn.lock | 24 ++--- 3 files changed, 148 insertions(+), 135 deletions(-) diff --git a/Gemfile b/Gemfile index 18087d27a..4c10ead59 100644 --- a/Gemfile +++ b/Gemfile @@ -104,7 +104,7 @@ gem 'geoblacklight_sidecar_images', git: "https://github.com/geoblacklight/geobl gem 'mini_magick', '~> 4.9.4' gem "image_processing", ">= 1.2" -gem 'statesman', '~> 10.0' +gem 'statesman', '~> 11.0' gem 'sidekiq', '~> 6.4' gem 'sidekiq-failures', '~> 1.0.0' gem 'down', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index f626c61fc..97cb7ce85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,13 @@ GIT remote: https://github.com/cbeer/solr_wrapper.git - revision: 8decbdd1840e14a8b039ceead1060f864891408c + revision: 868986a97c76c7a50eeab835892c7471b07b0821 branch: master specs: - solr_wrapper (4.0.2) - http + solr_wrapper (4.1.0) + faraday + faraday-follow_redirects minitar + ostruct retriable ruby-progressbar @@ -41,10 +43,10 @@ GIT GIT remote: https://github.com/geobtaa/geoblacklight_admin.git - revision: 2ac63e33ea33ce6fe7eccc3b64600bf90292d346 + revision: 602951aff2f4a248ef2b997312c833314088597b branch: develop specs: - geoblacklight_admin (0.4.1) + geoblacklight_admin (0.5.1) active_storage_validations (~> 1.0) amazing_print blacklight (~> 7.33) @@ -56,7 +58,6 @@ GIT config (~> 4.0) devise (~> 4.7) devise-bootstrap-views (~> 1.0) - devise_invitable (~> 2.0) dotenv-rails (~> 2.8) geoblacklight (~> 4.4) haml (~> 5.2) @@ -64,93 +65,95 @@ GIT inline_svg (~> 1.9) jquery-rails (~> 4.4) kithe (~> 2.0) + mutex_m (~> 0.2.0) noticed (~> 1.6) pagy (~> 6.0) paper_trail (~> 15.0) pg (~> 1.4) qa (~> 5.0) - rails (~> 7.0, < 8.0) + rails (~> 7.0, < 7.3) ruby-progressbar simple_form (~> 5.0) - sprockets (< 4) - statesman (~> 10.0) + sprockets (~> 3.0) + statesman (~> 11.0) vite_rails (~> 3.0) vite_ruby (>= 3.5) + zeitwerk (~> 2.6) GEM remote: https://rubygems.org/ specs: - Ascii85 (1.1.1) - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + Ascii85 (2.0.1) + actioncable (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailbox (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailer (7.0.8.6) + actionpack (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activesupport (= 7.0.8.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionpack (7.0.8.6) + actionview (= 7.0.8.6) + activesupport (= 7.0.8.6) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + actiontext (7.0.8.6) + actionpack (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.0.8.6) + activesupport (= 7.0.8.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_query_trace (1.8.2) activerecord (>= 6.0.0) - active_storage_validations (1.1.4) - activejob (>= 5.2.0) - activemodel (>= 5.2.0) - activestorage (>= 5.2.0) - activesupport (>= 5.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + active_storage_validations (1.3.0) + activejob (>= 6.1.4) + activemodel (>= 6.1.4) + activestorage (>= 6.1.4) + activesupport (>= 6.1.4) + activejob (7.0.8.6) + activesupport (= 7.0.8.6) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.0.8.6) + activesupport (= 7.0.8.6) + activerecord (7.0.8.6) + activemodel (= 7.0.8.6) + activesupport (= 7.0.8.6) activerecord-import (1.8.1) activerecord (>= 4.2) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activestorage (7.0.8.6) + actionpack (= 7.0.8.6) + activejob (= 7.0.8.6) + activerecord (= 7.0.8.6) + activesupport (= 7.0.8.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.4) + activesupport (7.0.8.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -164,7 +167,8 @@ GEM net-http-persistent amazing_print (1.6.0) ansi (1.5.0) - appsignal (4.0.6) + appsignal (4.1.2) + logger rack attr_json (2.4.0) activerecord (>= 6.0.0, < 7.3) @@ -172,23 +176,24 @@ GEM execjs (~> 2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.971.0) - aws-sdk-core (3.203.0) + aws-partitions (1.1001.0) + aws-sdk-core (3.211.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.89.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.160.0) - aws-sdk-core (~> 3, >= 3.203.0) + aws-sdk-s3 (1.169.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.9.1) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.10.0) + axe-core-api (4.10.1) dumb_delegator + ostruct virtus axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -217,11 +222,11 @@ GEM jquery-rails rails (>= 3.0) tether-rails - blazer (3.0.4) + blazer (3.1.0) activerecord (>= 6.1) chartkick (>= 5) csv - railties (>= 6.1) + railties (>= 7) safely_block (>= 0.4) bootsnap (1.9.4) msgpack (~> 1.0) @@ -245,7 +250,7 @@ GEM capybara-selenium (0.0.6) capybara selenium-webdriver - chartkick (5.1.0) + chartkick (5.1.2) childprocess (5.1.0) logger (~> 1.5) chosen-rails (1.10.0) @@ -272,13 +277,13 @@ GEM content_disposition (1.0.0) crass (1.0.6) csv (3.3.0) - database_cleaner (2.0.2) + database_cleaner (2.1.0) database_cleaner-active_record (>= 2, < 3) database_cleaner-active_record (2.2.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.4) + date (3.4.0) deep_merge (1.2.2) deprecation (1.1.0) activesupport @@ -307,12 +312,13 @@ GEM railties (>= 3.2) down (5.4.2) addressable (~> 2.8) - dry-cli (1.1.0) + dry-cli (1.2.0) dry-configurable (1.2.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) - dry-core (1.0.1) + dry-core (1.0.2) concurrent-ruby (~> 1.0) + logger zeitwerk (~> 2.6) dry-inflector (1.1.0) dry-initializer (3.1.1) @@ -345,20 +351,23 @@ GEM erubi (1.13.0) ethon (0.16.0) ffi (>= 1.15.0) - execjs (2.9.1) + execjs (2.10.0) factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faraday (2.11.0) + faraday (2.12.0) faraday-net_http (>= 2.0, < 3.4) + json logger + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) faraday-net_http (3.3.0) net-http - faraday-net_http_persistent (2.1.0) + faraday-net_http_persistent (2.3.0) faraday (~> 2.5) - net-http-persistent (~> 4.0) + net-http-persistent (>= 4.0.4, < 5) faraday-retry (2.2.1) faraday (~> 2.0) fastimage (2.3.1) @@ -397,7 +406,7 @@ GEM geocoder (1.8.3) base64 (>= 0.1.0) csv (>= 3.0.0) - git (2.3.0) + git (2.3.1) activesupport (>= 5.0) addressable (~> 2.8) process_executer (~> 1.1) @@ -428,7 +437,7 @@ GEM mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) ice_nine (0.11.2) image_processing (1.13.0) @@ -437,7 +446,7 @@ GEM inline_svg (1.10.0) activesupport (>= 3.0) nokogiri (>= 1.6) - jbuilder (2.12.0) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) jmespath (1.6.2) @@ -445,7 +454,8 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json-schema (5.0.0) + json (2.7.6) + json-schema (5.0.1) addressable (~> 2.8) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -492,7 +502,7 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) logger (1.6.1) - loofah (2.22.0) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) m (1.5.1) @@ -513,9 +523,10 @@ GEM matrix (0.4.2) memory_profiler (0.9.14) method_source (1.1.0) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) + mime-types-data (3.2024.1001) mimemagic (0.4.3) nokogiri (~> 1) rake @@ -531,18 +542,19 @@ GEM builder minitest (>= 5.0) ruby-progressbar - msgpack (1.7.2) + msgpack (1.7.3) multi_json (1.15.0) multi_xml (0.7.1) bigdecimal (~> 3.1) - net-ftp (0.3.7) + mutex_m (0.2.0) + net-ftp (0.3.8) net-protocol time net-http (0.4.1) uri - net-http-persistent (4.0.2) + net-http-persistent (4.0.4) connection_pool (~> 2.2) - net-imap (0.4.16) + net-imap (0.5.0) date net-protocol net-pop (0.1.2) @@ -551,7 +563,7 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -567,22 +579,22 @@ GEM parslet (2.0.0) pastel (0.8.0) tty-color (~> 0.5) - pdf-reader (2.12.0) - Ascii85 (~> 1.0) + pdf-reader (2.13.0) + Ascii85 (>= 1.0, < 3.0, != 2.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.8) + pg (1.5.9) 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) - process_executer (1.1.0) + process_executer (1.2.0) public_suffix (6.0.1) - puma (5.6.8) + puma (5.6.9) nio4r (~> 2.0) qa (5.13.0) activerecord-import @@ -594,7 +606,7 @@ GEM rails (>= 5.0, < 8.0) rdf racc (1.8.1) - rack (2.2.9) + rack (2.2.10) rack-cors (2.0.2) rack (>= 2.0.0) rack-mini-profiler (2.3.4) @@ -603,20 +615,20 @@ GEM rack rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails (7.0.8.6) + actioncable (= 7.0.8.6) + actionmailbox (= 7.0.8.6) + actionmailer (= 7.0.8.6) + actionpack (= 7.0.8.6) + actiontext (= 7.0.8.6) + actionview (= 7.0.8.6) + activejob (= 7.0.8.6) + activemodel (= 7.0.8.6) + activerecord (= 7.0.8.6) + activestorage (= 7.0.8.6) + activesupport (= 7.0.8.6) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.0.8.6) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -624,9 +636,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + railties (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -640,7 +652,7 @@ GEM bcp47_spec (~> 0.2) bigdecimal (~> 3.1, >= 3.1.5) link_header (~> 0.0, >= 0.0.8) - rdf-vocab (3.3.1) + rdf-vocab (3.3.2) rdf (~> 3.3) redis (4.8.1) regexp_parser (2.9.2) @@ -650,7 +662,7 @@ GEM actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) - rexml (3.3.7) + rexml (3.3.9) rgeo (3.0.1) rgeo-geojson (2.2.0) multi_json (~> 1.15) @@ -706,13 +718,13 @@ GEM tilt scrub_rb (1.0.1) sd_notify (0.1.1) - selenium-webdriver (4.24.0) + selenium-webdriver (4.26.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semantic_range (3.0.0) + semantic_range (3.1.0) shrine (3.6.0) content_disposition (~> 1.0) down (~> 5.1) @@ -733,13 +745,13 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) sitemap_generator (6.0.2) builder (~> 3.0) slop (4.10.1) spring (4.2.1) - sprockets (3.7.3) + sprockets (3.7.5) base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -750,11 +762,11 @@ GEM sqlite3 (1.7.3) mini_portile2 (~> 2.8.0) stackprof (0.2.26) - statesman (10.0.0) + statesman (11.0.0) stimulus-rails (1.3.4) railties (>= 6.0.0) temple (0.10.3) - terser (1.2.3) + terser (1.2.4) execjs (>= 0.3.0, < 3) tether-rails (1.4.0) rails (>= 3.1) @@ -801,11 +813,12 @@ 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_rails (3.0.19) + railties (>= 5.1, < 9) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.8.2) + vite_ruby (3.9.0) dry-cli (>= 0.7, < 2) + logger (~> 1.6) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) warden (1.2.9) @@ -829,7 +842,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yell (2.2.2) - zeitwerk (2.6.18) + zeitwerk (2.7.1) PLATFORMS ruby @@ -912,7 +925,7 @@ DEPENDENCIES spring sqlite3 (~> 1.4) stackprof (~> 0.2.12) - statesman (~> 10.0) + statesman (~> 11.0) stimulus-rails terser turbolinks diff --git a/yarn.lock b/yarn.lock index 8bd8854d5..6fc1e4872 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1647,9 +1647,9 @@ integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== "@geoblacklight/admin@^0.4.4": - version "0.4.4" - resolved "https://registry.yarnpkg.com/@geoblacklight/admin/-/admin-0.4.4.tgz#359033da67b5a10f4e713f8bbc9a9802aa011064" - integrity sha512-De3OtOzzNs0ZpHm+D3FLeiJDvF4nFpsJ7wJXHUB9nU1KKjUDi1DObxvAgboACbRt/iG0XYEHQbsB5vw21EsbfQ== + version "0.4.12" + resolved "https://registry.yarnpkg.com/@geoblacklight/admin/-/admin-0.4.12.tgz#a6270411af86bebc5d833ac5c1743ef4f78c42bd" + integrity sha512-BlP9CiwuUig3N5TeayHX64chuScej70jKI+pcpu6J5nEypEgai3k/LUgyVabjnzmg831FYf8QJ97yk++d1xQ6A== dependencies: "@hotwired/stimulus" "^3.2.2" "@nathanvda/cocoon" "^1.2.14" @@ -2664,9 +2664,9 @@ "@babel/runtime" "^7.13.10" "@rails/actioncable@^6.0.0": - version "6.1.7" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.7.tgz#8b4506925d3f7146a70941e4db7ce9dda99f99ae" - integrity sha512-F6S74NGpxhbbDRFsQFGYqefRfZPgYvePNtz9hHKYOqLturrsqrDoG+UcrxEGHsvqDUorMYfx4Wl3K8smmk/u2g== + version "6.1.710" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.710.tgz#5c77515cbc9b8fb5118afa0aa0048192b33c33ea" + integrity sha512-YDzMuh8mDRNLFXiexlLVnF1NUwk1bXwwO1gtEhOCsCqIsL6D21JfxpMwAD5x8qzrMJ1J0RZVa2hLl7ofeg+Mqw== "@rails/actioncable@^7.0.7-2": version "7.1.3" @@ -2674,9 +2674,9 @@ integrity sha512-ojNvnoZtPN0pYvVFtlO7dyEN9Oml1B6IDM+whGKVak69MMYW99lC2NOWXWeE3bmwEydbP/nn6ERcpfjHVjYQjA== "@rails/activestorage@^6.0.0": - version "6.1.7" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.7.tgz#5aaae9f4d10800fdb4fd6fe26fd8b4218579c6e3" - integrity sha512-h++k8LBLns4O8AqzdaFp1TsCLP9VSc2hgWI37bjzJ+4D995X7Rd8kdkRmXRaNAUlHDJgy6RpnbhBJ5oiIgWTDw== + version "6.1.710" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.710.tgz#bc914716f642ba233f033b7765a44dc3bfb626f5" + integrity sha512-hLXxAtn7hSWXkTzMGOmQmjuzJ0FzVw8j/Zi8DGS+DG9x4uPQjl+ZEVdty7pFcsBCjkpejtk0TChcBQlLW8sgOg== dependencies: spark-md5 "^3.0.0" @@ -2688,9 +2688,9 @@ spark-md5 "^3.0.1" "@rails/ujs@^6.0.0": - version "6.1.7" - resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.7.tgz#b09dc5b2105dd267e8374c47e4490240451dc7f6" - integrity sha512-0e7WQ4LE/+LEfW2zfAw9ppsB6A8RmxbdAUPAF++UT80epY+7emuQDkKXmaK0a9lp6An50RvzezI0cIQjp1A58w== + version "6.1.710" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.710.tgz#14cbf938c49985af51cca52d117f9c358ea4a579" + integrity sha512-NUS8nUkYHGSn/EDg3oJCkpMweSKeFxA4ef6pcnW2fJEZ7RcoWdJa1rr9vamUoqzNR+Ctd8ezsgBMAjxUahVB1w== "@rails/ujs@^7.0.7-2": version "7.1.3"