update to marked 13

Author: Rich-Harris

apps/svelte.dev/package.json

@@ -74,7 +74,7 @@
 		"jimp": "^1.1.1",
 		"lightningcss": "^1.25.1",
 		"magic-string": "^0.30.11",
-		"marked": "^12.0.2",
+		"marked": "^13.0.3",
 		"prettier": "^3.3.2",
 		"prettier-plugin-svelte": "^3.2.4",
 		"satori": "^0.10.13",

apps/svelte.dev/src/routes/content.json/+server.ts

@@ -91,13 +91,13 @@ async function content() {
 }
 
 async function plaintext(markdown: string) {
-	const block = (text: unknown) => `${text}\n`;
+	const block = ({ text }: any) => `${text}\n`;
 
-	const inline = (text: string) => text;
+	const inline = ({ text }: any) => text;
 
 	return (
 		await markedTransform(markdown, {
-			code: (source) => source.split('// ---cut---\n').pop() || 'ERROR: ---cut--- not found',
+			code: ({ text }) => text.split('// ---cut---\n').pop() || 'ERROR: ---cut--- not found',
 			blockquote: block,
 			html: () => '\n',
 			heading: (text) => `${text}\n`,
@@ -108,16 +108,16 @@ async function plaintext(markdown: string) {
 			paragraph: (text) => `${text}\n\n`,
 			table: block,
 			tablerow: block,
-			tablecell: (text, opts) => {
+			tablecell: ({ text }) => {
 				return text + ' ';
 			},
 			strong: inline,
 			em: inline,
 			codespan: inline,
 			br: () => '',
 			del: inline,
-			link: (href, title, text) => text,
-			image: (href, title, text) => text,
+			link: inline,
+			image: inline,
 			text: inline
 		})
 	)

apps/svelte.dev/src/routes/tutorial/[slug]/markdown.server.js

@@ -115,6 +115,7 @@ const default_renderer = {
  */
 export async function transform(markdown, options) {
 	const marked = new Marked({
+		useNewRenderer: true,
 		renderer: {
 			...default_renderer,
 			...options

packages/repl/package.json

@@ -78,7 +78,7 @@
 		"acorn": "^8.11.3",
 		"esm-env": "^1.0.0",
 		"esrap": "^1.2.2",
-		"marked": "^11.2.0",
+		"marked": "^13.0.3",
 		"resolve.exports": "^2.0.2",
 		"svelte": "^5.0.0-next.243",
 		"zimmerframe": "^1.1.2"

packages/site-kit/package.json

@@ -34,7 +34,7 @@
 		"@types/node": "^20.12.11",
 		"flexsearch": "^0.7.43",
 		"magic-string": "^0.30.11",
-		"marked": "^12.0.2",
+		"marked": "^13.0.3",
 		"prettier": "^3.3.2",
 		"prettier-plugin-svelte": "^3.2.4",
 		"shiki-twoslash": "^3.1.2",

packages/site-kit/src/lib/markdown/renderer.ts

@@ -259,42 +259,40 @@ async function parse({
 	// from linking to themselves
 	let current = '';
 
-	/** @type {string} */
-	const content = await transform(body, {
-		text: smart_quotes,
-		heading(html, level, raw) {
-			const title = html
+	return await transform(body, {
+		text({ text }) {
+			return smart_quotes(text);
+		},
+		heading({ text, depth, raw }) {
+			const title = text
 				.replace(/<\/?code>/g, '')
 				.replace(/&quot;/g, '"')
 				.replace(/&lt;/g, '<')
 				.replace(/&gt;/g, '>');
-
 			current = title;
-
 			const normalized = normalizeSlugify(raw);
-
-			headings[level - 1] = normalized;
-			headings.length = level;
-
+			headings[depth - 1] = normalized;
+			headings.length = depth;
 			const slug = headings.filter(Boolean).join('-');
-
-			return `<h${level} id="${slug}">${html.replace(
+			return `<h${depth} id="${slug}">${text.replace(
 				/<\/?code>/g,
 				''
-			)}<a href="#${slug}" class="permalink"><span class="visually-hidden">permalink</span></a></h${level}>`;
+			)}<a href="#${slug}" class="permalink"><span class="visually-hidden">permalink</span></a></h${depth}>`;
 		},
-		code: (source, language) => code(source, language ?? 'js', current),
-		codespan,
-		blockquote: (content) => {
+		code({ text, lang }) {
+			return code(text, lang ?? 'js', current);
+		},
+		codespan({ text }) {
+			return codespan(text);
+		},
+		blockquote(token) {
+			let content = this.parser?.parse(token.tokens) ?? '';
 			if (content.includes('[!LEGACY]')) {
 				content = `<details class="legacy"><summary>Legacy mode</summary>${content.replace('[!LEGACY]', '')}</details>`;
 			}
-
 			return `<blockquote>${content}</blockquote>`;
 		}
 	});
-
-	return content;
 }
 
 /**

packages/site-kit/src/lib/markdown/utils.ts

@@ -105,6 +105,7 @@ const tokenizer: TokenizerObject = {
 
 export async function transform(markdown: string, renderer: Partial<Renderer> = {}) {
 	const marked = new Marked({
+		useNewRenderer: true,
 		renderer,
 		tokenizer
 	});