Merge branch 'master' of https://github.com/lowlighter/metrics [skip ci]

This commit is contained in:
lowlighter
2021-11-12 00:33:31 -05:00
3 changed files with 12 additions and 12 deletions

16
package-lock.json generated
View File

@@ -26,7 +26,7 @@
"jimp": "^0.16.1", "jimp": "^0.16.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"linguist-js": "^2.1.4", "linguist-js": "^2.1.4",
"marked": "^3.0.7", "marked": "^4.0.0",
"memory-cache": "^0.2.0", "memory-cache": "^0.2.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"node-chartist": "^1.0.5", "node-chartist": "^1.0.5",
@@ -6476,11 +6476,11 @@
} }
}, },
"node_modules/marked": { "node_modules/marked": {
"version": "3.0.7", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-3.0.7.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.0.tgz",
"integrity": "sha512-ctKqbnLuNbsHbI26cfMyOlKgXGfl1orOv1AvWWDX7AkgfMOwCWvmuYc+mVLeWhQ9W6hdWVBynOs96VkcscKo0Q==", "integrity": "sha512-K3C1JvtiXuXVLoxDQEJP4NMLBuThlTkthgUOCzqLghIpHfis1DIZZfPI3o4UgfFpQ0d+JvTql2h+szR9jQ1p1w==",
"bin": { "bin": {
"marked": "bin/marked" "marked": "bin/marked.js"
}, },
"engines": { "engines": {
"node": ">= 12" "node": ">= 12"
@@ -14893,9 +14893,9 @@
} }
}, },
"marked": { "marked": {
"version": "3.0.7", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-3.0.7.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.0.tgz",
"integrity": "sha512-ctKqbnLuNbsHbI26cfMyOlKgXGfl1orOv1AvWWDX7AkgfMOwCWvmuYc+mVLeWhQ9W6hdWVBynOs96VkcscKo0Q==" "integrity": "sha512-K3C1JvtiXuXVLoxDQEJP4NMLBuThlTkthgUOCzqLghIpHfis1DIZZfPI3o4UgfFpQ0d+JvTql2h+szR9jQ1p1w=="
}, },
"matchmedia": { "matchmedia": {
"version": "0.1.2", "version": "0.1.2",

View File

@@ -42,7 +42,7 @@
"jimp": "^0.16.1", "jimp": "^0.16.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"linguist-js": "^2.1.4", "linguist-js": "^2.1.4",
"marked": "^3.0.7", "marked": "^4.0.0",
"memory-cache": "^0.2.0", "memory-cache": "^0.2.0",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"node-chartist": "^1.0.5", "node-chartist": "^1.0.5",

View File

@@ -6,7 +6,7 @@ import processes from "child_process"
import fss from "fs" import fss from "fs"
import GIFEncoder from "gifencoder" import GIFEncoder from "gifencoder"
import jimp from "jimp" import jimp from "jimp"
import marked from "marked" import {marked} from "marked"
import nodechartist from "node-chartist" import nodechartist from "node-chartist"
import opengraph from "open-graph-scraper" import opengraph from "open-graph-scraper"
import os from "os" import os from "os"
@@ -261,7 +261,7 @@ export function highlight(code, lang) {
/**Markdown-html sanitizer-interpreter */ /**Markdown-html sanitizer-interpreter */
export async function markdown(text, {mode = "inline", codelines = Infinity} = {}) { export async function markdown(text, {mode = "inline", codelines = Infinity} = {}) {
//Sanitize user input once to prevent injections and parse into markdown //Sanitize user input once to prevent injections and parse into markdown
let rendered = await marked(htmlunescape(htmlsanitize(text)), {highlight, silent:true, xhtml:true}) let rendered = await marked.parse(htmlunescape(htmlsanitize(text)), {highlight, silent:true, xhtml:true})
//Markdown mode //Markdown mode
switch (mode) { switch (mode) {
case "inline": { case "inline": {
@@ -354,7 +354,7 @@ export const svg = {
rendered = await svg.twemojis(rendered, {custom:false}) rendered = await svg.twemojis(rendered, {custom:false})
if ((gemojis) && (rest)) if ((gemojis) && (rest))
rendered = await svg.gemojis(rendered, {rest}) rendered = await svg.gemojis(rendered, {rest})
rendered = marked(rendered) rendered = marked.parse(rendered)
//Render through browser and print pdf //Render through browser and print pdf
console.debug("metrics/svg/pdf > loading svg") console.debug("metrics/svg/pdf > loading svg")
const page = await svg.resize.browser.newPage() const page = await svg.resize.browser.newPage()