From 71c0efe4b7dfb07222d6dcc909ff4b975c021a84 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Mon, 7 Jul 2025 12:03:43 +0930 Subject: [PATCH 1/6] INT-3353: Update to use TinyMCE 8 by default --- package.json | 2 +- src/main/component/Editor.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 672988a..d5ef3ff 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "LICENSE.txt" ], "peerDependencies": { - "tinymce": "^7.0.0 || ^6.0.0 || ^5.0.0" + "tinymce": "^8.0.0 || ^7.0.0 || ^6.0.0 || ^5.0.0" }, "peerDependenciesMeta": { "tinymce": { diff --git a/src/main/component/Editor.svelte b/src/main/component/Editor.svelte index 43ac3de..ebee4f5 100644 --- a/src/main/component/Editor.svelte +++ b/src/main/component/Editor.svelte @@ -73,7 +73,7 @@ export let disabled: boolean = false; export let readonly: boolean = false; export let apiKey: string = 'no-api-key'; - export let licenseKey: string | undefined = undefined; + export let licenseKey: string = 'glp'; export let channel: Channel = '7'; export let scriptSrc: string | undefined = undefined; export let conf: EditorOptions = {}; From 6eb60cd1d5fc2d671d93d104551925c43e5b2762 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Fri, 11 Jul 2025 14:59:20 +0930 Subject: [PATCH 2/6] Update demo to use tinymce 8 --- README.md | 8 ++++---- src/main/component/Editor.svelte | 6 +++--- src/stories/Editor.stories.svelte | 2 +- yarn.lock | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index cd0351d..d41312d 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ This package is a thin wrapper around [TinyMCE](https://github.com/tinymce/tinymce) to make it easier to use in a Svelte application. -* For the TinyMCE Svelte Quick Start, see: [TinyMCE Documentation - Svelte Integration](https://www.tiny.cloud/docs/tinymce/7/svelte-cloud/). -* For a self-hosted setup using TinyMCE package with TinyMCE Svelte, see: [TinyMCE Documentation - TinyMCE package with Svelte](https://www.tiny.cloud/docs/tinymce/7/svelte-pm/). -* For a self-hosted setup using TinyMCE .zip package with TinyMCE Svelte, see: [TinyMCE Documentation - TinyMCE .zip package with Svelte](https://www.tiny.cloud/docs/tinymce/7/svelte-zip/). -* For the TinyMCE Svelte Technical Reference, see: [TinyMCE Documentation - TinyMCE Svelte Technical Reference](https://www.tiny.cloud/docs/tinymce/7/svelte-ref/). +* For the TinyMCE Svelte Quick Start, see: [TinyMCE Documentation - Svelte Integration](https://www.tiny.cloud/docs/tinymce/latest/svelte-cloud/). +* For a self-hosted setup using TinyMCE package with TinyMCE Svelte, see: [TinyMCE Documentation - TinyMCE package with Svelte](https://www.tiny.cloud/docs/tinymce/latest/svelte-pm/). +* For a self-hosted setup using TinyMCE .zip package with TinyMCE Svelte, see: [TinyMCE Documentation - TinyMCE .zip package with Svelte](https://www.tiny.cloud/docs/tinymce/latest/svelte-zip/). +* For the TinyMCE Svelte Technical Reference, see: [TinyMCE Documentation - TinyMCE Svelte Technical Reference](https://www.tiny.cloud/docs/tinymce/latest/svelte-ref/). * For our quick demos, check out the TinyMCE Svelte [Storybook](https://tinymce.github.io/tinymce-svelte/). diff --git a/src/main/component/Editor.svelte b/src/main/component/Editor.svelte index ebee4f5..8856826 100644 --- a/src/main/component/Editor.svelte +++ b/src/main/component/Editor.svelte @@ -65,7 +65,7 @@ import { createEventDispatcher, onDestroy, onMount } from 'svelte'; import type { TinyMCE, Editor as TinyMCEEditor } from 'tinymce'; type EditorOptions = Parameters[0]; - type Channel = `${'4' | '5' | '6' | '7'}${'' | '-dev' | '-testing' | `.${number}` | `.${number}.${number}`}`; + type Channel = `${'4' | '5' | '6' | '7' | '8'}${'' | '-dev' | '-testing' | `.${number}` | `.${number}.${number}`}`; import { bindHandlers } from './Utils'; export let id: string = uuid('tinymce-svelte'); // default values @@ -73,8 +73,8 @@ export let disabled: boolean = false; export let readonly: boolean = false; export let apiKey: string = 'no-api-key'; - export let licenseKey: string = 'glp'; - export let channel: Channel = '7'; + export let licenseKey: string = 'gpl'; + export let channel: Channel = '8'; export let scriptSrc: string | undefined = undefined; export let conf: EditorOptions = {}; export let modelEvents: string = 'change input undo redo'; diff --git a/src/stories/Editor.stories.svelte b/src/stories/Editor.stories.svelte index 233607e..4f09655 100644 --- a/src/stories/Editor.stories.svelte +++ b/src/stories/Editor.stories.svelte @@ -29,7 +29,7 @@ TinyMCE provides a full-featured { readonly = !readonly; } - const controls = { channel: '7', conf: { plugins: 'help' } } + const controls = { channel: '8' } diff --git a/yarn.lock b/yarn.lock index c70f1bc..200492a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7488,9 +7488,9 @@ tiny-invariant@^1.3.1, tiny-invariant@^1.3.3: integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg== tinymce@^7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.2.1.tgz#9b4f6b5a0fa647e2953c174ac69aa47483683332" - integrity sha512-ADd1cvdIuq6NWyii0ZOZRuu+9sHIdQfcRNWBcBps2K8vy7OjlRkX6iw7zz1WlL9kY4z4L1DvIP+xOrVX/46aHA== + version "7.9.1" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.9.1.tgz#1b18bad9cb7a3b4b12e3e5a7f29fc7daad0713d7" + integrity sha512-zaOHwmiP1EqTeLRXAvVriDb00JYnfEjWGPdKEuac7MiZJ5aiDMZ4Unc98Gmajn+PBljOmO1GKV6G0KwWn3+k8A== tmp@^0.2.1: version "0.2.3" From 510cb3a69a131555a042e33cf45eb60e72edfcd4 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 14:59:41 +0930 Subject: [PATCH 3/6] Move rollup-plugin-execute to dev dependency --- package.json | 7 +++---- yarn.lock | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 4d3b743..377767f 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "react-dom": "^18", "rollup": "^2.56.2", "rollup-plugin-css-only": "^3.1.0", + "rollup-plugin-execute": "^1.1.1", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-svelte": "^7.1.5", "rollup-plugin-terser": "^7.0.0", @@ -84,7 +85,7 @@ "svelte-check": "^3.8.0", "svelte-loader": "^3.2.0", "svelte-preprocess": "^5.1.4", - "tinymce": "^7.2.1", + "tinymce": "^8.0.0", "tslib": "^2.6.2", "typescript": "^5.4.5", "vite": "^5.2.13", @@ -95,7 +96,5 @@ "glob-parent": "^5.1.2", "trim": "^0.0.3" }, - "dependencies": { - "rollup-plugin-execute": "^1.1.1" - } + "dependencies": {} } diff --git a/yarn.lock b/yarn.lock index 200492a..31ac32d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7487,10 +7487,10 @@ tiny-invariant@^1.3.1, tiny-invariant@^1.3.3: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127" integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg== -tinymce@^7.2.1: - version "7.9.1" - resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.9.1.tgz#1b18bad9cb7a3b4b12e3e5a7f29fc7daad0713d7" - integrity sha512-zaOHwmiP1EqTeLRXAvVriDb00JYnfEjWGPdKEuac7MiZJ5aiDMZ4Unc98Gmajn+PBljOmO1GKV6G0KwWn3+k8A== +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.3" From e692170d2b802edb3e6a038544b980cc1936a201 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 15:20:18 +0930 Subject: [PATCH 4/6] Add changelog entries --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39c5f3c..b934d12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Changed +- Set the default cloudChannel to `8`. #INT-3353 +- Moved `rollup-plugin-execute` to devDependency. #INT-3353 + ## 3.1.0 - 2025-05-29 ### Fixed From 52a3ecfa752227b927c071b862d3ed09f783ce0a Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 15:21:23 +0930 Subject: [PATCH 5/6] Fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b934d12..e734174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Changed -- Set the default cloudChannel to `8`. #INT-3353 +- Set the default `channel` to `8`. #INT-3353 - Moved `rollup-plugin-execute` to devDependency. #INT-3353 ## 3.1.0 - 2025-05-29 From ebb392525c038e6676c7c7860ca98a3d8f3d5393 Mon Sep 17 00:00:00 2001 From: Ben Tran Date: Wed, 23 Jul 2025 15:24:04 +0930 Subject: [PATCH 6/6] Undo licenseKey change --- src/main/component/Editor.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/component/Editor.svelte b/src/main/component/Editor.svelte index 8856826..eb71e60 100644 --- a/src/main/component/Editor.svelte +++ b/src/main/component/Editor.svelte @@ -73,7 +73,7 @@ export let disabled: boolean = false; export let readonly: boolean = false; export let apiKey: string = 'no-api-key'; - export let licenseKey: string = 'gpl'; + export let licenseKey: string | undefined = undefined; export let channel: Channel = '8'; export let scriptSrc: string | undefined = undefined; export let conf: EditorOptions = {};