ckeditor5 1.24.2 → 1.24.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb2870df1641fcf9fc15b9a7951c80e887991808078d56cc9ec67febad405c3
-  data.tar.gz: 725cb66917c42b51c48ecbc41161359ff73e81de17c0a0f95e6ddcc3b58bb7bc
+  metadata.gz: cca06dbc54bf1070cfebfd54b85ea203ada266e4316e65f3c1862f9897728b06
+  data.tar.gz: 142ea208fe9629f060e44c641f15a0b5f6f3bdebaae11756e3dd3389cc5785d1
 SHA512:
-  metadata.gz: 5c8729eb7e323a8f240d4877171d64e27a5dab46567921c1372f57b9be635b4eac0d4e9492fd6693b0ef448533ca56a233498fe570866f734f2da5377c4140b3
-  data.tar.gz: 3ed9851296ad8cce6282a0c9262120436118552c7166490059bafd29ad82e83f8930c93a3464a780672b4c38aa9468b34a36cf1e8e613cfc34114b8523c22942
+  metadata.gz: 47a5040ef3c012676d0c2fb4ded7798ccb1d9f6a0a59ac399b6d8584ed0b07041cbce13b8fefbca040d64eedde569a3cc899ad70d9fdb8aa7295e5a36dcf733f
+  data.tar.gz: 394210568ca3100e7c0af2e14565b923348b0fce2918c1bb02d01ae3840b3c8fe7b9c82c1c805bbbb320fa9fa50c2767436458de2a03fe61c5293648cbf180b3

data/lib/ckeditor5/rails/editor/props_inline_plugin.rb

@@ -9,8 +9,13 @@ module CKEditor5::Rails::Editor
     def initialize(name, code)
       super(name)
 
-      @code = code
-      validate_code!
+      raise ArgumentError, 'Code must be a String' unless code.is_a?(String)
+
+      @code = "(async () => { #{code.html_safe} })()"
+    end
+
+    def compress!
+      @code = Terser.new(compress: false, mangle: true).compile(@code)
     end
 
     def to_h
@@ -19,12 +24,6 @@ module CKEditor5::Rails::Editor
         window_name: name
       }
     end
-
-    private
-
-    def validate_code!
-      raise ArgumentError, 'Code must be a String' unless code.is_a?(String)
-    end
   end
 
   class InlinePluginWindowInitializer

data/lib/ckeditor5/rails/engine.rb

@@ -76,7 +76,8 @@ module CKEditor5::Rails
       delegate :presets, to: :@configuration
 
       delegate :version, :gpl, :premium, :cdn, :translations, :license_key,
-               :type, :menubar, :toolbar, :plugins, :plugin, :inline_plugin,
+               :type, :menubar, :plugins, :plugin, :inline_plugin,
+               :toolbar, :block_toolbar, :balloon_toolbar,
                :language, :ckbox, :configure, :automatic_upgrades, :simple_upload_adapter,
                :editable_height, :wproofreader, to: :default_preset
 

data/lib/ckeditor5/rails/plugins/simple_upload_adapter.rb

@@ -3,7 +3,7 @@
 module CKEditor5::Rails::Plugins
   class SimpleUploadAdapter < CKEditor5::Rails::Editor::PropsInlinePlugin
     PLUGIN_CODE = <<~JS
-      import { Plugin, FileRepository } from 'ckeditor5';
+      const { Plugin, FileRepository } = await import( 'ckeditor5' );
 
       return class SimpleUploadAdapter extends Plugin {
         static get requires() {

data/lib/ckeditor5/rails/plugins/wproofreader.rb

@@ -26,6 +26,7 @@ module CKEditor5::Rails::Plugins
   # Sync I18n language from editor to WProofreader plugin
   class WProofreaderSync < CKEditor5::Rails::Editor::PropsInlinePlugin
     PLUGIN_CODE = <<~JS
+      const { Plugin, FileRepository } = await import( 'ckeditor5' );
       const CORRECTION_LANGUAGES = [
         'en_US', 'en_GB', 'pt_BR', 'da_DK',
         'nl_NL', 'en_CA', 'fi_FI', 'fr_FR',
@@ -34,27 +35,35 @@ module CKEditor5::Rails::Plugins
         'uk_UA', 'auto'
       ];
 
-      export default function WProofreaderSync(editor) {
-        const wproofreaderConfig = editor.config.get('wproofreader');
-        const editorLangCode = (() => {
-          const config = editor.config.get('language');
+      return class WproofreaderSync extends Plugin {
+        static get pluginName() {
+          return 'WProofreaderSync';
+        }
 
-          return config.content || config.ui;
-        })();
+        async init() {
+          const { editor } = this;
 
-        if (!wproofreaderConfig || !editorLangCode) {
-          return;
-        }
+          const wproofreaderConfig = editor.config.get('wproofreader');
+          const editorLangCode = (() => {
+            const config = editor.config.get('language');
+
+            return config.content || config.ui;
+          })();
 
-        const lang = CORRECTION_LANGUAGES.find(
-          lang => lang.startsWith(editorLangCode.toLowerCase())
-        ) || 'auto';
+          if (!wproofreaderConfig || !editorLangCode) {
+            return;
+          }
 
-        editor.config.set('wproofreader', {
-          lang,
-          localization: editorLangCode,
-          ...wproofreaderConfig,
-        });
+          const lang = CORRECTION_LANGUAGES.find(
+            lang => lang.startsWith(editorLangCode.toLowerCase())
+          ) || 'auto';
+
+          editor.config.set('wproofreader', {
+            lang,
+            localization: editorLangCode,
+            ...wproofreaderConfig,
+          });
+        }
       }
     JS
 

data/lib/ckeditor5/rails/presets/concerns/plugin_methods.rb

@@ -61,14 +61,10 @@ module CKEditor5::Rails
                   'Plugin code must return a class that extends Plugin!'
           end
 
-          wrapped_code = "(async () => { #{code} })();"
-          minified_code = wrapped_code
+          plugin = Editor::PropsInlinePlugin.new(name, code)
+          plugin.compress! unless disallow_inline_plugin_compression
 
-          unless disallow_inline_plugin_compression
-            minified_code = Terser.new(compress: false, mangle: true).compile(minified_code)
-          end
-
-          register_plugin(Editor::PropsInlinePlugin.new(name, minified_code))
+          register_plugin(plugin)
         end
 
         # Register a single plugin by name

data/lib/ckeditor5/rails/version.rb

@@ -2,7 +2,7 @@
 
 module CKEditor5
   module Rails
-    VERSION = '1.24.2'
+    VERSION = '1.24.4'
 
     DEFAULT_CKEDITOR_VERSION = '44.1.0'
   end

data/spec/lib/ckeditor5/rails/context/preset_builder_spec.rb

@@ -102,7 +102,7 @@ RSpec.describe CKEditor5::Rails::Context::PresetBuilder do
     it 'accepts plugin options' do
       plugin = builder.inline_plugin('Test', plugin_code)
 
-      expect(plugin.code).to eq("(async () => { #{plugin_code} })();")
+      expect(plugin.code).to eq("(async () => { #{plugin_code} })()")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor5
 version: !ruby/object:Gem::Version
-  version: 1.24.2
+  version: 1.24.4
 platform: ruby
 authors:
 - Mateusz Bagiński