chore(deps): update dependency mdast-util-to-hast to v13

package.json

@@ -51,8 +51,8 @@
  "json5": "^2.2.3",
  "knitwork": "^1.0.0",
  "listhen": "^1.0.4",
- "mdast-util-to-hast": "^12.3.0",
- "mdurl": "^1.0.1",
+ "mdast-util-to-hast": "^13.0.0",
+ "micromark-util-sanitize-uri": "^2.0.0",
  "ohash": "^1.1.2",
  "pathe": "^1.1.1",
  "property-information": "^6.2.0",

src/module.ts

@@ -271,7 +271,10 @@ export default defineNuxtModule<ModuleOptions>({
  defaultLocale: undefined,
  highlight: false,
  markdown: {
- tags: Object.fromEntries(PROSE_TAGS.map(t => [t, `prose-${t}`])),
+ tags: {
+ ...Object.fromEntries(PROSE_TAGS.map(t => [t, `prose-${t}`])),
+ code: 'ProseCodeInline'
+ },
  anchorLinks: {
  depth: 4,
  exclude: [1]

src/runtime/components/Prose/ProsePre.vue

@@ -0,0 +1,38 @@
+<script lang="ts">
+import { defineComponent } from '#imports'
+
+export default defineComponent({
+ props: {
+ code: {
+ type: String,
+ default: ''
+ },
+ language: {
+ type: String,
+ default: null
+ },
+ filename: {
+ type: String,
+ default: null
+ },
+ highlights: {
+ type: Array as () => number[],
+ default: () => []
+ },
+ meta: {
+ type: String,
+ default: null
+ },
+ class: {
+ type: String,
+ default: ''
+ }
+ }
+})
+</script>
+
+<template>
+ <ProseCode>
+ <pre :class="$props.class"><slot /></pre>
+ </ProseCode>
+</template>

src/runtime/markdown-parser/handler/code.ts

@@ -1,31 +1,43 @@
-import type { H } from 'mdast-util-to-hast'
+import { type State } from 'mdast-util-to-hast'
+import { type Element, type Properties } from 'hast'
+import { type Code } from 'mdast'
 import { detab } from 'detab'
-import { u } from 'unist-builder'
-import type { MdastContent } from 'mdast-util-to-hast/lib'
 import { parseThematicBlock } from './utils'
 
-type Node = MdastContent & {
- lang: string
- meta: string
- value: string
-}
-
-export default (h: H, node: Node) => {
+export default (state: State, node: Code) => {
  const lang = (node.lang || '') + ' ' + (node.meta || '')
  const { language, highlights, filename, meta } = parseThematicBlock(lang)
- const code = node.value ? detab(node.value + '\n') : ''
+ const value = node.value ? detab(node.value + '\n') : ''
+
+ // Create `<code>`.
+ let result: Element = {
+ type: 'element',
+ tagName: 'code',
+ properties: { __ignoreMap: '' },
+ children: [{ type: 'text', value }]
+ }
+
+ if (node.meta) {
+ result.data = { meta: node.meta }
+ }
+
+ state.patch(node, result)
+ result = state.applyData(node, result)
+
+ const properties: Properties = {
+ language,
+ filename,
+ highlights,
+ meta,
+ code: value
+ }
+
+ if (node.lang) {
+ properties.className = ['language-' + node.lang]
+ }
 
- return h(
- node.position,
- 'code',
- {
- language,
- filename,
- highlights,
- meta,
- code,
- className: [`language-${language}`]
- },
- [h(node, 'pre', {}, [h(node, 'code', { __ignoreMap: '' }, [u('text', code)])])]
- )
+ // Create `<pre>`.
+ result = { type: 'element', tagName: 'pre', properties, children: [result] }
+ state.patch(node, result)
+ return result
 }

src/runtime/markdown-parser/handler/containerComponent.ts

@@ -1,21 +1,30 @@
-import type { H } from 'mdast-util-to-hast'
-import { all } from 'mdast-util-to-hast'
-import type { MdastContent } from 'mdast-util-to-hast/lib'
+import { type State } from 'mdast-util-to-hast'
+import { type Element, type Properties } from 'hast'
+import { type Nodes as MdastContent } from 'mdast'
 
 type Node = MdastContent & {
- tagName: string
- attributes?: any
- fmAttributes?: any
+ name: string
+ attributes?: Properties
+ fmAttributes?: Properties
 }
 
-export default function containerComponent (h: H, node: Node) {
- const hast: any = h(node, node.tagName, node.attributes, all(h, node))
+export default function containerComponent (state: State, node: Node) {
+ const result: Element = {
+ type: 'element',
+ tagName: node.name,
+ properties: {
+ ...node.attributes,
+ ...node.data?.hProperties
+ },
+ children: state.all(node)
+ }
+ state.patch(node, result)
 
- // Inline attributes that passed in MDC sysntax `:component{...attributes}`
- hast.attributes = node.attributes
+ // @ts-ignore Inline attributes that passed in MDC sysntax `:component{...attributes}`
+ result.attributes = node.attributes
 
- // Attributes define using FrontMatter syntax and YAML format
- hast.fmAttributes = node.fmAttributes
+ // @ts-ignore Attributes define using FrontMatter syntax and YAML format
+ result.fmAttributes = node.fmAttributes
 
- return hast
+ return result
 }

src/runtime/markdown-parser/handler/emphasis.ts

@@ -1,11 +1,14 @@
-import type { H } from 'mdast-util-to-hast'
-import { all } from 'mdast-util-to-hast'
-import type { MdastContent } from 'mdast-util-to-hast/lib'
+import { type State } from 'mdast-util-to-hast'
+import { type Element, type Properties } from 'hast'
+import { type Emphasis } from 'mdast'
 
-type Node = MdastContent & {
- attributes?: any
-}
-
-export default function emphasis (h: H, node: Node) {
- return h(node, 'em', node.attributes, all(h, node))
+export default function emphasis (state: State, node: Emphasis & { attributes?: Properties }) {
+ const result: Element = {
+ type: 'element',
+ tagName: 'em',
+ properties: node.attributes || {},
+ children: state.all(node)
+ }
+ state.patch(node, result)
+ return state.applyData(node, result)
 }

src/runtime/markdown-parser/handler/heading.ts

@@ -1,7 +1,14 @@
-import type { H } from 'mdast-util-to-hast'
-import { all } from 'mdast-util-to-hast'
-import type { MdastContent } from 'mdast-util-to-hast/lib'
+import { type State } from 'mdast-util-to-hast'
+import { type Element, type Properties } from 'hast'
+import { type Heading } from 'mdast'
 
-export default function heading (h: H, node: MdastContent) {
- return h(node, 'h' + (node as any).depth, all(h, node))
+export default function heading (state: State, node: Heading & { attributes?: Properties }) {
+ const result: Element = {
+ type: 'element',
+ tagName: 'h' + node.depth,
+ properties: node.attributes || {},
+ children: state.all(node)
+ }
+ state.patch(node, result)
+ return state.applyData(node, result)
 }