Skip to content

Commit 5d69fd4

Browse files
authored
Merge pull request #18828 from ckeditor/release_to_stable
Merge release (v46.0.0) to stable
2 parents 47c0d2b + 8c53ec1 commit 5d69fd4

File tree

2,639 files changed

+57166
-41754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,639 files changed

+57166
-41754
lines changed

.circleci/template.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ jobs:
155155
when: always
156156
name: Check if all packages are exported in the "ckeditor5" package
157157
command: yarn run check-exports
158+
- run:
159+
when: always
160+
name: Check if all package members are exported correctly from the index.ts file
161+
command: yarn run validate-module-re-exports
158162

159163
cke5_coverage:
160164
machine: true

.husky/pre-commit

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#!/bin/bash
2-
31
# @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
42
# For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
53

6-
. "$(dirname -- "$0")/_/husky.sh"
7-
84
yarn lint-staged

CHANGELOG.md

Lines changed: 273 additions & 155 deletions
Large diffs are not rendered by default.

LICENSE.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,33 @@ Where not otherwise indicated, all CKEditor content is authored by CKSource engi
2121
The following libraries are included in CKEditor under the [MIT license](https://opensource.org/licenses/MIT):
2222

2323
* @types/color-convert - Copyright (c) DefinitelyTyped.
24-
* @types/marked - Copyright (c) DefinitelyTyped.
25-
* @types/turndown - Copyright (c) DefinitelyTyped.
2624
* blurhash - Copyright (c) Wolt Enterprises.
2725
* color-convert - Copyright (c) 2011–2016 Heather Arthur <fayearthur@gmail.com>, copyright (c) 2016–2021 Josh Junon <josh@junon.me>.
2826
* color-parse - Copyright (c) 2015 Dmitry Ivanov.
2927
* emojibase-data - Copyright (c) 2017-2019 Miles Johnson.
3028
* es-toolkit - Copyright (c) 2024 Viva Republica, Inc.
3129
* fuzzysort - Copyright (c) 2018 Stephen Kamenar.
3230
* is-emoji-supported - Copyright (c) 2016-2020 Koala Interactive, Inc.
33-
* marked - Copyright (c) 2018+, MarkedJS (https://github.com/markedjs/), Copyright (c) 2011–2018, Christopher Jeffrey (https://github.com/chjj/).
34-
* turndown - Copyright (c) 2017 Dom Christie.
35-
* turndown-plugin-gfm - Copyright (c) 2017 Dom Christie.
3631
* vanilla-colorful - Copyright (c) 2020 Serhii Kulykov <iamkulykov@gmail.com>.
3732
* Regular Expression for URL validation - Copyright (c) 2010-2018 Diego Perini.
33+
* @types/hast - Copyright (c) Microsoft Corporation.
34+
* hast-util-to-html - Copyright (c) Titus Wormer <tituswormer@gmail.com>
35+
* hast-util-to-mdast - Copyright (c) Titus Wormer <tituswormer@gmail.com> and Copyright (c) Seth Vincent <sethvincent@gmail.com>
36+
* hastscript - Copyright (c) Titus Wormer <tituswormer@gmail.com>
37+
* rehype-remark - Copyright (c) Titus Wormer <tituswormer@gmail.com>
38+
* remark-breaks - Copyright (c) 2017 Titus Wormer <tituswormer@gmail.com>
39+
* remark-gfm - Copyright (c) Titus Wormer <tituswormer@gmail.com>
40+
* remark-parse - Copyright (c) 2014 Titus Wormer <tituswormer@gmail.com>
41+
* remark-rehype - Copyright (c) Titus Wormer <tituswormer@gmail.com>
42+
* remark-stringify - Copyright (c) 2014 Titus Wormer <tituswormer@gmail.com>
43+
* unified - Copyright (c) 2015 Titus Wormer <tituswormer@gmail.com>
44+
* unist-util-visit - Copyright (c) 2015 Titus Wormer <tituswormer@gmail.com>
45+
46+
The following libraries are included in CKEditor under the [ISC license](https://opensource.org/license/isc-license-txt):
47+
48+
* hast-util-from-dom - Copyright (c) Keith McKnight <keith@mcknig.ht>
49+
* rehype-dom-parse - Copyright (c) 2018 Keith McKnight <keith@mcknig.ht>
50+
* rehype-dom-stringify - Copyright (c) 2018 Keith McKnight <keith@mcknig.ht>
3851

3952
Trademarks
4053
----------

docs/_snippets/framework/tutorials/inline-widget.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
Widget,
1717
toWidget,
1818
viewToModelPositionOutsideModelElement,
19-
ViewModel,
19+
UIModel,
2020
addListToDropdown,
2121
createDropdown,
2222
Collection
@@ -106,7 +106,7 @@ function getDropdownItemsDefinitions( placeholderNames ) {
106106
for ( const name of placeholderNames ) {
107107
const definition = {
108108
type: 'button',
109-
model: new ViewModel( {
109+
model: new UIModel( {
110110
commandParam: name,
111111
label: name,
112112
withText: true

docs/_snippets/framework/ui/ui-dropdown.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
addListToDropdown,
1111
addToolbarToDropdown,
1212
createDropdown,
13-
ViewModel,
13+
UIModel,
1414
IconBold,
1515
IconItalic,
1616
Collection,
@@ -22,14 +22,14 @@ const locale = new Locale();
2222
const collection = new Collection();
2323
collection.add( {
2424
type: 'button',
25-
model: new ViewModel( {
25+
model: new UIModel( {
2626
label: 'Button',
2727
withText: true
2828
} )
2929
} );
3030
collection.add( {
3131
type: 'switchbutton',
32-
model: new ViewModel( {
32+
model: new UIModel( {
3333
label: 'Switch button',
3434
withText: true
3535
} )

docs/_snippets/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
export { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
77
export { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';
8-
export { default as ArticlePluginSet } from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset.js';
8+
export { ArticlePluginSet } from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset.js';
99

1010
export {
1111
attachTourBalloon,

docs/assets/global.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ It breaks CKEditor 5 (see how <p><code>[]</code></p> looks). */
7676

7777
.demo-row {
7878
width: 100%;
79-
display: -ms-flexbox;
8079
display: flex;
8180
}
8281

docs/features/feature-digest.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Core editing capability provides tools to create, edit, and style content. Here
270270
</td>
271271
<td>
272272
The image feature allows adding images of various kinds to the rich
273-
content inside the editor. A large set of subfeature background-grays lets the users
273+
content inside the editor. A large set of subfeatures lets the users
274274
fully control this process. Upload or paste images, insert
275275
via URL, use responsive images, resize images, add captions, set
276276
different image styles, and link images.
@@ -378,6 +378,20 @@ Core editing capability provides tools to create, edit, and style content. Here
378378
the image load much faster and saves bandwidth.
379379
</td>
380380
</tr>
381+
<tr id="line-height" class="feature">
382+
<td>
383+
<span>
384+
{@link features/line-height Line height
385+
<span class="tree__item__badge tree__item__badge_premium" data-badge-tooltip="Premium feature">
386+
<span class="tree__item__badge__text">Premium feature</span></span>
387+
}
388+
</span>
389+
</td>
390+
<td>
391+
The line height feature lets you adjust the vertical spacing between lines of text,
392+
controlling how tightly or loosely text is packed within paragraphs.
393+
</td>
394+
</tr>
381395
<tr id="links" class="feature">
382396
<td>
383397
{@link features/link Links}
@@ -402,7 +416,9 @@ Core editing capability provides tools to create, edit, and style content. Here
402416
</tr>
403417
<tr id="list-indentation" class="subfeature background-gray">
404418
<td>
405-
{@link features/lists-editing#indenting-lists List indentation}
419+
<span>
420+
<span class="subfeature-icon"></span>&nbsp;{@link features/lists-editing#indenting-lists List indentation}
421+
</span>
406422
</td>
407423
<td>
408424
Besides controlling
@@ -1966,7 +1982,9 @@ Customize your editor even further. Use components and helpers from our UI libra
19661982
</tr>
19671983
<tr id="custom-components" class="subfeature background-gray">
19681984
<td>
1969-
{@link features/custom-components Custom Widgets and Components}
1985+
<span>
1986+
<span class="subfeature-icon"></span>&nbsp;{@link features/custom-components Custom Widgets and Components}
1987+
</span>
19701988
</td>
19711989
<td>
19721990
Build custom interactive components using CKEditor 5's widget system. Create block widgets, inline elements, external data integrations, and framework components (React, Vue, Angular) that seamlessly integrate with the editor's content model and UI.

docs/framework/architecture/core-editor-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ refresh() {
114114
}
115115
```
116116

117-
This method is called automatically (by the command itself) when {@link module:engine/model/document~Document#event:change any changes are applied to the model}. This means that the command automatically refreshes its own state when anything changes in the editor.
117+
This method is called automatically (by the command itself) when {@link module:engine/model/document~ModelDocument#event:change any changes are applied to the model}. This means that the command automatically refreshes its own state when anything changes in the editor.
118118

119119
The important thing about commands is that every change in their state as well as calling the `execute()` method fire events. Some examples of these are {@link module:core/command~Command#event-set:{property} `#set:value`} and {@link module:core/command~Command#event-change:{property} `#change:value`} when you change the `#value` property and {@link module:core/command~Command#event:execute `#execute`} when you execute the command.
120120

0 commit comments

Comments
 (0)