Merge pull request #3113 from AlchemyCMS/backport/7.4-stable/pr-3043

[7.4-stable] Bundle alchemy_link plugin into tinymce bundle
AlchemyCMS · Jan 3, 2025 · 77f6251 · 77f6251
2 parents c4284da + 2147751
commit 77f6251
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 6 deletions.
diff --git a/app/assets/config/alchemy_manifest.js b/app/assets/config/alchemy_manifest.js
@@ -1,7 +1,5 @@
 //= link alchemy/admin/all.js
 //= link alchemy/preview.js
-//= link tinymce/plugins/alchemy_link/plugin.min.js
-//= link tinymce/icons/remixicons/icons.js
 //= link_tree ../builds/alchemy/
 //= link_tree ../builds/tinymce/
 //= link_tree ../images/alchemy/

diff --git a/...scripts/tinymce/icons/remixicons/icons.js → ...ascript/tinymce/icons/remixicons/index.js b/...scripts/tinymce/icons/remixicons/icons.js → ...ascript/tinymce/icons/remixicons/index.js
diff --git a/...inymce/plugins/alchemy_link/plugin.min.js → ...ipt/tinymce/plugins/alchemy_link/index.js b/...inymce/plugins/alchemy_link/plugin.min.js → ...ipt/tinymce/plugins/alchemy_link/index.js
diff --git a/bundles/tinymce.js b/bundles/tinymce.js
@@ -3,6 +3,7 @@ import tinymce from "tinymce"
 
 /* Default icons are required. After that, import custom icons if applicable */
 import "tinymce/icons/default"
+import "tinymce/icons/remixicons"
 
 /* Required TinyMCE components */
 import "tinymce/themes/silver"
@@ -16,5 +17,6 @@ import "tinymce/plugins/directionality"
 import "tinymce/plugins/fullscreen"
 import "tinymce/plugins/link"
 import "tinymce/plugins/lists"
+import "tinymce/plugins/alchemy_link"
 
 export default tinymce
diff --git a/lib/alchemy/tinymce.rb b/lib/alchemy/tinymce.rb
@@ -5,6 +5,7 @@ module Tinymce
     mattr_accessor :languages, :plugins
 
     DEFAULT_PLUGINS = %w[
+      alchemy_link
       anchor
       charmap
       code
@@ -14,7 +15,7 @@ module Tinymce
       lists
     ]
 
-    @@plugins = DEFAULT_PLUGINS + %w[alchemy_link]
+    @@plugins = DEFAULT_PLUGINS
     @@init = {
       skin: "alchemy",
       content_css: "/assets/tinymce/skins/content/alchemy/content.min.css",

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -60,6 +60,12 @@ export default [
       name: "tinymce",
       format: "esm"
     },
-    plugins: [resolve(), commonjs(), terser()]
+    plugins: [
+      resolve({
+        modulePaths: ["app/javascript"]
+      }),
+      commonjs(),
+      terser()
+    ]
   }
 ]
diff --git a/spec/libraries/tinymce_spec.rb b/spec/libraries/tinymce_spec.rb
@@ -30,7 +30,6 @@ module Alchemy
 
       it "returns all plugins without default plugins" do
         is_expected.to eq %w[
-          alchemy_link
           foo
         ]
       end

diff --git a/vendor/javascript/tinymce.min.js b/vendor/javascript/tinymce.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ module Alchemy @@
           it "returns all plugins without default plugins" do
             is_expected.to eq %w[
-              alchemy_link
               foo
             ]
           end
@@ Expand Down @@