Skip to content

INT-3355: Update to use TinyMCE 8.0 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EkimChau merged 10 commits into from
Jul 31, 2025
Merged

INT-3355: Update to use TinyMCE 8.0 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fddc4b7
INT-3355: Update for tinymce 8.0
tiny-ben-tran Jul 21, 2025
7b56aec
Update LoadTest to use 8-testing for now
tiny-ben-tran Jul 21, 2025
ed90c28
Update readme
tiny-ben-tran Jul 21, 2025
056a712
Update to use 8 channel
tiny-ben-tran Jul 23, 2025
d3562ff
Updateb to use cloudchannel 8
tiny-ben-tran Jul 23, 2025
c5c876e
Update tinymce dependency to 8
tiny-ben-tran Jul 23, 2025
8299deb
Fix test
tiny-ben-tran Jul 23, 2025
1c06280
Update tinymce to 8.0
tiny-ben-tran Jul 29, 2025
6aa9b3b
Merge remote-tracking branch 'origin' into feature/INT-3355
tiny-ben-tran Jul 31, 2025
3568744
Minor changes
tiny-ben-tran Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .storybook/preview-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
crossorigin="anonymous"></script>
<!-- load TinyMCE -->
<script
src="https://cdn.tiny.cloud/1/qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc/tinymce/6/tinymce.min.js"
<script
src="https://cdn.tiny.cloud/1/qagffr3pkuv17a8on1afax661irst1hbr4e6tbv888sz91jc/tinymce/8/tinymce.min.js"
referrerpolicy="origin"></script>
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/demo/html/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Page Title</title>
<meta name='viewport' content='width=device-width, initial-scale=1'>
<script src="http://code.jquery.com/jquery-3.5.1.js" integrity="sha256-QWo7LDvxbWT2tbbQ97B53yJnYU3WhH/C8ycbRAkjPDc=" crossorigin="anonymous"></script>
<script src='../../../dist/index.js'></script>
<script src='../../../dist/tinymce-min.js'></script>
</head>
<body>
<textarea></textarea>
Expand Down
2 changes: 1 addition & 1 deletion src/main/ts/Integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/ts/browser/ScriptSrcTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"',
Expand All @@ -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"',
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading