Skip to content

Commit

Permalink
Upgrade CommonMark and use the bundled table extension (#31411)
Browse files Browse the repository at this point in the history
league/commonmark 1.3 now includes the official extensions directly in
the main projects.  The separate extension packages (like
`league/commonmark-ext-table`) are being deprecated in the very near
future.

For more information, please see:
https://www.colinodell.com/blog/202002/league-commonmark-130-adds-full-gfm-support
  • Loading branch information
colinodell authored Feb 10, 2020
1 parent 641972a commit 6b59236
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
"doctrine/inflector": "^1.1",
"dragonmantank/cron-expression": "^2.0",
"egulias/email-validator": "^2.1.10",
"league/commonmark": "^1.1",
"league/commonmark-ext-table": "^2.1",
"league/commonmark": "^1.3",
"league/flysystem": "^1.0.8",
"monolog/monolog": "^1.12|^2.0",
"nesbot/carbon": "^2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/Markdown.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Illuminate\Support\Str;
use League\CommonMark\CommonMarkConverter;
use League\CommonMark\Environment;
use League\CommonMark\Ext\Table\TableExtension;
use League\CommonMark\Extension\Table\TableExtension;
use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;

class Markdown
Expand Down
3 changes: 1 addition & 2 deletions src/Illuminate/Mail/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"illuminate/container": "^6.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0",
"league/commonmark": "^1.1",
"league/commonmark-ext-table": "^2.1",
"league/commonmark": "^1.3",
"psr/log": "^1.0",
"swiftmailer/swiftmailer": "^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.2.1"
Expand Down

0 comments on commit 6b59236

Please sign in to comment.