Skip to content

Commit 43158e8

Browse files
authored
Upgrade NPM packages (github#21480)
* Upgrade a bunch of packages * ...and upgrade highlightjs * ... and ajv-formats (but not ajv) * Revert graphql changes * Revert "Revert graphql changes" This reverts commit a5b8a34d52a48a7c2858415f6b1081c1d4902482. * Update build-changelog.js * Upgrade html-entities * Upgrade commander, following migration guide
1 parent b808ca6 commit 43158e8

11 files changed

+2050
-2464
lines changed

lib/render-content/plugins/use-english-headings.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import GithubSlugger from 'github-slugger'
2-
import HtmlEntities from 'html-entities'
2+
import { encode } from 'html-entities'
33
import { toString } from 'hast-util-to-string'
44
import { visit } from 'unist-util-visit'
55
const slugger = new GithubSlugger()
6-
const entities = new HtmlEntities.XmlEntities()
76

87
const matcher = (node) => node.type === 'element' && ['h2', 'h3', 'h4'].includes(node.tagName)
98

@@ -16,7 +15,7 @@ export default function useEnglishHeadings({ englishHeadings }) {
1615
// Get the plain text content of the heading node
1716
const text = toString(node)
1817
// find English heading in the collection
19-
const englishHeading = englishHeadings[entities.encode(text)]
18+
const englishHeading = englishHeadings[encode(text)]
2019
// get English slug
2120
const englishSlug = slugger.slug(englishHeading)
2221
// use English slug for heading ID and link

lib/render-content/renderContent.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import liquid from './liquid.js'
22
import cheerio from 'cheerio'
3-
import HtmlEntities from 'html-entities'
3+
import { encode } from 'html-entities'
44
import stripHtmlComments from 'strip-html-comments'
55
import createProcessor from './create-processor.js'
6-
const entities = new HtmlEntities.XmlEntities()
76

87
// used below to remove extra newlines in TOC lists
98
const endLine = '</a>\r?\n'
@@ -60,7 +59,7 @@ async function renderContent(template = '', context = {}, options = {}) {
6059
return cheerio.load(html, { xmlMode: true })
6160
}
6261

63-
if (options.encodeEntities) html = entities.encode(html)
62+
if (options.encodeEntities) html = encode(html)
6463

6564
return html.trim()
6665
} catch (error) {

lib/use-english-headings.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import GithubSlugger from 'github-slugger'
2-
import HtmlEntities from 'html-entities'
2+
import { encode } from 'html-entities'
33
const slugger = new GithubSlugger()
4-
const entities = new HtmlEntities.XmlEntities()
54

65
// replace translated IDs and links in headings with English
76
export default function useEnglishHeadings($, englishHeadings) {
87
$('h2, h3, h4').each((i, el) => {
98
slugger.reset()
109

1110
// find English heading in the collection
12-
const englishHeading = englishHeadings[entities.encode($(el).text())]
11+
const englishHeading = englishHeadings[encode($(el).text())]
1312

1413
// get English slug
1514
const englishSlug = slugger.slug(englishHeading)

0 commit comments

Comments
 (0)