Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 28 additions & 28 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@
"license": "Apache-2.0",
"private": true,
"dependencies": {
"@ckeditor/ckeditor5-alignment": "32.0.0",
"@ckeditor/ckeditor5-autosave": "32.0.0",
"@ckeditor/ckeditor5-basic-styles": "32.0.0",
"@ckeditor/ckeditor5-block-quote": "32.0.0",
"@ckeditor/ckeditor5-clipboard": "32.0.0",
"@ckeditor/ckeditor5-code-block": "32.0.0",
"@ckeditor/ckeditor5-core": "32.0.0",
"@ckeditor/ckeditor5-editor-classic": "32.0.0",
"@ckeditor/ckeditor5-engine": "32.0.0",
"@ckeditor/ckeditor5-essentials": "32.0.0",
"@ckeditor/ckeditor5-heading": "32.0.0",
"@ckeditor/ckeditor5-highlight": "32.0.0",
"@ckeditor/ckeditor5-image": "^32.0.0",
"@ckeditor/ckeditor5-indent": "32.0.0",
"@ckeditor/ckeditor5-link": "32.0.0",
"@ckeditor/ckeditor5-list": "32.0.0",
"@ckeditor/ckeditor5-paragraph": "32.0.0",
"@ckeditor/ckeditor5-paste-from-office": "32.0.0",
"@ckeditor/ckeditor5-remove-format": "32.0.0",
"@ckeditor/ckeditor5-source-editing": "32.0.0",
"@ckeditor/ckeditor5-table": "32.0.0",
"@ckeditor/ckeditor5-theme-lark": "32.0.0",
"@ckeditor/ckeditor5-typing": "32.0.0",
"@ckeditor/ckeditor5-ui": "32.0.0",
"@ckeditor/ckeditor5-utils": "32.0.0",
"@ckeditor/ckeditor5-alignment": "34.0.0",
"@ckeditor/ckeditor5-autosave": "34.0.0",
"@ckeditor/ckeditor5-basic-styles": "34.0.0",
"@ckeditor/ckeditor5-block-quote": "34.0.0",
"@ckeditor/ckeditor5-clipboard": "34.0.0",
"@ckeditor/ckeditor5-code-block": "34.0.0",
"@ckeditor/ckeditor5-core": "34.0.0",
"@ckeditor/ckeditor5-editor-classic": "34.0.0",
"@ckeditor/ckeditor5-engine": "34.0.0",
"@ckeditor/ckeditor5-essentials": "34.0.0",
"@ckeditor/ckeditor5-heading": "34.0.0",
"@ckeditor/ckeditor5-highlight": "34.0.0",
"@ckeditor/ckeditor5-image": "34.0.0",
"@ckeditor/ckeditor5-indent": "34.0.0",
"@ckeditor/ckeditor5-link": "34.0.0",
"@ckeditor/ckeditor5-list": "34.0.0",
"@ckeditor/ckeditor5-paragraph": "34.0.0",
"@ckeditor/ckeditor5-paste-from-office": "34.0.0",
"@ckeditor/ckeditor5-remove-format": "34.0.0",
"@ckeditor/ckeditor5-source-editing": "34.0.0",
"@ckeditor/ckeditor5-table": "34.0.0",
"@ckeditor/ckeditor5-theme-lark": "34.0.0",
"@ckeditor/ckeditor5-typing": "34.0.0",
"@ckeditor/ckeditor5-ui": "34.0.0",
"@ckeditor/ckeditor5-utils": "34.0.0",
"@coremedia/ckeditor5-coremedia-content-clipboard": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-link": "5.0.1-rc.0",
"@coremedia/ckeditor5-coremedia-images": "5.0.1-rc.0",
Expand All @@ -44,9 +44,9 @@
"xml-formatter": "^2.5.1"
},
"devDependencies": {
"@ckeditor/ckeditor5-dev-utils": "^28.1.0",
"@ckeditor/ckeditor5-dev-webpack-plugin": "^28.1.0",
"@ckeditor/ckeditor5-inspector": "^3.1.0",
"@ckeditor/ckeditor5-dev-utils": "^30.1.3",
"@ckeditor/ckeditor5-dev-webpack-plugin": "^30.1.3",
"@ckeditor/ckeditor5-inspector": "^4.0.0",
"circular-dependency-plugin": "^5.2.2",
"css-loader": "^6.5.1",
"postcss": "^8.3.11",
Expand Down
4 changes: 2 additions & 2 deletions app/src/ckeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Indent from '@ckeditor/ckeditor5-indent/src/indent';
import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
import AutoLink from "@ckeditor/ckeditor5-link/src/autolink";
import Link from '@ckeditor/ckeditor5-link/src/link';
import List from '@ckeditor/ckeditor5-list/src/list';
import DocumentList from '@ckeditor/ckeditor5-list/src/documentlist';
import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice';
import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat';
Expand Down Expand Up @@ -84,7 +84,7 @@ ClassicEditor.create(document.querySelector('.editor'), {
Link,
LinkTarget,
CoreMediaStudioEssentials,
List,
DocumentList,
Paragraph,
PasteFromOffice,
RemoveFormat,
Expand Down
41 changes: 41 additions & 0 deletions app/src/example-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -1321,6 +1321,47 @@ const exampleData = {
CoreMedia RichText 1.0 (and HTML) lists within CKEditor 5.
</p>
<ul><li>Lorem</li><li><p>Ipsum</p></li><li>Dolor</li></ul>`),

"Valid List Elements": richText(`
${h1("Valid List Elements")}
<p>
The following example shows an overview of valid elements in lists. List elements can either be
inline-, block- or plain text elements. Please see the lists below.
</p>
<p>
These lists show a symptom of the document lists, described in
<a xlink:href="https://github.com/ckeditor/ckeditor5/issues/11786">ckeditor/ckeditor5#11786</a>.
CKEditor 5 adds an additional &lt;span class="ck-list-bogus-paragraph"> element inside the &lt;li> element.
This can be observed for all inline elements in the SourceEditing view.
</p>
<p>
It can also be observed for paragraphs, images, nested lists (an empty span appears before the list) and plain text.
</p>
<p>
The first list contains inline elements (&lt;/br>, &lt;span>, &lt;em>, &lt;strong>, &lt;sup>, &lt;sub> and &lt;a>).
</p>
<ul>
<li><br/>Lorem Linebreak</li>
<li><span>Lorem Ipusum in additional span tag</span></li>
<li><em>Italic Lorem Ipsum in em tag</em></li>
<li><strong>Bold Lorem Ipsum in strong tag</strong></li>
<li>Lorem <sup>Ipsum</sup> (sup tag)</li>
<li>Lorem <sub>Ipsum</sub> (sub tag)</li>
<li><a xlink:href="https://example.org/">Link to example.org</a></li>
</ul>
<p>The next list contains block elements (&lt;p>, &lt;ol>, &lt;blockquote>, &lt;pre>, &lt;table> and &lt;img>). </p>
<ul>
<li><p>Lorem Ipsum in Paragraph</p></li>
<li><ol><li>Lorem Ipsum List Element</li></ol></li>
<li><pre>Lorem Ipsum Blocktext</pre></li>
<li><blockquote>Lorem Ipsum Blockquote</blockquote></li>
<li><table><tr><td>Lorem Ipsum Table Cell</td></tr></table></li>
<li><img xlink:href="${INLINE_IMG}" alt="inline image"/></li>
</ul>
Comment on lines +1343 to +1360
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For manual tests, examples are enough for a first smoke-test. In the end, we should provide integration (contract) tests, also validating different combinations of attributes on various layers.

<p>The next list contains plain text without any tags (PCDATA).</p>
<ul>
<li>Lorem ipsum dolor sit amet, consectetur adipisici elit</li>
</ul>`)
};

const setExampleData = (editor, exampleKey) => {
Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor5-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
Expand All @@ -34,7 +34,7 @@
"typescript": "^4.4.4"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0"
"@ckeditor/ckeditor5-core": "^34.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-logging": "5.0.1-rc.0"
Expand Down
24 changes: 12 additions & 12 deletions packages/ckeditor5-coremedia-content-clipboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-html-support": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-undo": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-html-support": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@ckeditor/ckeditor5-undo": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
Expand All @@ -49,12 +49,12 @@
"./*": "./dist/*.js"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-html-support": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-undo": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-html-support": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
"@ckeditor/ckeditor5-undo": "^34.0.0",
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/ckeditor5-coremedia-images/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-image": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-image": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia/service-agent": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
Expand All @@ -44,10 +44,10 @@
"typescript": "^4.4.4"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-image": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-image": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
Expand Down
28 changes: 14 additions & 14 deletions packages/ckeditor5-coremedia-link/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-link": "^32.0.0",
"@ckeditor/ckeditor5-typing": "^32.0.0",
"@ckeditor/ckeditor5-ui": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-link": "^34.0.0",
"@ckeditor/ckeditor5-typing": "^34.0.0",
"@ckeditor/ckeditor5-ui": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/service-agent": "^1.0.0",
Expand All @@ -52,13 +52,13 @@
"typescript": "^4.4.4"
},
"peerDependencies": {
"@ckeditor/ckeditor5-clipboard": "^32.0.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-link": "^32.0.0",
"@ckeditor/ckeditor5-typing": "^32.0.0",
"@ckeditor/ckeditor5-ui": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-clipboard": "^34.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-link": "^34.0.0",
"@ckeditor/ckeditor5-typing": "^34.0.0",
"@ckeditor/ckeditor5-ui": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
Expand Down
16 changes: 8 additions & 8 deletions packages/ckeditor5-coremedia-richtext-support/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-html-support": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-html-support": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
Expand All @@ -45,10 +45,10 @@
"./*": "./dist/*.js"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-html-support": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0"
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-html-support": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-logging": "5.0.1-rc.0"
Expand Down
12 changes: 6 additions & 6 deletions packages/ckeditor5-coremedia-richtext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
Expand All @@ -43,9 +43,9 @@
"./*": "./dist/*.js"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0"
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-dataprocessor-support": "5.0.1-rc.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/ckeditor5-coremedia-studio-essentials/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-link": "^32.0.0",
"@ckeditor/ckeditor5-typing": "^32.0.0",
"@ckeditor/ckeditor5-ui": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-link": "^34.0.0",
"@ckeditor/ckeditor5-typing": "^34.0.0",
"@ckeditor/ckeditor5-ui": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
Expand All @@ -49,11 +49,11 @@
"typescript": "^4.4.4"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-typing": "^32.0.0",
"@ckeditor/ckeditor5-ui": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0"
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-typing": "^34.0.0",
"@ckeditor/ckeditor5-ui": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-coremedia-richtext": "5.0.1-rc.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/service-agent": "^1.0.0",
Expand All @@ -44,7 +44,7 @@
"typescript": "^4.4.4"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@coremedia/service-agent": "^1.0.0"
},
"dependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/ckeditor5-dataprocessor-support/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"devDependencies": {
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.0",
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0",
"@ckeditor/ckeditor5-utils": "^32.0.0",
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0",
"@ckeditor/ckeditor5-utils": "^34.0.0",
"@coremedia-internal/ckeditor5-babel-config": "^1.0.0",
"@coremedia-internal/ckeditor5-jest-test-helpers": "^1.0.0",
"@coremedia/types-ckeditor__ckeditor5-core": "5.0.1-rc.0",
Expand All @@ -43,8 +43,8 @@
"typescript": "^4.4.4"
},
"peerDependencies": {
"@ckeditor/ckeditor5-core": "^32.0.0",
"@ckeditor/ckeditor5-engine": "^32.0.0"
"@ckeditor/ckeditor5-core": "^34.0.0",
"@ckeditor/ckeditor5-engine": "^34.0.0"
},
"dependencies": {
"@coremedia/ckeditor5-logging": "5.0.1-rc.0"
Expand Down
Loading