From fddc4b79c08d631af9c953806646212e007812ec Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Mon, 21 Jul 2025 11:42:12 +0930 Subject: [PATCH 1/9] INT-3355: Update for tinymce 8.0 --- .storybook/preview-head.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 9e35481..93f7c79 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -4,6 +4,6 @@ integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"> - \ No newline at end of file From 7b56aec8d1df1aa372e39d08a4dfd98fb2fa760a Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Mon, 21 Jul 2025 11:50:48 +0930 Subject: [PATCH 2/9] Update LoadTest to use 8-testing for now --- src/test/ts/browser/LoadTest.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/ts/browser/LoadTest.ts b/src/test/ts/browser/LoadTest.ts index 5fb849a..ffb2ca0 100644 --- a/src/test/ts/browser/LoadTest.ts +++ b/src/test/ts/browser/LoadTest.ts @@ -21,6 +21,8 @@ UnitTest.asynctest('LoadTest', (success, failure) => { Step.sync(() => { // select the SugarElement we just created and use the jQuery extension to make tinymce $('div.test-editor').tinymce({ + channel: '8-testing', + api_key: 'qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc', setup: (_editor: Editor) => { seenSetup.set(true); }, From ed90c2858c92804707eb1a6754012ff12832c08d Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Mon, 21 Jul 2025 13:41:31 +0930 Subject: [PATCH 3/9] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9783ecd..2b4ed13 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ instead be distributed as an independent npm package. * If you need detailed documentation on TinyMCE, see: [TinyMCE Documentation](https://www.tiny.cloud/docs/). * For the TinyMCE jQuery Quick Start, see: -[TinyMCE Documentation - jQuery Integration](https://www.tiny.cloud/docs/integrations/jquery/). +[TinyMCE Documentation - jQuery Integration](https://www.tiny.cloud/docs/tinymce/latest/jquery-cloud/). * For our quick demos, check out the TinyMCE jQuery [Storybook](https://tinymce.github.io/tinymce-jquery/). From 056a712a826e3702e8869facc7ab4f385e12b82c Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 11:13:21 +0930 Subject: [PATCH 4/9] Update to use 8 channel --- .storybook/preview-head.html | 2 +- src/demo/html/demo.html | 2 +- src/main/ts/Integration.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 93f7c79..a58da23 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -5,5 +5,5 @@ crossorigin="anonymous"> \ No newline at end of file diff --git a/src/demo/html/demo.html b/src/demo/html/demo.html index 6b62c52..6ea2231 100644 --- a/src/demo/html/demo.html +++ b/src/demo/html/demo.html @@ -6,7 +6,7 @@ Page Title - + diff --git a/src/main/ts/Integration.ts b/src/main/ts/Integration.ts index 3742fbf..65eb38f 100644 --- a/src/main/ts/Integration.ts +++ b/src/main/ts/Integration.ts @@ -26,7 +26,7 @@ export const getScriptSrc = (settings: RawEditorExtendedSettings): string => { if (typeof settings.script_url === 'string') { return settings.script_url; } else { - const channel = typeof settings.channel === 'string' ? settings.channel : '6'; + const channel = typeof settings.channel === 'string' ? settings.channel : '8'; const apiKey = typeof settings.api_key === 'string' ? settings.api_key : 'no-api-key'; return `https://cdn.tiny.cloud/1/${apiKey}/tinymce/${channel}/tinymce.min.js`; } From d3562ff8469d7925d1e6b5746dd6046a61751825 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 11:36:19 +0930 Subject: [PATCH 5/9] Updateb to use cloudchannel 8 --- CHANGELOG.md | 3 +++ src/test/ts/browser/LoadTest.ts | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a0cdd..98001e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +- Set default cloudChannel to 8 + ## 2.1.0 - 2023-03-27 ### Fixed diff --git a/src/test/ts/browser/LoadTest.ts b/src/test/ts/browser/LoadTest.ts index ffb2ca0..5fb849a 100644 --- a/src/test/ts/browser/LoadTest.ts +++ b/src/test/ts/browser/LoadTest.ts @@ -21,8 +21,6 @@ UnitTest.asynctest('LoadTest', (success, failure) => { Step.sync(() => { // select the SugarElement we just created and use the jQuery extension to make tinymce $('div.test-editor').tinymce({ - channel: '8-testing', - api_key: 'qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc', setup: (_editor: Editor) => { seenSetup.set(true); }, From c5c876e4d36b53c0f437aac4dc2fb7e11188f376 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 12:56:02 +0930 Subject: [PATCH 6/9] Update tinymce dependency to 8 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1fdcf65..d503fce 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react-dom": "^17.0.0", "rimraf": "^4.4.1", "rollup": "^3.20.2", - "tinymce": "^6.4.0", + "tinymce": "^8.0.0", "tslib": "^2.5.0", "typescript": "~4.8.3", "webpack": "^5.9.0" diff --git a/yarn.lock b/yarn.lock index ecabd3e..39e991a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11806,10 +11806,10 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -tinymce@^6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.4.0.tgz#311658bdc74bc983db410c58270ef957c4f48652" - integrity sha512-A1IZKhEM7sS/je7M+SjKqa1UM59GzOxi2M5me8sYx9/VoSzCaAXOgTo1M1wQsu8dFbThbBgz9vZqBFqukhYyhg== +tinymce@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-8.0.0.tgz#e6abd6bd31a2972f0a514462c281d4f7b2dae50e" + integrity sha512-E1OwCXXCzmZLx6sQVeMHdb61Hsp+7AxWtYstXp7Yw59Et4AdHQ0N36n7InVaYDmq2aBlCM8qkTQYKEqKgecP3A== tmp@^0.2.1: version "0.2.1" From 8299deb9beaaf36e738420e138e30174e9c5e4c3 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 13:16:33 +0930 Subject: [PATCH 7/9] Fix test --- src/test/ts/browser/ScriptSrcTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/ts/browser/ScriptSrcTest.ts b/src/test/ts/browser/ScriptSrcTest.ts index 8b6a9c7..c66d449 100644 --- a/src/test/ts/browser/ScriptSrcTest.ts +++ b/src/test/ts/browser/ScriptSrcTest.ts @@ -7,7 +7,7 @@ UnitTest.test('ScriptSrcTest', () => { const aKey = 'abcdef0123456789'; const aChannel = '5.4.2'; Assertions.assertEq('Test empty settings', - 'https://cdn.tiny.cloud/1/no-api-key/tinymce/6/tinymce.min.js', + 'https://cdn.tiny.cloud/1/no-api-key/tinymce/8/tinymce.min.js', getScriptSrc({})); Assertions.assertEq('Test "script_url"', @@ -18,7 +18,7 @@ UnitTest.test('ScriptSrcTest', () => { getScriptSrc({ channel: aChannel })); Assertions.assertEq('Test "api_key"', - 'https://cdn.tiny.cloud/1/abcdef0123456789/tinymce/6/tinymce.min.js', + 'https://cdn.tiny.cloud/1/abcdef0123456789/tinymce/8/tinymce.min.js', getScriptSrc({ api_key: aKey })); Assertions.assertEq('Test "api_key" and "channel"', From 1c062804cbdbb401db9f8a75862b545626246d75 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Tue, 29 Jul 2025 13:06:54 +0930 Subject: [PATCH 8/9] Update tinymce to 8.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d503fce..500ec42 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "react-dom": "^17.0.0", "rimraf": "^4.4.1", "rollup": "^3.20.2", - "tinymce": "^8.0.0", + "tinymce": "^8.0.1", "tslib": "^2.5.0", "typescript": "~4.8.3", "webpack": "^5.9.0" diff --git a/yarn.lock b/yarn.lock index 39e991a..2f03f35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11806,10 +11806,10 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -tinymce@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-8.0.0.tgz#e6abd6bd31a2972f0a514462c281d4f7b2dae50e" - integrity sha512-E1OwCXXCzmZLx6sQVeMHdb61Hsp+7AxWtYstXp7Yw59Et4AdHQ0N36n7InVaYDmq2aBlCM8qkTQYKEqKgecP3A== +tinymce@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-8.0.1.tgz#268903624c44be574c72daeedcf8ae36bf37f0ba" + integrity sha512-KQ/+KaWmkIzSkNCYmqhXD2mftt+EEhz1bd1QCVopa2DNkoJ/rYFXhMnYGg1gVcRQa43xkmmv0Jj0ph+05VY0hQ== tmp@^0.2.1: version "0.2.1" From 3568744c050c96c9b68cdaa456e14f7def0e8b07 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Thu, 31 Jul 2025 13:32:05 +0930 Subject: [PATCH 9/9] Minor changes --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98001e1..c983e15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Changed -- Set default cloudChannel to 8 +- Set the default cloudChannel to 8 ## 2.1.0 - 2023-03-27 diff --git a/README.md b/README.md index 2b4ed13..5685b33 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ instead be distributed as an independent npm package. * If you need detailed documentation on TinyMCE, see: [TinyMCE Documentation](https://www.tiny.cloud/docs/). * For the TinyMCE jQuery Quick Start, see: -[TinyMCE Documentation - jQuery Integration](https://www.tiny.cloud/docs/tinymce/latest/jquery-cloud/). +[TinyMCE Documentation - jQuery Integration](https://www.tiny.cloud/docs/tinymce/8/jquery-cloud/). * For our quick demos, check out the TinyMCE jQuery [Storybook](https://tinymce.github.io/tinymce-jquery/).