diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 9e35481..a58da23 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a0cdd..c983e15 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 the default cloudChannel to 8 + ## 2.1.0 - 2023-03-27 ### Fixed diff --git a/README.md b/README.md index 9783ecd..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/integrations/jquery/). +[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/). diff --git a/package.json b/package.json index c3a7a59..be6577f 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.1", "tslib": "^2.5.0", "typescript": "~4.8.3", "webpack": "^5.9.0" 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`; } 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"', diff --git a/yarn.lock b/yarn.lock index 15f3835..5a1c2b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13530,10 +13530,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.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-8.0.1.tgz#268903624c44be574c72daeedcf8ae36bf37f0ba" + integrity sha512-KQ/+KaWmkIzSkNCYmqhXD2mftt+EEhz1bd1QCVopa2DNkoJ/rYFXhMnYGg1gVcRQa43xkmmv0Jj0ph+05VY0hQ== tinyrainbow@^1.2.0: version "1.2.0"