Merge pull request #1855 from creative-commoners/pulls/3/js-minor-deps

DEP Update JS dependencies
silverstripe · Nov 20, 2024 · 1222c65 · 1222c65
2 parents 883d6e0 + abcb699
commit 1222c65
Show file tree

Hide file tree

Showing 12 changed files with 1,560 additions and 1,483 deletions.
diff --git a/client/dist/js/vendor.js b/client/dist/js/vendor.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/dist/styles/editor.css b/client/dist/styles/editor.css
@@ -1 +1 @@
-body.mce-content-body a.ss-broken{background-color:#d40404;border:1px #bb0404 solid;color:#fff;padding:1px;text-decoration:underline}
+body.mce-content-body a.ss-broken{background-color:#d40404;border:1px hsl(0,96.2962962963%,37.3529411765%) solid;color:#fff;padding:1px;text-decoration:underline}
diff --git a/client/dist/tinymce/CHANGELOG.md b/client/dist/tinymce/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixed
+- Upgraded dependencies. #TINY-11331
+- Invalid HTML elements within an `svg` element are removed. #TINY-11331
+
 ## 6.8.4 - 2024-06-19
 
 ### Fixed

diff --git a/client/dist/tinymce/composer.json b/client/dist/tinymce/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tinymce/tinymce",
-	"version": "6.8.4",
+	"version": "6.8.5",
 	"description": "Web based JavaScript HTML WYSIWYG editor control.",
 	"license": [
 		"MIT-only"

diff --git a/client/dist/tinymce/package.json b/client/dist/tinymce/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "tinymce",
-	"version": "6.8.4",
+	"version": "6.8.5",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/tinymce/tinymce.git",

diff --git a/client/dist/tinymce/themes/silver/theme.js b/client/dist/tinymce/themes/silver/theme.js
diff --git a/client/dist/tinymce/themes/silver/theme.min.js b/client/dist/tinymce/themes/silver/theme.min.js
diff --git a/client/dist/tinymce/tinymce.js b/client/dist/tinymce/tinymce.js
diff --git a/client/dist/tinymce/tinymce.min.js b/client/dist/tinymce/tinymce.min.js
diff --git a/package.json b/package.json
@@ -50,6 +50,7 @@
     "detect-browser": "^5.3.0",
     "es6-promise": "^4.2.8",
     "events-polyfill": "^2.1.2",
+    "immutable": "^4.3.7",
     "isomorphic-fetch": "^3.0.0",
     "jquery": "^3.6.1",
     "jquery-form": "^4.3.0",

diff --git a/yarn.lock b/yarn.lock
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		body.mce-content-body a.ss-broken{background-color:#d40404;border:1px #bb0404 solid;color:#fff;padding:1px;text-decoration:underline}
		body.mce-content-body a.ss-broken{background-color:#d40404;border:1px hsl(0,96.2962962963%,37.3529411765%) solid;color:#fff;padding:1px;text-decoration:underline}