From 6f15ec3d2c045075ef77e3d250528085db93be85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 15:41:54 +0000 Subject: [PATCH 1/3] Bump tinymce from 6.8.5 to 7.2.0 Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce) from 6.8.5 to 7.2.0. - [Changelog](https://github.com/tinymce/tinymce/blob/main/modules/tinymce/CHANGELOG.md) - [Commits](https://github.com/tinymce/tinymce/commits/7.2.0/modules/tinymce) --- updated-dependencies: - dependency-name: tinymce dependency-version: 7.2.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index daf7b90078..fb0792e659 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "regenerator-runtime": "^0.13.5", "sass": "^1.57.1", "timeago.js": "^4.0.2", - "tinymce": "^6.4.1", + "tinymce": "^7.2.0", "webpack": "^5.75.0", "webpack-cli": "^5.0.1" }, diff --git a/yarn.lock b/yarn.lock index 5ac897171e..e01f051c9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4177,10 +4177,10 @@ timeago.js@^4.0.2: resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.2.tgz#724e8c8833e3490676c7bb0a75f5daf20e558028" integrity sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w== -tinymce@^6.4.1: - version "6.8.5" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.5.tgz#aa9a711c4e0b59d506dd281bade857d35a7b3c59" - integrity sha512-qAL/FxL7cwZHj4BfaF818zeJJizK9jU5IQzTcSLL4Rj5MaJdiVblEj7aDr80VCV1w9h4Lak9hlnALhq/kVtN1g== +tinymce@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.2.0.tgz#c5015567e742093b43186400c3e7c8394b90cc1f" + integrity sha512-R460NlE4REIFuLcZd9mpHK8zRsHdOueLV2m6Wsn0JHfGhDWMcfB1IqUX2QGrSbJga93ygJbJbNMwb2sakFlE/g== tmp@^0.2.1: version "0.2.3" From c1fe90681e85c3c4c218909eec0a3568e7e73078 Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Thu, 13 Jun 2024 10:38:00 -0600 Subject: [PATCH 2/3] Set licence_key in TinyMCE config From https://www.tiny.cloud/docs/tinymce/latest/license-key/?utm_campaign=console_license_key_message&utm_source=tinymce&utm_medium=referral TinyMCE 7 is licensed under the GNU General Public License Version 2 or later. A new configuration option called 'license_key' requires developers to make a conscious decision to use TinyMCE with the GPLv2+ license or with a commercial license. If you are using TinyMCE in a self-hosted environment, a console log warning message will display if the license key config option is missing or invalid. This message aims to ensure compliance with licensing requirements and provide transparency during the evaluation period. --- app/javascript/src/utils/tinymce.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/src/utils/tinymce.js b/app/javascript/src/utils/tinymce.js index de778da215..c1112b1a35 100644 --- a/app/javascript/src/utils/tinymce.js +++ b/app/javascript/src/utils/tinymce.js @@ -25,6 +25,7 @@ import { isObject, isString, isUndefined } from './isType'; // // https://www.tinymce.com/docs/advanced/usage-with-module-loaders/ export const defaultOptions = { selector: '.tinymce', + license_key: 'gpl', statusbar: true, menubar: false, toolbar: 'bold italic | bullist numlist | link | table', From fdecea8733a323f1907fae37e6b4808ddf2aefdc Mon Sep 17 00:00:00 2001 From: aaronskiba Date: Thu, 10 Apr 2025 10:11:35 -0600 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72d803ce26..ee4c80212b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fixed issues with Conditional Question serialization offered by @briri from PR https://github.com/CDLUC3/dmptool/pull/667 for DMPTool. There is a migration file with code for MySQL and Postgres to update the Conditions table to convert JSON Arrays in string format records in the conditions table so that they are JSON Arrays. - Refactor `org_admin/conditions/_form.html.erb` [#3502](https://github.com/DMPRoadmap/roadmap/pull/3502) - Refactor `Question.save_condition` [#3501](https://github.com/DMPRoadmap/roadmap/pull/3501) +- Bump tinymce from 6.8.5 to 7.2.0 [#3505](https://github.com/DMPRoadmap/roadmap/pull/3505) ## v4.2.0