diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-12 21:09:53 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-12 21:09:53 +0000 |
commit | b6f17c69925beded921017fa049385de715553ba (patch) | |
tree | 5f8b2a5fbc6b1e779b7421ceddd219065e65fec9 /glfm_specification | |
parent | 0ba11d8461a2b091d37bb6308d85e74f2b133803 (diff) | |
download | gitlab-ce-b6f17c69925beded921017fa049385de715553ba.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'glfm_specification')
-rw-r--r-- | glfm_specification/example_snapshots/html.yml | 103 | ||||
-rw-r--r-- | glfm_specification/example_snapshots/prosemirror_json.yml | 597 |
2 files changed, 581 insertions, 119 deletions
diff --git a/glfm_specification/example_snapshots/html.yml b/glfm_specification/example_snapshots/html.yml index 701f7ccef0e..6a9acdd03a4 100644 --- a/glfm_specification/example_snapshots/html.yml +++ b/glfm_specification/example_snapshots/html.yml @@ -1527,8 +1527,9 @@ <a></a> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p> + *hello* + </p></div> 04_06__leaf_blocks__html_blocks__004: canonical: | </div> @@ -1549,8 +1550,7 @@ <p data-sourcepos="3:1-3:10"><em>Markdown</em></p> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p><em>Markdown</em></p></div> 04_06__leaf_blocks__html_blocks__006: canonical: | <div id="foo" @@ -1560,8 +1560,7 @@ <div> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div></div> 04_06__leaf_blocks__html_blocks__007: canonical: | <div id="foo" class="bar @@ -1571,8 +1570,7 @@ <div> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div></div> 04_06__leaf_blocks__html_blocks__008: canonical: | <div> @@ -1584,8 +1582,9 @@ <p data-sourcepos="4:1-4:5"><em>bar</em></p> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p> + *foo* + </p><p><em>bar</em></p></div> 04_06__leaf_blocks__html_blocks__009: canonical: | <div id="foo" @@ -1616,8 +1615,7 @@ static: |- <div><a href="bar">*foo*</a></div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p><a target="_blank" rel="noopener noreferrer nofollow" href="bar">*foo*</a></p></div> 04_06__leaf_blocks__html_blocks__013: canonical: | <table><tr><td> @@ -1643,8 +1641,7 @@ int x = 33; ``` wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div></div> 04_06__leaf_blocks__html_blocks__015: canonical: | <a href="foo"> @@ -1667,8 +1664,7 @@ *bar* wysiwyg: |- - Error - check implementation: - Hast node of type "warning" not supported by this converter. Please, provide an specification. + <p></p> 04_06__leaf_blocks__html_blocks__017: canonical: | <i class="foo"> @@ -1761,8 +1757,7 @@ <p data-sourcepos="6:1-6:4" dir="auto">okay</p> wysiwyg: |- - Error - check implementation: - Hast node of type "script" not supported by this converter. Please, provide an specification. + <p>okay</p> 04_06__leaf_blocks__html_blocks__024: canonical: | <style @@ -1780,8 +1775,7 @@ <p data-sourcepos="7:1-7:4" dir="auto">okay</p> wysiwyg: |- - Error - check implementation: - Hast node of type "style" not supported by this converter. Please, provide an specification. + <p>okay</p> 04_06__leaf_blocks__html_blocks__025: canonical: | <style @@ -1793,8 +1787,7 @@ foo wysiwyg: |- - Error - check implementation: - Hast node of type "style" not supported by this converter. Please, provide an specification. + <p></p> 04_06__leaf_blocks__html_blocks__026: canonical: | <blockquote> @@ -1811,8 +1804,9 @@ </div> </blockquote> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <blockquote multiline="false"><div><p> + foo + </p></div></blockquote> 04_06__leaf_blocks__html_blocks__027: canonical: | <ul> @@ -1831,8 +1825,7 @@ </li> </ul> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <ul bullet="*"><li><p></p><div></div></li><li><p>foo</p></li></ul> 04_06__leaf_blocks__html_blocks__028: canonical: | <style>p{color:red;}</style> @@ -1841,8 +1834,7 @@ p{color:red;} <p data-sourcepos="2:1-2:5" dir="auto"><em>foo</em></p> wysiwyg: |- - Error - check implementation: - Hast node of type "style" not supported by this converter. Please, provide an specification. + <p><em>foo</em></p> 04_06__leaf_blocks__html_blocks__029: canonical: | <!-- foo -->*bar* @@ -1861,8 +1853,7 @@ static: |- 1. *bar* wysiwyg: |- - Error - check implementation: - Hast node of type "script" not supported by this converter. Please, provide an specification. + <p>1. *bar*</p> 04_06__leaf_blocks__html_blocks__031: canonical: | <!-- Foo @@ -1955,8 +1946,7 @@ </div> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><pre class="content-editor-code-block undefined code highlight"><code><div></code></pre></div> 04_06__leaf_blocks__html_blocks__037: canonical: | <p>Foo</p> @@ -1969,8 +1959,7 @@ bar </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <p>Foo</p> 04_06__leaf_blocks__html_blocks__038: canonical: | <div> @@ -1983,8 +1972,9 @@ </div> *foo* wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p> + bar + </p></div> 04_06__leaf_blocks__html_blocks__039: canonical: | <p>Foo @@ -2008,8 +1998,7 @@ <p data-sourcepos="3:1-3:18"><em>Emphasized</em> text.</p> </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p><em>Emphasized</em> text.</p></div> 04_06__leaf_blocks__html_blocks__041: canonical: | <div> @@ -2020,8 +2009,9 @@ *Emphasized* text. </div> wysiwyg: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + <div><p> + *Emphasized* text. + </p></div> 04_06__leaf_blocks__html_blocks__042: canonical: | <table> @@ -2157,8 +2147,7 @@ <p data-sourcepos="1:1-1:17" dir="auto">[foo]: (baz)</p> <p data-sourcepos="3:1-3:5" dir="auto">[foo]</p> wysiwyg: |- - Error - check implementation: - Hast node of type "bar" not supported by this converter. Please, provide an specification. + <p>[foo]: </p> 04_07__leaf_blocks__link_reference_definitions__011: canonical: | <p><a href="/url%5Cbar*baz" title="foo"bar\baz">foo</a></p> @@ -6096,8 +6085,7 @@ static: |- <p data-sourcepos="1:1-2:5" dir="auto">[link]()</p> wysiwyg: |- - Error - check implementation: - Hast node of type "foo" not supported by this converter. Please, provide an specification. + <p>[link](</p> 06_07__inlines__links__009: canonical: | <p><a href="b)c">a</a></p> @@ -6336,8 +6324,7 @@ static: |- <p data-sourcepos="1:1-1:24" dir="auto">[foo </p> wysiwyg: |- - Error - check implementation: - Hast node of type "bar" not supported by this converter. Please, provide an specification. + <p>[foo </p> 06_07__inlines__links__041: canonical: | <p>[foo<code>](/uri)</code></p> @@ -6422,8 +6409,7 @@ static: |- <p data-sourcepos="1:1-1:24" dir="auto">[foo </p> wysiwyg: |- - Error - check implementation: - Hast node of type "bar" not supported by this converter. Please, provide an specification. + <p>[foo </p> 06_07__inlines__links__053: canonical: | <p>[foo<code>][ref]</code></p> @@ -7085,16 +7071,14 @@ static: |- <p data-sourcepos="1:1-1:13" dir="auto"><a></a></p> wysiwyg: |- - Error - check implementation: - Hast node of type "bab" not supported by this converter. Please, provide an specification. + <p></p> 06_11__inlines__raw_html__002: canonical: | <p><a/><b2/></p> static: |- <p data-sourcepos="1:1-1:9" dir="auto"><a></a></p> wysiwyg: |- - Error - check implementation: - Hast node of type "b2" not supported by this converter. Please, provide an specification. + <p></p> 06_11__inlines__raw_html__003: canonical: | <p><a /><b2 @@ -7102,8 +7086,7 @@ static: |- <p data-sourcepos="1:1-2:12" dir="auto"><a></a></p> wysiwyg: |- - Error - check implementation: - Hast node of type "b2" not supported by this converter. Please, provide an specification. + <p></p> 06_11__inlines__raw_html__004: canonical: | <p><a foo="bar" bam = 'baz <em>"</em>' @@ -7118,8 +7101,7 @@ static: |- <p data-sourcepos="1:1-1:38" dir="auto">Foo </p> wysiwyg: |- - Error - check implementation: - Hast node of type "responsive-image" not supported by this converter. Please, provide an specification. + <p>Foo </p> 06_11__inlines__raw_html__006: canonical: | <p><33> <__></p> @@ -7260,8 +7242,7 @@ <xmp> is disallowed. <XMP> is also disallowed. </blockquote></strong></p> wysiwyg: |- - Error - check implementation: - Hast node of type "title" not supported by this converter. Please, provide an specification. + <p></p> 06_13__inlines__hard_line_breaks__001: canonical: | <p>foo<br /> @@ -7434,11 +7415,11 @@ 07_01__gitlab_specific_markdown__footnotes__001: canonical: "" static: |- - <p data-sourcepos="1:1-1:27" dir="auto">footnote reference tag <sup class="footnote-ref"><a href="#fn-1-4281" id="fnref-1-4281" data-footnote-ref>1</a></sup></p> + <p data-sourcepos="1:1-1:27" dir="auto">footnote reference tag <sup class="footnote-ref"><a href="#fn-1-794" id="fnref-1-794" data-footnote-ref>1</a></sup></p> <section data-footnotes class="footnotes"> <ol> - <li id="fn-1-4281"> - <p data-sourcepos="3:7-3:19">footnote text <a href="#fnref-1-4281" data-footnote-backref aria-label="Back to content" class="footnote-backref"><gl-emoji title="leftwards arrow with hook" data-name="leftwards_arrow_with_hook" data-unicode-version="1.1">↩</gl-emoji></a></p> + <li id="fn-1-794"> + <p data-sourcepos="3:7-3:19">footnote text <a href="#fnref-1-794" data-footnote-backref aria-label="Back to content" class="footnote-backref"><gl-emoji title="leftwards arrow with hook" data-name="leftwards_arrow_with_hook" data-unicode-version="1.1">↩</gl-emoji></a></p> </li> </ol> </section> diff --git a/glfm_specification/example_snapshots/prosemirror_json.yml b/glfm_specification/example_snapshots/prosemirror_json.yml index a221350775d..85d499ef552 100644 --- a/glfm_specification/example_snapshots/prosemirror_json.yml +++ b/glfm_specification/example_snapshots/prosemirror_json.yml @@ -2941,8 +2941,25 @@ ] } 04_06__leaf_blocks__html_blocks__003: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\n *hello*\n " + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__004: |- { "type": "doc", @@ -2959,17 +2976,82 @@ ] } 04_06__leaf_blocks__html_blocks__005: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "marks": [ + { + "type": "italic" + } + ], + "text": "Markdown" + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__006: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div" + } + ] + } 04_06__leaf_blocks__html_blocks__007: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div" + } + ] + } 04_06__leaf_blocks__html_blocks__008: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\n*foo*\n" + } + ] + }, + { + "type": "paragraph", + "content": [ + { + "type": "text", + "marks": [ + { + "type": "italic" + } + ], + "text": "bar" + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__009: |- { "type": "doc", @@ -2998,8 +3080,37 @@ ] } 04_06__leaf_blocks__html_blocks__012: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "marks": [ + { + "type": "link", + "attrs": { + "href": "bar", + "target": "_blank", + "class": null, + "title": null, + "canonicalSrc": null + } + } + ], + "text": "*foo*" + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__013: |- { "type": "doc", @@ -3039,8 +3150,23 @@ ] } 04_06__leaf_blocks__html_blocks__014: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div" + }, + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\n``` c\nint x = 33;\n```" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__015: |- { "type": "doc", @@ -3069,8 +3195,14 @@ ] } 04_06__leaf_blocks__html_blocks__016: |- - Error - check implementation: - Hast node of type "warning" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph" + } + ] + } 04_06__leaf_blocks__html_blocks__017: |- { "type": "doc", @@ -3181,29 +3313,158 @@ ] } 04_06__leaf_blocks__html_blocks__023: |- - Error - check implementation: - Hast node of type "script" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "okay" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__024: |- - Error - check implementation: - Hast node of type "style" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "okay" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__025: |- - Error - check implementation: - Hast node of type "style" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph" + } + ] + } 04_06__leaf_blocks__html_blocks__026: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "blockquote", + "attrs": { + "multiline": false + }, + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\nfoo\n" + } + ] + } + ] + } + ] + }, + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "bar" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__027: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "bulletList", + "attrs": { + "bullet": "*" + }, + "content": [ + { + "type": "listItem", + "content": [ + { + "type": "paragraph" + }, + { + "type": "div" + } + ] + }, + { + "type": "listItem", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "foo" + } + ] + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__028: |- - Error - check implementation: - Hast node of type "style" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "marks": [ + { + "type": "italic" + } + ], + "text": "foo" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__029: |- Error - check implementation: Cannot read properties of undefined (reading 'wrapper') 04_06__leaf_blocks__html_blocks__030: |- - Error - check implementation: - Hast node of type "script" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "1. *bar*" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__031: |- Error - check implementation: Cannot destructure property 'className' of 'hastNode.properties' as it is undefined. @@ -3226,14 +3487,87 @@ Error - check implementation: Cannot destructure property 'className' of 'hastNode.properties' as it is undefined. 04_06__leaf_blocks__html_blocks__036: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "codeBlock", + "attrs": { + "language": null, + "class": "code highlight" + }, + "content": [ + { + "type": "text", + "text": "<div>" + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__037: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "Foo" + } + ] + }, + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\nbar\n" + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__038: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\nbar\n" + } + ] + } + ] + }, + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\n*foo*" + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__039: |- { "type": "doc", @@ -3266,11 +3600,54 @@ ] } 04_06__leaf_blocks__html_blocks__040: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "marks": [ + { + "type": "italic" + } + ], + "text": "Emphasized" + }, + { + "type": "text", + "text": " text." + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__041: |- - Error - check implementation: - Hast node of type "div" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "div", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "\n*Emphasized* text.\n" + } + ] + } + ] + } + ] + } 04_06__leaf_blocks__html_blocks__042: |- { "type": "doc", @@ -3586,8 +3963,29 @@ ] } 04_07__leaf_blocks__link_reference_definitions__010: |- - Error - check implementation: - Hast node of type "bar" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "[foo]: " + } + ] + }, + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "[foo]" + } + ] + } + ] + } 04_07__leaf_blocks__link_reference_definitions__011: |- { "type": "doc", @@ -13715,8 +14113,20 @@ ] } 06_07__inlines__links__008: |- - Error - check implementation: - Hast node of type "foo" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "[link](" + } + ] + } + ] + } 06_07__inlines__links__009: |- { "type": "doc", @@ -14573,8 +14983,20 @@ ] } 06_07__inlines__links__040: |- - Error - check implementation: - Hast node of type "bar" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "[foo " + } + ] + } + ] + } 06_07__inlines__links__041: |- { "type": "doc", @@ -14938,8 +15360,20 @@ ] } 06_07__inlines__links__052: |- - Error - check implementation: - Hast node of type "bar" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "[foo " + } + ] + } + ] + } 06_07__inlines__links__053: |- { "type": "doc", @@ -17446,14 +17880,32 @@ ] } 06_11__inlines__raw_html__001: |- - Error - check implementation: - Hast node of type "bab" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph" + } + ] + } 06_11__inlines__raw_html__002: |- - Error - check implementation: - Hast node of type "b2" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph" + } + ] + } 06_11__inlines__raw_html__003: |- - Error - check implementation: - Hast node of type "b2" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph" + } + ] + } 06_11__inlines__raw_html__004: |- { "type": "doc", @@ -17464,8 +17916,20 @@ ] } 06_11__inlines__raw_html__005: |- - Error - check implementation: - Hast node of type "responsive-image" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph", + "content": [ + { + "type": "text", + "text": "Foo " + } + ] + } + ] + } 06_11__inlines__raw_html__006: |- { "type": "doc", @@ -17662,8 +18126,25 @@ ] } 06_12__inlines__disallowed_raw_html_extension__001: |- - Error - check implementation: - Hast node of type "title" not supported by this converter. Please, provide an specification. + { + "type": "doc", + "content": [ + { + "type": "paragraph" + }, + { + "type": "blockquote", + "attrs": { + "multiline": false + }, + "content": [ + { + "type": "paragraph" + } + ] + } + ] + } 06_13__inlines__hard_line_breaks__001: |- { "type": "doc", |