Updates to latest marked

Author: eamodio

ThirdPartyNotices.txt

@@ -23,7 +23,7 @@ This project incorporates components from the projects listed below.
 18. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
 19. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
 20. lit version 3.2.0 (https://github.com/lit/lit)
-21. marked version 12.0.2 (https://github.com/markedjs/marked)
+21. marked version 14.1.2 (https://github.com/markedjs/marked)
 22. microsoft/vscode (https://github.com/microsoft/vscode)
 23. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
 24. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)

package.json

@@ -18000,7 +18000,7 @@
 		"https-proxy-agent": "5.0.1",
 		"iconv-lite": "0.6.3",
 		"lit": "3.2.0",
-		"marked": "12.0.2",
+		"marked": "14.1.2",
 		"node-fetch": "2.7.0",
 		"os-browserify": "0.3.0",
 		"path-browserify": "1.0.1",

src/webviews/apps/plus/graph/hover/markdown.ts

@@ -2,7 +2,7 @@ import { css, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 import { until } from 'lit/directives/until.js';
-import type { RendererObject } from 'marked';
+import type { RendererObject, RendererThis, Tokens } from 'marked';
 import { marked } from 'marked';
 import type { ThemeIcon } from 'vscode';
 
@@ -116,34 +116,7 @@ export class GLMarkdown extends LitElement {
 
 function getMarkdownRenderer(): RendererObject {
 	return {
-		// heading: function (text: string, level: number, raw: string, slugger: any): string {
-		// 	level = Math.min(6, level);
-		// 	const id = slugger.slug(text);
-		// 	const hlinks = null;
-
-		// 	let content;
-
-		// 	if (hlinks === null) {
-		// 		// No heading links
-		// 		content = text;
-		// 	} else {
-		// 		content = `<a href="#${id}" class="anchor">`;
-
-		// 		if (hlinks === '') {
-		// 			// Heading content is the link
-		// 			content += `${text}</a>`;
-		// 		} else {
-		// 			// Headings are prepended with a linked symbol
-		// 			content += `${hlinks}</a>${text}`;
-		// 		}
-		// 	}
-
-		// 	return `
-		// 		<h${level} id="${id}">
-		// 			${content}
-		// 		</h${level}>`;
-		// },
-		image: (href: string | null, title: string | null, text: string): string => {
+		image: function (this: RendererThis, { href, title, text }: Tokens.Image): string {
 			let dimensions: string[] = [];
 			let attributes: string[] = [];
 			if (href) {
@@ -161,27 +134,24 @@ function getMarkdownRenderer(): RendererObject {
 			}
 			return `<img ${attributes.join(' ')}>`;
 		},
-
-		paragraph: (text: string): string => {
+		paragraph: function (this: RendererThis, { tokens }: Tokens.Paragraph): string {
+			const text = this.parser.parseInline(tokens);
 			return `<p>${text}</p>`;
 		},
-
-		link: (href: string, title: string | null | undefined, text: string): string | false => {
-			if (typeof href !== 'string') {
-				return '';
-			}
+		link: function (this: RendererThis, { href, title, tokens }: Tokens.Link): string | false {
+			if (typeof href !== 'string') return '';
 
 			// Remove markdown escapes. Workaround for https://github.com/chjj/marked/issues/829
+			let text = this.parser.parseInline(tokens);
 			if (href === text) {
 				// raw link case
 				text = removeMarkdownEscapes(text);
 			}
 
 			title = typeof title === 'string' ? escapeDoubleQuotes(removeMarkdownEscapes(title)) : '';
-			href = removeMarkdownEscapes(href);
 
 			// HTML Encode href
-			href = href
+			href = removeMarkdownEscapes(href)
 				.replace(/&/g, '&amp;')
 				.replace(/</g, '&lt;')
 				.replace(/>/g, '&gt;')
@@ -190,17 +160,15 @@ function getMarkdownRenderer(): RendererObject {
 
 			return `<a href="${href}" title="${title || href}" draggable="false">${text}</a>`;
 		},
-
-		code: function (code: string, infostring: string | undefined, _escaped: boolean): string {
+		code: function (this: RendererThis, { text, lang }: Tokens.Code): string {
 			// Remote code may include characters that need to be escaped to be visible in HTML
-			code = code.replace(/</g, '&lt;');
-			return `<pre class="language-${infostring}"><code>${code}</code></pre>`;
+			text = text.replace(/</g, '&lt;');
+			return `<pre class="language-${lang}"><code>${text}</code></pre>`;
 		},
-
-		codespan: function (code: string): string {
+		codespan: function (this: RendererThis, { text }: Tokens.Codespan): string {
 			// Remote code may include characters that need to be escaped to be visible in HTML
-			code = code.replace(/</g, '&lt;');
-			return `<code>${code}</code>`;
+			text = text.replace(/</g, '&lt;');
+			return `<code>${text}</code>`;
 		},
 	};
 }

yarn.lock

@@ -4951,10 +4951,10 @@ markdown-it@^14.1.0:
     punycode.js "^2.3.1"
     uc.micro "^2.1.0"
 
-marked@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-12.0.2.tgz#b31578fe608b599944c69807b00f18edab84647e"
-  integrity sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==
+marked@14.1.2:
+  version "14.1.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-14.1.2.tgz#3cbc26b2d6832be32b75ae0746e0968c781b6156"
+  integrity sha512-f3r0yqpz31VXiDB/wj9GaOB0a2PRLQl6vJmXiFrniNwjkKdvakqJRULhjFKJpxOchlCRiG5fcacoUZY5Xa6PEQ==
 
 mdn-data@2.0.28:
   version "2.0.28"