diff options
Diffstat (limited to 'packages/markdown/remark/src/shiki.ts')
| -rw-r--r-- | packages/markdown/remark/src/shiki.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/markdown/remark/src/shiki.ts b/packages/markdown/remark/src/shiki.ts index 04b1bbcf6..492d5a821 100644 --- a/packages/markdown/remark/src/shiki.ts +++ b/packages/markdown/remark/src/shiki.ts @@ -1,5 +1,6 @@ import { bundledLanguages, createCssVariablesTheme, getHighlighter } from 'shikiji'; import { visit } from 'unist-util-visit'; +import type { Properties } from 'hast'; import type { ShikiConfig } from './types.js'; export interface ShikiHighlighter { @@ -61,9 +62,8 @@ export async function createShikiHighlighter({ node.tagName = 'code'; } - // Cast to string as shikiji will always pass them as strings instead of any other types - const classValue = (node.properties.class as string) ?? ''; - const styleValue = (node.properties.style as string) ?? ''; + const classValue = normalizePropAsString(node.properties.class) ?? ''; + const styleValue = normalizePropAsString(node.properties.style) ?? ''; // Replace "shiki" class naming with "astro-code" node.properties.class = classValue.replace(/shiki/g, 'astro-code'); @@ -129,6 +129,10 @@ export async function createShikiHighlighter({ }; } +function normalizePropAsString(value: Properties[string]): string | null { + return Array.isArray(value) ? value.join(' ') : (value as string | null); +} + /** * shiki -> shikiji compat as we need to manually replace it * @internal Exported for error overlay use only |