Skip to content

Commit 5cd7e7b

Browse files
pklieschpkliesch
authored
Merge pull request #64 from CoreMedia/update/to-ckeditor5-v34
Update CKEditor5 to version 34.0.0
2 parents d2679c6 + 638dd9d commit 5cd7e7b

File tree

20 files changed

+1085
-455
lines changed

20 files changed

+1085
-455
lines changed

‎app/package.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
"license": "Apache-2.0",
99
"private": true,
1010
"dependencies": {
11-
"@ckeditor/ckeditor5-alignment": "32.0.0",
12-
"@ckeditor/ckeditor5-autosave": "32.0.0",
13-
"@ckeditor/ckeditor5-basic-styles": "32.0.0",
14-
"@ckeditor/ckeditor5-block-quote": "32.0.0",
15-
"@ckeditor/ckeditor5-clipboard": "32.0.0",
16-
"@ckeditor/ckeditor5-code-block": "32.0.0",
17-
"@ckeditor/ckeditor5-core": "32.0.0",
18-
"@ckeditor/ckeditor5-editor-classic": "32.0.0",
19-
"@ckeditor/ckeditor5-engine": "32.0.0",
20-
"@ckeditor/ckeditor5-essentials": "32.0.0",
21-
"@ckeditor/ckeditor5-heading": "32.0.0",
22-
"@ckeditor/ckeditor5-highlight": "32.0.0",
23-
"@ckeditor/ckeditor5-image": "^32.0.0",
24-
"@ckeditor/ckeditor5-indent": "32.0.0",
25-
"@ckeditor/ckeditor5-link": "32.0.0",
26-
"@ckeditor/ckeditor5-list": "32.0.0",
27-
"@ckeditor/ckeditor5-paragraph": "32.0.0",
28-
"@ckeditor/ckeditor5-paste-from-office": "32.0.0",
29-
"@ckeditor/ckeditor5-remove-format": "32.0.0",
30-
"@ckeditor/ckeditor5-source-editing": "32.0.0",
31-
"@ckeditor/ckeditor5-table": "32.0.0",
32-
"@ckeditor/ckeditor5-theme-lark": "32.0.0",
33-
"@ckeditor/ckeditor5-typing": "32.0.0",
34-
"@ckeditor/ckeditor5-ui": "32.0.0",
35-
"@ckeditor/ckeditor5-utils": "32.0.0",
11+
"@ckeditor/ckeditor5-alignment": "34.0.0",
12+
"@ckeditor/ckeditor5-autosave": "34.0.0",
13+
"@ckeditor/ckeditor5-basic-styles": "34.0.0",
14+
"@ckeditor/ckeditor5-block-quote": "34.0.0",
15+
"@ckeditor/ckeditor5-clipboard": "34.0.0",
16+
"@ckeditor/ckeditor5-code-block": "34.0.0",
17+
"@ckeditor/ckeditor5-core": "34.0.0",
18+
"@ckeditor/ckeditor5-editor-classic": "34.0.0",
19+
"@ckeditor/ckeditor5-engine": "34.0.0",
20+
"@ckeditor/ckeditor5-essentials": "34.0.0",
21+
"@ckeditor/ckeditor5-heading": "34.0.0",
22+
"@ckeditor/ckeditor5-highlight": "34.0.0",
23+
"@ckeditor/ckeditor5-image": "34.0.0",
24+
"@ckeditor/ckeditor5-indent": "34.0.0",
25+
"@ckeditor/ckeditor5-link": "34.0.0",
26+
"@ckeditor/ckeditor5-list": "34.0.0",
27+
"@ckeditor/ckeditor5-paragraph": "34.0.0",
28+
"@ckeditor/ckeditor5-paste-from-office": "34.0.0",
29+
"@ckeditor/ckeditor5-remove-format": "34.0.0",
30+
"@ckeditor/ckeditor5-source-editing": "34.0.0",
31+
"@ckeditor/ckeditor5-table": "34.0.0",
32+
"@ckeditor/ckeditor5-theme-lark": "34.0.0",
33+
"@ckeditor/ckeditor5-typing": "34.0.0",
34+
"@ckeditor/ckeditor5-ui": "34.0.0",
35+
"@ckeditor/ckeditor5-utils": "34.0.0",
3636
"@coremedia/ckeditor5-coremedia-content-clipboard": "5.0.1-rc.0",
3737
"@coremedia/ckeditor5-coremedia-link": "5.0.1-rc.0",
3838
"@coremedia/ckeditor5-coremedia-images": "5.0.1-rc.0",
@@ -44,9 +44,9 @@
4444
"xml-formatter": "^2.5.1"
4545
},
4646
"devDependencies": {
47-
"@ckeditor/ckeditor5-dev-utils": "^28.1.0",
48-
"@ckeditor/ckeditor5-dev-webpack-plugin": "^28.1.0",
49-
"@ckeditor/ckeditor5-inspector": "^3.1.0",
47+
"@ckeditor/ckeditor5-dev-utils": "^30.1.3",
48+
"@ckeditor/ckeditor5-dev-webpack-plugin": "^30.1.3",
49+
"@ckeditor/ckeditor5-inspector": "^4.0.0",
5050
"circular-dependency-plugin": "^5.2.2",
5151
"css-loader": "^6.5.1",
5252
"postcss": "^8.3.11",

‎app/src/ckeditor.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Indent from '@ckeditor/ckeditor5-indent/src/indent';
1313
import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
1414
import AutoLink from "@ckeditor/ckeditor5-link/src/autolink";
1515
import Link from '@ckeditor/ckeditor5-link/src/link';
16-
import List from '@ckeditor/ckeditor5-list/src/list';
16+
import DocumentList from '@ckeditor/ckeditor5-list/src/documentlist';
1717
import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
1818
import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice';
1919
import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat';
@@ -84,7 +84,7 @@ ClassicEditor.create(document.querySelector('.editor'), {
8484
Link,
8585
LinkTarget,
8686
CoreMediaStudioEssentials,
87-
List,
87+
DocumentList,
8888
Paragraph,
8989
PasteFromOffice,
9090
RemoveFormat,

‎app/src/example-data.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,47 @@ const exampleData = {
13211321
CoreMedia RichText 1.0 (and HTML) lists within CKEditor 5.
13221322
</p>
13231323
<ul><li>Lorem</li><li><p>Ipsum</p></li><li>Dolor</li></ul>`),
1324+
1325+
"Valid List Elements": richText(`
1326+
${h1("Valid List Elements")}
1327+
<p>
1328+
The following example shows an overview of valid elements in lists. List elements can either be
1329+
inline-, block- or plain text elements. Please see the lists below.
1330+
</p>
1331+
<p>
1332+
These lists show a symptom of the document lists, described in
1333+
<a xlink:href="https://github.com/ckeditor/ckeditor5/issues/11786">ckeditor/ckeditor5#11786</a>.
1334+
CKEditor 5 adds an additional &lt;span class="ck-list-bogus-paragraph"> element inside the &lt;li> element.
1335+
This can be observed for all inline elements in the SourceEditing view.
1336+
</p>
1337+
<p>
1338+
It can also be observed for paragraphs, images, nested lists (an empty span appears before the list) and plain text.
1339+
</p>
1340+
<p>
1341+
The first list contains inline elements (&lt;/br>, &lt;span>, &lt;em>, &lt;strong>, &lt;sup>, &lt;sub> and &lt;a>).
1342+
</p>
1343+
<ul>
1344+
<li><br/>Lorem Linebreak</li>
1345+
<li><span>Lorem Ipusum in additional span tag</span></li>
1346+
<li><em>Italic Lorem Ipsum in em tag</em></li>
1347+
<li><strong>Bold Lorem Ipsum in strong tag</strong></li>
1348+
<li>Lorem <sup>Ipsum</sup> (sup tag)</li>
1349+
<li>Lorem <sub>Ipsum</sub> (sub tag)</li>
1350+
<li><a xlink:href="https://example.org/">Link to example.org</a></li>
1351+
</ul>
1352+
<p>The next list contains block elements (&lt;p>, &lt;ol>, &lt;blockquote>, &lt;pre>, &lt;table> and &lt;img>). </p>
1353+
<ul>
1354+
<li><p>Lorem Ipsum in Paragraph</p></li>
1355+
<li><ol><li>Lorem Ipsum List Element</li></ol></li>
1356+
<li><pre>Lorem Ipsum Blocktext</pre></li>
1357+
<li><blockquote>Lorem Ipsum Blockquote</blockquote></li>
1358+
<li><table><tr><td>Lorem Ipsum Table Cell</td></tr></table></li>
1359+
<li><img xlink:href="${INLINE_IMG}" alt="inline image"/></li>
1360+
</ul>
1361+
<p>The next list contains plain text without any tags (PCDATA).</p>
1362+
<ul>
1363+
<li>Lorem ipsum dolor sit amet, consectetur adipisici elit</li>
1364+
</ul>`)
13241365
};
13251366

13261367
const setExampleData = (editor, exampleKey) => {

‎packages/ckeditor5-common/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"@babel/cli": "^7.16.0",
1818
"@babel/core": "^7.16.0",
19-
"@ckeditor/ckeditor5-core": "^32.0.0",
19+
"@ckeditor/ckeditor5-core": "^34.0.0",
2020
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
2121
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
2222
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
@@ -34,7 +34,7 @@
3434
"typescript": "^4.4.4"
3535
},
3636
"peerDependencies": {
37-
"@ckeditor/ckeditor5-core": "^32.0.0"
37+
"@ckeditor/ckeditor5-core": "^34.0.0"
3838
},
3939
"dependencies": {
4040
"@coremedia/ckeditor5-logging": "5.0.1-rc.0"

‎packages/ckeditor5-coremedia-content-clipboard/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
"devDependencies": {
1818
"@babel/cli": "^7.16.0",
1919
"@babel/core": "^7.16.0",
20-
"@ckeditor/ckeditor5-core": "^32.0.0",
21-
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
22-
"@ckeditor/ckeditor5-engine": "^32.0.0",
23-
"@ckeditor/ckeditor5-html-support": "^32.0.0",
24-
"@ckeditor/ckeditor5-utils": "^32.0.0",
25-
"@ckeditor/ckeditor5-undo": "^32.0.0",
20+
"@ckeditor/ckeditor5-core": "^34.0.0",
21+
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
22+
"@ckeditor/ckeditor5-engine": "^34.0.0",
23+
"@ckeditor/ckeditor5-html-support": "^34.0.0",
24+
"@ckeditor/ckeditor5-utils": "^34.0.0",
25+
"@ckeditor/ckeditor5-undo": "^34.0.0",
2626
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
2727
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
2828
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
@@ -49,12 +49,12 @@
4949
"./*": "./dist/*.js"
5050
},
5151
"peerDependencies": {
52-
"@ckeditor/ckeditor5-core": "^32.0.0",
53-
"@ckeditor/ckeditor5-engine": "^32.0.0",
54-
"@ckeditor/ckeditor5-html-support": "^32.0.0",
55-
"@ckeditor/ckeditor5-utils": "^32.0.0",
56-
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
57-
"@ckeditor/ckeditor5-undo": "^32.0.0",
52+
"@ckeditor/ckeditor5-core": "^34.0.0",
53+
"@ckeditor/ckeditor5-engine": "^34.0.0",
54+
"@ckeditor/ckeditor5-html-support": "^34.0.0",
55+
"@ckeditor/ckeditor5-utils": "^34.0.0",
56+
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
57+
"@ckeditor/ckeditor5-undo": "^34.0.0",
5858
"@coremedia/service-agent": "^1.0.0"
5959
},
6060
"dependencies": {

‎packages/ckeditor5-coremedia-images/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"devDependencies": {
2121
"@babel/cli": "^7.16.0",
2222
"@babel/core": "^7.16.0",
23-
"@ckeditor/ckeditor5-core": "^32.0.0",
24-
"@ckeditor/ckeditor5-engine": "^32.0.0",
25-
"@ckeditor/ckeditor5-image": "^32.0.0",
26-
"@ckeditor/ckeditor5-utils": "^32.0.0",
23+
"@ckeditor/ckeditor5-core": "^34.0.0",
24+
"@ckeditor/ckeditor5-engine": "^34.0.0",
25+
"@ckeditor/ckeditor5-image": "^34.0.0",
26+
"@ckeditor/ckeditor5-utils": "^34.0.0",
2727
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
2828
"@coremedia/service-agent": "^1.0.0",
2929
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
@@ -44,10 +44,10 @@
4444
"typescript": "^4.4.4"
4545
},
4646
"peerDependencies": {
47-
"@ckeditor/ckeditor5-core": "^32.0.0",
48-
"@ckeditor/ckeditor5-engine": "^32.0.0",
49-
"@ckeditor/ckeditor5-image": "^32.0.0",
50-
"@ckeditor/ckeditor5-utils": "^32.0.0",
47+
"@ckeditor/ckeditor5-core": "^34.0.0",
48+
"@ckeditor/ckeditor5-engine": "^34.0.0",
49+
"@ckeditor/ckeditor5-image": "^34.0.0",
50+
"@ckeditor/ckeditor5-utils": "^34.0.0",
5151
"@coremedia/service-agent": "^1.0.0"
5252
},
5353
"dependencies": {

‎packages/ckeditor5-coremedia-link/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
"devDependencies": {
2121
"@babel/cli": "^7.16.0",
2222
"@babel/core": "^7.16.0",
23-
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
24-
"@ckeditor/ckeditor5-core": "^32.0.0",
25-
"@ckeditor/ckeditor5-engine": "^32.0.0",
26-
"@ckeditor/ckeditor5-link": "^32.0.0",
27-
"@ckeditor/ckeditor5-typing": "^32.0.0",
28-
"@ckeditor/ckeditor5-ui": "^32.0.0",
29-
"@ckeditor/ckeditor5-utils": "^32.0.0",
23+
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
24+
"@ckeditor/ckeditor5-core": "^34.0.0",
25+
"@ckeditor/ckeditor5-engine": "^34.0.0",
26+
"@ckeditor/ckeditor5-link": "^34.0.0",
27+
"@ckeditor/ckeditor5-typing": "^34.0.0",
28+
"@ckeditor/ckeditor5-ui": "^34.0.0",
29+
"@ckeditor/ckeditor5-utils": "^34.0.0",
3030
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
3131
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
3232
"@coremedia/service-agent": "^1.0.0",
@@ -52,13 +52,13 @@
5252
"typescript": "^4.4.4"
5353
},
5454
"peerDependencies": {
55-
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
56-
"@ckeditor/ckeditor5-core": "^32.0.0",
57-
"@ckeditor/ckeditor5-engine": "^32.0.0",
58-
"@ckeditor/ckeditor5-link": "^32.0.0",
59-
"@ckeditor/ckeditor5-typing": "^32.0.0",
60-
"@ckeditor/ckeditor5-ui": "^32.0.0",
61-
"@ckeditor/ckeditor5-utils": "^32.0.0",
55+
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
56+
"@ckeditor/ckeditor5-core": "^34.0.0",
57+
"@ckeditor/ckeditor5-engine": "^34.0.0",
58+
"@ckeditor/ckeditor5-link": "^34.0.0",
59+
"@ckeditor/ckeditor5-typing": "^34.0.0",
60+
"@ckeditor/ckeditor5-ui": "^34.0.0",
61+
"@ckeditor/ckeditor5-utils": "^34.0.0",
6262
"@coremedia/service-agent": "^1.0.0"
6363
},
6464
"dependencies": {

‎packages/ckeditor5-coremedia-richtext-support/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"devDependencies": {
1818
"@babel/cli": "^7.16.0",
1919
"@babel/core": "^7.16.0",
20-
"@ckeditor/ckeditor5-core": "^32.0.0",
21-
"@ckeditor/ckeditor5-engine": "^32.0.0",
22-
"@ckeditor/ckeditor5-html-support": "^32.0.0",
23-
"@ckeditor/ckeditor5-utils": "^32.0.0",
20+
"@ckeditor/ckeditor5-core": "^34.0.0",
21+
"@ckeditor/ckeditor5-engine": "^34.0.0",
22+
"@ckeditor/ckeditor5-html-support": "^34.0.0",
23+
"@ckeditor/ckeditor5-utils": "^34.0.0",
2424
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
2525
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
2626
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
@@ -45,10 +45,10 @@
4545
"./*": "./dist/*.js"
4646
},
4747
"peerDependencies": {
48-
"@ckeditor/ckeditor5-core": "^32.0.0",
49-
"@ckeditor/ckeditor5-engine": "^32.0.0",
50-
"@ckeditor/ckeditor5-html-support": "^32.0.0",
51-
"@ckeditor/ckeditor5-utils": "^32.0.0"
48+
"@ckeditor/ckeditor5-core": "^34.0.0",
49+
"@ckeditor/ckeditor5-engine": "^34.0.0",
50+
"@ckeditor/ckeditor5-html-support": "^34.0.0",
51+
"@ckeditor/ckeditor5-utils": "^34.0.0"
5252
},
5353
"dependencies": {
5454
"@coremedia/ckeditor5-logging": "5.0.1-rc.0"

‎packages/ckeditor5-coremedia-richtext/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"devDependencies": {
1818
"@babel/cli": "^7.16.0",
1919
"@babel/core": "^7.16.0",
20-
"@ckeditor/ckeditor5-core": "^32.0.0",
21-
"@ckeditor/ckeditor5-engine": "^32.0.0",
22-
"@ckeditor/ckeditor5-utils": "^32.0.0",
20+
"@ckeditor/ckeditor5-core": "^34.0.0",
21+
"@ckeditor/ckeditor5-engine": "^34.0.0",
22+
"@ckeditor/ckeditor5-utils": "^34.0.0",
2323
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
2424
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
2525
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
@@ -43,9 +43,9 @@
4343
"./*": "./dist/*.js"
4444
},
4545
"peerDependencies": {
46-
"@ckeditor/ckeditor5-core": "^32.0.0",
47-
"@ckeditor/ckeditor5-engine": "^32.0.0",
48-
"@ckeditor/ckeditor5-utils": "^32.0.0"
46+
"@ckeditor/ckeditor5-core": "^34.0.0",
47+
"@ckeditor/ckeditor5-engine": "^34.0.0",
48+
"@ckeditor/ckeditor5-utils": "^34.0.0"
4949
},
5050
"dependencies": {
5151
"@coremedia/ckeditor5-dataprocessor-support": "5.0.1-rc.0",

‎packages/ckeditor5-coremedia-studio-essentials/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"devDependencies": {
2121
"@babel/cli": "^7.16.0",
2222
"@babel/core": "^7.16.0",
23-
"@ckeditor/ckeditor5-core": "^32.0.0",
24-
"@ckeditor/ckeditor5-engine": "^32.0.0",
25-
"@ckeditor/ckeditor5-link": "^32.0.0",
26-
"@ckeditor/ckeditor5-typing": "^32.0.0",
27-
"@ckeditor/ckeditor5-ui": "^32.0.0",
28-
"@ckeditor/ckeditor5-utils": "^32.0.0",
23+
"@ckeditor/ckeditor5-core": "^34.0.0",
24+
"@ckeditor/ckeditor5-engine": "^34.0.0",
25+
"@ckeditor/ckeditor5-link": "^34.0.0",
26+
"@ckeditor/ckeditor5-typing": "^34.0.0",
27+
"@ckeditor/ckeditor5-ui": "^34.0.0",
28+
"@ckeditor/ckeditor5-utils": "^34.0.0",
2929
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
3030
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
3131
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
@@ -49,11 +49,11 @@
4949
"typescript": "^4.4.4"
5050
},
5151
"peerDependencies": {
52-
"@ckeditor/ckeditor5-core": "^32.0.0",
53-
"@ckeditor/ckeditor5-engine": "^32.0.0",
54-
"@ckeditor/ckeditor5-typing": "^32.0.0",
55-
"@ckeditor/ckeditor5-ui": "^32.0.0",
56-
"@ckeditor/ckeditor5-utils": "^32.0.0"
52+
"@ckeditor/ckeditor5-core": "^34.0.0",
53+
"@ckeditor/ckeditor5-engine": "^34.0.0",
54+
"@ckeditor/ckeditor5-typing": "^34.0.0",
55+
"@ckeditor/ckeditor5-ui": "^34.0.0",
56+
"@ckeditor/ckeditor5-utils": "^34.0.0"
5757
},
5858
"dependencies": {
5959
"@coremedia/ckeditor5-coremedia-richtext": "5.0.1-rc.0",

0 commit comments

Comments
 (0)