Remove custom direct uploads

.rubocop.yml

@@ -8,7 +8,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: 3.3
+  TargetRubyVersion: 4.0
   Exclude:
     # Dummy app
     - spec/dummy/tmp/**/*

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    katalyst-content (3.1.3)
+    katalyst-content (3.4.0)
       active_storage_validations
       activerecord
       katalyst-govuk-formbuilder
@@ -115,11 +115,11 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    compare-xml (0.66)
-      nokogiri (~> 1.8)
+    compare-xml (1.0.0)
+      nokogiri (>= 1.6)
     concurrent-ruby (1.3.7)
     connection_pool (3.0.2)
-    crass (1.0.6)
+    crass (1.0.7)
     cuprite (0.17)
       capybara (~> 3.0)
       ferrum (~> 0.17.0)
@@ -148,16 +148,16 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (~> 0.7)
-    globalid (1.3.0)
+    globalid (1.4.0)
       activesupport (>= 6.1)
-    govuk_design_system_formbuilder (6.2.0)
+    govuk_design_system_formbuilder (6.2.1)
       actionview (>= 7.2)
       activemodel (>= 7.2)
       activesupport (>= 7.2)
       html-attributes-utils (~> 1)
     html-attributes-utils (1.0.2)
       activesupport (>= 6.1.4.4)
-    i18n (1.15.0)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     image_processing (2.0.2)
     importmap-rails (2.2.3)
@@ -170,8 +170,8 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.9)
-    katalyst-govuk-formbuilder (1.27.0)
+    json (2.20.0)
+    katalyst-govuk-formbuilder (1.28.0)
       govuk_design_system_formbuilder (>= 6.2.0)
     katalyst-html-attributes (1.1.2)
       activesupport
@@ -217,17 +217,14 @@ GEM
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    pp (0.6.3)
+    pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
     propshaft (1.3.2)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
-    psych (5.4.0)
-      date
-      stringio
     public_suffix (7.0.5)
     puma (8.0.2)
       nio4r (~> 2.0)
@@ -276,9 +273,14 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.4.2)
-    rdoc (7.2.0)
+    rbs (4.0.3)
+      logger
+      prism (>= 1.6.0)
+      tsort
+    rdoc (8.0.0)
       erb
-      psych (>= 4.0.0)
+      prism (>= 1.6.0)
+      rbs (>= 4.0.0)
       tsort
     regexp_parser (2.12.0)
     reline (0.6.3)
@@ -314,7 +316,7 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-capybara (2.23.0)
+    rubocop-capybara (3.0.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-factory_bot (2.28.0)
@@ -334,7 +336,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.35.4)
+    rubocop-rails (2.35.5)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -368,7 +370,6 @@ GEM
     sqlite3 (2.9.5-x86_64-linux-gnu)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.2.0)
     thor (1.5.0)
     timeout (0.6.1)
     tsort (0.2.0)
@@ -387,7 +388,7 @@ GEM
       activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)
     webrick (1.9.2)
-    websocket-driver (0.8.1)
+    websocket-driver (0.8.2)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -428,4 +429,4 @@ DEPENDENCIES
   turbo-rails
 
 BUNDLED WITH
-  4.0.14
+  4.0.15

app/helpers/katalyst/content/editor_helper.rb

@@ -10,9 +10,8 @@ module EditorHelper
       def content_editor_rich_text_attributes(attributes = {})
         {
           data: {
-            direct_upload_url: direct_uploads_url,
-            controller:        "content--editor--trix",
-            action:            "trix-initialize->content--editor--trix#trixInitialize",
+            controller: "content--editor--trix",
+            action:     "trix-initialize->content--editor--trix#trixInitialize",
           },
         }.merge_html(attributes)
       end

app/javascript/content/application.js

@@ -5,7 +5,6 @@ import ListController from "./editor/list_controller";
 import NewItemsController from "./editor/new_items_controller";
 import StatusBarController from "./editor/status_bar_controller";
 import TableController from "./editor/table_controller";
-import TrixController from "./editor/trix_controller";
 
 const Definitions = [
   {
@@ -36,10 +35,6 @@ const Definitions = [
     identifier: "content--editor--table",
     controllerConstructor: TableController,
   },
-  {
-    identifier: "content--editor--trix",
-    controllerConstructor: TrixController,
-  },
 ];
 
 export { Definitions as default };

config/routes.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 Katalyst::Content::Engine.routes.draw do
-  resources :direct_uploads, only: :create
   resources :items
   resources :tables, only: %i[create update]
 end

katalyst-content.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "katalyst-content"
-  spec.version = "3.1.3"
+  spec.version = "3.4.0"
   spec.authors = ["Katalyst Interactive"]
   spec.email   = ["[email protected]"]
 
   spec.summary               = "Rich content page builder and editor"
   spec.homepage              = "https://github.com/katalyst/content"
   spec.license               = "MIT"
-  spec.required_ruby_version = ">= 3.3"
+  spec.required_ruby_version = ">= 4.0"
 
   spec.files                             = Dir["{app,config,db,lib/katalyst}/**/*", "spec/factories/**/*",
                                                "LICENSE.txt", "README.md"]