deps(marked): Update to v9 (from v4). (#118)

* Update.

* Remove highlight.

* Fix types.

Author: milesj

package.json

@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@moonrepo/dev": "^2.0.1",
-    "@types/marked": "^4.3.2",
+    "@types/marked": "^6.0.0",
     "@types/react": "^18.2.33",
     "eslint": "^8.52.0",
     "eslint-config-moon": "^2.0.11",

packages/plugin/package.json

@@ -49,7 +49,8 @@
     "@docusaurus/types": "^3.0.0",
     "@docusaurus/utils": "^3.0.0",
     "@vscode/codicons": "^0.0.35",
-    "marked": "^4.3.0",
+    "marked": "^9.1.4",
+    "marked-smartypants": "^1.1.3",
     "typedoc": "0.25.0"
   },
   "devDependencies": {

packages/plugin/src/components/Markdown.tsx

@@ -1,9 +1,11 @@
 /* eslint-disable react/no-array-index-key */
 
 import { Fragment, useState } from 'react';
-import { marked } from 'marked';
+import { marked, type Tokens } from 'marked';
+import { markedSmartypants } from 'marked-smartypants';
 import { useDocsData } from '@docusaurus/plugin-content-docs/client';
 import { useDocsVersion } from '@docusaurus/theme-common/internal';
+import CodeBlock from '@theme/CodeBlock';
 import MDX from '@theme/MDXComponents';
 import { useReflectionMap } from '../hooks/useReflectionMap';
 import { replaceLinkTokens } from '../utils/markdown';
@@ -14,22 +16,41 @@ interface Admonition {
 	title?: string;
 	keyword?: string;
 	text: string;
-	tokens: marked.Token[];
+	tokens: Token[];
 }
 
-type TokensList = (Admonition | marked.Token)[];
-
-marked.setOptions({
-	gfm: true,
-	headerIds: false,
-	mangle: false,
-	smartLists: true,
-	smartypants: true,
-});
+type Token =
+	| Admonition
+	| Tokens.Blockquote
+	| Tokens.Br
+	| Tokens.Code
+	| Tokens.Codespan
+	| Tokens.Def
+	| Tokens.Del
+	| Tokens.Em
+	| Tokens.Escape
+	| Tokens.Heading
+	| Tokens.Hr
+	| Tokens.HTML
+	| Tokens.Image
+	| Tokens.Link
+	| Tokens.List
+	| Tokens.ListItem
+	| Tokens.Paragraph
+	| Tokens.Space
+	| Tokens.Strong
+	| Tokens.Table
+	| Tokens.Tag
+	| Tokens.Text;
+type TokensList = Token[];
 
 const ADMONITION_START = /^:{3}([a-z]+)? *(.*)\n/;
 const ADMONITION_END = '\n:::';
 
+marked.setOptions({
+	gfm: true,
+});
+marked.use(markedSmartypants());
 marked.use({
 	extensions: [
 		{
@@ -99,9 +120,12 @@ function convertAstToElements(ast: TokensList): React.ReactNode[] | undefined {
 		switch (token.type) {
 			case 'code':
 				elements.push(
-					<MDX.pre key={counter} className={token.lang && `language-${token.lang}`}>
+					/* <MDX.pre key={counter} className={token.lang && `language-${token.lang}`}>
+						{token.text}
+					</MDX.pre>, */
+					<CodeBlock key={counter} language={token.lang}>
 						{token.text}
-					</MDX.pre>,
+					</CodeBlock>,
 				);
 				break;
 
@@ -118,12 +142,12 @@ function convertAstToElements(ast: TokensList): React.ReactNode[] | undefined {
 			}
 
 			case 'image':
-				elements.push(<MDX.img key={counter} alt={token.title} src={token.href} />);
+				elements.push(<MDX.img key={counter} alt={token.title ?? ''} src={token.href} />);
 				break;
 
 			case 'link':
 				elements.push(
-					<MDX.a key={counter} href={token.href} title={token.title}>
+					<MDX.a key={counter} href={token.href} title={token.title ?? ''}>
 						{convertAstToElements(children) ?? token.text}
 					</MDX.a>,
 				);
@@ -231,8 +255,11 @@ export function Markdown({ content }: MarkdownProps) {
 	const reflections = useReflectionMap();
 	const version = useDocsVersion();
 	const docsData = useDocsData(version.pluginId);
-	const [ast] = useState<TokensList>(() =>
-		marked.lexer(replaceLinkTokens(content, reflections, version, docsData.path)),
+	const [ast] = useState<TokensList>(
+		() =>
+			marked.lexer(
+				replaceLinkTokens(content, reflections, version, docsData.path),
+			) as unknown as TokensList,
 	);
 
 	if (!content) {

website/docusaurus.config.ts

@@ -232,6 +232,9 @@ const config: Config = {
 		prism: {
 			theme: themes.github,
 			darkTheme: themes.dracula,
+			prism: {
+				additionalLanguages: ['bash', 'diff', 'json', 'typescript'],
+			},
 		},
 	},
 	presets: [

yarn.lock

@@ -4047,10 +4047,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/marked@npm:^4.3.2":
-  version: 4.3.2
-  resolution: "@types/marked@npm:4.3.2"
-  checksum: c1b5aa2cee0b8929164f4a8d206d7f89256ebde0d5b9998e9cdf6da2a5fa71162f66ef30e80b98213ee2c3372514b39b756e8494980174a4907a4aa4690b4d1d
+"@types/marked@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@types/marked@npm:6.0.0"
+  dependencies:
+    marked: "npm:*"
+  checksum: ad4cd5a405604b27efb4d3979b05869f3069529d1f5b2a38039de7c96e57270f03e7580efe327ca1c136ec22a355d0a7d8578346bd2af8397fdd6bb76ca1b084
   languageName: node
   linkType: hard
 
@@ -7292,7 +7294,7 @@ __metadata:
   resolution: "docusaurus-plugin-typedoc-api-root@workspace:."
   dependencies:
     "@moonrepo/dev": "npm:^2.0.1"
-    "@types/marked": "npm:^4.3.2"
+    "@types/marked": "npm:^6.0.0"
     "@types/react": "npm:^18.2.33"
     eslint: "npm:^8.52.0"
     eslint-config-moon: "npm:^2.0.11"
@@ -7316,7 +7318,8 @@ __metadata:
     "@docusaurus/types": "npm:^3.0.0"
     "@docusaurus/utils": "npm:^3.0.0"
     "@vscode/codicons": "npm:^0.0.35"
-    marked: "npm:^4.3.0"
+    marked: "npm:^9.1.4"
+    marked-smartypants: "npm:^1.1.3"
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
     typedoc: "npm:0.25.0"
@@ -11784,6 +11787,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"marked-smartypants@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "marked-smartypants@npm:1.1.3"
+  dependencies:
+    smartypants: "npm:^0.2.2"
+  peerDependencies:
+    marked: ">=4 <10"
+  checksum: 1d9fa32f9adc4e91e31e34db96b02a9863ced5947766aec90816c8cd4cf396fcd1f76f1d80ef726988c313bbcf041b7ffb7770fbf4ced73b0069c151413356e0
+  languageName: node
+  linkType: hard
+
+"marked@npm:*, marked@npm:^9.1.4":
+  version: 9.1.4
+  resolution: "marked@npm:9.1.4"
+  bin:
+    marked: bin/marked.js
+  checksum: 365d60f32818a01a7d7ff3baf3a860c28d65738e1dd3bb7645a339f6fda399cbfe13f06f0d156559f12b928998296a1b634834b729284d19b435bf0f2b26666b
+  languageName: node
+  linkType: hard
+
 "marked@npm:^4.3.0":
   version: 4.3.0
   resolution: "marked@npm:4.3.0"
@@ -16440,6 +16463,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"smartypants@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "smartypants@npm:0.2.2"
+  bin:
+    smartypants: bin/smartypants.js
+    smartypantsu: bin/smartypantsu.js
+  checksum: e73ff0493fab65f8302d471cff01c1287d3d83ccbdd3d972c2bc383e2e65a51f6862429c0ce3efbafb6bad7cf4bb5648711567cb11465251aa273faee22626c0
+  languageName: node
+  linkType: hard
+
 "sockjs@npm:^0.3.24":
   version: 0.3.24
   resolution: "sockjs@npm:0.3.24"