Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-02-17 22:44:24 -05:00
Code Issues Activity

normalize class property (#9723)

Browse source 
* normalize class property

* Add changeset

* properly type return value

* normalize styles, rename function

* properly describe change

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>

---------

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
This commit is contained in:
Degreat 2024-01-22 20:00:00 +00:00 • committed by GitHub
parent ad01642517
commit 2f81cffa9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/nervous-dodos-compete.md Normal file
View file

@ -0,0 +1,5 @@
---
"@astrojs/markdown-remark": patch
---
Fixes a case where transformers wouldn't work on the `class` property

10
packages/markdown/remark/src/shiki.ts
View file

@ -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