Skip to content

Commit

Permalink
INT-3324: Moved tinymce to be an optional peer dependency (#61)
Browse files Browse the repository at this point in the history
* INT-3324: Added tinymce as an optional peer dependency

* INT-3324: Updated tinymce dev dependency to 7.2.1

* INT-3324: Bump major version

* INT-3324: Fix two type errors

* INT-3324: Added changelog entry

* Revert "INT-3324: Bump major version"

This reverts commit 0b5bb7a.

* INT-3324: Changed change log entry to `### Added`

* INT-3324: Swapped changelog entry to a "Fixed" heading
  • Loading branch information
danoaky-tiny authored Aug 7, 2024
1 parent d033869 commit 739f211
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

### Fixed
- tinymce "^v7.0.0 || ^v6.0.0 || ^v5.0.0" is now an optional peer dependency. #INT-3324

## 3.0.0 - 2024-06-05

### Added
Expand Down
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
"CHANGELOG.md",
"LICENSE.txt"
],
"peerDependencies": {
"tinymce": "^7.0.0 || ^6.0.0 || ^5.0.0"
},
"peerDependenciesMeta": {
"tinymce": {
"optional": true
}
},
"devDependencies": {
"@babel/core": "^7.14.8",
"@rollup/plugin-commonjs": "^17.0.0",
Expand Down Expand Up @@ -76,7 +84,7 @@
"svelte-check": "^3.8.0",
"svelte-loader": "^3.2.0",
"svelte-preprocess": "^5.1.4",
"tinymce": "^7.1.1",
"tinymce": "^7.2.1",
"tslib": "^2.6.2",
"typescript": "^5.4.5",
"vite": "^5.2.13",
Expand Down
4 changes: 2 additions & 2 deletions src/main/component/Editor.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
export let apiKey: string = 'no-api-key';
export let licenseKey: string | undefined = undefined;
export let channel: Channel = '7';
export let scriptSrc: string = undefined;
export let scriptSrc: string | undefined = undefined;
export let conf: EditorOptions = {};
export let modelEvents: string = 'change input undo redo';
export let value: string = '';
Expand Down Expand Up @@ -139,7 +139,7 @@
},
};
element.style.visibility = '';
void getTinymce().init(finalInit);
void getTinymce()?.init(finalInit);
};
onMount(() => {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7488,10 +7488,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.1.1:
version "7.1.2"
resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.1.2.tgz#cb40e527dc03d6a0547a23c91231a946e50dae03"
integrity sha512-I/M5WRyEJjwIhyIv6FhkvZS1mWNbb0sIEvDkP8akBnuV1X78mkNhi6Kz9FBBbHzy61U3pmXgzyCSaDZfdQbCSg==
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==

tmp@^0.2.1:
version "0.2.3"
Expand Down

0 comments on commit 739f211

Please sign in to comment.