Merge branch 'main' into fix_page_form

AlchemyCMS · Oct 4, 2024 · 6f1a54f · 6f1a54f
2 parents 9500c50 + 24de0d2
commit 6f1a54f
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 6 deletions.
diff --git a/app/assets/builds/tinymce/skins/content/alchemy/content.css b/app/assets/builds/tinymce/skins/content/alchemy/content.css
diff --git a/app/assets/builds/tinymce/skins/content/alchemy/content.css.map b/app/assets/builds/tinymce/skins/content/alchemy/content.css.map
diff --git a/app/assets/builds/tinymce/skins/ui/alchemy/skin.css b/app/assets/builds/tinymce/skins/ui/alchemy/skin.css
diff --git a/app/assets/builds/tinymce/skins/ui/alchemy/skin.css.map b/app/assets/builds/tinymce/skins/ui/alchemy/skin.css.map
diff --git a/app/assets/config/alchemy_manifest.js b/app/assets/config/alchemy_manifest.js
@@ -1,5 +1,6 @@
 //= link alchemy/admin/all.js
 //= link_tree ../builds/alchemy/
+//= link_tree ../builds/tinymce/
 //= link_tree ../images/alchemy/
 //= link_tree ../../../vendor/assets/fonts/
 //= link_tree ../../javascript .js

diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "devDependencies": {
     "@babel/core": "^7.24.9",
     "@babel/preset-env": "^7.24.8",
-    "@rollup/plugin-commonjs": "^26.0.1",
+    "@rollup/plugin-commonjs": "^28.0.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "babel-jest": "^29.6.4",

diff --git a/vendor/javascript/tinymce.min.js b/vendor/javascript/tinymce.min.js