diff --git a/composer.json b/composer.json index b3755db..2cf6f00 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "drupal/hook_event_dispatcher": "^2", "drupal/hreflang": "^1.3", "drupal/insert": "^2.0", - "drupal/markdown": "^1.3", + "drupal/markdown": "^3.0", "drupal/menu_trail_by_path": "^1.3", "drupal/metatag": "^1.11", "drupal/migrate_plus": "^5.0", @@ -45,6 +45,7 @@ "drupal/stage_file_proxy": "^1.0", "drush/drush": "^10", "illuminate/collections": "^8.38", + "michelf/php-markdown": "^1.9", "nesbot/carbon": "^2.33", "platformsh/config-reader": "^2.4", "symfony/config": "^3.4" diff --git a/composer.lock b/composer.lock index e8a4743..e787126 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": "8c486be72d08bf61786de0b9cebbbef3", + "content-hash": "74c67a9e7b92495a730372d2a0d10466", "packages": [ { "name": "asm89/stack-cors", @@ -3022,56 +3022,70 @@ }, { "name": "drupal/markdown", - "version": "1.3.0", + "version": "3.0.0-rc1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/markdown.git", - "reference": "8.x-1.3" + "reference": "3.0.0-rc1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/markdown-8.x-1.3.zip", - "reference": "8.x-1.3", - "shasum": "599f3f4dfe3c3d3f3b6d301f940a1125e437a2b0" + "url": "https://ftp.drupal.org/files/projects/markdown-3.0.0-rc1.zip", + "reference": "3.0.0-rc1", + "shasum": "d774a17b4872160a93e5ff6fe1a9bf4d9ee8dff9" }, "require": { - "drupal/core": "~8.0", - "league/commonmark": "^0.18.3", - "michelf/php-markdown": "^1.6" + "composer/semver": "^1.0 || ^2.0 || ^3.0", + "drupal/core": "^8 || ^9", + "php": ">=5.5.9" + }, + "suggest": { + "league/commonmark": "The PHP CommonMark parser is a robust, highly-extensible Markdown parser for PHP based on the CommonMark and Github-Flavored Markdown specifications." }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.3", - "datestamp": "1568908385", + "version": "3.0.0-rc1", + "datestamp": "1638826906", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "RC releases are not covered by Drupal security advisories." + } + }, + "drush": { + "services": { + "drush.services.yml": "^9 || ^10" } } }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { - "name": "frjo", - "homepage": "https://www.drupal.org/user/5546" + "name": "Mark Halliwell (markhalliwell)", + "homepage": "https://www.drupal.org/u/markhalliwell", + "role": "D8+ Maintainer" }, { - "name": "gisle", - "homepage": "https://www.drupal.org/user/409554" + "name": "Gisle Hannemyr (gisle)", + "homepage": "https://www.drupal.org/u/gisle", + "role": "D7 Maintainer" + }, + { + "name": "joelpittet", + "homepage": "https://www.drupal.org/user/160302" }, { "name": "markhalliwell", "homepage": "https://www.drupal.org/user/501638" } ], - "description": "Allows content to be submitted using Markdown, a simple plain-text syntax that is transformed into valid HTML.", + "description": "Provides Markdown integration for Drupal and allows content to be formatted in a simple plain-text syntax that is transformed into valid HTML.", "homepage": "https://www.drupal.org/project/markdown", "support": { - "source": "https://cgit.drupalcode.org/markdown", + "source": "https://git.drupalcode.org/project/markdown", "issues": "https://www.drupal.org/project/markdown" } }, @@ -5161,81 +5175,6 @@ ], "time": "2020-05-20T16:45:56+00:00" }, - { - "name": "league/commonmark", - "version": "0.18.5", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/commonmark.git", - "reference": "f94e18d68260f43a7d846279cad88405854b1306" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/f94e18d68260f43a7d846279cad88405854b1306", - "reference": "f94e18d68260f43a7d846279cad88405854b1306", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.6.5" - }, - "replace": { - "colinodell/commonmark-php": "*" - }, - "require-dev": { - "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.28", - "erusev/parsedown": "~1.0", - "michelf/php-markdown": "~1.4", - "mikehaertl/php-shellcommand": "^1.2", - "phpunit/phpunit": "^5.7.27|^6.5.14", - "scrutinizer/ocular": "^1.1", - "symfony/finder": "^3.0|^4.0" - }, - "suggest": { - "league/commonmark-extras": "Library of useful extensions including smart punctuation" - }, - "bin": [ - "bin/commonmark" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.19-dev" - } - }, - "autoload": { - "psr-4": { - "League\\CommonMark\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com", - "role": "Lead Developer" - } - ], - "description": "PHP Markdown parser based on the CommonMark spec", - "homepage": "https://github.com/thephpleague/commonmark", - "keywords": [ - "commonmark", - "markdown", - "parser" - ], - "support": { - "docs": "https://commonmark.thephpleague.com/", - "issues": "https://github.com/thephpleague/commonmark/issues", - "rss": "https://github.com/thephpleague/commonmark/releases.atom", - "source": "https://github.com/thephpleague/commonmark" - }, - "time": "2019-03-28T13:52:31+00:00" - }, { "name": "league/container", "version": "2.5.0", @@ -5380,16 +5319,16 @@ }, { "name": "michelf/php-markdown", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" + "reference": "5024d623c1a057dcd2d076d25b7d270a1d0d55f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/5024d623c1a057dcd2d076d25b7d270a1d0d55f3", + "reference": "5024d623c1a057dcd2d076d25b7d270a1d0d55f3", "shasum": "" }, "require": { @@ -5427,9 +5366,9 @@ ], "support": { "issues": "https://github.com/michelf/php-markdown/issues", - "source": "https://github.com/michelf/php-markdown/tree/1.9.0" + "source": "https://github.com/michelf/php-markdown/tree/1.9.1" }, - "time": "2019-12-02T02:32:27+00:00" + "time": "2021-11-24T02:52:38+00:00" }, { "name": "nesbot/carbon", diff --git a/config/filter.format.full_html.yml b/config/filter.format.full_html.yml index 53e6df0..3e33d45 100644 --- a/config/filter.format.full_html.yml +++ b/config/filter.format.full_html.yml @@ -12,17 +12,10 @@ filters: filter_url: id: filter_url provider: filter - status: true + status: false weight: -49 settings: filter_url_length: 72 - markdown: - id: markdown - provider: markdown - status: true - weight: -50 - settings: - markdown_library: php-markdown filter_html_image_secure: id: filter_html_image_secure provider: filter @@ -44,7 +37,7 @@ filters: filter_htmlcorrector: id: filter_htmlcorrector provider: filter - status: true + status: false weight: -42 settings: { } filter_align: @@ -77,3 +70,22 @@ filters: default_view_mode: default allowed_media_types: { } allowed_view_modes: { } + markdown: + id: markdown + provider: markdown + status: true + weight: -15 + settings: + override: false + id: php-markdown-extra + enabled: true + render_strategy: + type: filter_output + custom_allowed_html: '' + plugins: + filter_align: false + filter_caption: false + media_embed: false + php-markdown: true + php-markdown-extra: true + filterFormat: full_html