Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Complete revamp of markdown-gfm #7307

Merged
merged 32 commits into from
Aug 17, 2020
Merged

Complete revamp of markdown-gfm #7307

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f537b9a
Migrated from to-markdown to Turndown (except converters).
fredck May 26, 2020
ecd001f
Importing 'marked' as an npm module and separate it into it's own code.
fredck May 26, 2020
9c55502
Fixed the conversion of todo lists to match the default HTML generate…
fredck May 26, 2020
1612929
Configured markdown to output fenced (```) code blocks.
fredck May 26, 2020
18dc7cc
Minor clarification in a code comment.
fredck May 26, 2020
a05667f
Changed the defaults of some of the markdown markup produced.
fredck May 26, 2020
8b63c53
Aligned some of the tests with the current expected behavior of featu…
fredck May 26, 2020
cd4b9f9
Changed test that are outdated, low quality or irrelevant.
fredck May 26, 2020
e26e376
Removed outdated code, confirmed to not be anymore needed.
fredck May 26, 2020
52aed7f
HTML as text is now properly escaped in the output mardown.
fredck May 26, 2020
e593849
Added a basic test for todo lists.
fredck May 26, 2020
c30bd15
Added a test for todo lists when loading the HTML produced by the tod…
fredck May 26, 2020
3cb85fa
Fixed an unfortunate typo in the todo list tests.
fredck May 26, 2020
6eb57fc
For the purpose of this plugin, autolinking from markdown to html is …
fredck May 26, 2020
129da7d
Upgrade to v18.0.0.
fredck May 26, 2020
43cce7f
Made it possible to define html elements to be kept as is in the output.
fredck May 26, 2020
5a76d6a
Tricked JSDoc on not failing validation.
fredck May 27, 2020
a0b1ad1
Fixed linting issues.
fredck Jun 25, 2020
a32884d
Added test for code blocks with triple/quadruple ticks inside.
fredck May 26, 2020
390a3cf
Upgraded to Turndown v6.0.0.
fredck May 26, 2020
ae368f4
Fixed the html->markdown conversion to avoid escaping urls in text no…
fredck May 26, 2020
b3e93b4
Merge branch 'i/github-writer/17' into i/5988
fredck Aug 11, 2020
db22d92
Merge branch 'i/github-writer/93' into i/5988
fredck Aug 11, 2020
0e2f99e
Merge branch 'master' into i/5988
jodator Aug 13, 2020
2c10447
Update yarn.lock.
jodator Aug 13, 2020
36c0f9c
Match code style to the rest of the modules.
jodator Aug 14, 2020
85d2030
Add test for escaping text between 2 URLs.
jodator Aug 14, 2020
49d86f1
Use String.matchAll() instead of do-while for regex matches traversal.
jodator Aug 14, 2020
317fcfa
Update markdown gfm module documentation.
jodator Aug 17, 2020
00de1de
Update markdown-gfm manual test.
jodator Aug 17, 2020
516ed39
Fix condition in html2markdown processing.
jodator Aug 17, 2020
d7dbe8c
Merge branch 'master' into i/5988
jodator Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ckeditor5-markdown-gfm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@ckeditor/ckeditor5-engine": "^21.0.0",
"marked": "^0.7.0",
"turndown": "^5.0.3",
"turndown": "^6.0.0",
"turndown-plugin-gfm": "^1.0.2"
},
"engines": {
Expand Down
36 changes: 36 additions & 0 deletions packages/ckeditor5-markdown-gfm/tests/gfmdataprocessor/code.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,5 +276,41 @@ describe( 'GFMDataProcessor', () => {
'`code `` code ``` `'
);
} );

it( 'should handle triple ticks inside code', () => {
testDataProcessor(
'````\n' +
'```\n' +
'Code\n' +
'```\n' +
'````',

'<pre><code>' +
'```\n' +
'Code\n' +
'```' +
'</code></pre>'
);
} );

it( 'should handle triple and quatruple ticks inside code', () => {
testDataProcessor(
'`````\n' +
'````\n' +
'```\n' +
'Code\n' +
'```\n' +
'````\n' +
'`````',

'<pre><code>' +
'````\n' +
'```\n' +
'Code\n' +
'```\n' +
'````' +
'</code></pre>'
);
} );
} );
} );