Skip to content

Commit

Permalink
Merge branch 'master' into ck/14663-to-do-lists-poc
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/ckeditor5-code-block/package.json
  • Loading branch information
niegowski committed Sep 20, 2023
2 parents 960220d + fa35555 commit 4bb162e
Show file tree
Hide file tree
Showing 271 changed files with 3,224 additions and 916 deletions.
87 changes: 82 additions & 5 deletions .circleci/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,26 @@ parameters:
default: false

commands:
halt_if_short_flow:
steps:
- run:
name: ⭐ Short flow breakpoint - Check if the build should continue
command: |
#!/bin/bash
COMMIT_MESSAGE=$(git log -n 1 --pretty=format:%s ${CIRCLE_SHA1})
IS_NIGHTLY=<< pipeline.parameters.isNightly >>
if [[ "$IS_NIGHTLY" == "true" ]]; then
echo "Running full flow due to nightly build, despite detecting '[short flow]'."
exit 0
fi
if [[ "$COMMIT_MESSAGE" == *"[short flow]" ]]; then
echo "Skipping, because the commit message contains '[short flow]'."
circleci step halt
fi
prepare_environment_command:
description: "Prepare environment (RAM, browsers, hosts, etc.)"
steps:
Expand Down Expand Up @@ -50,7 +70,7 @@ commands:
name: 👤 Verify if the build was triggered by community - Check if the build should continue
command: |
#!/bin/bash
if [[ -z ${COVERALLS_REPO_TOKEN} ]];
then
circleci-agent step halt
Expand All @@ -61,6 +81,7 @@ jobs:
machine: true
steps:
- checkout_command
- halt_if_short_flow
- bootstrap_repository_command
- prepare_environment_command
- run:
Expand Down Expand Up @@ -106,6 +127,7 @@ jobs:
steps:
- community_verification_command
- checkout_command
- halt_if_short_flow
- bootstrap_repository_command
- prepare_environment_command
- attach_workspace:
Expand All @@ -123,6 +145,31 @@ jobs:
name: Upload the coverage to Coveralls
command: npx coveralls -v < .out/combined_lcov.info

cke5_trigger_release_process:
machine: true
steps:
- community_verification_command
- checkout_command
- bootstrap_repository_command
- run:
name: Verify if CKEditor 5 is ready to release
command: |
#!/bin/bash
# Do not fail if the Node script ends with non-zero exit code.
set +e
node scripts/ci/is-ckeditor5-ready-to-release.js
EXIT_CODE=$( echo $? )
if [ ${EXIT_CODE} -eq 1 ];
then
circleci-agent step halt
fi
- run:
name: Trigger the Uber CI
command: node scripts/ci/trigger-ckeditor5-continuous-integration.js -r ckeditor/ckeditor5 -c $CIRCLE_SHA1 -b $CIRCLE_BRANCH

cke5_trigger_uber_ci:
machine: true
steps:
Expand All @@ -137,6 +184,7 @@ jobs:
machine: true
steps:
- checkout_command
- halt_if_short_flow
- bootstrap_repository_command
- prepare_environment_command
- run:
Expand Down Expand Up @@ -168,8 +216,16 @@ workflows:
main:
unless: << pipeline.parameters.isNightly >>
jobs:
- cke5_tests_framework
- cke5_tests_features
- cke5_tests_framework:
filters:
branches:
ignore:
- stable
- cke5_tests_features:
filters:
branches:
ignore:
- stable
- cke5_coverage:
requires:
- cke5_tests_framework
Expand All @@ -178,9 +234,19 @@ workflows:
branches:
only:
- master
ignore:
- stable
- cke5_validators
- cke5_manual
- release_prepare
- cke5_manual:
filters:
branches:
ignore:
- stable
- release_prepare:
filters:
branches:
ignore:
- stable
- cke5_trigger_uber_ci:
requires:
- cke5_tests_framework
Expand All @@ -193,6 +259,17 @@ workflows:
branches:
only:
- master
- cke5_trigger_release_process:
requires:
- cke5_tests_framework
- cke5_tests_features
- cke5_validators
- cke5_manual
- release_prepare
filters:
branches:
only:
- release
- notify_ci_failure:
filters:
branches:
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/balloon-block-editor.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-balloon-block-editor">
<div class="ck ck-content" id="snippet-balloon-block-editor">
<h2>Taj Mahal: A breathtaking ode to love</h2>

<figure class="image image-style-side" height="400">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/balloon-editor.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-balloon-editor">
<div class="ck ck-content" id="snippet-balloon-editor">
<h2>Walking the capitals of Europe: Warsaw</h2>

<figure class="media">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/bottom-toolbar-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
</style>

<div id="editor">
<div class="ck ck-content" id="editor">
<div id="editor-content">
<figure class="image image_resized" style="width: 65px;">
<img
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/classic-editor-short.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-classic-editor-short">
<div class="ck ck-content" id="snippet-classic-editor-short">
<h2>Walking the capitals of Europe: Warsaw</h2>
<p>The best time to visit the city is July and August when it’s cool enough not to break a sweat and hot enough to enjoy summer. The city, which has quite a combination of both old and modern textures, is located by the river of Vistula.</p>
<p>The historic <strong>Old Town</strong>, reconstructed after World War II, with its late 18th-century characteristics, is a must-see. You can start your walk from <strong>Nowy Świat Street</strong> which will take you straight to the Old Town.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/classic-editor.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-classic-editor">
<div class="ck ck-content" id="snippet-classic-editor">
<h2>The three greatest things you learn from traveling</h2>

<p>Like all the great things on earth traveling teaches us by example. Here are some of the most precious lessons I’ve learned over the years of traveling.</p>
Expand Down
4 changes: 2 additions & 2 deletions docs/_snippets/examples/inline-editor.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-inline-editor">
<div class="ck ck-content" id="snippet-inline-editor">
<header data-inline-inject="true">
<h2>Gone traveling</h2>
<h3>Monthly travel news and inspiration</h3>
Expand All @@ -9,7 +9,7 @@ <h3>Destination of the Month</h3>

<h4>Valletta</h4>

<figure class="image image-style-align-right" style="width: 50%;">
<figure class="image image-style-align-left" style="width: 50%;">
<img alt="Picture of a sunlit facade of a Maltan building." src="%BASE_PATH%/assets/img/malta.jpg" srcset="%BASE_PATH%/assets/img/malta.jpg, %BASE_PATH%/assets/img/malta_2x.jpg 2x">
<figcaption>It's siesta time in Valletta.</figcaption>
</figure>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/mermaid.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script src="https://cdn.ckbox.io/ckbox/latest/ckbox.js"></script>
<div id="mermaid">
<div class="ck ck-content" id="mermaid">
<h2>CKEditor timeline diagram</h2>
<pre spellcheck="false"><code class="language-mermaid">
timeline
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/examples/multi-root-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h3>Monthly travel news and inspiration</h3>
</div>
</div>
<div class="editor">
<div id="content">
<div class="ck ck-content" id="content">
<h3>Destination of the Month</h3>

<figure class="image image-style-side">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/image-upload.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div id="snippet-image-upload">
<div class="ck ck-content" id="snippet-image-upload">
<p>Paste or drop an image directly into the editor. You can also use the "Insert image" button in the toolbar.</p>
</div>
2 changes: 1 addition & 1 deletion docs/_snippets/features/mathtype.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}
</style>

<div id="mathtype-editor">
<div class="ck ck-content" id="mathtype-editor">
<p>In elementary algebra, the <strong>quadratic formula</strong> is the solution of the quadratic equation. </p>
<p style="text-align:center;">
<span class="ck-math-widget ck-widget" contenteditable="false">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/placeholder-custom.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
}
</style>

<div id="snippet-placeholder-custom">
<div class="ck ck-content" id="snippet-placeholder-custom">
<p></p>
</div>
2 changes: 1 addition & 1 deletion docs/_snippets/features/placeholder.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div id="snippet-placeholder">
<div class="ck ck-content" id="snippet-placeholder">
<p></p>
</div>
2 changes: 1 addition & 1 deletion docs/_snippets/features/read-only-hide-toolbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button id="snippet-read-only-toggle-toolbar">Switch to read-only mode</button>
</p>

<div id="snippet-read-only-toolbar">
<div class="ck ck-content" id="snippet-read-only-toolbar">
<h2>The sales data for Q4 for the <strong>Click&rsquo;n&rsquo;go</strong> product line</h2>

<table border="1" cellpadding="1" cellspacing="1" style="width:500px">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/read-only.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button id="snippet-read-only-toggle">Switch to read-only mode</button>
</p>

<div id="snippet-read-only">
<div class="ck ck-content" id="snippet-read-only">
<h2>The sales data for Q3 for the <strong>Click&rsquo;n&rsquo;go</strong> product line</h2>

<table border="1" cellpadding="1" cellspacing="1" style="width:500px">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/ui-language-content.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-ui-language-content">
<div class="ck ck-content" id="snippet-ui-language-content">
<h2>لغة</h2>
<p>اللغة نسق من الإشارات والرموز، يشكل أداة من أدوات المعرفة، وتعتبر اللغة أهم وسائل التفاهم والاحتكاك بين أفراد المجتمع في جميع ميادين الحياة. وبدون اللغة يتعذر نشاط الناس المعرفي. وترتبط اللغة بالتفكير ارتباطًا وثيقًا؛ فأفكار الإنسان تصاغ دومًا في قالب لغوي، حتى في حال تفكيره الباطني. ومن خلال اللغة فقط تحصل الفكرة على وجودها الواقعي. كما ترمز اللغة إلى الأشياء المنعكسة فيها.</p>
<p><sup>Source: <a href="https://ar.wikipedia.org/wiki/%D9%84%D8%BA%D8%A9#:~:text=%D8%A7%D9%84%D9%84%D8%BA%D8%A9%20%D9%87%D9%8A%20%D9%86%D8%B3%D9%82%20%D8%B9%D9%84%D9%89%20%D9%85%D9%86,%D8%AD%D8%AA%D9%89%20%D9%81%D9%8A%20%D8%AD%D8%A7%D9%84%20%D8%AA%D9%81%D9%83%D9%8A%D8%B1%D9%87%20%D8%A7%D9%84%D8%A8%D8%A7%D8%B7%D9%86%D9%8A.">Wikipedia</a></sup></p>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/ui-language-rtl.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-ui-language-rtl">
<div class="ck ck-content" id="snippet-ui-language-rtl">
<h2>لغة</h2>
<p>اللغة نسق من الإشارات والرموز، يشكل أداة من أدوات المعرفة، وتعتبر اللغة أهم وسائل التفاهم والاحتكاك بين أفراد المجتمع في جميع ميادين الحياة. وبدون اللغة يتعذر نشاط الناس المعرفي. وترتبط اللغة بالتفكير ارتباطًا وثيقًا؛ فأفكار الإنسان تصاغ دومًا في قالب لغوي، حتى في حال تفكيره الباطني. ومن خلال اللغة فقط تحصل الفكرة على وجودها الواقعي. كما ترمز اللغة إلى الأشياء المنعكسة فيها.</p>
<p><sup>Source: <a href="https://ar.wikipedia.org/wiki/%D9%84%D8%BA%D8%A9#:~:text=%D8%A7%D9%84%D9%84%D8%BA%D8%A9%20%D9%87%D9%8A%20%D9%86%D8%B3%D9%82%20%D8%B9%D9%84%D9%89%20%D9%85%D9%86,%D8%AD%D8%AA%D9%89%20%D9%81%D9%8A%20%D8%AD%D8%A7%D9%84%20%D8%AA%D9%81%D9%83%D9%8A%D8%B1%D9%87%20%D8%A7%D9%84%D8%A8%D8%A7%D8%B7%D9%86%D9%8A.">Wikipedia</a></sup></p>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/ui-language.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-ui-language">
<div class="ck ck-content" id="snippet-ui-language">
<p>Un <strong>lenguaje</strong> (del <a href="http://es.wikipedia.org/wiki/Idioma_occitano">provenzal</a> <em>lenguatge</em> y este del <a href="http://es.wikipedia.org/wiki/Lat%C3%ADn">lat&iacute;n</a> <em>lingua</em>) es un sistema de <a href="http://es.wikipedia.org/wiki/Comunicaci%C3%B3n">comunicaci&oacute;n</a> estructurado para el que existe un <a href="http://es.wikipedia.org/wiki/Significado">contexto</a> de uso y ciertos principios combinatorios formales. Existen contextos tanto naturales como artificiales.</p>
<p><sup>Source: <a href="https://es.wikipedia.org/wiki/Lenguaje">Wikipedia</a></sup></p>
</div>
2 changes: 1 addition & 1 deletion docs/_snippets/features/update-placeholder.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-update-placeholder">
<div class="ck ck-content" id="snippet-update-placeholder">
<p></p>
</div>
<button id="update-placeholder-button">Update placeholder</button>
2 changes: 1 addition & 1 deletion docs/_snippets/features/wproofreader.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-wproofreader">
<div class="ck ck-content" id="snippet-wproofreader">
<p>Warsaw is the capital adn largest city of Poland. The metropolis stands on the Vistula River in east-central Poland and its population is officially estimatd at 1.8 million residents within a greater metropolitan area of 3.1 million residents, which makes Warsaw the 7th most-populous capital city in the European Union. Warsaw is an alpha-global city, a major international tourist destination, and a significaant cultural, political, and economic hub. Its historical Old Town was designated a UNESCO World Heritage Site.</p>

<p>Warschau ist seit 1596 die Hauptstadt Polens und die fl&auml;chenm&auml;&szlig;ig gr&ouml;&szlig;te sowie mit &uuml;ber 1,75 Mio. Einwonern bev&ouml;lkerungsreichste Staddt des Landes. Als eines der wichtigsten Verkehrs-, wirtschaftlichen und Handelszentren Mittel- und Osteeuropas genie&szlig;t Warschau gro&szlig;e politische und kulturelle Bedetung. In der Stadt befinden sich zahlreiche Institutionen, Universit&auml;ten, Theater, Museen und Baudenkm&auml;ler.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/framework/development-tools/inspector.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-classic-editor">
<div class="ck ck-content" id="snippet-classic-editor">
<h2>CKEditor 5 inspector demo</h2>

<p>Click the button below to enable the <a href="https://github.com/ckeditor/ckeditor5-inspector">CKEditor 5 inspector</a> for this editor instance.</p>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/framework/tutorials/block-widget.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
</style>

<div id="snippet-block-widget">
<div class="ck ck-content" id="snippet-block-widget">
<p>This is a simple box:</p>

<section class="simple-box">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
</style>

<div id="snippet-external-data-widget">
<div class="ck ck-content" id="snippet-external-data-widget">
<h2>Current exchange rate fetched from Binance (updates every 10 seconds):</h2>
<p>Bitcoin rate:&nbsp;<span data-resource-url="https://api2.binance.com/api/v3/ticker/24hr?symbol=BTCUSDT"></span></p>
</div>
2 changes: 1 addition & 1 deletion docs/_snippets/framework/tutorials/inline-widget.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}
</style>

<div id="snippet-inline-widget">
<div class="ck ck-content" id="snippet-inline-widget">
<p>Hello <span class="placeholder">{first name}</span> <span class="placeholder">{surname}</span>!</p>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
}
</style>

<div id="snippet-react-in-widget">
<div class="ck ck-content" id="snippet-react-in-widget">
<div class="app"></div>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div id="snippet-manualsave">
<div class="ck ck-content" id="snippet-manualsave">
<p>Change the content of this editor, then save it on the server.</p>
</div>

<div id="snippet-manualsave-header">
<div id="snippet-manualsave-server">
<div id="snippet-manualsave-server_label">HTTP server lag (ms):</div>
<div class="ck ck-content" id="snippet-manualsave-header">
<div class="ck ck-content" id="snippet-manualsave-server">
<div class="ck ck-content" id="snippet-manualsave-server_label">HTTP server lag (ms):</div>
<input id="snippet-manualsave-lag" type="number" value="500" step="100" min="0" max="9000">
</div>
<div id="snippet-manualsave-container">
<div class="ck ck-content" id="snippet-manualsave-container">
<span id="snippet-manualsave-spinner"></span>
<input id="snippet-manualsave-save" type="submit" value="Save">
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-managing-ckeditor-logo-position">
<div class="ck ck-content" id="snippet-managing-ckeditor-logo-position">
<h2>Taj Mahal: A breathtaking ode to love</h2>

<figure class="image image-style-side" height="400">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/support/managing-ckeditor-logo-styling.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="custom-theme-editor-wrapper">
<div id="snippet-managing-ckeditor-logo-styling">
<div class="ck ck-content" id="snippet-managing-ckeditor-logo-styling">
<h2>Taj Mahal: A breathtaking ode to love</h2>

<figure class="image image-style-side" height="400">
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/tutorials/abbreviation-level-1.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-abbreviation-plugin">
<div class="ck ck-content" id="snippet-abbreviation-plugin">
<h2>Abbreviation plugin</h2>
<p>CKEditor 5 is a modern, feature-rich, world-class <abbr title="What You See Is What You Get">WYSIWYG</abbr> editor.</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/tutorials/abbreviation-level-2.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-abbreviation-plugin">
<div class="ck ck-content" id="snippet-abbreviation-plugin">
<h2>Abbreviation plugin</h2>
<p>CKEditor 5 is a modern, feature-rich, world-class <abbr title="What You See Is What You Get">WYSIWYG</abbr> editor.</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/tutorials/abbreviation-level-3.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-abbreviation-plugin">
<div class="ck ck-content" id="snippet-abbreviation-plugin">
<h2>Abbreviation plugin</h2>
<p>CKEditor 5 is a modern, feature-rich, world-class <abbr title="What You See Is What You Get">WYSIWYG</abbr> editor.</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/tutorials/timestamp-plugin.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="snippet-timestamp-plugin">
<div class="ck ck-content" id="snippet-timestamp-plugin">
<h2>The timestamp plugin</h2>
<p>Use the timestamp toolbar button to insert current date and time.</p>

Expand Down
2 changes: 1 addition & 1 deletion docs/framework/contributing/development-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ You can find all the official packages listed in the [CKEditor&nbsp;5 repository

In order to start developing CKEditor&nbsp;5 you will require:

* [Node.js](https://nodejs.org/en/) 16.0.0+
* [Node.js](https://nodejs.org/en/) 18.0.0+
* [Git](https://git-scm.com/)

## Setting up the CKEditor development environment
Expand Down
Loading

0 comments on commit 4bb162e

Please sign in to comment.