Skip to content

Commit

Permalink
Switch to esm-compatible build of Trix (#793)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bramjetten authored Aug 22, 2021
1 parent 98c7b85 commit 93c3a2b
Show file tree
Hide file tree
Showing 7 changed files with 5,289 additions and 33 deletions.
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ PATH
bcrypt
breadcrumbs_on_rails
image_processing
importmap-rails (= 0.2.7)
importmap-rails (= 0.3.1)
jsonapi-serializer
kaminari
mobility (>= 1.1.3)
pg
rack-rewrite (>= 1.5.0)
rails (>= 6.0)
sass-rails
stimulus-rails (~> 0.3.3)
turbo-rails (~> 0.7.2)
stimulus-rails (~> 0.3.8)
turbo-rails (~> 0.7.4)
view_component (~> 2.32)

GEM
Expand Down Expand Up @@ -111,7 +111,7 @@ GEM
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
importmap-rails (0.2.7)
importmap-rails (0.3.1)
rails (>= 6.0.0)
json (2.5.1)
jsonapi-serializer (2.2.0)
Expand Down Expand Up @@ -228,11 +228,11 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stimulus-rails (0.3.7)
stimulus-rails (0.3.8)
rails (>= 6.0.0)
thor (1.1.0)
tilt (2.0.10)
turbo-rails (0.7.3)
turbo-rails (0.7.4)
rails (>= 6.0.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/spina/application.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import "@hotwired/turbo-rails"
import "@hotwired/stimulus-autoloader"
import "libraries/trix"
2 changes: 1 addition & 1 deletion app/assets/javascripts/spina/libraries/trix.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//= require ./[email protected]
//= require ./[email protected].esm.js

// Extra headings
Trix.config.blockAttributes.heading2 = {
Expand Down
Loading

0 comments on commit 93c3a2b

Please sign in to comment.