Merge pull request #837 from open-data-rescue/staging

Fixes for page upload

.nvmrc

@@ -0,0 +1 @@
+16

Gemfile

@@ -117,7 +117,8 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
-gem "vite_rails", "~> 3.0"
+gem "vite_rails", "3.0.15"
+gem "vite_ruby", "3.3.4"
 gem 'vite_plugin_legacy'
 
 gem "haml-rails"

Gemfile.lock

@@ -103,7 +103,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     dry-cli (1.2.0)
-    erubi (1.13.0)
+    erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
     execjs (2.10.0)
@@ -114,7 +114,7 @@ GEM
       railties (>= 5.0.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
     fugit (1.11.1)
@@ -191,7 +191,6 @@ GEM
     mime-types-data (3.2024.1203)
     mini_mime (1.1.5)
     minitest (5.25.4)
-    mutex_m (0.3.0)
     mysql2 (0.5.6)
     net-imap (0.5.2)
       date
@@ -206,10 +205,6 @@ GEM
     nio4r (2.7.4)
     nokogiri (1.17.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-linux)
-      racc (~> 1.4)
     orm_adapter (0.5.0)
     paper_trail (16.0.0)
       activerecord (>= 6.1)
@@ -366,13 +361,11 @@ GEM
     unicode-emoji (4.0.4)
     vite_plugin_legacy (3.0.2)
       vite_ruby (~> 3.0, >= 3.0.4)
-    vite_rails (3.0.19)
-      railties (>= 5.1, < 9)
+    vite_rails (3.0.15)
+      railties (>= 5.1, < 8)
       vite_ruby (~> 3.0, >= 3.2.2)
-    vite_ruby (3.9.1)
+    vite_ruby (3.3.4)
       dry-cli (>= 0.7, < 2)
-      logger (~> 1.6)
-      mutex_m
       rack-proxy (~> 0.6, >= 0.6.1)
       zeitwerk (~> 2.2)
     warden (1.2.9)
@@ -393,8 +386,6 @@ GEM
 
 PLATFORMS
   arm64-darwin-24
-  x86_64-darwin-21
-  x86_64-linux-musl
 
 DEPENDENCIES
   better_errors
@@ -446,7 +437,8 @@ DEPENDENCIES
   tzinfo-data
   uglifier
   vite_plugin_legacy
-  vite_rails (~> 3.0)
+  vite_rails (= 3.0.15)
+  vite_ruby (= 3.3.4)
   web-console
   will_paginate
   with_advisory_lock

package.json

@@ -26,7 +26,7 @@
     "jquery-ui-dist": "^1.13.2",
     "jquery-ujs": "^1.2.3",
     "jquery.kinetic": "^2.2.4",
-    "jsonapi-vuex": "^5.10.0",
+    "jsonapi-vuex": "5.13.1",
     "lodash": "^4.17.21",
     "lodash.merge": "^4.6.2",
     "luxon": "^3.1.0",
@@ -47,8 +47,8 @@
   "devDependencies": {
     "@vue/compiler-sfc": "^3.2.45",
     "@vue/runtime-dom": "^3.2.47",
-    "vite": "^5.0.0",
+    "vite": "^4.5.5",
     "vite-plugin-full-reload": "^1.0.5",
-    "vite-plugin-ruby": "^5.1.0"
+    "vite-plugin-ruby": "^3.2.2"
   }
 }