Skip to content

Commit

Permalink
Merge stable into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@CKTravisBot
CKTravisBot authored Sep 29, 2021
2 parents ee98090 + 06ab990 commit 1c0dace
Show file tree
Hide file tree
Showing 89 changed files with 1,155 additions and 985 deletions.
158 changes: 158 additions & 0 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions docs/builds/guides/migration/migration-to-30.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ order: 94
modified_at: 2021-09-16
---

# Migration to CKEditor 5 v30.x
# Migration to CKEditor 5 v30.0.0

<info-box>
When updating your CKEditor 5 installation, make sure **all the packages are the same version** to avoid errors.

For custom builds, you may try removing the `package-lock.json` or `yarn.lock` files (if applicable) and reinstalling all packages before rebuilding the editor. For best results, make sure you use the most recent package versions.
</info-box>

## Migration to CKEditor 5 v30.0.0

<!-- For the entire list of changes introduced in version 30.0.0, see the [changelog for CKEditor 5 v30.0.0](https://github.com/ckeditor/ckeditor5/blob/master/CHANGELOG.md#3000-2021-09-26).-->
For the entire list of changes introduced in version 30.0.0, see the [changelog for CKEditor 5 v30.0.0](https://github.com/ckeditor/ckeditor5/blob/master/CHANGELOG.md#3000-2021-09-27).

Listed below are the most important changes that require your attention when upgrading to CKEditor 5 v30.0.0.

Expand Down
14 changes: 14 additions & 0 deletions docs/framework/guides/contributing/git-commit-message-convention.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,20 @@ Changelog
* **[utils](http://npmjs.com/package/@ckeditor/ckeditor5-utils)**: Extracted the `utils#foo()` to a separate package. Thanks to [@CKEditor](https://github.com/CKEditor). ([e8cc04f](https://github.com/ckeditor/ckeditor5/commit/e8cc04f))
```

### Fixing errors

If the commit message was wrong but it was already too late to fix (e.g. already merged into `master`), you can push an empty commit with the correct message straight to `master`:

```
git checkout master
git commit --allow-empty # Fix the message in the commit
git push origin master
```

<info-box>
Two commits for the same pull request will require **manual deduplication** during the changelog generation process. To reduce the noise, **avoid this technique for minor errors** like spelling or grammar: changelog entries will be checked and corrected anyway. Use it to add missing `BREAKING CHANGE` entries or fix wrong ticket numbers in `Closes #123` (critical information for integrators). You can also notify the team about the fix.
</info-box>

## Handling pull requests

When creating a pull request, its author may (it is recommended in the pull request template) propose a merge commit message.
Expand Down
116 changes: 58 additions & 58 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ckeditor5",
"version": "29.2.0",
"version": "30.0.0",
"description": "The development environment of CKEditor 5 – the best browser-based rich text editor.",
"private": true,
"keywords": [
Expand All @@ -21,63 +21,63 @@
"framework"
],
"dependencies": {
"@ckeditor/ckeditor5-adapter-ckfinder": "^29.2.0",
"@ckeditor/ckeditor5-alignment": "^29.2.0",
"@ckeditor/ckeditor5-autoformat": "^29.2.0",
"@ckeditor/ckeditor5-autosave": "^29.2.0",
"@ckeditor/ckeditor5-basic-styles": "^29.2.0",
"@ckeditor/ckeditor5-block-quote": "^29.2.0",
"@ckeditor/ckeditor5-build-balloon": "^29.2.0",
"@ckeditor/ckeditor5-build-balloon-block": "^29.2.0",
"@ckeditor/ckeditor5-build-classic": "^29.2.0",
"@ckeditor/ckeditor5-build-decoupled-document": "^29.2.0",
"@ckeditor/ckeditor5-build-inline": "^29.2.0",
"@ckeditor/ckeditor5-ckfinder": "^29.2.0",
"@ckeditor/ckeditor5-clipboard": "^29.2.0",
"@ckeditor/ckeditor5-cloud-services": "^29.2.0",
"@ckeditor/ckeditor5-code-block": "^29.2.0",
"@ckeditor/ckeditor5-core": "^29.2.0",
"@ckeditor/ckeditor5-easy-image": "^29.2.0",
"@ckeditor/ckeditor5-editor-balloon": "^29.2.0",
"@ckeditor/ckeditor5-editor-classic": "^29.2.0",
"@ckeditor/ckeditor5-editor-decoupled": "^29.2.0",
"@ckeditor/ckeditor5-editor-inline": "^29.2.0",
"@ckeditor/ckeditor5-engine": "^29.2.0",
"@ckeditor/ckeditor5-enter": "^29.2.0",
"@ckeditor/ckeditor5-essentials": "^29.2.0",
"@ckeditor/ckeditor5-find-and-replace": "^29.2.0",
"@ckeditor/ckeditor5-font": "^29.2.0",
"@ckeditor/ckeditor5-heading": "^29.2.0",
"@ckeditor/ckeditor5-highlight": "^29.2.0",
"@ckeditor/ckeditor5-horizontal-line": "^29.2.0",
"@ckeditor/ckeditor5-html-embed": "^29.2.0",
"@ckeditor/ckeditor5-html-support": "^29.2.0",
"@ckeditor/ckeditor5-image": "^29.2.0",
"@ckeditor/ckeditor5-indent": "^29.2.0",
"@ckeditor/ckeditor5-language": "^29.2.0",
"@ckeditor/ckeditor5-link": "^29.2.0",
"@ckeditor/ckeditor5-list": "^29.2.0",
"@ckeditor/ckeditor5-markdown-gfm": "^29.2.0",
"@ckeditor/ckeditor5-media-embed": "^29.2.0",
"@ckeditor/ckeditor5-mention": "^29.2.0",
"@ckeditor/ckeditor5-page-break": "^29.2.0",
"@ckeditor/ckeditor5-paragraph": "^29.2.0",
"@ckeditor/ckeditor5-paste-from-office": "^29.2.0",
"@ckeditor/ckeditor5-remove-format": "^29.2.0",
"@ckeditor/ckeditor5-restricted-editing": "^29.2.0",
"@ckeditor/ckeditor5-select-all": "^29.2.0",
"@ckeditor/ckeditor5-source-editing": "^29.2.0",
"@ckeditor/ckeditor5-special-characters": "^29.2.0",
"@ckeditor/ckeditor5-table": "^29.2.0",
"@ckeditor/ckeditor5-theme-lark": "^29.2.0",
"@ckeditor/ckeditor5-typing": "^29.2.0",
"@ckeditor/ckeditor5-ui": "^29.2.0",
"@ckeditor/ckeditor5-undo": "^29.2.0",
"@ckeditor/ckeditor5-upload": "^29.2.0",
"@ckeditor/ckeditor5-utils": "^29.2.0",
"@ckeditor/ckeditor5-watchdog": "^29.2.0",
"@ckeditor/ckeditor5-widget": "^29.2.0",
"@ckeditor/ckeditor5-word-count": "^29.2.0"
"@ckeditor/ckeditor5-adapter-ckfinder": "^30.0.0",
"@ckeditor/ckeditor5-alignment": "^30.0.0",
"@ckeditor/ckeditor5-autoformat": "^30.0.0",
"@ckeditor/ckeditor5-autosave": "^30.0.0",
"@ckeditor/ckeditor5-basic-styles": "^30.0.0",
"@ckeditor/ckeditor5-block-quote": "^30.0.0",
"@ckeditor/ckeditor5-build-balloon": "^30.0.0",
"@ckeditor/ckeditor5-build-balloon-block": "^30.0.0",
"@ckeditor/ckeditor5-build-classic": "^30.0.0",
"@ckeditor/ckeditor5-build-decoupled-document": "^30.0.0",
"@ckeditor/ckeditor5-build-inline": "^30.0.0",
"@ckeditor/ckeditor5-ckfinder": "^30.0.0",
"@ckeditor/ckeditor5-clipboard": "^30.0.0",
"@ckeditor/ckeditor5-cloud-services": "^30.0.0",
"@ckeditor/ckeditor5-code-block": "^30.0.0",
"@ckeditor/ckeditor5-core": "^30.0.0",
"@ckeditor/ckeditor5-easy-image": "^30.0.0",
"@ckeditor/ckeditor5-editor-balloon": "^30.0.0",
"@ckeditor/ckeditor5-editor-classic": "^30.0.0",
"@ckeditor/ckeditor5-editor-decoupled": "^30.0.0",
"@ckeditor/ckeditor5-editor-inline": "^30.0.0",
"@ckeditor/ckeditor5-engine": "^30.0.0",
"@ckeditor/ckeditor5-enter": "^30.0.0",
"@ckeditor/ckeditor5-essentials": "^30.0.0",
"@ckeditor/ckeditor5-find-and-replace": "^30.0.0",
"@ckeditor/ckeditor5-font": "^30.0.0",
"@ckeditor/ckeditor5-heading": "^30.0.0",
"@ckeditor/ckeditor5-highlight": "^30.0.0",
"@ckeditor/ckeditor5-horizontal-line": "^30.0.0",
"@ckeditor/ckeditor5-html-embed": "^30.0.0",
"@ckeditor/ckeditor5-html-support": "^30.0.0",
"@ckeditor/ckeditor5-image": "^30.0.0",
"@ckeditor/ckeditor5-indent": "^30.0.0",
"@ckeditor/ckeditor5-language": "^30.0.0",
"@ckeditor/ckeditor5-link": "^30.0.0",
"@ckeditor/ckeditor5-list": "^30.0.0",
"@ckeditor/ckeditor5-markdown-gfm": "^30.0.0",
"@ckeditor/ckeditor5-media-embed": "^30.0.0",
"@ckeditor/ckeditor5-mention": "^30.0.0",
"@ckeditor/ckeditor5-page-break": "^30.0.0",
"@ckeditor/ckeditor5-paragraph": "^30.0.0",
"@ckeditor/ckeditor5-paste-from-office": "^30.0.0",
"@ckeditor/ckeditor5-remove-format": "^30.0.0",
"@ckeditor/ckeditor5-restricted-editing": "^30.0.0",
"@ckeditor/ckeditor5-select-all": "^30.0.0",
"@ckeditor/ckeditor5-source-editing": "^30.0.0",
"@ckeditor/ckeditor5-special-characters": "^30.0.0",
"@ckeditor/ckeditor5-table": "^30.0.0",
"@ckeditor/ckeditor5-theme-lark": "^30.0.0",
"@ckeditor/ckeditor5-typing": "^30.0.0",
"@ckeditor/ckeditor5-ui": "^30.0.0",
"@ckeditor/ckeditor5-undo": "^30.0.0",
"@ckeditor/ckeditor5-upload": "^30.0.0",
"@ckeditor/ckeditor5-utils": "^30.0.0",
"@ckeditor/ckeditor5-watchdog": "^30.0.0",
"@ckeditor/ckeditor5-widget": "^30.0.0",
"@ckeditor/ckeditor5-word-count": "^30.0.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-comments": ">=28.0.0",
Expand Down
30 changes: 15 additions & 15 deletions packages/ckeditor5-adapter-ckfinder/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-adapter-ckfinder",
"version": "29.2.0",
"version": "30.0.0",
"description": "CKFinder adapter for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,23 +12,23 @@
],
"main": "src/index.js",
"dependencies": {
"ckeditor5": "^29.2.0"
"ckeditor5": "^30.0.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "^29.2.0",
"@ckeditor/ckeditor5-core": "^29.2.0",
"@ckeditor/ckeditor5-clipboard": "^29.2.0",
"@ckeditor/ckeditor5-basic-styles": "^30.0.0",
"@ckeditor/ckeditor5-core": "^30.0.0",
"@ckeditor/ckeditor5-clipboard": "^30.0.0",
"@ckeditor/ckeditor5-dev-utils": "^25.4.0",
"@ckeditor/ckeditor5-editor-classic": "^29.2.0",
"@ckeditor/ckeditor5-enter": "^29.2.0",
"@ckeditor/ckeditor5-heading": "^29.2.0",
"@ckeditor/ckeditor5-image": "^29.2.0",
"@ckeditor/ckeditor5-list": "^29.2.0",
"@ckeditor/ckeditor5-paragraph": "^29.2.0",
"@ckeditor/ckeditor5-theme-lark": "^29.2.0",
"@ckeditor/ckeditor5-typing": "^29.2.0",
"@ckeditor/ckeditor5-undo": "^29.2.0",
"@ckeditor/ckeditor5-upload": "^29.2.0",
"@ckeditor/ckeditor5-editor-classic": "^30.0.0",
"@ckeditor/ckeditor5-enter": "^30.0.0",
"@ckeditor/ckeditor5-heading": "^30.0.0",
"@ckeditor/ckeditor5-image": "^30.0.0",
"@ckeditor/ckeditor5-list": "^30.0.0",
"@ckeditor/ckeditor5-paragraph": "^30.0.0",
"@ckeditor/ckeditor5-theme-lark": "^30.0.0",
"@ckeditor/ckeditor5-typing": "^30.0.0",
"@ckeditor/ckeditor5-undo": "^30.0.0",
"@ckeditor/ckeditor5-upload": "^30.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
},
Expand Down
26 changes: 13 additions & 13 deletions packages/ckeditor5-alignment/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-alignment",
"version": "29.2.0",
"version": "30.0.0",
"description": "Text alignment feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,21 +12,21 @@
],
"main": "src/index.js",
"dependencies": {
"ckeditor5": "^29.2.0"
"ckeditor5": "^30.0.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-block-quote": "^29.2.0",
"@ckeditor/ckeditor5-core": "^29.2.0",
"@ckeditor/ckeditor5-block-quote": "^30.0.0",
"@ckeditor/ckeditor5-core": "^30.0.0",
"@ckeditor/ckeditor5-dev-utils": "^25.4.0",
"@ckeditor/ckeditor5-editor-classic": "^29.2.0",
"@ckeditor/ckeditor5-engine": "^29.2.0",
"@ckeditor/ckeditor5-enter": "^29.2.0",
"@ckeditor/ckeditor5-heading": "^29.2.0",
"@ckeditor/ckeditor5-image": "^29.2.0",
"@ckeditor/ckeditor5-list": "^29.2.0",
"@ckeditor/ckeditor5-paragraph": "^29.2.0",
"@ckeditor/ckeditor5-theme-lark": "^29.2.0",
"@ckeditor/ckeditor5-typing": "^29.2.0",
"@ckeditor/ckeditor5-editor-classic": "^30.0.0",
"@ckeditor/ckeditor5-engine": "^30.0.0",
"@ckeditor/ckeditor5-enter": "^30.0.0",
"@ckeditor/ckeditor5-heading": "^30.0.0",
"@ckeditor/ckeditor5-image": "^30.0.0",
"@ckeditor/ckeditor5-list": "^30.0.0",
"@ckeditor/ckeditor5-paragraph": "^30.0.0",
"@ckeditor/ckeditor5-theme-lark": "^30.0.0",
"@ckeditor/ckeditor5-typing": "^30.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
},
Expand Down
32 changes: 16 additions & 16 deletions packages/ckeditor5-autoformat/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-autoformat",
"version": "29.2.0",
"version": "30.0.0",
"description": "Autoformatting feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,24 +12,24 @@
],
"main": "src/index.js",
"dependencies": {
"ckeditor5": "^29.2.0"
"ckeditor5": "^30.0.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "^29.2.0",
"@ckeditor/ckeditor5-block-quote": "^29.2.0",
"@ckeditor/ckeditor5-code-block": "^29.2.0",
"@ckeditor/ckeditor5-core": "^29.2.0",
"@ckeditor/ckeditor5-basic-styles": "^30.0.0",
"@ckeditor/ckeditor5-block-quote": "^30.0.0",
"@ckeditor/ckeditor5-code-block": "^30.0.0",
"@ckeditor/ckeditor5-core": "^30.0.0",
"@ckeditor/ckeditor5-dev-utils": "^25.4.0",
"@ckeditor/ckeditor5-editor-classic": "^29.2.0",
"@ckeditor/ckeditor5-engine": "^29.2.0",
"@ckeditor/ckeditor5-enter": "^29.2.0",
"@ckeditor/ckeditor5-heading": "^29.2.0",
"@ckeditor/ckeditor5-horizontal-line": "^29.2.0",
"@ckeditor/ckeditor5-list": "^29.2.0",
"@ckeditor/ckeditor5-paragraph": "^29.2.0",
"@ckeditor/ckeditor5-theme-lark": "^29.2.0",
"@ckeditor/ckeditor5-typing": "^29.2.0",
"@ckeditor/ckeditor5-undo": "^29.2.0",
"@ckeditor/ckeditor5-editor-classic": "^30.0.0",
"@ckeditor/ckeditor5-engine": "^30.0.0",
"@ckeditor/ckeditor5-enter": "^30.0.0",
"@ckeditor/ckeditor5-heading": "^30.0.0",
"@ckeditor/ckeditor5-horizontal-line": "^30.0.0",
"@ckeditor/ckeditor5-list": "^30.0.0",
"@ckeditor/ckeditor5-paragraph": "^30.0.0",
"@ckeditor/ckeditor5-theme-lark": "^30.0.0",
"@ckeditor/ckeditor5-typing": "^30.0.0",
"@ckeditor/ckeditor5-undo": "^30.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/ckeditor5-autosave/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-autosave",
"version": "29.2.0",
"version": "30.0.0",
"description": "Autosave feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,15 +12,15 @@
],
"main": "src/index.js",
"dependencies": {
"ckeditor5": "^29.2.0",
"ckeditor5": "^30.0.0",
"lodash-es": "^4.17.15"
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^29.2.0",
"@ckeditor/ckeditor5-core": "^30.0.0",
"@ckeditor/ckeditor5-dev-utils": "^25.4.0",
"@ckeditor/ckeditor5-editor-classic": "^29.2.0",
"@ckeditor/ckeditor5-paragraph": "^29.2.0",
"@ckeditor/ckeditor5-theme-lark": "^29.2.0",
"@ckeditor/ckeditor5-editor-classic": "^30.0.0",
"@ckeditor/ckeditor5-paragraph": "^30.0.0",
"@ckeditor/ckeditor5-theme-lark": "^30.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
},
Expand Down
20 changes: 10 additions & 10 deletions packages/ckeditor5-basic-styles/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ckeditor/ckeditor5-basic-styles",
"version": "29.2.0",
"version": "30.0.0",
"description": "Basic styles feature for CKEditor 5.",
"keywords": [
"ckeditor",
Expand All @@ -12,18 +12,18 @@
],
"main": "src/index.js",
"dependencies": {
"ckeditor5": "^29.2.0"
"ckeditor5": "^30.0.0"
},
"devDependencies": {
"@ckeditor/ckeditor5-core": "^29.2.0",
"@ckeditor/ckeditor5-core": "^30.0.0",
"@ckeditor/ckeditor5-dev-utils": "^25.4.0",
"@ckeditor/ckeditor5-editor-classic": "^29.2.0",
"@ckeditor/ckeditor5-engine": "^29.2.0",
"@ckeditor/ckeditor5-essentials": "^29.2.0",
"@ckeditor/ckeditor5-paragraph": "^29.2.0",
"@ckeditor/ckeditor5-theme-lark": "^29.2.0",
"@ckeditor/ckeditor5-ui": "^29.2.0",
"@ckeditor/ckeditor5-utils": "^29.2.0",
"@ckeditor/ckeditor5-editor-classic": "^30.0.0",
"@ckeditor/ckeditor5-engine": "^30.0.0",
"@ckeditor/ckeditor5-essentials": "^30.0.0",
"@ckeditor/ckeditor5-paragraph": "^30.0.0",
"@ckeditor/ckeditor5-theme-lark": "^30.0.0",
"@ckeditor/ckeditor5-ui": "^30.0.0",
"@ckeditor/ckeditor5-utils": "^30.0.0",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11"
},
Expand Down
Loading

0 comments on commit 1c0dace

Please sign in to comment.