Updates

geobtaa · Jan 9, 2024 · 2d2a34a · 2d2a34a
1 parent ee01bc6
commit 2d2a34a
Show file tree

Hide file tree

Showing 5 changed files with 460 additions and 411 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ gem "puma", "~> 5.6"
 gem 'sd_notify', '>= 0.1.0'
 
 # Webpacker
-gem 'webpacker', '~> 4.x'
+gem 'webpacker', '~> 5.x'
 
 gem 'sqlite3', '~> 1.4'
 #gem 'mysql2', '~> 0.5.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -650,6 +650,7 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    semantic_range (3.0.0)
     shrine (3.5.0)
       content_disposition (~> 1.0)
       down (~> 5.1)
@@ -735,10 +736,11 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webpacker (4.3.0)
-      activesupport (>= 4.2)
+    webpacker (5.4.4)
+      activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
-      railties (>= 4.2)
+      railties (>= 5.2)
+      semantic_range (>= 2.3.0)
     websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -832,7 +834,7 @@ DEPENDENCIES
   twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
   uglifier (>= 1.3.0)
   web-console
-  webpacker (~> 4.x)
+  webpacker (~> 5.x)
   whenever (~> 1.0.0)
 
 BUNDLED WITH

diff --git a/app/models/solr_document_sidecar.rb b/app/models/solr_document_sidecar.rb
@@ -13,9 +13,6 @@ class SolrDocumentSidecar < ApplicationRecord
     initial_state: :initialized
   ]
 
-  # Deprecated - Carrierwave
-  mount_uploader :cw_image, ImageUploader
-
   # ActiveStorage
   has_one_attached :image
 

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "@babel/core": "^7.7.2",
     "@babel/register": "^7.7.0",
     "shx": "^0.3.2",
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": "^4.0"
   },
   "dependencies": {
     "@babel/cli": "^7.5.5",