From 2335b3aa06c0fdcbbc3dcf137531d0058df369d1 Mon Sep 17 00:00:00 2001 From: sul-devops-team Date: Mon, 30 Sep 2024 02:44:47 -0700 Subject: [PATCH 1/5] Update Ruby dependencies --- Gemfile.lock | 91 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c97a06f..bead35a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -104,40 +104,41 @@ GEM rails (>= 6.1, < 8) view_component (>= 2.66, < 4) zeitwerk - blacklight-gallery (4.5.4) + blacklight-gallery (4.6.0) blacklight (>= 7.17, < 9) rails (>= 6.1, < 8) blacklight-hierarchy (6.4.0) blacklight (>= 7.18, < 9) deprecation rails (>= 6.1, < 7.3) - blacklight-oembed (1.1.1) - blacklight (>= 7.0, < 9) + blacklight-oembed (1.2.0) + blacklight (>= 7.25, < 9) rails ruby-oembed - blacklight-spotlight (4.0.3) + blacklight-spotlight (4.1.2) activejob-status acts-as-taggable-on (>= 5.0, < 12) autoprefixer-rails - blacklight (>= 7.18, < 9) + blacklight (>= 7.19, < 9) blacklight-gallery (>= 3.0, < 5) bootstrap_form (>= 4.1, < 6) breadcrumbs_on_rails (>= 3.0, < 5) cancancan carrierwave (~> 2.2) clipboard-rails (~> 1.5) + csv devise (~> 4.9) devise_invitable faraday faraday-follow_redirects friendly_id (~> 5.5) github-markup + google-analytics-data i18n i18n-active_record iiif-presentation iiif_manifest leaflet-rails - legato mini_magick nokogiri oauth2 @@ -151,7 +152,7 @@ GEM roar-rails signet tophat - view_component (~> 2.0) + view_component (>= 2.66, < 4) blacklight_range_limit (8.5.0) blacklight (>= 7.25.2, < 9) deprecation @@ -210,12 +211,14 @@ GEM ssrf_filter (~> 1.0) clipboard-rails (1.7.1) concurrent-ruby (1.3.4) - config (5.5.1) + config (5.5.2) deep_merge (~> 1.2, >= 1.2.1) + ostruct connection_pool (2.4.1) crass (1.0.6) cssbundling-rails (1.4.1) railties (>= 6.0.0) + csv (3.3.0) date (3.3.4) debug (1.9.2) irb (~> 1.10) @@ -296,6 +299,8 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.3.0) net-http + faraday-retry (2.2.1) + faraday (~> 2.0) ffi (1.17.0-arm64-darwin) ffi (1.17.0-x86_64-darwin) ffi (1.17.0-x86_64-linux-gnu) @@ -306,10 +311,61 @@ GEM railties (>= 3.2, < 8.0) friendly_id (5.5.1) activerecord (>= 4.0.0) + gapic-common (0.22.0) + faraday (>= 1.9, < 3.a) + faraday-retry (>= 1.0, < 3.a) + google-protobuf (>= 3.25, < 5.a) + googleapis-common-protos (~> 1.6) + googleapis-common-protos-types (~> 1.15) + googleauth (~> 1.11) + grpc (~> 1.65) geo_coord (0.2.0) github-markup (5.0.1) globalid (1.2.1) activesupport (>= 6.1) + google-analytics-data (0.6.1) + google-analytics-data-v1beta (>= 0.11, < 2.a) + google-cloud-core (~> 1.6) + google-analytics-data-v1beta (0.13.1) + gapic-common (>= 0.21.1, < 2.a) + google-cloud-errors (~> 1.0) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (2.2.0) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.4.0) + google-protobuf (4.28.2-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.28.2-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.28.2-x86_64-linux) + bigdecimal + rake (>= 13) + googleapis-common-protos (1.6.0) + google-protobuf (>= 3.18, < 5.a) + googleapis-common-protos-types (~> 1.7) + grpc (~> 1.41) + googleapis-common-protos-types (1.16.0) + google-protobuf (>= 3.18, < 5.a) + googleauth (1.11.0) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + grpc (1.66.0-arm64-darwin) + google-protobuf (>= 3.25, < 5.0) + googleapis-common-protos-types (~> 1.0) + grpc (1.66.0-x86_64-darwin) + google-protobuf (>= 3.25, < 5.0) + googleapis-common-protos-types (~> 1.0) + grpc (1.66.0-x86_64-linux) + google-protobuf (>= 3.25, < 5.0) + googleapis-common-protos-types (~> 1.0) hashie (5.0.0) highline (3.1.1) reline @@ -355,14 +411,14 @@ GEM activesupport (>= 6.0.0) railties (>= 6.0.0) io-console (0.7.2) - irb (1.14.0) + irb (1.14.1) rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) json (2.7.2) - jwt (2.9.0) + jwt (2.9.1) base64 kaminari (1.2.2) activesupport (>= 4.1.0) @@ -380,8 +436,6 @@ GEM leaflet-rails (1.9.5) actionpack (>= 4.2.0) railties (>= 4.2.0) - legato (0.7.0) - multi_json llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) @@ -445,6 +499,7 @@ GEM openseadragon (0.7.0) rails (> 6.1.0) orm_adapter (0.5.0) + os (1.1.4) ostruct (0.6.0) paper_trail (15.2.0) activerecord (>= 6.1) @@ -537,7 +592,7 @@ GEM actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) - rexml (3.3.7) + rexml (3.3.8) riiif (2.6.0) deprecation (>= 1.0.0) iiif-image-api (>= 0.1.0) @@ -646,9 +701,11 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - solr_wrapper (4.0.2) - http + solr_wrapper (4.1.0) + faraday + faraday-follow_redirects minitar + ostruct retriable ruby-progressbar sprockets (4.2.1) @@ -693,7 +750,7 @@ GEM unicode-display_width (2.6.0) uri (0.13.1) version_gem (1.1.4) - view_component (2.83.0) + view_component (3.15.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -704,7 +761,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webrick (1.8.1) + webrick (1.8.2) websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) From 509b69fb29d1fda13a957e29139f62204c2d19fb Mon Sep 17 00:00:00 2001 From: sul-devops-team Date: Mon, 30 Sep 2024 02:45:04 -0700 Subject: [PATCH 2/5] Update Yarn dependencies --- yarn.lock | 130 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 55 deletions(-) diff --git a/yarn.lock b/yarn.lock index fc741161..739ce4ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1265,17 +1265,37 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": - version "4.19.5" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz#218064e321126fcf9048d1ca25dd2465da55d9c6" - integrity sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg== +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz#91f06cda1049e8f17eeab364798ed79c97488a1c" + integrity sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/send" "*" + +"@types/express-serve-static-core@^4.17.33": + version "4.19.6" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267" + integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/send" "*" -"@types/express@*", "@types/express@^4.17.13": +"@types/express@*": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.0.tgz#13a7d1f75295e90d19ed6e74cab3678488eaa96c" + integrity sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^5.0.0" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/express@^4.17.13": version "4.17.21" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d" integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ== @@ -1323,9 +1343,9 @@ "@types/node" "*" "@types/node@*": - version "22.5.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.5.tgz#52f939dd0f65fc552a4ad0b392f3c466cc5d7a44" - integrity sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA== + version "22.7.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.4.tgz#e35d6f48dca3255ce44256ddc05dee1c23353fcc" + integrity sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg== dependencies: undici-types "~6.19.2" @@ -1345,9 +1365,9 @@ integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== "@types/react-redux@^7.1.20": - version "7.1.33" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" - integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== + version "7.1.34" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.34.tgz#83613e1957c481521e6776beeac4fd506d11bd0e" + integrity sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -1362,9 +1382,9 @@ "@types/react" "*" "@types/react@*": - version "18.3.8" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.8.tgz#1672ab19993f8aca7c7dc844c07d5d9e467d5a79" - integrity sha512-syBUrW3/XpnW4WJ41Pft+I+aPoDVbrBVQGEnbD7NijDGlVC+8gV/XKRY+7vMDlfPpbwYt0l1vd/Sj8bJGMbs9Q== + version "18.3.10" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.10.tgz#6edc26dc22ff8c9c226d3c7bf8357b013c842219" + integrity sha512-02sAAlBnP39JgXwkAq3PeU9DVaaGpZyF3MGcC0MKgQVkZor5IiiDAipVaxQHtDJAmO4GIy/rVBy/LzVj76Cyqg== dependencies: "@types/prop-types" "*" csstype "^3.0.2" @@ -1813,12 +1833,12 @@ browser@^0.2.6: u2r x.x.x browserslist@^4.21.10, browserslist@^4.23.1, browserslist@^4.23.3: - version "4.23.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== + version "4.24.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.0.tgz#a1325fe4bc80b64fda169629fc01b3d6cecd38d4" + integrity sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A== dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" + caniuse-lite "^1.0.30001663" + electron-to-chromium "^1.5.28" node-releases "^2.0.18" update-browserslist-db "^1.1.0" @@ -1856,10 +1876,10 @@ camel-case@^4.1.2: pascal-case "^3.1.2" tslib "^2.0.3" -caniuse-lite@^1.0.30001646: - version "1.0.30001663" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001663.tgz#1529a723505e429fdfd49532e9fc42273ba7fed7" - integrity sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA== +caniuse-lite@^1.0.30001663: + version "1.0.30001664" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz#d588d75c9682d3301956b05a3749652a80677df4" + integrity sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g== capital-case@^1.0.4: version "1.0.4" @@ -2304,9 +2324,9 @@ domhandler@^5.0.2, domhandler@^5.0.3: domelementtype "^2.3.0" dompurify@^2.0.11: - version "2.5.6" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.6.tgz#8402b501611eaa7fb3786072297fcbe2787f8592" - integrity sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ== + version "2.5.7" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.7.tgz#6e0d36b9177db5a99f18ade1f28579db5ab839d7" + integrity sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q== domutils@^3.0.1, domutils@^3.1.0: version "3.1.0" @@ -2330,10 +2350,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.5.4: - version "1.5.27" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.27.tgz#5203ce5d6054857d84ba84d3681cbe59132ade78" - integrity sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw== +electron-to-chromium@^1.5.28: + version "1.5.29" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz#aa592a3caa95d07cc26a66563accf99fa573a1ee" + integrity sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw== element-resize-detector@^1.2.1: version "1.2.4" @@ -2405,7 +2425,7 @@ es5-shim@^4.5.12: resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.6.7.tgz#bc67ae0fc3dd520636e0a1601cc73b450ad3e955" integrity sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ== -escalade@^3.1.2: +escalade@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== @@ -2528,9 +2548,9 @@ fast-json-stable-stringify@^2.0.0: integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-uri@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" - integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.2.tgz#d78b298cf70fd3b752fd951175a3da6a7b48f024" + integrity sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row== fastest-levenshtein@^1.0.12: version "1.0.16" @@ -3287,9 +3307,9 @@ make-dir@^3.0.2, make-dir@^3.1.0: semver "^6.0.0" manifesto.js@^4.2.0: - version "4.2.17" - resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.17.tgz#9d06dd50f5442a80897ccf7d88dfe861afb6a343" - integrity sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA== + version "4.2.18" + resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.18.tgz#7b753698304b92123c391125111e2d203120c511" + integrity sha512-UDglbiYPXxIIXNIF529tQBHlZoKCwxh/3UI929VZs7t2UfAyZJ/3Z2r+eXzLXQGse1Gc6qOWtdG7eIqmwAI61g== dependencies: "@edsilv/http-status-codes" "^1.0.3" "@iiif/vocabulary" "^1.0.26" @@ -3687,7 +3707,7 @@ path-to-regexp@0.1.10: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== -picocolors@^1.0.0, picocolors@^1.0.1: +picocolors@^1.0.0, picocolors@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== @@ -4193,9 +4213,9 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== sass@^1.58.3: - version "1.79.3" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.3.tgz#7811b000eb68195fe51dea89177e73e7ef7f546f" - integrity sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA== + version "1.79.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.4.tgz#f9c45af35fbeb53d2c386850ec842098d9935267" + integrity sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg== dependencies: chokidar "^4.0.0" immutable "^4.0.0" @@ -4465,9 +4485,9 @@ spdy@^4.0.2: spdy-transport "^3.0.0" spotlight-frontend@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/spotlight-frontend/-/spotlight-frontend-4.0.3.tgz#1f341dfcf01e1cef6e57b71a199ee4eb3a9c24fe" - integrity sha512-TORlL7bZvhrWDGeC+sLc90VJ2s0zenvazrH56q2pJw8dALiYA8k+H+otVGa7EhAb7NSEJS24Za9iRerYORpncQ== + version "4.1.1" + resolved "https://registry.yarnpkg.com/spotlight-frontend/-/spotlight-frontend-4.1.1.tgz#09702a9bb852ca991e99dfc45fbe2380349a56f0" + integrity sha512-WtbIOoN3f4CZvMdzToSQOaY9Z/sTAeZ11vcZ6+QYRZtWy5TSi2JpTESETcgZIhx6x8La1WASNO2BEQYoUnnKVQ== statuses@2.0.1: version "2.0.1" @@ -4551,9 +4571,9 @@ terser-webpack-plugin@5, terser-webpack-plugin@^5.3.10: terser "^5.26.0" terser@^5.26.0: - version "5.33.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.33.0.tgz#8f9149538c7468ffcb1246cfec603c16720d2db1" - integrity sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g== + version "5.34.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.34.1.tgz#af40386bdbe54af0d063e0670afd55c3105abeb6" + integrity sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -4703,12 +4723,12 @@ unpipe@1.0.0, unpipe@~1.0.0: integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.0" upper-case-first@^2.0.2: version "2.0.2" @@ -4894,9 +4914,9 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@5: - version "5.94.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" - integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== + version "5.95.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0" + integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q== dependencies: "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" From 834a38a492b53e217631e3eedb8df436f885fba8 Mon Sep 17 00:00:00 2001 From: Cory Lown Date: Mon, 30 Sep 2024 16:39:04 -0400 Subject: [PATCH 3/5] Fix record feedback form modal using new slot API --- app/views/record_feedback/new.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/record_feedback/new.html.erb b/app/views/record_feedback/new.html.erb index 5d65aac5..55901e8b 100644 --- a/app/views/record_feedback/new.html.erb +++ b/app/views/record_feedback/new.html.erb @@ -1,7 +1,7 @@ <%= render Blacklight::System::ModalComponent.new do |component| %> - <% component.title { t('record_feedback.header') } %> + <% component.with_title { t('record_feedback.header') } %> - <% component.body do %> + <% component.with_body do %> <%= bootstrap_form_for(@contact_form || Spotlight::ContactForm.new(current_url: request.original_url), url: main_app.exhibit_record_feedback_path(current_exhibit), as: 'contact_form', html: { data: { turbo: false } }) do |f| %> From 9f3893faef17b18e16a8893d5de3941409acf3cf Mon Sep 17 00:00:00 2001 From: Cory Lown Date: Mon, 30 Sep 2024 16:52:33 -0400 Subject: [PATCH 4/5] Fix DocumentMetadataComponent test for ViewComponent v3 --- spec/components/document_metadata_component_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/components/document_metadata_component_spec.rb b/spec/components/document_metadata_component_spec.rb index 760c5212..f327a3a4 100644 --- a/spec/components/document_metadata_component_spec.rb +++ b/spec/components/document_metadata_component_spec.rb @@ -7,7 +7,7 @@ render_inline(described_class.new(fields: fields)) end - let(:view_context) { controller.view_context } + let(:view_context) { vc_test_controller.view_context } let(:document) do SolrDocument.new({ 'agg_is_shown_at.wr_id_ssim' => ['http://example.com/resource/'], From 2f1821e8214d24b507db2d0b0b9f6364a78cfe5a Mon Sep 17 00:00:00 2001 From: Cory Lown Date: Mon, 30 Sep 2024 17:25:21 -0400 Subject: [PATCH 5/5] Fix multilingual range limit component by using new slot API --- app/components/multilingual_date_range_component.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/multilingual_date_range_component.html.erb b/app/components/multilingual_date_range_component.html.erb index cb33c8b7..21203cec 100644 --- a/app/components/multilingual_date_range_component.html.erb +++ b/app/components/multilingual_date_range_component.html.erb @@ -1,8 +1,8 @@ <%= render(@layout.new(facet_field: @facet_field)) do |component| %> - <% component.label do %> + <% component.with_label do %> <%= @facet_field.label %> <% end %> - <% component.body do %> + <% component.with_body do %>