alchemy_cms 7.1.0.pre.b1 → 7.1.0.pre.b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5fb9cc889441542df81f914d50c91feabb03990e67f92ce0092546736f1bb1d
-  data.tar.gz: ce0865e967f9f99d5008d43230f8e89c45287890185c502303ba8986df54e454
+  metadata.gz: d58b4f365ee68fac527d4ffad812ad68343fcfcb0b17ace3348aebd57d25c4d3
+  data.tar.gz: 91017ca029bc75e2f15d9c4ad3e60cf17f81a00f6bb72ca66f4a16c02d71f46b
 SHA512:
-  metadata.gz: 9dafbbae6fa3b062d79ac7121781a864deb5d0da1bc2ba663753799b8a5a28eaf413d9a7ff9f12e3f35590d62bb08b7f7ea154f5e92a729877a1ae6c0c5428e9
-  data.tar.gz: 83805ccd75226f2c596f0d24594857beedfc5e6391b305e88d0e9d5727b0e70d1b7d1bb4969e2649635baa9c29dfb65e104424ff4f327ae8a4b5d9ed60a3605b
+  metadata.gz: 6d1a10956e3ee72021b402063f36f930da4db1d48b631159e9bec9535bddc4f9b369dffdfb5d20f5b3a4e33f699bee4b93f1d8eaa4e6cc1269b1585c14c9792e
+  data.tar.gz: 0a3936c7a71f7d32ddc348f3cff42be35204816bc88cc6223e400dba647da412c4a009879d855c289b75be743375b81976e5a3038cc8023e86d4eb77195559ec

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 7.1.0-b2 (2024-01-09)
+
+- Download and bundle third party JS packages with npm [#2679](https://github.com/AlchemyCMS/alchemy_cms/pull/2679) ([tvdeyen](https://github.com/tvdeyen))
+- Remove legacy pages urls and folded pages if page gets destroyed [#2678](https://github.com/AlchemyCMS/alchemy_cms/pull/2678) ([tvdeyen](https://github.com/tvdeyen))
+- Clear unnecessary legacy URLs [#2677](https://github.com/AlchemyCMS/alchemy_cms/pull/2677) ([mamhoff](https://github.com/mamhoff))
+- Fix error linking text in tinymce [#2676](https://github.com/AlchemyCMS/alchemy_cms/pull/2676) ([tvdeyen](https://github.com/tvdeyen))
+- Use WebP for all thumbnails [#2675](https://github.com/AlchemyCMS/alchemy_cms/pull/2675) ([tvdeyen](https://github.com/tvdeyen))
+- Allow quality setting for webp images [#2674](https://github.com/AlchemyCMS/alchemy_cms/pull/2674) ([tvdeyen](https://github.com/tvdeyen))
+- Do not remove background from non transparent images [#2673](https://github.com/AlchemyCMS/alchemy_cms/pull/2673) ([tvdeyen](https://github.com/tvdeyen))
+- Update Tinymce to v6 [#2671](https://github.com/AlchemyCMS/alchemy_cms/pull/2671) ([tvdeyen](https://github.com/tvdeyen))
+- Update Tinymce to v5 [#2670](https://github.com/AlchemyCMS/alchemy_cms/pull/2670) ([tvdeyen](https://github.com/tvdeyen))
+- Fix missing image styles [#2667](https://github.com/AlchemyCMS/alchemy_cms/pull/2667) ([tvdeyen](https://github.com/tvdeyen))
+- Preserve transparent backgrounds for PNGs [#2666](https://github.com/AlchemyCMS/alchemy_cms/pull/2666) ([tvdeyen](https://github.com/tvdeyen))
+- Resource filter fixes [#2665](https://github.com/AlchemyCMS/alchemy_cms/pull/2665) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Update sqlite3 → 1.7.0 (unknown) [#2663](https://github.com/AlchemyCMS/alchemy_cms/pull/2663) ([depfu](https://github.com/apps/depfu))
+- Fix brakeman offense [#2661](https://github.com/AlchemyCMS/alchemy_cms/pull/2661) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.1.0-b1 (2023-12-28)
 
 - Fix messages controller [#2658](https://github.com/AlchemyCMS/alchemy_cms/pull/2658) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -8,7 +8,7 @@ rails_version = ENV.fetch("RAILS_VERSION", "7.1")
 gem "rails", "~> #{rails_version}.0"
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
-  gem "sqlite3", "~> 1.6.0"
+  gem "sqlite3", "~> 1.7.0"
 end
 if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
   gem "mysql2", "~> 0.5.1"

data/README.md

@@ -6,7 +6,7 @@
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](https://badge.fury.io/rb/alchemy_cms)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
-[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+[![Lint](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/lint.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/lint.yml)
 [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
 
 [![Backers on Open Collective](https://opencollective.com/alchemy_cms/backers/badge.svg?color=blue)](#backers)
@@ -51,7 +51,7 @@ Visit the existing demo at https://alchemy-demo.fly.dev/
 
 ## 🚂 Rails Version
 
-**This version of AlchemyCMS runs with Rails 7.0**
+**This version of AlchemyCMS runs with Rails 7.0 and 7.1**
 
 * For a Rails 6.1 compatible version use the [`7.0-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/7.0-stable).
 * For a Rails 6.0 compatible version use the [`6.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/6.1-stable).

data/alchemy_cms.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.requirements << "ImageMagick (libmagick), v6.6 or greater."
   gem.required_ruby_version = ">= 3.0.0"
   gem.license = "BSD New"
-  gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/|yarn|^\.}) }
   gem.require_paths = ["lib"]
 
   %w[

data/app/assets/config/alchemy_manifest.js

@@ -5,11 +5,10 @@
 //= link alchemy/print.css
 //= link alchemy/welcome.css
 //= link tinymce/plugins/alchemy_link/plugin.min.js
-//= link tinymce/tinymce.min.js
-//= link_directory ../stylesheets/tinymce/skins/alchemy/ .css
-//= link_directory ../stylesheets/tinymce/skins/alchemy/img/
-//= link_directory ../stylesheets/tinymce/skins/alchemy/fonts/
+//= link_directory ../stylesheets/tinymce/skins/ui/alchemy/ .css
+//= link_directory ../stylesheets/tinymce/skins/content/alchemy/ .css
 //= link_tree ../images/alchemy/
 //= link_tree ../../../vendor/assets/fonts/
 //= link_tree ../../../vendor/assets/images/
 //= link_tree ../../javascript .js
+//= link_tree ../../../vendor/javascript .js

data/app/assets/images/alchemy/missing-image.svg

@@ -1 +1 @@
-<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" width="16" height="16"><path fill="#f7f7f7" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z" class=""></path></svg>
+<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="18" height="18"><path d="M12.8659 3.00017L22.3922 19.5002C22.6684 19.9785 22.5045 20.5901 22.0262 20.8662C21.8742 20.954 21.7017 21.0002 21.5262 21.0002H2.47363C1.92135 21.0002 1.47363 20.5525 1.47363 20.0002C1.47363 19.8246 1.51984 19.6522 1.60761 19.5002L11.1339 3.00017C11.41 2.52187 12.0216 2.358 12.4999 2.63414C12.6519 2.72191 12.7782 2.84815 12.8659 3.00017ZM4.20568 19.0002H19.7941L11.9999 5.50017L4.20568 19.0002ZM10.9999 16.0002H12.9999V18.0002H10.9999V16.0002ZM10.9999 9.00017H12.9999V14.0002H10.9999V9.00017Z" fill="currentColor"></path></svg>

data/app/assets/javascripts/alchemy/admin.js

@@ -1,11 +1,7 @@
 // Alchemy CMS Sprockets Manifest
 // ------------------------------
 //= require jquery3
-//= require tinymce/tinymce.min
 //= require_tree ../../../../vendor/assets/javascripts/jquery_plugins/
-//= require clipboard.min
-//= require keymaster
-//= require requestAnimationFrame
 //= require handlebars
 //= require alchemy/templates
 //= require alchemy/alchemy.dialog

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -149,13 +149,13 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
 
   # Selects the correct tab for link type and fills all fields.
   selectTab: ->
-    # Creating an temporary anchor node if we are linking an Picture Ingredient.
-    if (@link_object.getAttribute("is") == "alchemy-link-button")
-      @$link = $(@createTempLink())
     # Restoring the bookmarked selection inside the TinyMCE of an Richtext.
-    else if (@link_object.node.nodeName == 'A')
+    if @link_object.node?.nodeName == 'A'
       @$link = $(@link_object.node)
       @link_object.selection.moveToBookmark(@link_object.bookmark)
+    # Creating an temporary anchor node if we are linking an Picture Ingredient.
+    else if @link_object.getAttribute && @link_object.getAttribute("is") == "alchemy-link-button"
+      @$link = $(@createTempLink())
     else
       return false
     # Populate title and target fields.

data/app/assets/javascripts/tinymce/icons/remixicons/icons.js

@@ -0,0 +1,93 @@
+tinymce.IconManager.add("remixicons", {
+  icons: {
+    "action-next":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12 13.2 5-5 1.4 1.4L12 16 5.6 9.6l1.5-1.4 4.9 5Z"/></svg>',
+    "action-prev":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12 10.8-5 5-1.4-1.4L12 8l6.4 6.4-1.5 1.4-4.9-5Z"/></svg>',
+    "align-center":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M3 4h18v2H3V4Zm2 15h14v2H5v-2Zm-2-5h18v2H3v-2Zm2-5h14v2H5V9Z"/></svg>',
+    "align-justify":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M3 4h18v2H3V4Zm0 15h18v2H3v-2Zm0-5h18v2H3v-2Zm0-5h18v2H3V9Z"/></svg>',
+    "align-left":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M3 4h18v2H3V4Zm0 15h14v2H3v-2Zm0-5h18v2H3v-2Zm0-5h14v2H3V9Z"/></svg>',
+    "align-right":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M3 4h18v2H3V4Zm4 15h14v2H7v-2Zm-4-5h18v2H3v-2Zm4-5h14v2H7V9Z"/></svg>',
+    "arrow-left":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M7.8 11H20v2H7.8l5.4 5.4-1.4 1.4L4 12l7.8-7.8 1.4 1.4L7.8 11Z"/></svg>',
+    "arrow-right":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m16.2 11-5.4-5.4 1.4-1.4L20 12l-7.8 7.8-1.4-1.4 5.4-5.4H4v-2h12.2Z"/></svg>',
+    bold: '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M8 11h4.5a2.5 2.5 0 0 0 0-5H8v5Zm10 4.5c0 2.5-2 4.5-4.5 4.5H6V4h6.5a4.5 4.5 0 0 1 3.3 7.6c1.3.8 2.2 2.2 2.2 3.9ZM8 13v5h5.5a2.5 2.5 0 0 0 0-5H8Z"/></svg>',
+    bookmark:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M5 2h14c.6 0 1 .4 1 1v19.1a.5.5 0 0 1-.8.5L12 18l-7.2 4.6A.5.5 0 0 1 4 22V3c0-.6.4-1 1-1Zm13 2H6v15.4l6-3.7 6 3.7V4Z"/></svg>',
+    cancel:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20Zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16Zm0-9.4 2.8-2.8 1.4 1.4-2.8 2.8 2.8 2.8-1.4 1.4-2.8-2.8-2.8 2.8-1.4-1.4 2.8-2.8-2.8-2.8 1.4-1.4 2.8 2.8Z"/></svg>',
+    checkmark:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M10 15.2 19.2 6l1.4 1.4L10 18l-6.4-6.4L5 10.2l5 5Z"/></svg>',
+    "chevron-down":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12 13.2 5-5 1.4 1.4L12 16 5.6 9.6l1.5-1.4 4.9 5Z"/></svg>',
+    "chevron-left":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m10.8 12 5 5-1.4 1.4L8 12l6.4-6.4 1.4 1.5-5 4.9Z"/></svg>',
+    "chevron-right":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m13.2 12-5-5 1.4-1.4L16 12l-6.4 6.4L8.2 17l5-5Z"/></svg>',
+    "chevron-up":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12 10.8-5 5-1.4-1.4L12 8l6.4 6.4-1.5 1.4-4.9-5Z"/></svg>',
+    close:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12 10.6 5-5 1.4 1.5-5 4.9 5 5-1.5 1.4-4.9-5-5 5L5.6 17l5-5-5-5L7 5.7l5 5Z"/></svg>',
+    "color-picker":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M12 2c5.5 0 10 4 10 8.9 0 3-2.5 5.5-5.6 5.5h-2a1.7 1.7 0 0 0-1.2 2.8c.3.3.5.7.5 1.1 0 1-.8 1.7-1.7 1.7a10 10 0 0 1 0-20Zm-1.2 16.1c0-2 1.7-3.7 3.7-3.7h2c2 0 3.5-1.5 3.5-3.5C20 7 16.5 4 12 4a8 8 0 0 0-.7 16c-.3-.6-.5-1.2-.5-1.9ZM7.5 12a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Zm9 0a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3ZM12 9a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Z"/></svg>',
+    "color-swatch-remove-color":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m8.6 8.9-5 4.9L8.8 19h2.4l3.7-3.8L8.6 9ZM10 7.4l6.4 6.4 2.8-2.8-6.4-6.4L10 7.4ZM14 19h7v2H8l-6.5-6.5a1 1 0 0 1 0-1.4L12.1 2.5a1 1 0 0 1 1.4 0l7.8 7.8c.4.4.4 1 0 1.4L14 19Z"/></svg>',
+    fill: '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M19.2 18.7 21 17l1.8 1.7a2.5 2.5 0 1 1-3.6 0ZM9 1.1l11.3 11.3c.4.4.4 1 0 1.4l-8.5 8.5a1 1 0 0 1-1.4 0l-8.5-8.5a1 1 0 0 1 0-1.4l7.8-7.8-2.1-2.1L8.9 1ZM11 6l-7 7h14l-7-7Z"/></svg>',
+    fullscreen:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M8 3v2H4v4H2V3h6ZM2 21v-6h2v4h4v2H2Zm20 0h-6v-2h4v-4h2v6Zm0-12h-2V5h-4V3h6v6Z"/></svg>',
+    "highlight-bg-color":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M19.2 18.7 21 17l1.8 1.7a2.5 2.5 0 1 1-3.6 0ZM9 1.1l11.3 11.3c.4.4.4 1 0 1.4l-8.5 8.5a1 1 0 0 1-1.4 0l-8.5-8.5a1 1 0 0 1 0-1.4l7.8-7.8-2.1-2.1L8.9 1ZM11 6l-7 7h14l-7-7Z"/></svg>',
+    "horizontal-rule":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M2 11h2v2H2v-2Zm4 0h12v2H6v-2Zm14 0h2v2h-2v-2Z"/></svg>',
+    indent:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M3 4h18v2H3V4Zm0 15h18v2H3v-2Zm8-5h10v2H11v-2Zm0-5h10v2H11V9Zm-4 3.5L3 16V9l4 3.5Z"/></svg>',
+    "insert-character":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M14 20v-2.2a8.5 8.5 0 0 0 3.5-7c0-3-2-6-5.5-6s-5.5 3-5.5 6c0 3.2 1.6 5.9 3.5 7V20H3v-2h4.8C5.7 16.5 4 14 4 10.9 4 6.2 7.5 3 12 3s8 3.2 8 7.9c0 3-1.7 5.6-3.8 7.1H21v2h-7Z"/></svg>',
+    italic:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M15 20H7v-2h3l2-12H9V4h8v2h-3l-2 12h3v2Z"/></svg>',
+    link: '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m17.7 14.8-1.5-1.4 1.5-1.4A4 4 0 1 0 12 6.3l-1.4 1.5-1.4-1.5L10.6 5a6 6 0 0 1 8.5 8.5l-1.4 1.4Zm-2.9 2.9L13.4 19A6 6 0 0 1 5 10.6l1.4-1.4 1.5 1.4L6.3 12a4 4 0 0 0 5.7 5.7l1.4-1.5 1.4 1.5Zm0-10 1.4 1.5-7 7-1.4-1.4 7-7Z"/></svg>',
+    "more-drawer":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M4.5 10.5c-.8 0-1.5.7-1.5 1.5s.7 1.5 1.5 1.5S6 12.8 6 12s-.7-1.5-1.5-1.5Zm15 0c-.8 0-1.5.7-1.5 1.5s.7 1.5 1.5 1.5S21 12.8 21 12s-.7-1.5-1.5-1.5Zm-7.5 0c-.8 0-1.5.7-1.5 1.5s.7 1.5 1.5 1.5 1.5-.7 1.5-1.5-.7-1.5-1.5-1.5Z"/></svg>',
+    "new-tab":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M10 6v2H5v11h11v-5h2v6c0 .6-.4 1-1 1H4a1 1 0 0 1-1-1V7c0-.6.4-1 1-1h6Zm11-3v8h-2V6.4l-7.8 7.8-1.4-1.4L17.6 5H13V3h8Z"/></svg>',
+    "ordered-list":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M5.8 3.5h-1l-1.5.4v1.5l1-.2v3.3H3V10h4V8.5H5.8v-5ZM10 4h11v2H10V4Zm0 7h11v2H10v-2Zm0 7h11v2H10v-2Zm-7.1-2.4A2.1 2.1 0 1 1 6.7 17l-1.4 1.6H7V20H3v-1.1L5.5 16l.1-.4a.6.6 0 0 0-1.2 0v.3H2.9v-.3Z"/></svg>',
+    outdent:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M3 4h18v2H3V4Zm0 15h18v2H3v-2Zm8-5h10v2H11v-2Zm0-5h10v2H11V9Zm-8 3.5L7 9v7l-4-3.5Z"/></svg>',
+    paragraph:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M12 6v15h-2v-5a6 6 0 0 1 0-12h10v2h-3v15h-2V6h-3Zm-2 0a4 4 0 1 0 0 8V6Z"/></svg>',
+    "paste-text":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M13 6v15h-2V6H5V4h14v2h-6Z"/></svg>',
+    redo: '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M18.2 7H11a6 6 0 0 0 0 12h9v2h-9a8 8 0 0 1 0-16h7.2l-2.6-2.5L17.1 1 22 6l-5 5-1.4-1.5L18.2 7Z"/></svg>',
+    "remove-formatting":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12.7 14-1.1 6h-2l1.3-7.7L3.5 5 5 3.5l15.6 15.6-1.4 1.4-6.4-6.4Zm-1-6.5L12 6h-1.8l-2-2H20v2h-6l-.5 3.3-1.7-1.8Z"/></svg>',
+    sourcecode:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M17 8.5 18.3 7l5 4.9-5 5-1.4-1.5 3.5-3.5-3.6-3.5Zm-10 0L3.6 12l3.6 3.5L5.6 17 .6 12l5-5 1.5 1.5Z"/></svg>',
+    "strike-through":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M17.2 14c.2.5.3 1 .3 1.7 0 1.4-.5 2.4-1.6 3.2-1 .7-2.5 1.1-4.3 1.1-1.7 0-3.3-.4-4.9-1.1v-2.3c1.5.9 3 1.3 4.7 1.3 2.5 0 3.8-.7 3.8-2.2a2.2 2.2 0 0 0-.7-1.7H3v-2h18v2h-3.8ZM13 11H7.6a3.2 3.2 0 0 1-1.1-2.5c0-1.3.5-2.3 1.4-3.2 1-.9 2.4-1.3 4.3-1.3 1.5 0 2.9.3 4.2 1V7c-1.2-.7-2.5-1-3.9-1-2.5 0-3.7.8-3.7 2.4 0 .4.2.7.6 1 .5.4 1 .6 1.6.8l2 .7Z"/></svg>',
+    subscript:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m5.6 4 4.9 6 4.9-6H18l-6.2 7.5L18 19h-2.6l-4.9-6-5 6H3l6.2-7.5L3 4h2.6Zm16.2 12a.8.8 0 1 0-1.6.2l-1.1.3a2 2 0 1 1 3.3 1L20.7 19H23v1h-4v-1l2.6-2.4.2-.6Z"/></svg>',
+    superscript:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m5.6 5 4.9 6 4.9-6H18l-6.2 7.5L18 20h-2.6l-4.9-6-5 6H3l6.2-7.5L3 5h2.6Zm16 1.6a.8.8 0 0 0-.6-1.4.8.8 0 0 0-.8 1l-1.1.3a2 2 0 1 1 3.3 1L20.7 9H23v1h-4V9l2.6-2.4Z"/></svg>',
+    "text-color":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M15.2 14H8.8l-1.6 4H5l6-15h2l6 15h-2.2l-1.6-4Zm-.8-2L12 5.9 9.6 12h4.8ZM3 20h18v2H3v-2Z"/></svg>',
+    underline:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M8 3v9a4 4 0 0 0 8 0V3h2v9a6 6 0 0 1-12 0V3h2ZM4 20h16v2H4v-2Z"/></svg>',
+    undo: '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m5.8 7 2.6 2.5L6.9 11 2 6l5-5 1.4 1.5L5.8 5H13a8 8 0 1 1 0 16H4v-2h9a6 6 0 0 0 0-12H5.8Z"/></svg>',
+    unlink:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m17.7 14.8-1.5-1.4 1.5-1.4A4 4 0 1 0 12 6.3l-1.4 1.5-1.4-1.5L10.6 5a6 6 0 0 1 8.5 8.5l-1.4 1.4Zm-2.9 2.9L13.4 19A6 6 0 0 1 5 10.6l1.4-1.4 1.5 1.4L6.3 12a4 4 0 0 0 5.7 5.7l1.4-1.5 1.4 1.5Zm0-10 1.4 1.5-7 7-1.4-1.4 7-7Zm-9-5.4 2-.5 1 3.8-2 .6-1-4Zm9.5 16 1.9-.5 1 4-2 .4-1-3.8ZM2.3 5.9l3.9 1-.6 2-3.8-1 .5-2Zm16 9.5 4 1-.6 2-3.9-1.1.6-2Z"/></svg>',
+    "unordered-list":
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M8 4h13v2H8V4ZM4.5 6.5a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Zm0 7a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3Zm0 6.9a1.5 1.5 0 1 1 0-3 1.5 1.5 0 0 1 0 3ZM8 11h13v2H8v-2Zm0 7h13v2H8v-2Z"/></svg>',
+    visualblocks:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M1 2v3h2V4h2v5H3.5v2h5V9H7V4h2v1h2V2H1Zm20 1h-7v2h6v14H4v-5H2v6c0 .6.4 1 1 1h18c.6 0 1-.4 1-1V4c0-.6-.4-1-1-1Z"/></svg>',
+    visualchars:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="M12 6v15h-2v-5a6 6 0 0 1 0-12h10v2h-3v15h-2V6h-3Zm-2 0a4 4 0 1 0 0 8V6Z"/></svg>',
+    warning:
+      '<svg viewBox="0 0 24 24" width="16" height="16"><path d="m12.9 3 9.5 16.5a1 1 0 0 1-.9 1.5h-19a1 1 0 0 1-.9-1.5L11.1 3A1 1 0 0 1 13 3ZM4.2 19h15.6L12 5.5 4.2 19Zm6.8-3h2v2h-2v-2Zm0-7h2v5h-2V9Z"/></svg>'
+  }
+})

data/app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js

@@ -1,19 +1,38 @@
-tinymce.PluginManager.add('alchemy_link', function(editor, url) {
-  editor.addButton('alchemy_link', {
-    icon: 'link',
-    tooltip: 'Insert/edit link',
-    shortcut: 'Ctrl+K',
-    stateSelector: 'a[href]',
-    onclick: function () {
-      var linkObject = {
-        node: editor.selection.getNode(),
-        bookmark: editor.selection.getBookmark(),
-        selection: editor.selection,
-        editor: editor
-      };
-      var linkDialog = new Alchemy.LinkDialog(linkObject);
-      editor.focus();
-      linkDialog.open();
+tinymce.PluginManager.add("alchemy_link", function (editor) {
+  const getAnchor = (selectedElm) => {
+    return editor.dom.getParent(selectedElm, "a[href]")
+  }
+
+  const openLinkDialog = () => {
+    if (Alchemy.currentDialog()) return
+    const linkObject = {
+      node: getAnchor(editor.selection.getNode()),
+      bookmark: editor.selection.getBookmark(),
+      selection: editor.selection,
+      editor: editor
     }
-  });
-});
+    const linkDialog = new Alchemy.LinkDialog(linkObject)
+    editor.focus()
+    linkDialog.open()
+  }
+
+  editor.ui.registry.addToggleButton("alchemy_link", {
+    icon: "link",
+    tooltip: "Insert/edit link",
+    onSetup(buttonApi) {
+      const onNodeChange = () => {
+        buttonApi.setActive(getAnchor(editor.selection.getNode()) !== null)
+      }
+      onNodeChange()
+      editor.on("NodeChange", onNodeChange)
+      return () => {
+        editor.off("NodeChange", onNodeChange)
+      }
+    },
+    onAction: openLinkDialog
+  })
+
+  // Replace the default link command with our own
+  editor.addCommand("mceLink", openLinkDialog)
+  editor.addShortcut("Meta+K", "", openLinkDialog)
+})

data/app/assets/stylesheets/alchemy/_variables.scss

@@ -30,7 +30,11 @@ $default-font-size: 1em !default;
 $small-font-size: 0.9em !default;
 $default-font-style: $default-font-size $default-font-family !default;
 
+$default-padding: 4px !default;
+$default-margin: $default-padding !default;
+
 $dialog-header-height: 36px !default;
+$dialog-header-padding: 0 2 * $default-padding !default;
 $dialog-header-color: $dark-blue !default;
 $dialog-header-text-color: $white !default;
 $dialog-header-font-size: $default-font-size !default;
@@ -39,9 +43,6 @@ $dialog-overlay-color: rgb(100, 100, 100) !default;
 $dialog-overlay-opacity: 0.4 !default;
 $dialog-background-color: $light-gray !default;
 
-$default-padding: 4px !default;
-$default-margin: $default-padding !default;
-
 $default-border-color: rgba(#afafaf, 0.5) !default;
 $border-inset-color: lighten($default-border-color, 10%) !default;
 $default-border-width: 1px !default;
@@ -84,6 +85,13 @@ $button-padding: $default-padding 5 * $default-padding !default;
 $small-button-padding: 0.4em 0.8em !default;
 $button-margin: $form-field-margin !default;
 
+$icon-button-width: 30px !default;
+$icon-button-height: 30px !default;
+$icon-button-medium-width: 26px !default;
+$icon-button-medium-height: 26px !default;
+$icon-button-small-width: 15px !default;
+$icon-button-small-height: 15px !default;
+
 $secondary-button-bg-color: transparent !default;
 $secondary-button-text-color: $text-color !default;
 $secondary-button-border-color: $default-border-color !default;

data/app/assets/stylesheets/alchemy/archive.scss

@@ -69,9 +69,12 @@
   img {
     max-width: 100%;
     max-height: 100%;
-    background: $thumbnail-background;
 
-    &[src*=".svg"] {
+    &:not([src*="alchemy/missing-image"]) {
+      background: $thumbnail-background;
+    }
+
+    &[src$=".svg"]:not([src*="alchemy/missing-image"]) {
       width: var(--picture-width);
       max-height: var(--picture-height);
     }

data/app/assets/stylesheets/alchemy/buttons.scss

@@ -52,18 +52,19 @@ input.button {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  width: 30px;
-  height: 30px;
+  width: $icon-button-width;
+  height: $icon-button-height;
   margin: 0;
   padding: 0;
   text-shadow: none;
   border-radius: $default-border-radius;
 
   &.small {
-    width: 15px;
-    height: 15px;
+    width: $icon-button-small-width;
+    height: $icon-button-small-height;
     background: none;
     border: none;
+    padding: 0; // button.small has padding
   }
 
   &.active,

data/app/assets/stylesheets/alchemy/dialogs.scss

@@ -126,7 +126,7 @@ $dialog-transition-duration: 150ms;
   gap: $default-padding;
   position: relative;
   height: $dialog-header-height;
-  padding: 0 2 * $default-padding;
+  padding: $dialog-header-padding;
   background: $dialog-header-color;
   color: $dialog-header-text-color;
   font-weight: normal;

data/app/assets/stylesheets/alchemy/elements.scss

@@ -555,8 +555,8 @@ alchemy-publish-element-button {
   border-bottom-right-radius: $default-border-radius;
 
   .icon_button {
-    width: 26px;
-    height: 26px;
+    width: $icon-button-medium-width;
+    height: $icon-button-medium-height;
   }
 }
 
@@ -604,9 +604,8 @@ alchemy-publish-element-button {
     height: 120px;
 
     .icon {
-      font-size: 4em;
-      color: $medium-gray;
-      vertical-align: top;
+      font-size: 3em;
+      color: var(--color-grey_dark);
 
       &.error {
         font-size: 1.2em;

data/app/assets/stylesheets/tinymce/skins/content/alchemy/content.min.scss

@@ -0,0 +1,69 @@
+/**
+* Copyright (c) Tiny Technologies, Inc. All rights reserved.
+* Licensed under the LGPL or a commercial license.
+* For LGPL see License.txt in the project root for license information.
+* For commercial licenses see https://www.tiny.cloud/
+*/
+
+@import "alchemy/variables";
+
+html {
+  font-size: 13px;
+}
+
+body {
+  font-family: $default-font-family;
+  line-height: 1.4;
+  margin: 1em;
+  color: $text-color;
+}
+
+a {
+  color: $dark-blue;
+}
+
+table {
+  border-collapse: collapse;
+}
+
+table td,
+table th {
+  border: 1px solid $default-border-color;
+  padding: 0.4rem;
+}
+
+figure {
+  display: table;
+  margin: 1rem auto;
+}
+
+figure figcaption {
+  color: $dark-gray;
+  display: block;
+  margin-top: 0.25rem;
+  text-align: center;
+}
+
+hr {
+  border-color: $default-border-color;
+  border-style: solid;
+  border-width: 1px 0 0 0;
+}
+
+code {
+  background-color: $light-gray;
+  border-radius: $default-border-radius;
+  padding: 0.1rem 0.2rem;
+}
+
+.mce-content-body:not([dir="rtl"]) blockquote {
+  border-left: 2px solid $default-border-color;
+  margin-left: 1.5rem;
+  padding-left: 1rem;
+}
+
+.mce-content-body[dir="rtl"] blockquote {
+  border-right: 2px solid $default-border-color;
+  margin-right: 1.5rem;
+  padding-right: 1rem;
+}

data/app/assets/stylesheets/tinymce/skins/skintool.json

@@ -0,0 +1,38 @@
+{
+  "backgroundColor": "#ffffff",
+  "skinName": "alchemy",
+  "contentCss": "body {\n  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;\n  line-height: 1.4;\n  margin: 1rem;\n}\n\ntable {\n  border-collapse: collapse;\n}\n\ntable th,\ntable td {\n  border: 1px solid #ccc;\n  padding: .4rem;\n}\n\nfigure {\n  display: table;\n  margin: 1rem auto;\n}\n\nfigure figcaption {\n  color: #999;\n  display: block;\n  margin-top: .25rem;\n  text-align: center;\n}\n\nhr {\n  border-color: #ccc;\n  border-style: solid;\n  border-width: 1px 0 0 0;\n}\n\ncode {\n  background-color: #e8e8e8;\n  border-radius: 3px;\n  padding: .1rem .2rem;\n}\n\n.mce-content-body:not([dir=rtl]) {\n  blockquote {\n    border-left: 2px solid #ccc;\n    margin-left: 1.5rem;\n    padding-left: 1rem;\n  }\n}\n\n// RTL\n.mce-content-body[dir=rtl] {\n  blockquote {\n    border-right: 2px solid #ccc;\n    margin-right: 1.5rem;\n    padding-right: 1rem;\n  }\n}\n",
+  "initConfig": "tinymce.init({\n  plugins: [\n    \"a11ychecker advcode casechange formatpainter\",\n    \"linkchecker autolink lists checklist\",\n    \"media mediaembed pageembed permanentpen\",\n    \"powerpaste table advtable tinymcespellchecker\"\n  ],\n  toolbar: \"formatselect | fontselect | bold italic strikethrough forecolor backcolor formatpainter | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | link insertfile image | removeformat | code | addcomment | checklist | casechange\",\n  height: 360\n});",
+  "lessVariablesMap": {
+    "@background-color": "#fff",
+    "@toolbar-background-color": "#efefef",
+    "@menubar-background-color": "#efefef",
+    "@border-color": "rgba(175, 175, 175, 0.5)",
+    "@color-black": "#000",
+    "@color-white": "#fff",
+    "@color-tint": "rgba(45, 90, 141, 1)",
+    "@color-error": "rgba(239, 211, 211, 1)",
+    "@color-success": "rgba(226, 239, 211, 1)",
+    "@base-value": "13px",
+    "@control-border-radius": "3px",
+    "@panel-border-radius": "3px",
+    "@tinymce-border-radius": "3px",
+    "@font-weight-normal": "normal",
+    "@font-weight-bold": "bold",
+    "@toolbar-button-icon-color": "rgba(51, 59, 81, 0.75)",
+    "@toolbar-button-text-color": "rgba(51, 59, 81, 0.75)",
+    "@toolbar-button-hover-background-color": "rgba(175, 175, 175, 0.25)",
+    "@toolbar-button-hover-icon-color": "rgba(51, 59, 81, 0.8)",
+    "@toolbar-button-hover-text-color": "rgba(51, 59, 81, 0.8)",
+    "@toolbar-button-focus-background-color": "rgba(175, 175, 175, 0.25)",
+    "@toolbar-button-focus-icon-color": "@toolbar-button-hover-icon-color",
+    "@toolbar-button-focus-text-color": "@toolbar-button-hover-icon-color",
+    "@toolbar-button-active-background-color": "rgba(175, 175, 175, 0.5)",
+    "@toolbar-button-enabled-background-color": "rgba(175, 175, 175, 0.5)",
+    "@toolbar-button-active-icon-color": "@toolbar-button-hover-icon-color",
+    "@toolbar-button-active-text-color": "@toolbar-button-hover-icon-color",
+    "@toolbar-button-enabled-icon-color": "@toolbar-button-hover-icon-color",
+    "@toolbar-button-enabled-text-color": "@toolbar-button-hover-icon-color"
+  },
+  "lessVariables": "@background-color: #fff;\n@toolbar-background-color: #efefef;\n@menubar-background-color: #efefef;\n@border-color: rgba(175, 175, 175, 0.5);\n@color-black: #000;\n@color-white: #fff;\n@color-tint: rgba(45, 90, 141, 1);\n@color-error: rgba(239, 211, 211, 1);\n@color-success: rgba(226, 239, 211, 1);\n@base-value: 13px;\n@control-border-radius: 3px;\n@panel-border-radius: 3px;\n@tinymce-border-radius: 3px;\n@font-stack: \"Open Sans\", \"Lucida Grande\", \"Lucida Sans Unicode\",\n  \"Lucida Sans\", Verdana, Tahoma, sans-serif;\n@font-weight-normal: normal;\n@font-weight-bold: bold;\n@toolbar-button-icon-color: rgba(51, 59, 81, 0.75);\n@toolbar-button-text-color: rgba(51, 59, 81, 0.75);\n@toolbar-button-hover-background-color: rgba(175, 175, 175, 0.25);\n@toolbar-button-hover-icon-color: rgba(51, 59, 81, 0.8);\n@toolbar-button-hover-text-color: rgba(51, 59, 81, 0.8);\n@toolbar-button-focus-background-color: rgba(175, 175, 175, 0.25);\n@toolbar-button-focus-icon-color: @toolbar-button-hover-icon-color;\n@toolbar-button-focus-text-color: @toolbar-button-hover-icon-color;\n@toolbar-button-active-background-color: rgba(175, 175, 175, 0.5);\n@toolbar-button-enabled-background-color: rgba(175, 175, 175, 0.5);\n@toolbar-button-active-icon-color: @toolbar-button-hover-icon-color;\n@toolbar-button-active-text-color: @toolbar-button-hover-icon-color;\n@toolbar-button-enabled-icon-color: @toolbar-button-hover-icon-color;\n@toolbar-button-enabled-text-color: @toolbar-button-hover-icon-color;\n"
+}