diff --git a/composer.json b/composer.json index 7c193f4b..3db56845 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ "drupal/advanced_text_formatter": "^3.0@RC", "drupal/better_exposed_filters": "^6", "drupal/betterlogin": "^2.0", + "drupal/ckeditor5-ckeditor5": "1.0.x-dev@dev", "drupal/ckeditor_iframe": "^3.0@alpha", "drupal/config_ignore": "^3.2", "drupal/config_update": "^2.0@alpha", @@ -65,6 +66,7 @@ "drupal/views_conditional": "^1.4", "drupal/views_ef_fieldset": "^1", "drupal/xmlsitemap": "^1.3", + "drush/drush": "^11", "geocoder-php/google-maps-provider": "^4.6", "geocoder-php/mapquest-provider": "^4.2", "wikimedia/composer-merge-plugin": "^2.0" diff --git a/composer.lock b/composer.lock index 2e4cc1e1..2c83134b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f915ac7fc503f45614a6bfb21da87f1c", + "content-hash": "8863ac96672f2db0916ba2ed6bce9ff8", "packages": [ { "name": "ajgl/breakpoint-twig-extension", @@ -2948,6 +2948,66 @@ "source": "https://git.drupalcode.org/project/ckeditor" } }, + { + "name": "drupal/ckeditor5-ckeditor5", + "version": "dev-1.0.x", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/ckeditor5.git", + "reference": "fbacec8247208f39472d3d8544c540676404dfe5" + }, + "require": { + "drupal/core": "^9.2" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.0.x": "1.0.x-dev" + }, + "drupal": { + "version": "1.0.x-dev", + "datestamp": "1636563369", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "bnjmnm", + "homepage": "https://www.drupal.org/user/2369194" + }, + { + "name": "lauriii", + "homepage": "https://www.drupal.org/user/1078742" + }, + { + "name": "Taran2L", + "homepage": "https://www.drupal.org/user/473438" + }, + { + "name": "tim.plunkett", + "homepage": "https://www.drupal.org/user/241634" + }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" + }, + { + "name": "zrpnr", + "homepage": "https://www.drupal.org/user/1448368" + } + ], + "homepage": "https://www.drupal.org/project/ckeditor5", + "support": { + "source": "https://git.drupalcode.org/project/ckeditor5" + } + }, { "name": "drupal/ckeditor_iframe", "version": "3.0.0-alpha1", @@ -15851,6 +15911,7 @@ "drupal/administerusersbyrole": 20, "drupal/advanced_text_formatter": 5, "drupal/bulkdelete": 20, + "drupal/ckeditor5-ckeditor5": 20, "drupal/ckeditor_iframe": 15, "drupal/config_devel": 20, "drupal/config_update": 15, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index eb085d0b..118e5141 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -21,6 +21,7 @@ module: bulkdelete: 0 checklistapi: 0 ckeditor: 0 + ckeditor5: 0 ckeditor_iframe: 0 config: 0 config_devel: 0 diff --git a/config/sync/editor.editor.wysiwyg.yml b/config/sync/editor.editor.wysiwyg.yml index e07d40ea..3e665c64 100644 --- a/config/sync/editor.editor.wysiwyg.yml +++ b/config/sync/editor.editor.wysiwyg.yml @@ -1,76 +1,43 @@ -uuid: a4e62f3c-179b-40bd-b5ff-bad393554328 +uuid: deddb1b4-05d6-4c9b-821d-cf8862c09983 langcode: fr status: true dependencies: config: - filter.format.wysiwyg module: - - ckeditor -_core: - default_config_hash: 45tCDsVx8RKDcrtyfVeP88jcBXzIxLtadjP2kF_DIjs + - ckeditor5 format: wysiwyg -editor: ckeditor +editor: ckeditor5 settings: toolbar: - rows: - - - - - name: Formats - items: - - Styles - - Bold - - Italic - - Underline - - - name: Liens - items: - - DrupalLink - - DrupalUnlink - - - name: Listes - items: - - BulletedList - - NumberedList - - - name: Média - items: - - Blockquote - - DrupalImage - - video_embed - - - name: Outils - items: - - Source - - - name: Copy/Paste - items: - - Copy - - Cut - - Paste - - PasteText - - PasteFromWord - - - name: iframe - items: - - Iframe + items: + - heading + - bold + - underline + - italic + - link + - bulletedList + - numberedList + - blockQuote + - uploadImage + - sourceEditing plugins: - drupallink: - linkit_enabled: true - linkit_profile: default - stylescombo: - styles: h4.inter-titre|Inter-titre - video_embed: - defaults: - children: - autoplay: false - responsive: false - width: '854' - height: '480' + ckeditor5_heading: + enabled_headings: + - heading2 + - heading3 + - heading4 + - heading5 + - heading6 + ckeditor5_sourceEditing: + allowed_tags: { } + linkit_extension: + linkit_enabled: false image_upload: status: true scheme: public - directory: wysiwyg-images + directory: inline-images max_size: '' max_dimensions: - width: null - height: null + width: 0 + height: 0 diff --git a/config/sync/filter.format.wysiwyg.yml b/config/sync/filter.format.wysiwyg.yml index 577ab8f2..e25a7ff1 100644 --- a/config/sync/filter.format.wysiwyg.yml +++ b/config/sync/filter.format.wysiwyg.yml @@ -28,14 +28,14 @@ filters: filter_url: id: filter_url provider: filter - status: true + status: false weight: -43 settings: filter_url_length: 72 filter_autop: id: filter_autop provider: filter - status: true + status: false weight: -49 settings: { } filter_htmlcorrector: @@ -92,6 +92,6 @@ filters: video_embed_wysiwyg: id: video_embed_wysiwyg provider: video_embed_wysiwyg - status: true + status: false weight: -44 settings: { } diff --git a/config/sync/metatag.settings.yml b/config/sync/metatag.settings.yml index d0e5803d..15f6f459 100644 --- a/config/sync/metatag.settings.yml +++ b/config/sync/metatag.settings.yml @@ -1 +1,2 @@ +langcode: fr tag_trim_end: '|.,-:;/+&([{"'''