Upgrade openseadragon

sul-dlss · Jan 6, 2025 · c76b12a · c76b12a
1 parent fa994ed
commit c76b12a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 26 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -100,7 +100,7 @@ GEM
     bibtex-ruby (6.1.0)
       latex-decode (~> 0.0)
       racc (~> 1.7)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     bindex (0.8.1)
     blacklight (8.7.0)
       globalid
@@ -111,7 +111,7 @@ GEM
       rails (>= 6.1, < 9)
       view_component (>= 2.74, < 4)
       zeitwerk
-    blacklight-gallery (4.6.4)
+    blacklight-gallery (4.7.0)
       blacklight (>= 7.17, < 9)
       rails (>= 6.1, < 9)
     blacklight-oembed (1.2.0)
@@ -289,7 +289,7 @@ GEM
     ed25519 (1.3.0)
     edtf (3.2.0)
       activesupport (>= 3.0, < 9.0)
-    erubi (1.13.0)
+    erubi (1.13.1)
     execjs (2.10.0)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
@@ -438,7 +438,7 @@ GEM
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     io-console (0.8.0)
-    irb (1.14.2)
+    irb (1.14.3)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso-639 (0.3.8)
@@ -483,8 +483,8 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    logger (1.6.3)
-    loofah (2.23.1)
+    logger (1.6.4)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -507,6 +507,7 @@ GEM
     mime-types-data (3.2024.1203)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.8)
     minitar (1.0.2)
     minitest (5.25.4)
     mods (3.0.5)
@@ -530,7 +531,7 @@ GEM
       racc (~> 1.7)
     net-http (0.6.0)
       uri
-    net-imap (0.5.2)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -546,17 +547,24 @@ GEM
     net-ssh (7.3.0)
     newrelic_rpm (9.16.1)
     nio4r (2.7.4)
-    nokogiri (1.17.2-aarch64-linux)
+    nokogiri (1.18.1)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.17.2-arm-linux)
+    nokogiri (1.18.1-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.17.2-arm64-darwin)
+    nokogiri (1.18.1-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86-linux)
+    nokogiri (1.18.1-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-darwin)
+    nokogiri (1.18.1-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-linux)
+    nokogiri (1.18.1-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.1-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.1-x86_64-linux-musl)
       racc (~> 1.4)
     nom-xml (1.2.0)
       i18n
@@ -570,7 +578,7 @@ GEM
       version_gem (~> 1.1)
     observer (0.1.2)
     okcomputer (1.18.5)
-    openseadragon (0.9.0)
+    openseadragon (1.0.11)
       rails (> 6.1.0)
     orm_adapter (0.5.0)
     os (1.1.4)
@@ -584,7 +592,7 @@ GEM
       racc
     parslet (2.0.0)
     popper_js (2.11.8)
-    psych (5.2.1)
+    psych (5.2.2)
       date
       stringio
     public_suffix (6.0.1)
@@ -602,9 +610,10 @@ GEM
       rack (>= 1.0, < 4)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rack-timeout (0.7.0)
     rackup (2.2.1)
@@ -651,7 +660,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.9.1)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
     recaptcha (5.17.1)
     redcarpet (3.6.0)
@@ -852,7 +861,7 @@ GEM
     uri (1.0.2)
     useragent (0.16.11)
     version_gem (1.1.4)
-    view_component (3.20.0)
+    view_component (3.21.0)
       activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -868,7 +877,8 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,6 +1,6 @@
 //= link_tree ../images
+//= link application.css
 //= link application.js
-//= link openseadragon-assets.js
 //= link spotlight/manifest.js
 //= link component_library_overrides.css
 //= link_tree ../builds
diff --git a/app/assets/javascripts/openseadragon.js b/app/assets/javascripts/openseadragon.js
@@ -1,2 +1,2 @@
-//= require openseadragon/openseadragon
-//= require openseadragon/rails
+//= require openseadragon-rails/app/javascript/openseadragon-rails/dom
+//= require openseadragon-rails/app/javascript/openseadragon-rails/rails
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -10,6 +10,7 @@
 Rails.application.config.assets.paths << Rails.root.join('node_modules')
 Rails.application.config.assets.paths << Rails.root.join("node_modules/bootstrap-icons/font")
 
+Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon/images')
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.

diff --git a/package.json b/package.json
@@ -10,6 +10,7 @@
     "leaflet": "^1.9.4",
     "leaflet-sidebar": "^0.2.4",
     "nodemon": "^3.1.7",
+    "openseadragon-rails": "^1.0.4",
     "postcss": "^8.4.49",
     "postcss-cli": "^11.0.0",
     "sass": "^1.82.0",

diff --git a/yarn.lock b/yarn.lock
@@ -172,9 +172,9 @@ binary-extensions@^2.0.0:
     bootstrap ">=4.3.1 <6.0.0"
 
 blacklight-gallery@^4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/blacklight-gallery/-/blacklight-gallery-4.6.3.tgz#5e812928185f075afb89e7263834b8bc26765455"
-  integrity sha512-wfq46OyAzEhnRVw9/sd8leePXidDYnbxTzSo57drmIF+X/LbJYGzc8E2Ir20mKoTcsveq8PoaneZYFapHPYSAw==
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/blacklight-gallery/-/blacklight-gallery-4.7.0.tgz#0f040fb39c3cada8b091a471143acfe3c8665fef"
+  integrity sha512-p4ad3SHYZnUtcnyfyHJey/ynTWhSgyBnn6fnz8iXS5tjJ1wbdyfN8KyPr0lRaBENX1QGlvI/Fkcccfw1gJTQfg==
   dependencies:
     blacklight-frontend ">=7.1.0 <9"
     jquery ">=3.0"
@@ -526,6 +526,18 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
+openseadragon-rails@^1.0.4:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/openseadragon-rails/-/openseadragon-rails-1.0.11.tgz#0e1dc0ff8358141092497ff4efe581b613e304a8"
+  integrity sha512-LlvL+m3aPCcLJVfLvDFVp89h2Px8cY5eWu7zhoLlOrSEF4C8ypssf87HVQW7aHULT/TAihhA8mE5q2wfJugn2g==
+  dependencies:
+    openseadragon "^5.0.1"
+
+openseadragon@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/openseadragon/-/openseadragon-5.0.1.tgz#ad3aaccc6c0f733c3153131e9af05bc2e17a1952"
+  integrity sha512-a/hjouW9i3UfWxRADVYN2MyRhXMGnE7x9VVL7/4jXCcDLFyO4UM5o4RStYtqa5BfaHw/wMNAaD2WbxQF8f1pJg==
+
 path-type@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8"