Merge pull request #18782 from ckeditor/master_to_release

Internal: Merge master to release for testing phase.

Author: pomek

.circleci/template.yml

@@ -155,6 +155,10 @@ jobs:
           when: always
           name: Check if all packages are exported in the "ckeditor5" package
           command: yarn run check-exports
+      - run:
+          when: always
+          name: Check if all package members are exported correctly from the index.ts file
+          command: yarn run validate-module-re-exports
 
   cke5_coverage:
     machine: true

.husky/pre-commit

@@ -1,8 +1,4 @@
-#!/bin/bash
-
 # @license Copyright (c) 2003-2025, CKSource Holding sp. z o.o. All rights reserved.
 # For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-licensing-options
 
-. "$(dirname -- "$0")/_/husky.sh"
-
 yarn lint-staged

LICENSE.md

@@ -21,20 +21,33 @@ Where not otherwise indicated, all CKEditor content is authored by CKSource engi
 The following libraries are included in CKEditor under the [MIT license](https://opensource.org/licenses/MIT):
 
 * @types/color-convert - Copyright (c) DefinitelyTyped.
-* @types/marked - Copyright (c) DefinitelyTyped.
-* @types/turndown - Copyright (c) DefinitelyTyped.
 * blurhash - Copyright (c) Wolt Enterprises.
 * color-convert - Copyright (c) 2011–2016 Heather Arthur <[email protected]>, copyright (c) 2016–2021 Josh Junon <[email protected]>.
 * color-parse - Copyright (c) 2015 Dmitry Ivanov.
 * emojibase-data - Copyright (c) 2017-2019 Miles Johnson.
 * es-toolkit - Copyright (c) 2024 Viva Republica, Inc.
 * fuzzysort - Copyright (c) 2018 Stephen Kamenar.
 * is-emoji-supported - Copyright (c) 2016-2020 Koala Interactive, Inc.
-* marked - Copyright (c) 2018+, MarkedJS (https://github.com/markedjs/), Copyright (c) 2011–2018, Christopher Jeffrey (https://github.com/chjj/).
-* turndown - Copyright (c) 2017 Dom Christie.
-* turndown-plugin-gfm - Copyright (c) 2017 Dom Christie.
 * vanilla-colorful - Copyright (c) 2020 Serhii Kulykov <[email protected]>.
 * Regular Expression for URL validation - Copyright (c) 2010-2018 Diego Perini.
+* @types/hast - Copyright (c) Microsoft Corporation.
+* hast-util-to-html - Copyright (c) Titus Wormer <[email protected]>
+* hast-util-to-mdast - Copyright (c) Titus Wormer <[email protected]> and Copyright (c) Seth Vincent <[email protected]>
+* hastscript - Copyright (c) Titus Wormer <[email protected]>
+* rehype-remark - Copyright (c) Titus Wormer <[email protected]>
+* remark-breaks - Copyright (c) 2017 Titus Wormer <[email protected]>
+* remark-gfm - Copyright (c) Titus Wormer <[email protected]>
+* remark-parse - Copyright (c) 2014 Titus Wormer <[email protected]>
+* remark-rehype - Copyright (c) Titus Wormer <[email protected]>
+* remark-stringify - Copyright (c) 2014 Titus Wormer <[email protected]>
+* unified - Copyright (c) 2015 Titus Wormer <[email protected]>
+* unist-util-visit - Copyright (c) 2015 Titus Wormer <[email protected]>
+
+The following libraries are included in CKEditor under the [ISC license](https://opensource.org/license/isc-license-txt):
+
+* hast-util-from-dom - Copyright (c) Keith McKnight <[email protected]>
+* rehype-dom-parse - Copyright (c) 2018 Keith McKnight <[email protected]>
+* rehype-dom-stringify - Copyright (c) 2018 Keith McKnight <[email protected]>
 
 Trademarks
 ----------

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

@@ -16,7 +16,7 @@ import {
 	Widget,
 	toWidget,
 	viewToModelPositionOutsideModelElement,
-	ViewModel,
+	UIModel,
 	addListToDropdown,
 	createDropdown,
 	Collection
@@ -106,7 +106,7 @@ function getDropdownItemsDefinitions( placeholderNames ) {
 	for ( const name of placeholderNames ) {
 		const definition = {
 			type: 'button',
-			model: new ViewModel( {
+			model: new UIModel( {
 				commandParam: name,
 				label: name,
 				withText: true

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

@@ -10,7 +10,7 @@ import {
 	addListToDropdown,
 	addToolbarToDropdown,
 	createDropdown,
-	ViewModel,
+	UIModel,
 	IconBold,
 	IconItalic,
 	Collection,
@@ -22,14 +22,14 @@ const locale = new Locale();
 const collection = new Collection();
 collection.add( {
 	type: 'button',
-	model: new ViewModel( {
+	model: new UIModel( {
 		label: 'Button',
 		withText: true
 	} )
 } );
 collection.add( {
 	type: 'switchbutton',
-	model: new ViewModel( {
+	model: new UIModel( {
 		label: 'Switch button',
 		withText: true
 	} )

docs/_snippets/index.js

@@ -5,7 +5,7 @@
 
 export { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
 export { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';
-export { default as ArticlePluginSet } from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset.js';
+export { ArticlePluginSet } from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset.js';
 
 export {
 	attachTourBalloon,

docs/assets/global.css

@@ -76,7 +76,6 @@ It breaks CKEditor 5 (see how <p><code>[]</code></p> looks). */
 
 .demo-row {
 	width: 100%;
-	display: -ms-flexbox;
 	display: flex;
 }