Skip to content

Commit 72a287e

Browse files
mgolKrinkle
authored andcommittedNov 8, 2023
Fix logic after cheerio update
Newer cheerio by default wraps the content in `<html><head>...<body>` tags which we don't want. Fix the logic & test fixtures.
1 parent b786a2a commit 72a287e

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed
 

‎lib/highlight.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ function outdent( string ) {
6363
}
6464

6565
function syntaxHighlight( html ) {
66-
var $ = cheerio.load( html );
66+
67+
// The third parameter is `false` to disable wrapping contents
68+
// in `<html><head>...`, etc.
69+
var $ = cheerio.load( html, null, false );
6770

6871
$( "pre > code" ).each( function() {
6972
var $t = $( this ),

‎test/expected/wordpress/posts/page/pages/Hello_World.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<script>{"title":"Hello World","customFields":[{"key":"source_path","value":"fixture/pages/Hello_World.html"}]}</script>
2-
<html><head></head><body><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque pellentesque placerat arcu, vel viverra augue posuere commodo. Aenean hendrerit quam sed commodo pellentesque.</p>
2+
3+
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque pellentesque placerat arcu, vel viverra augue posuere commodo. Aenean hendrerit quam sed commodo pellentesque.</p>
34
<p>Donec sed commodo velit, non molestie justo.</p>
45
<h3>Phasellus</h3>
56
<p>Cras vel justo molestie lorem auctor convallis. Donec ac lacus tincidunt, euismod lectus eu, pulvinar tortor.</p>
@@ -31,4 +32,3 @@ <h3>Phasellus</h3>
3132
<h3>Sed sed molestie purus</h3>
3233
<p>Aliquam venenatis sem elit, et aliquet libero ultrices vitae. Nullam rutrum convallis justo, sed suscipit leo facilisis et.
3334
</p>
34-
</body></html>
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<script>{"title":"Markdown","customFields":[{"key":"source_path","value":"fixture/pages/Mark.md"}]}</script>
2-
<html><head></head><body><p><strong>Conubia linguae</strong> hydrae novissima recepto certe, clarus quod amictus tum ignota fluctibus <em>et quod</em>, est verba capitum, variusque. Sui saevam gentes propiora Cycladas, Hecate stamina nurus ramum!</p>
2+
<p><strong>Conubia linguae</strong> hydrae novissima recepto certe, clarus quod amictus tum ignota fluctibus <em>et quod</em>, est verba capitum, variusque. Sui saevam gentes propiora Cycladas, Hecate stamina nurus ramum!</p>
33
<h2 class="toc-linked" id="oculi-miserarum"><a href="#oculi-miserarum" class="icon-link toc-link"><span class="visuallyhidden">link</span></a> Oculi miserarum</h2><p>Lorem <a href="https://en.wikipedia.org/wiki/Markdown">markdownum</a> silentia umerique, colla. Per felix innoxia pariterque capillos accessit, nec ad tempore in nubes detrahitur.</p>
44
<p>Aures precantibus supplice Medusaeo, Lycormas est esse aestuat aut Pterelas.</p>
55
<h2 class="toc-linked" id="domitos-interea"><a href="#domitos-interea" class="icon-link toc-link"><span class="visuallyhidden">link</span></a> Domitos interea</h2><ol>
66
<li>Non torsi numine amor</li>
77
<li>Tamen vino hinc indignatus aquas iunguntur sacrifica</li>
88
<li>Solitum bacae tellure ille</li>
99
</ol>
10-
</body></html>

‎test/expected/wordpress/posts/post/addClass.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<html><head><script>{
1+
<script>{
22
"title":
33
".addClass()",
44
"excerpt":
@@ -8,7 +8,7 @@
88
"css","version/1.0","version/1.4"
99
]
1010
}
11-
}</script></head><body><article id="addClass1" class="entry method"><h2 class="section-title">
11+
}</script><article id="addClass1" class="entry method"><h2 class="section-title">
1212
<span class="name">.addClass( className )</span><span class="returns">Returns: <a href="http://api.jquery.com/Types/#jQuery">jQuery</a></span>
1313
</h2>
1414
<div class="entry-wrapper">
@@ -117,4 +117,3 @@ <h4>Demo:</h4>
117117
<div class="demo code-demo"></div>
118118
</div></section>
119119
</div></article>
120-
</body></html>

0 commit comments

Comments
 (0)
Please sign in to comment.