Commit 654241a2 authored by catch's avatar catch
Browse files

Issue #3307186 by lauriii, xjm, Wim Leers, catch, hooroomoo, yash.rode,... 

Issue #3307186 by lauriii, xjm, Wim Leers, catch, hooroomoo, yash.rode, Luke.Leber, zrpnr, nod_, Spokje, gabesullice, bnjmnm, anand.toshniwal93, tim.plunkett: Mark CKEditor 5 stable

(cherry picked from commit aa2f8c33)
parent fc425d53

core/core.libraries.yml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ ckeditor5.editorDecoupled: 
    - core/ckeditor5

    - core/ckeditor5.htmlSupport



ckeditor5.internal:

ckeditor5.essentials:

  remote: https://github.com/ckeditor/ckeditor5

  version: "35.1.0"

  license:

core/modules/ckeditor5/ckeditor5.ckeditor5.yml

+34 −34
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ ckeditor5_essentials: 
      - essentials.Essentials

  drupal:

    label: Essentials

    library: ckeditor5/drupal.ckeditor5.internal

    admin_library: ckeditor5/admin.internal

    library: ckeditor5/internal.drupal.ckeditor5.htmlEngine

    admin_library: ckeditor5/internal.admin.essentials

    toolbar_items:

      undo:

        label: Undo
@@ -25,8 +25,8 @@ ckeditor5_paragraph: 
    plugins: [paragraph.Paragraph]

  drupal:

    label: Paragraph

    library: core/ckeditor5.internal

    admin_library: ckeditor5/admin.internal

    library: core/ckeditor5.essentials

    admin_library: ckeditor5/internal.admin.essentials

    elements:

      - <p>
@@ -48,8 +48,8 @@ ckeditor5_heading: 
          - { model: 'heading6', view: 'h6', title: 'Heading 6', class: 'ck-heading_heading6' }

  drupal:

    label: Headings

    library: core/ckeditor5.internal

    admin_library: ckeditor5/admin.heading

    library: core/ckeditor5.essentials

    admin_library: ckeditor5/internal.admin.heading

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Heading

    toolbar_items:

      heading:
@@ -68,7 +68,7 @@ ckeditor5_style: 
  drupal:

    label: Style

    library: core/ckeditor5.style

    admin_library: ckeditor5/admin.style

    admin_library: ckeditor5/internal.admin.style

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Style

    toolbar_items:

      style:
@@ -168,7 +168,7 @@ ckeditor5_specialCharacters: 
  drupal:

    label: Special characters

    library: core/ckeditor5.specialCharacters

    admin_library: ckeditor5/admin.specialCharacters

    admin_library: ckeditor5/internal.admin.specialCharacters

    toolbar_items:

      specialCharacters:

        label: Special characters
@@ -188,7 +188,7 @@ ckeditor5_sourceEditing: 
    # @see \Drupal\ckeditor5\Plugin\CKEditor5PluginManager::getProvidedElements()

    elements: []

    library: core/ckeditor5.sourceEditing

    admin_library: ckeditor5/admin.sourceEditing

    admin_library: ckeditor5/internal.admin.sourceEditing

    toolbar_items:

      sourceEditing:

        label: Source
@@ -199,7 +199,7 @@ ckeditor5_bold: 
  drupal:

    label: Bold

    library: core/ckeditor5.basic

    admin_library: ckeditor5/admin.basic

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      bold:

        label: Bold
@@ -213,8 +213,8 @@ ckeditor5_emphasis: 
      - drupalEmphasis.DrupalEmphasis

  drupal:

    label: Emphasis

    library: ckeditor5/drupal.ckeditor5.emphasis

    admin_library: ckeditor5/admin.basic

    library: ckeditor5/internal.drupal.ckeditor5.emphasis

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      italic:

        label: Italic
@@ -227,7 +227,7 @@ ckeditor5_underline: 
  drupal:

    label: Underline

    library: core/ckeditor5.basic

    admin_library: ckeditor5/admin.basic

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      underline:

        label: Underline
@@ -240,7 +240,7 @@ ckeditor5_code: 
  drupal:

    label: Code

    library: core/ckeditor5.basic

    admin_library: ckeditor5/admin.basic

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      code:

        label: Code
@@ -261,8 +261,8 @@ ckeditor5_codeBlock: 
            name: pre

  drupal:

    label: Code Block

    library: ckeditor5/drupal.ckeditor5.codeBlock

    admin_library: ckeditor5/admin.codeBlock

    library: ckeditor5/internal.drupal.ckeditor5.codeBlock

    admin_library: ckeditor5/internal.admin.codeBlock

    toolbar_items:

      codeBlock:

        label: Code Block
@@ -277,7 +277,7 @@ ckeditor5_strikethrough: 
  drupal:

    label: Strikethrough

    library: core/ckeditor5.basic

    admin_library: ckeditor5/admin.basic

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      strikethrough:

        label: Strikethrough
@@ -290,7 +290,7 @@ ckeditor5_subscript: 
  drupal:

    label: Subscript

    library: core/ckeditor5.basic

    admin_library: ckeditor5/admin.basic

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      subscript:

        label: Subscript
@@ -303,7 +303,7 @@ ckeditor5_superscript: 
  drupal:

    label: Superscript

    library: core/ckeditor5.basic

    admin_library: ckeditor5/admin.basic

    admin_library: ckeditor5/internal.admin.basic

    toolbar_items:

      superscript:

        label: Superscript
@@ -317,7 +317,7 @@ ckeditor5_blockquote: 
  drupal:

    label: Block quote

    library: core/ckeditor5.blockquote

    admin_library: ckeditor5/admin.blockquote

    admin_library: ckeditor5/internal.admin.blockquote

    toolbar_items:

      blockQuote:

        label: Block quote
@@ -331,7 +331,7 @@ ckeditor5_link: 
  drupal:

    label: Link

    library: core/ckeditor5.link

    admin_library: ckeditor5/admin.link

    admin_library: ckeditor5/internal.admin.link

    toolbar_items:

      link:

        label: Link
@@ -388,7 +388,7 @@ ckeditor5_list: 
  drupal:

    label: List

    library: core/ckeditor5.list

    admin_library: ckeditor5/admin.list

    admin_library: ckeditor5/internal.admin.list

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\ListPlugin

    toolbar_items:

      bulletedList:
@@ -407,7 +407,7 @@ ckeditor5_horizontalLine: 
  drupal:

    label: Horizontal line

    library: core/ckeditor5.horizontalLine

    admin_library: ckeditor5/admin.horizontalLine

    admin_library: ckeditor5/internal.admin.horizontalLine

    toolbar_items:

      horizontalLine:

        label: Horizontal line
@@ -432,7 +432,7 @@ ckeditor5_alignment: 
  drupal:

    label: Alignment

    library: core/ckeditor5.alignment

    admin_library: ckeditor5/admin.alignment

    admin_library: ckeditor5/internal.admin.alignment

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Alignment

    toolbar_items:

      alignment:
@@ -446,7 +446,7 @@ ckeditor5_removeFormat: 
  drupal:

    label: Remove Format

    library: core/ckeditor5.removeFormat

    admin_library: ckeditor5/admin.removeFormat

    admin_library: ckeditor5/internal.admin.removeFormat

    toolbar_items:

      removeFormat:

        label: Remove Format
@@ -474,7 +474,7 @@ ckeditor5_table: 
  drupal:

    label: Table

    library: core/ckeditor5.table

    admin_library: ckeditor5/admin.table

    admin_library: ckeditor5/internal.admin.table

    toolbar_items:

      insertTable:

        label: table
@@ -503,8 +503,8 @@ ckeditor5_image: 
  drupal:

    label: Image

    class: \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Image

    library: ckeditor5/drupal.ckeditor5.image

    admin_library: ckeditor5/admin.image

    library: ckeditor5/internal.drupal.ckeditor5.image

    admin_library: ckeditor5/internal.admin.image

    elements:

      - <img>

      - <img src alt height width>
@@ -619,7 +619,7 @@ ckeditor5_indent: 
    label: Indent

    elements: false

    library: core/ckeditor5.indent

    admin_library: ckeditor5/admin.indent

    admin_library: ckeditor5/internal.admin.indent

    toolbar_items:

      indent:

        label: Indent
@@ -631,8 +631,8 @@ ckeditor5_language: 
    plugins: [language.TextPartLanguage]

  drupal:

    label: Language

    library: ckeditor5/ckeditor5.language

    admin_library: ckeditor5/admin.language

    library: ckeditor5/internal.ckeditor5.language

    admin_library: ckeditor5/internal.admin.language

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Language

    toolbar_items:

      textPartLanguage:
@@ -656,7 +656,7 @@ media_media: 
            invoke: true

  drupal:

    label: Media

    library: ckeditor5/drupal.ckeditor5.media

    library: ckeditor5/internal.drupal.ckeditor5.media

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Media

    elements:

      - <drupal-media>
@@ -722,7 +722,7 @@ media_mediaAlign: 
          - '|'

  drupal:

    label: Media align

    library: ckeditor5/drupal.ckeditor5.mediaAlign

    library: ckeditor5/internal.drupal.ckeditor5.mediaAlign

    elements:

      - <drupal-media data-align>

    conditions:
@@ -746,7 +746,7 @@ media_library_mediaLibrary: 
  drupal:

    label: Media Library

    elements: false

    admin_library: ckeditor5/admin.drupalmedia

    admin_library: ckeditor5/internal.admin.drupalmedia

    class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\MediaLibrary

    library: editor/drupal.editor.dialog

    toolbar_items:

core/modules/ckeditor5/ckeditor5.info.yml

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ name: CKEditor 5 
type: module

description: "WYSIWYG editing for rich text fields using CKEditor 5."

version: VERSION

package: Core (Experimental)

lifecycle: experimental

package: Core

dependencies:

  - drupal:editor

core/modules/ckeditor5/ckeditor5.libraries.yml

+44 −34
Original line number Diff line number Diff line 
ckeditor5.language:

# Internal libraries, do not depend on these.

# CKEditor 5 has a much faster release cadence for major and minor releases

# than Drupal. CKEditor 5 does not provide continued support for major or

# minor releases; they almost never issue patch releases. Drupal therefore

# has to keep its integration up-to-date with upstream. It is hence

# impossible to provide "stable overrides", since the stability is not

# controlled by Drupal, but by upstream.

# Hence all CKEditor 5 asset libraries are considered internal.

# @see https://ckeditor.com/docs/ckeditor5/latest/support/versioning-policy.html



internal.ckeditor5.language:

  css:

    component:

      css/language.css: {}

  dependencies:

    - core/ckeditor5.language



drupal.ckeditor5.internal:

internal.drupal.ckeditor5.htmlEngine:

  js:

    js/build/drupalHtmlEngine.js: { minified: true }

  dependencies:

    - core/ckeditor5

    - core/ckeditor5.internal

    - core/ckeditor5.essentials



drupal.ckeditor5:

internal.drupal.ckeditor5:

  js:

    js/ckeditor5.js: {}

  css:
@@ -27,23 +37,23 @@ drupal.ckeditor5: 
    - core/ckeditor5.editorDecoupled

    - core/ckeditor5

    - editor/drupal.editor

    - ckeditor5/drupal.ckeditor5.stylesheets

    - ckeditor5/internal.drupal.ckeditor5.stylesheets

    - core/drupalSettings

    - core/drupal.message



# Library used for dynamically loading CKEditor 5 stylesheets from the default

# front end theme.

# @see ckeditor5_library_info_alter()

drupal.ckeditor5.stylesheets:

internal.drupal.ckeditor5.stylesheets:

  version: VERSION

  css: []



drupal.ckeditor5.codeBlock:

internal.drupal.ckeditor5.codeBlock:

  dependencies:

    - core/ckeditor5.codeBlock

    - core/ckeditor5.htmlSupport



drupal.ckeditor5.image:

internal.drupal.ckeditor5.image:

  js:

    js/build/drupalImage.js: { minified: true }

  css:
@@ -54,7 +64,7 @@ drupal.ckeditor5.image: 
    - core/ckeditor5

    - core/ckeditor5.image



drupal.ckeditor5.emphasis:

internal.drupal.ckeditor5.emphasis:

  version: VERSION

  js:

    js/build/drupalEmphasis.js: { minified: true }
@@ -62,7 +72,7 @@ drupal.ckeditor5.emphasis: 
    - core/ckeditor5

    - core/ckeditor5.basic



drupal.ckeditor5.media:

internal.drupal.ckeditor5.media:

  js:

    js/build/drupalMedia.js: { minified: true }

  css:
@@ -73,14 +83,14 @@ drupal.ckeditor5.media: 
    - core/drupal

    - media/media_embed_ckeditor_theme



drupal.ckeditor5.mediaAlign:

internal.drupal.ckeditor5.mediaAlign:

  css:

    theme:

      css/media-alignment.css: { }

  dependencies:

    - ckeditor5/drupal.ckeditor5.media

    - ckeditor5/internal.drupal.ckeditor5.media



drupal.ckeditor5.filter.admin:

internal.drupal.ckeditor5.filter.admin:

  js:

    js/ckeditor5.filter.admin.js: {}

  dependencies:
@@ -89,7 +99,7 @@ drupal.ckeditor5.filter.admin: 
    - core/drupal.ajax

    - core/drupalSettings



admin:

internal.admin:

  js:

    js/ckeditor5.admin.js: { }

  css:
@@ -101,79 +111,79 @@ admin: 
    - core/jquery

    - core/once



admin.specialCharacters:

internal.admin.specialCharacters:

  css:

    theme:

      css/special-characters.css: { }



admin.removeFormat:

internal.admin.removeFormat:

  css:

    theme:

      css/remove-format.css: { }



admin.internal:

internal.admin.essentials:

  css:

    theme:

      css/internal.admin.css: { }

      css/essentials.admin.css: { }



admin.basic:

internal.admin.basic:

  css:

    theme:

      css/basic.admin.css: { }



admin.blockquote:

internal.admin.blockquote:

  css:

    theme:

      css/blockquote.admin.css: { }



admin.link:

internal.admin.link:

  css:

    theme:

      css/link.admin.css: { }



admin.list:

internal.admin.list:

  css:

    theme:

      css/list.admin.css: { }



admin.heading:

internal.admin.heading:

  css:

    theme:

      css/heading.admin.css: { }

  dependencies:

    - core/ckeditor5.internal

    - core/ckeditor5.essentials



admin.horizontalLine:

internal.admin.horizontalLine:

  css:

    theme:

      css/horizontal-line.admin.css: { }



admin.alignment:

internal.admin.alignment:

  css:

    theme:

      css/alignment.admin.css: { }



admin.indent:

internal.admin.indent:

  css:

    theme:

      css/indent.admin.css: { }



admin.language:

internal.admin.language:

  css:

    theme:

      css/language.admin.css: { }



admin.drupalmedia:

internal.admin.drupalmedia:

  css:

    theme:

      css/drupalmedia.admin.css: { }



admin.sourceEditing:

internal.admin.sourceEditing:

  css:

    theme:

      css/source-editing.admin.css: { }



admin.style:

internal.admin.style:

  js:

    js/ckeditor5.style.admin.js: { }

  css:
@@ -184,17 +194,17 @@ admin.style: 
    - core/drupal

    - core/drupal.vertical-tabs



admin.table:

internal.admin.table:

  css:

    theme:

      css/table.admin.css: { }



admin.codeBlock:

internal.admin.codeBlock:

  css:

    theme:

      css/code-block.admin.css: { }



admin.image:

internal.admin.image:

  css:

    theme:

      css/image.admin.css: { }

core/modules/ckeditor5/ckeditor5.module

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ function _ckeditor5_get_langcode_mapping($lang = FALSE) { 
 */

function ckeditor5_library_info_alter(&$libraries, $extension) {

  if ($extension === 'filter') {

    $libraries['drupal.filter.admin']['dependencies'][] = 'ckeditor5/drupal.ckeditor5.filter.admin';

    $libraries['drupal.filter.admin']['dependencies'][] = 'ckeditor5/internal.drupal.ckeditor5.filter.admin';

  }



  $moduleHandler = \Drupal::moduleHandler();
@@ -432,7 +432,7 @@ function ckeditor5_library_info_alter(&$libraries, $extension) { 
    // Add paths to stylesheets specified by a theme's ckeditor5-stylesheets

    // config property.

    $css = _ckeditor5_theme_css();

    $libraries['drupal.ckeditor5.stylesheets'] = [

    $libraries['internal.drupal.ckeditor5.stylesheets'] = [

      'css' => [

        'theme' => array_fill_keys(array_values($css), []),

      ],