Merge pull request github#30742 from github/repo-sync

Repo sync

data/secret-scanning.yml

@@ -824,7 +824,7 @@
   isPublic: true
   isPrivateWithGhas: true
   hasPushProtection: true
-  hasValidityCheck: false
+  hasValidityCheck: '{% ifversion fpt or ghes %}false{% else %}true{% endif %}'
 
 - provider: 'Duffel'
   supportedSecret: 'Duffel Live Access Token'

src/content-render/liquid/tool.js

@@ -3,7 +3,45 @@ import { allPlatforms } from '#src/tools/lib/all-platforms.js'
 
 export const tags = Object.keys(allTools).concat(allPlatforms).concat(['rowheaders'])
 
-const template = '<div class="ghd-tool {{ tagName }}">{{ output }}</div>'
+// The trailing newline is important. Without it, the line immediately after
+// the `</div>` will be considered part of the previous block, which means the Markdown following the `</div>` will not be rendered to HTML correctly. For example:
+//
+//    <div>Here's some stuff</div>
+//    And *here* us also some stuff.
+//
+//    Another **sentence** here.
+//
+// Will yield:
+//
+//    <div>Here's some stuff</div>
+//    And *here* us also some stuff.
+//
+//    <p>Another <b>sentence</b> here.</p>
+//
+// when rendering this template with unified.
+// If you instead inject an extra newline after the `</div>`, you
+// go from:
+//
+//    <div>Here's some stuff</div>
+//
+//    And *here* us also some stuff.
+//
+//    Another **sentence** here.
+//
+// which yields:
+//
+//    <div>Here's some stuff</div>
+//
+//    <p>And <i>here</i> us also some stuff.</p>
+//
+//    <p>Another <b>sentence</b> here.</p>
+//
+// The Tool Liquid tags are a little bit fragile because we hope and assume
+// that the author of the Liquid+Markdown *don't* do this:
+//
+//    {% vscode %}Bla bla.{% endvscode %}Next stuff here...
+//
+const template = '<div class="ghd-tool {{ tagName }}">{{ output }}</div>\n'
 
 export const Tool = {
   type: 'block',

src/fixtures/fixtures/content/get-started/liquid/tool-platform-switcher.md

@@ -78,3 +78,11 @@ Bla bla
 `linux` specific content.
 
 {% endlinux %}
+
+## Misc testing
+
+{% linux %}
+It's important to test that immediately after the end tag, the Markdown
+there renders to HTML.
+{% endlinux %}
+On *this* line is `Markdown` too.

src/fixtures/tests/liquid.js

@@ -224,6 +224,17 @@ describe('misc Liquid', () => {
     expect(texts[0]).toBe(url)
     expect(texts[1]).toBe('Pricing')
   })
+
+  test('page with tool Liquid tag followed by Markdown', async () => {
+    // This test tests Markdown being correctly rendered when the
+    // Markdown directly follows a tool tag like `{% linux %}...{% endlinux %}`.
+    // The next line immediately after the `{% endlinux %}` should not
+    // leave the Markdown unrendered
+    const $ = await getDOM('/get-started/liquid/tool-platform-switcher')
+    const innerHTML = $('#article-contents').html()
+    expect(innerHTML).not.toMatch('On *this* line is `Markdown` too.')
+    expect(innerHTML).toMatch('<p>On <em>this</em> line is <code>Markdown</code> too.</p>')
+  })
 })
 
 describe('data tag', () => {