diff --git a/composer.json b/composer.json index 64b1d83..e099ddd 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,9 @@ "phpdocumentor/reflection-docblock": "^5", "vardot/blazy": "^1.8", "codemirror/codemirror": "^5.65", - "cdubz/ckeditor5-source-editing-codemirror": "^35.1" + "cdubz/ckeditor5-source-editing-codemirror": "^35.1", + "drupal/ckeditor4_codemirror": "^1.0.0@beta", + "wikimedia/composer-merge-plugin": "^2.1" }, "require-dev": { "drupal/core-composer-scaffold": "^10", @@ -108,7 +110,8 @@ "drupal/console-extend-plugin": true, "oomphinc/composer-installers-extender": true, "dealerdirect/phpcodesniffer-composer-installer": true, - "phpstan/extension-installer": true + "phpstan/extension-installer": true, + "wikimedia/composer-merge-plugin": true } }, "autoload": { @@ -130,10 +133,6 @@ "type": "composer", "url": "https://drupalwxt.github.io/composer-extdeps/" }, - { - "type": "vcs", - "url": "https://github.com/ossobuffo/drupal-console-extend-plugin.git" - }, { "type": "package", "package": { @@ -228,6 +227,11 @@ "type:drupal-drush" ] }, + "merge-plugin": { + "include": [ + "html/modules/contrib/ckeditor4_codemirror/composer.libraries.json" + ] + }, "drush": { "services": { "drush.services.yml": "^10" diff --git a/modules/custom/wxt_ext/wxt_ext_editor/wxt_ext_editor.info.yml b/modules/custom/wxt_ext/wxt_ext_editor/wxt_ext_editor.info.yml index e61b863..88063f9 100644 --- a/modules/custom/wxt_ext/wxt_ext_editor/wxt_ext_editor.info.yml +++ b/modules/custom/wxt_ext/wxt_ext_editor/wxt_ext_editor.info.yml @@ -7,6 +7,7 @@ dependencies: - 'blazy:blazy' - 'ckeditor_abbreviation:ckeditor_abbreviation' - 'ckeditor_codemirror:ckeditor_codemirror' + - 'ckeditor4_codemirror:ckeditor4_codemirror' - 'ckeditor_details:ckeditor_details' - 'drupal:ckeditor5' - 'entity_embed:entity_embed'