Skip to content

Commit

Permalink
Merge branch 'master-it84' into ck/epic/17230-linking-experience-merged
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mati365
Mati365 committed Feb 19, 2025
2 parents eb9e454 + e6e06e7 commit ab764f4
Show file tree
Hide file tree
Showing 6,873 changed files with 56,056 additions and 16,044 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .circleci/.stale-bot.mjs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
* @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
*/

/* eslint-env node */
Expand Down
14 changes: 10 additions & 4 deletions .circleci/template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ parameters:
default: false

commands:
install_newest_emoji:
steps:
- run:
name: Install the emoji font
command: |
sudo apt install fonts-noto-color-emoji
halt_if_short_flow:
steps:
- run:
Expand Down Expand Up @@ -224,10 +230,9 @@ jobs:
name: Check if packages are ready to be released
command: npm run release:prepare-packages -- --compile-only --verbose

# Commented out due to a limitation of publint: https://github.com/bluwy/publint/issues/105
# - run:
# name: Lint generated packages
# command: yarn run release:lint-packages
- run:
name: Lint generated packages
command: yarn run release:lint-packages

- run:
name: Check dependencies
Expand Down Expand Up @@ -330,6 +335,7 @@ workflows:
branches:
only:
- master
- master-it84
- stable
- release

Expand Down
8 changes: 5 additions & 3 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

Expand All @@ -17,15 +17,16 @@ module.exports = {
// The CKEditor 5 core DLL build is created from JavaScript files.
// ESLint should not process compiled TypeScript.
'src/*.js',
'**/*.d.ts'
'**/*.d.ts',
'packages/ckeditor5-emoji/src/utils/isemojisupported.ts'
],
rules: {
'ckeditor5-rules/ckeditor-imports': 'error',
'ckeditor5-rules/prevent-license-key-leak': 'error',
'ckeditor5-rules/license-header': [ 'error', {
headerLines: [
'/**',
' * @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.',
' * @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',
' */'
]
Expand All @@ -41,6 +42,7 @@ module.exports = {
{
files: [ './packages/*/src/**/*.ts' ],
rules: {
'ckeditor5-rules/allow-svg-imports-only-in-icons-package': 'error',
'ckeditor5-rules/ckeditor-plugin-flags': [
'error',
{
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/codeql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ jobs:
- tests
- scripts
- 'packages/*/tests'
- 'packages/ckeditor5-build-*/build/**'
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
**/node_modules
build/
dist/
!packages/ckeditor5-build-*/build
docs/api/output.json
yarn.lock
package-lock.json
Expand Down
4 changes: 2 additions & 2 deletions .husky/pre-commit
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
# For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
# @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"

Expand Down
2 changes: 1 addition & 1 deletion .stylelintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{
"headerLines": [
"/*",
" * Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.",
" * 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",
" */"
]
Expand Down
374 changes: 236 additions & 138 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions LICENSE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

**CKEditor&nbsp;5** (https://github.com/ckeditor/ckeditor5)<br>
Copyright (c) 2003–2024, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.
Copyright (c) 2003–2025, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.

Licensed under a dual-license model, this software is available under:

Expand All @@ -21,7 +21,10 @@ The following libraries are included in CKEditor under the [MIT license](https:/
* BlurHash - Copyright (c) 2018 Wolt Enterprises (MIT license).
* 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.
* Lodash - Copyright (c) JS Foundation and other contributors https://js.foundation/. Based on Underscore.js, copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors http://underscorejs.org/.
* emoji-picker-element-data - Copyright (c) 2020 Nolan Lawson.
* Fuse.js - Copyright (c) 2017 Kirollos Risk.
* is-emoji-supported - Copyright (c) 2016-2020 Koala Interactive, Inc.
* es-toolkit - Copyright (c) 2024 Viva Republica, 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.
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/assets.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

Expand Down Expand Up @@ -87,6 +87,8 @@ window.attachTourBalloon = function( { target, text, editor, tippyOptions } ) {
}
} );
}

return tooltip;
};

/**
Expand Down
Empty file added docs/_snippets/build-balloon-block-source.html
View file
Empty file.
10 changes: 10 additions & 0 deletions docs/_snippets/build-balloon-block-source.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* @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
*/

/* globals window */

import BalloonBlockEditor from './build-balloon-block.js';

window.BalloonBlockEditor = BalloonBlockEditor;
71 changes: 54 additions & 17 deletions ...5-build-balloon-block/build/ckeditor.d.ts → docs/_snippets/build-balloon-block.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

import { BalloonEditor as BalloonEditorBase } from '@ckeditor/ckeditor5-editor-balloon';
import { Essentials } from '@ckeditor/ckeditor5-essentials';
import { CKFinderUploadAdapter } from '@ckeditor/ckeditor5-adapter-ckfinder';
Expand All @@ -23,19 +24,55 @@ import { PasteFromOffice } from '@ckeditor/ckeditor5-paste-from-office';
import { Table, TableToolbar } from '@ckeditor/ckeditor5-table';
import { TextTransformation } from '@ckeditor/ckeditor5-typing';
import { CloudServices } from '@ckeditor/ckeditor5-cloud-services';
export default class BalloonEditor extends BalloonEditorBase {
static builtinPlugins: (typeof BlockToolbar | typeof TextTransformation | typeof Essentials | typeof CKFinderUploadAdapter | typeof Paragraph | typeof Heading | typeof Autoformat | typeof Bold | typeof Italic | typeof BlockQuote | typeof Image | typeof ImageCaption | typeof ImageStyle | typeof ImageToolbar | typeof ImageUpload | typeof CloudServices | typeof CKBox | typeof CKFinder | typeof EasyImage | typeof List | typeof Indent | typeof Link | typeof MediaEmbed | typeof PasteFromOffice | typeof Table | typeof TableToolbar | typeof PictureEditing)[];
static defaultConfig: {
blockToolbar: string[];
toolbar: {
items: string[];
};
image: {
toolbar: string[];
};
table: {
contentToolbar: string[];
};
language: string;
};
}

export default class BalloonBlockEditor extends BalloonEditorBase {}

BalloonBlockEditor.builtinPlugins = [
Essentials,
CKFinderUploadAdapter,
Autoformat,
BlockToolbar,
Bold,
Italic,
BlockQuote,
CKBox,
CKFinder,
EasyImage,
Heading,
Image,
ImageCaption,
ImageStyle,
ImageToolbar,
ImageUpload,
PictureEditing,
Indent,
Link,
List,
MediaEmbed,
Paragraph,
PasteFromOffice,
Table,
TableToolbar,
TextTransformation,
CloudServices
];

BalloonBlockEditor.defaultConfig = {
blockToolbar: [
'undo', 'redo',
'|', 'heading',
'|', 'uploadImage', 'insertTable', 'mediaEmbed',
'|', 'bulletedList', 'numberedList', 'outdent', 'indent'
],
toolbar: [ 'bold', 'italic', 'link' ],
image: {
toolbar: [
'imageStyle:inline',
'imageStyle:block',
'imageStyle:wrapText',
'|',
'toggleImageCaption',
'imageTextAlternative'
]
}
};
Empty file added docs/_snippets/build-balloon-source.html
View file
Empty file.
10 changes: 10 additions & 0 deletions docs/_snippets/build-balloon-source.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* @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
*/

/* globals window */

import BalloonEditor from './build-balloon.js';

window.BalloonEditor = BalloonEditor;
71 changes: 55 additions & 16 deletions ...editor5-build-balloon/build/ckeditor.d.ts → docs/_snippets/build-balloon.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

import { BalloonEditor as BalloonEditorBase } from '@ckeditor/ckeditor5-editor-balloon';
import { Essentials } from '@ckeditor/ckeditor5-essentials';
import { CKFinderUploadAdapter } from '@ckeditor/ckeditor5-adapter-ckfinder';
Expand All @@ -22,18 +23,56 @@ import { PasteFromOffice } from '@ckeditor/ckeditor5-paste-from-office';
import { Table, TableToolbar } from '@ckeditor/ckeditor5-table';
import { TextTransformation } from '@ckeditor/ckeditor5-typing';
import { CloudServices } from '@ckeditor/ckeditor5-cloud-services';
export default class BalloonEditor extends BalloonEditorBase {
static builtinPlugins: (typeof TextTransformation | typeof Essentials | typeof CKFinderUploadAdapter | typeof Paragraph | typeof Heading | typeof Autoformat | typeof Bold | typeof Italic | typeof BlockQuote | typeof Image | typeof ImageCaption | typeof ImageStyle | typeof ImageToolbar | typeof ImageUpload | typeof CloudServices | typeof CKBox | typeof CKFinder | typeof EasyImage | typeof List | typeof Indent | typeof Link | typeof MediaEmbed | typeof PasteFromOffice | typeof Table | typeof TableToolbar | typeof PictureEditing)[];
static defaultConfig: {
toolbar: {
items: string[];
};
image: {
toolbar: string[];
};
table: {
contentToolbar: string[];
};
language: string;
};
}

export default class BalloonEditor extends BalloonEditorBase {}

BalloonEditor.builtinPlugins = [
Essentials,
Paragraph,
CKFinderUploadAdapter,
Autoformat,
Bold,
Italic,
BlockQuote,
CKBox,
CKFinder,
EasyImage,
Heading,
Image,
ImageCaption,
ImageStyle,
ImageToolbar,
ImageUpload,
PictureEditing,
Indent,
Link,
List,
MediaEmbed,
PasteFromOffice,
Table,
TableToolbar,
TextTransformation,
CloudServices
];

BalloonEditor.defaultConfig = {
toolbar: {
items: [
'undo', 'redo',
'|', 'heading',
'|', 'bold', 'italic',
'|', 'link', 'uploadImage', 'insertTable', 'mediaEmbed',
'|', 'bulletedList', 'numberedList', 'outdent', 'indent'
]
},
image: {
toolbar: [
'imageStyle:inline',
'imageStyle:block',
'imageStyle:wrapText',
'|',
'toggleImageCaption',
'imageTextAlternative'
]
}
};
2 changes: 1 addition & 1 deletion docs/_snippets/build-classic-source.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/build-classic.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/build-decoupled-document.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2024, CKSource Holding sp. z o.o. All rights reserved.
* @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
*/

Expand Down
Empty file added docs/_snippets/build-inline-source.html
View file
Empty file.
10 changes: 10 additions & 0 deletions docs/_snippets/build-inline-source.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* @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
*/

/* globals window */

import InlineEditor from './build-inline.js';

window.InlineEditor = InlineEditor;
Loading

0 comments on commit ab764f4

Please sign in to comment.