Merge branch 'main' of github.com:avo-hq/main.avodemo.com

Gemfile

@@ -139,3 +139,4 @@ gem "money-rails", "~> 1.12"
 
 gem "redcarpet"
 gem "marksmith"
+gem "commonmarker"

Gemfile.lock

@@ -177,6 +177,8 @@ GEM
       xpath (~> 3.2)
     chartkick (5.0.2)
     chronic (0.10.2)
+    commonmarker (2.0.4-arm64-darwin)
+    commonmarker (2.0.4-x86_64-linux)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.0)
     countries (5.4.0)
@@ -245,9 +247,8 @@ GEM
       net-smtp
     mapkick-rb (0.1.4)
     marcel (1.0.4)
-    marksmith (0.1.2)
+    marksmith (0.2.1)
       activesupport
-      redcarpet
     matrix (0.4.2)
     meta-tags (2.22.1)
       actionpack (>= 6.0.0, < 8.1)
@@ -432,6 +433,7 @@ DEPENDENCIES
   bugsnag
   capybara
   chartkick
+  commonmarker
   countries
   debug
   devise

app/javascript/avo.custom.js

@@ -1,13 +1,10 @@
 import CourseResourceController from 'controllers/course_controller'
 import NestedForm from 'stimulus-rails-nested-form'
-import { MarksmithController, ListContinuationController } from '@avo-hq/marksmith'
 
 // Hook into the stimulus instance provided by Avo
 const application = window.Stimulus
 application.register('course-resource', CourseResourceController)
 application.register('nested-form', NestedForm)
-application.register('marksmith', MarksmithController)
-application.register('list-continuation', ListContinuationController)
 
 // eslint-disable-next-line no-console
 console.log('Hi from Avo custom JS 👋')

config/importmap.rb

@@ -9,4 +9,3 @@
 # Avo custom JS entrypoint
 pin "avo.custom", preload: true
 pin "stimulus-rails-nested-form", to: "https://ga.jspm.io/npm:stimulus-rails-nested-form@4.0.0/dist/stimulus-rails-nested-form.es.js"
-pin "@avo-hq/marksmith", to: "@avo-hq--marksmith.js" # @0.0.13