Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Use `tinymce-rails` asset version of tinymce (#12343)
Damian Legawiecd8dafddc5461
diff --git a/admin/app/javascript/spree/admin/helpers/tinymce.js b/admin/app/javascript/spree/admin/helpers/tinymce.jsindex 4e5d5ef010..7d8e127395 100644--- a/admin/app/javascript/spree/admin/helpers/tinymce.js+++ b/admin/app/javascript/spree/admin/helpers/tinymce.js@@ -1,5 +1,3 @@-import 'tinymce'-document.addEventListener('turbo:before-render', initializeTinmce)document.addEventListener('turbo:load', initializeTinmce)document.addEventListener('turbo:frame-render', initializeTinmce)diff --git a/admin/app/views/spree/admin/shared/_head.html.erb b/admin/app/views/spree/admin/shared/_head.html.erbindex 5ce6ba6aaa..6b688d85b0 100644--- a/admin/app/views/spree/admin/shared/_head.html.erb+++ b/admin/app/views/spree/admin/shared/_head.html.erb@@ -36,30 +36,14 @@<%= stylesheet_link_tag 'spree/admin/actiontext', media: :all, data: { turbo_track: "reload" } %><%= action_cable_meta_tag %>--<%= yield :head %>--<% if Rails.env.test? %>- <style>- table tr td .btn {- visibility: visible !important;- }- </style>-<% end %>--<% if Rails.env.test? %>- <style>- .text-uppercase {- text-transform: none !important;- }- </style>-<% end %>-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/tabler-icons.min.css"><%= tag.meta name: "direct-upload-url", content: main_app.rails_direct_uploads_path %>+<%= tinymce_assets %><!-- Trix does not work with importmaps in Rails 7 --><!-- https://github.com/basecamp/trix/issues/1182 --><%= javascript_include_tag 'trix', data: { turbo_track: "reload" } %><%= javascript_importmap_tags 'application-spree-admin' %>++<%= yield :head %>\ No newline at end of filediff --git a/admin/config/importmap.rb b/admin/config/importmap.rbindex a6b4652885..ac3ec64e46 100644--- a/admin/config/importmap.rb+++ b/admin/config/importmap.rb@@ -14,7 +14,6 @@ pin "local-time", preload: ["application-spree-admin"] # @3.0.2pin "mapkick/bundle", to: "mapkick.bundle.js", preload: ["application-spree-admin"]pin 'jquery', to: 'jquery3.min.js', preload: ["application-spree-admin"]pin "bootstrap", to: "bootstrap--dist--js--bootstrap.bundle.min.js.js", preload: ["application-spree-admin"] # @4.6.1-pin "tinymce", to: 'tinymce/tinymce.js', preload: ["application-spree-admin"]pin "dompurify", preload: ["application-spree-admin"] # @3.2.3# Stimulus components