@astrojs/markdown-remark 6.0.0-beta.2 → 6.0.0

package/dist/index.js

@@ -32,7 +32,8 @@ const markdownConfigDefaults = {
     theme: "github-dark",
     themes: {},
     wrap: false,
-    transformers: []
+    transformers: [],
+    langAlias: {}
   },
   remarkPlugins: [],
   rehypePlugins: [],

package/dist/rehype-shiki.js

@@ -6,7 +6,8 @@ const rehypeShiki = (config) => {
     highlighterAsync ??= createShikiHighlighter({
       langs: config?.langs,
       theme: config?.theme,
-      themes: config?.themes
+      themes: config?.themes,
+      langAlias: config?.langAlias
     });
     const highlighter = await highlighterAsync;
     await highlightCodeBlocks(tree, (code, language, options) => {

package/dist/shiki.d.ts

@@ -1,5 +1,5 @@
 import type { Root } from 'hast';
-import { type LanguageRegistration, type ShikiTransformer, type ThemeRegistration, type ThemeRegistrationRaw } from 'shiki';
+import { type HighlighterCoreOptions, type LanguageRegistration, type ShikiTransformer, type ThemeRegistration, type ThemeRegistrationRaw } from 'shiki';
 import type { ThemePresets } from './types.js';
 export interface ShikiHighlighter {
     codeToHast(code: string, lang?: string, options?: ShikiHighlighterHighlightOptions): Promise<Root>;
@@ -9,6 +9,7 @@ export interface CreateShikiHighlighterOptions {
     langs?: LanguageRegistration[];
     theme?: ThemePresets | ThemeRegistration | ThemeRegistrationRaw;
     themes?: Record<string, ThemePresets | ThemeRegistration | ThemeRegistrationRaw>;
+    langAlias?: HighlighterCoreOptions['langAlias'];
 }
 export interface ShikiHighlighterHighlightOptions {
     /**
@@ -39,4 +40,4 @@ export interface ShikiHighlighterHighlightOptions {
      */
     meta?: string;
 }
-export declare function createShikiHighlighter({ langs, theme, themes, }?: CreateShikiHighlighterOptions): Promise<ShikiHighlighter>;
+export declare function createShikiHighlighter({ langs, theme, themes, langAlias, }?: CreateShikiHighlighterOptions): Promise<ShikiHighlighter>;

package/dist/shiki.js

@@ -4,24 +4,30 @@ import {
   isSpecialLang
 } from "shiki";
 let _cssVariablesTheme;
-const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = createCssVariablesTheme({ variablePrefix: "--astro-code-" }));
+const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = createCssVariablesTheme({
+  variablePrefix: "--astro-code-"
+}));
 async function createShikiHighlighter({
   langs = [],
   theme = "github-dark",
-  themes = {}
+  themes = {},
+  langAlias = {}
 } = {}) {
   theme = theme === "css-variables" ? cssVariablesTheme() : theme;
   const highlighter = await createHighlighter({
     langs: ["plaintext", ...langs],
+    langAlias,
     themes: Object.values(themes).length ? Object.values(themes) : [theme]
   });
   async function highlight(code, lang = "plaintext", options, to) {
+    const resolvedLang = langAlias[lang] ?? lang;
     const loadedLanguages = highlighter.getLoadedLanguages();
-    if (!isSpecialLang(lang) && !loadedLanguages.includes(lang)) {
+    if (!isSpecialLang(lang) && !loadedLanguages.includes(resolvedLang)) {
       try {
-        await highlighter.loadLanguage(lang);
+        await highlighter.loadLanguage(resolvedLang);
       } catch (_err) {
-        console.warn(`[Shiki] The language "${lang}" doesn't exist, falling back to "plaintext".`);
+        const langStr = lang === resolvedLang ? `"${lang}"` : `"${lang}" (aliased to "${resolvedLang}")`;
+        console.warn(`[Shiki] The language ${langStr} doesn't exist, falling back to "plaintext".`);
         lang = "plaintext";
       }
     }
@@ -58,7 +64,7 @@ async function createShikiHighlighter({
             }
           },
           line(node) {
-            if (lang === "diff") {
+            if (resolvedLang === "diff") {
               const innerSpanNode = node.children[0];
               const innerSpanTextNode = innerSpanNode?.type === "element" && innerSpanNode.children?.[0];
               if (innerSpanTextNode && innerSpanTextNode.type === "text") {

package/dist/types.d.ts

@@ -20,7 +20,7 @@ export type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugi
 export type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
 export type RemarkRehype = RemarkRehypeOptions;
 export type ThemePresets = BuiltinTheme | 'css-variables';
-export interface ShikiConfig extends Pick<CreateShikiHighlighterOptions, 'langs' | 'theme' | 'themes'>, Pick<ShikiHighlighterHighlightOptions, 'defaultColor' | 'wrap' | 'transformers'> {
+export interface ShikiConfig extends Pick<CreateShikiHighlighterOptions, 'langs' | 'theme' | 'themes' | 'langAlias'>, Pick<ShikiHighlighterHighlightOptions, 'defaultColor' | 'wrap' | 'transformers'> {
 }
 export interface AstroMarkdownOptions {
     syntaxHighlight?: 'shiki' | 'prism' | false;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/markdown/remark"
   },
   "bugs": "https://github.com/withastro/astro/issues",
@@ -37,13 +37,13 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.1",
     "remark-smartypants": "^3.0.2",
-    "shiki": "^1.21.0",
+    "shiki": "^1.23.1",
     "unified": "^11.0.5",
     "unist-util-remove-position": "^5.0.0",
     "unist-util-visit": "^5.0.0",
     "unist-util-visit-parents": "^6.0.1",
     "vfile": "^6.0.3",
-    "@astrojs/prism": "3.1.0"
+    "@astrojs/prism": "3.2.0"
   },
   "devDependencies": {
     "@types/estree": "^1.0.6",