chore: misc fixes

Author: adrianthedev

Gemfile

@@ -26,4 +26,4 @@ end
 
 # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
 gem "listen", ">= 3.5.1"
-gem "avo", ">= 3.2.1"
+# gem "avo", ">= 3.2.1"

Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     marksmith (0.1.2)
       activesupport
       redcarpet
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
@@ -51,9 +52,6 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    active_link_to (1.0.5)
-      actionpack
-      addressable
     activejob (8.0.1)
       activesupport (= 8.0.1)
       globalid (>= 0.3.6)
@@ -82,24 +80,7 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    avo (3.17.5)
-      actionview (>= 6.1)
-      active_link_to
-      activerecord (>= 6.1)
-      activesupport (>= 6.1)
-      addressable
-      docile
-      inline_svg
-      meta-tags
-      pagy (>= 7.0.0)
-      prop_initializer (>= 0.2.0)
-      turbo-rails (>= 2.0.0)
-      turbo_power (>= 0.6.0)
-      view_component (>= 3.7.0)
-      zeitwerk (>= 2.6.12)
     base64 (0.2.0)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
@@ -109,7 +90,6 @@ GEM
     connection_pool (2.5.0)
     crass (1.0.6)
     date (3.4.1)
-    docile (1.4.1)
     drb (2.2.1)
     dry-cli (1.2.0)
     erubi (1.13.1)
@@ -125,9 +105,6 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    inline_svg (1.10.0)
-      activesupport (>= 3.0)
-      nokogiri (>= 1.6)
     io-console (0.8.0)
     irb (1.15.1)
       pp (>= 0.6.0)
@@ -148,9 +125,6 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    meta-tags (2.22.1)
-      actionpack (>= 6.0.0, < 8.1)
-    method_source (1.1.0)
     mini_mime (1.1.5)
     minitest (5.25.4)
     mutex_m (0.3.0)
@@ -180,16 +154,13 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.2-x86_64-linux-musl)
       racc (~> 1.4)
-    pagy (9.3.3)
     parallel (1.26.3)
     parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
-    prop_initializer (0.2.0)
-      zeitwerk (>= 2.6.18)
     propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
@@ -198,7 +169,6 @@ GEM
     psych (5.2.3)
       date
       stringio
-    public_suffix (6.0.1)
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
@@ -298,19 +268,13 @@ GEM
     turbo-rails (2.0.11)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
-    turbo_power (0.7.0)
-      turbo-rails (>= 1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.2)
     useragent (0.16.11)
-    view_component (3.21.0)
-      activesupport (>= 5.2.0, < 8.1)
-      concurrent-ruby (~> 1.0)
-      method_source (~> 1.0)
     vite_rails (3.0.19)
       railties (>= 5.1, < 9)
       vite_ruby (~> 3.0, >= 3.2.2)
@@ -342,7 +306,6 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  avo (>= 3.2.1)
   listen (>= 3.5.1)
   marksmith!
   propshaft

app/components/marksmith/markdown_field/edit_component.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
-
-class Marksmith::MarkdownField::EditComponent < Avo::Fields::EditComponent
-  def unique_id
-    [@field.type, @resource&.singular_route_key, @field.id].compact.join("_")
+if defined?(Avo)
+  class Marksmith::MarkdownField::EditComponent < Avo::Fields::EditComponent
+    def unique_id
+      [@field.type, @resource&.singular_route_key, @field.id].compact.join("_")
+    end
   end
 end

app/components/marksmith/markdown_field/show_component.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
-
-class Marksmith::MarkdownField::ShowComponent < Avo::Fields::ShowComponent
+if defined?(Avo)
+  class Marksmith::MarkdownField::ShowComponent < Avo::Fields::ShowComponent
+  end
 end

app/helpers/marksmith/application_helper.rb

@@ -84,7 +84,7 @@
     <%= content_tag :div, class: "ms:flex ms:flex-1 ms:flex-col ms:size-full", data: { marksmith_target: "fieldContainer" } do %>
       <%= text_area_tag field_name, value,
         id: name,
-        class: class_names("ms:flex ms:flex-1 ms:rounded ms:border-none ms:resize-y ms:focus:outline-none ms:font-mono ms:focus:ring-0 ms:leading-normal ms:p-2 ms:text-sm", classes),
+        class: class_names("ms:flex ms:flex-1 ms:rounded ms:border-none ms:resize-none ms:focus:outline-none ms:font-mono ms:focus:ring-0 ms:leading-normal ms:p-2 ms:text-sm", classes),
         rows: rows,
         data: {
           action: "drop->marksmith#dropUpload paste->marksmith#pasteUpload",

app/jobs/marksmith/application_job.rb

@@ -53,6 +53,11 @@ def marksmith(*args, **kwargs, &block)
           Avo.asset_manager.register_stimulus_controller "marksmith", "MarksmithController"
           Avo.asset_manager.register_stimulus_controller "list-continuation", "ListContinuationController"
         end
+      else
+        # Ignore the markdown_field components if Avo is not defined
+        app.autoloaders.main.ignore(
+          root.join("app", "components", "marksmith", "markdown_field"),
+        )
       end
     end
   end