Skip to content

Commit e8f214d

Browse files
committed
fix: use new highlighter in plugins
1 parent f099e22 commit e8f214d

File tree

6 files changed

+6
-24
lines changed

6 files changed

+6
-24
lines changed

packages/plugin-code/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"typescript-cp": "^0.1.8"
2424
},
2525
"peerDependencies": {
26-
"carta-md": "^4.0.0"
26+
"carta-md": "^4.9.0"
2727
},
2828
"files": [
2929
"dist"

packages/plugin-code/src/index.ts

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,6 @@ export type CodeExtensionOptions = Omit<RehypeShikiOptions, 'theme' | 'themes'>
66
theme?: Theme | DualTheme;
77
};
88

9-
// FIXME: find a better solution then copy-pasting these functions in next version.
10-
// However, when importing from carta-md, this causes a MODULE_NOT_FOUND error
11-
// for some reason.
12-
/**
13-
* Checks if a theme is a dual theme.
14-
* @param theme The theme to check.
15-
* @returns Whether the theme is a dual theme.
16-
*/
17-
export const isDualTheme = (theme: Theme | DualTheme): theme is DualTheme =>
18-
typeof theme == 'object' && 'light' in theme && 'dark' in theme;
19-
20-
/**
21-
* Checks if a theme is a single theme.
22-
* @param theme The theme to check.
23-
* @returns Whether the theme is a single theme.
24-
*/
25-
export const isSingleTheme = (theme: Theme | DualTheme): theme is Theme => !isDualTheme(theme);
26-
279
/**
2810
* Carta code highlighting plugin. Themes available on [GitHub](https://github.com/speed-highlight/core/tree/main/dist/themes).
2911
*/
@@ -44,7 +26,7 @@ export const code = (options?: CodeExtensionOptions): Plugin => {
4426
theme = highlighter.settings.themeHash; // Use the theme specified in the highlighter
4527
}
4628

47-
if (isSingleTheme(theme)) {
29+
if (highlighter.utils.isSingleTheme(theme)) {
4830
processor.use(rehypeShikiFromHighlighter, shikiHighlighter, { ...options, theme });
4931
} else {
5032
processor.use(rehypeShikiFromHighlighter, shikiHighlighter, {

packages/plugin-math/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"!dist/**/*.spec.*"
3131
],
3232
"peerDependencies": {
33-
"carta-md": "^4.0.0",
33+
"carta-md": "^4.9.0",
3434
"svelte": "^5.0.0"
3535
},
3636
"devDependencies": {

packages/plugin-math/src/lib/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export const math = (options?: MathExtensionOptions): Plugin => {
5151
onLoad: async ({ carta }) => {
5252
const highlighter = await carta.highlighter();
5353
if (!highlighter) return;
54-
await highlighter.loadLanguage('tex');
54+
await highlighter.shikiHighlighter().loadLanguage('tex');
5555
carta.input?.update();
5656
},
5757
transformers: [

packages/plugin-tikz/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"vite-raw-plugin": "^1.0.2"
2929
},
3030
"peerDependencies": {
31-
"carta-md": "^4.0.0",
31+
"carta-md": "^4.9.0",
3232
"unified": "^11.0.0"
3333
},
3434
"files": [

packages/plugin-tikz/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const tikz = (options?: TikzExtensionOptions): Plugin => {
3333
onLoad: async ({ carta }) => {
3434
const highlighter = await carta.highlighter();
3535
if (!highlighter) return;
36-
await highlighter.loadLanguage('tex');
36+
await highlighter.shikiHighlighter().loadLanguage('tex');
3737
carta.input?.update();
3838
},
3939
transformers: [

0 commit comments

Comments
 (0)