Fix renderContent.liquid (#38571)

Author: heiskr

src/content-linter/lib/linting-rules/image-alt-text-length.js

@@ -1,5 +1,5 @@
 import { addError, forEachInlineChild } from 'markdownlint-rule-helpers'
-import { renderContent } from '#src/content-render/index.js'
+import { liquid } from '#src/content-render/index.js'
 
 export const incorrectAltTextLength = {
   names: ['MD111', 'incorrect-alt-text-length'],
@@ -11,7 +11,7 @@ export const incorrectAltTextLength = {
       let renderedString = token.content
       if (token.content.includes('{%') || token.content.includes('{{')) {
         const context = { currentLanguage: 'en' }
-        renderedString = await renderContent.liquid.parseAndRender(token.content, context)
+        renderedString = await liquid.parseAndRender(token.content, context)
       }
 
       if (renderedString.length < 40 || renderedString.length > 150) {

src/content-linter/tests/lint-files.js

@@ -19,7 +19,7 @@ import languages from '../../../lib/languages.js'
 import { tags } from '#src/content-render/liquid/extended-markdown.js'
 import releaseNotesSchema from '../lib/release-notes-schema.js'
 import learningTracksSchema from '../lib/learning-tracks-schema.js'
-import { renderContent } from '#src/content-render/index.js'
+import { renderContent, liquid } from '#src/content-render/index.js'
 import getApplicableVersions from '../../../lib/get-applicable-versions.js'
 import { allVersions } from '../../../lib/all-versions.js'
 import { getDiffFiles } from '../lib/diff-files.js'
@@ -467,7 +467,7 @@ describe('lint markdown content', () => {
         await Promise.all(
           yamlScheduledWorkflows.map(async (snippet) => {
             // If we don't parse the Liquid first, yaml loading chokes on {% raw %} tags
-            const rendered = await renderContent.liquid.parseAndRender(snippet, context)
+            const rendered = await liquid.parseAndRender(snippet, context)
             const parsed = yaml.load(rendered)
             return parsed.on.schedule
           })
@@ -669,7 +669,7 @@ describe('lint markdown content', () => {
       // If Liquid can't parse the file, it'll throw an error.
       // For example, the following is invalid and will fail this test:
       // {% if currentVersion ! "github-ae@latest" %}
-      expect(() => renderContent.liquid.parse(content)).not.toThrow()
+      expect(() => liquid.parse(content)).not.toThrow()
     })
 
     if (!markdownRelPath.includes('data/reusables')) {
@@ -679,7 +679,7 @@ describe('lint markdown content', () => {
         )
 
         for (const key of fmKeysWithLiquid) {
-          expect(() => renderContent.liquid.parse(frontmatterData[key])).not.toThrow()
+          expect(() => liquid.parse(frontmatterData[key])).not.toThrow()
         }
       })
     }
@@ -963,10 +963,7 @@ describe('lint GHES release notes', () => {
 
       for (const key in toLint) {
         if (!toLint[key]) continue
-        expect(
-          () => renderContent.liquid.parse(toLint[key]),
-          `${key} contains invalid liquid`
-        ).not.toThrow()
+        expect(() => liquid.parse(toLint[key]), `${key} contains invalid liquid`).not.toThrow()
       }
     })
   })
@@ -1030,10 +1027,7 @@ describe('lint GHAE release notes', () => {
 
       for (const key in toLint) {
         if (!toLint[key]) continue
-        expect(
-          () => renderContent.liquid.parse(toLint[key]),
-          `${key} contains invalid liquid`
-        ).not.toThrow()
+        expect(() => liquid.parse(toLint[key]), `${key} contains invalid liquid`).not.toThrow()
       }
     })
   })
@@ -1117,10 +1111,7 @@ describe('lint learning tracks', () => {
       })
 
       toLint.forEach((element) => {
-        expect(
-          () => renderContent.liquid.parse(element),
-          `${element} contains invalid liquid`
-        ).not.toThrow()
+        expect(() => liquid.parse(element), `${element} contains invalid liquid`).not.toThrow()
       })
     })
   })

src/content-render/README.md

@@ -90,7 +90,7 @@ The class and the template should have corresponding names, like `lib/liquid-tag
 You must also register the new tag in `src/content-render/liquid/engine.js` with a line like this:
 
 ```
-renderContent.liquid.registerTag('my_tag', require('./liquid-tags/my-tag'))
+engine.registerTag('my_tag', require('./liquid-tags/my-tag'))
 ```
 
 ## Further reading