@astrojs/markdown-remark 5.1.1 → 5.3.0

package/dist/highlight.js

@@ -16,13 +16,13 @@ async function highlightCodeBlocks(tree, highlighter) {
     let languageMatch;
     let { className } = node.properties;
     if (typeof className === "string") {
-      languageMatch = className.match(languagePattern);
+      languageMatch = languagePattern.exec(className);
     } else if (Array.isArray(className)) {
       for (const cls of className) {
         if (typeof cls !== "string") {
           continue;
         }
-        languageMatch = cls.match(languagePattern);
+        languageMatch = languagePattern.exec(cls);
         if (languageMatch) {
           break;
         }

package/dist/index.js

@@ -31,7 +31,8 @@ const markdownConfigDefaults = {
     theme: "github-dark",
     themes: {},
     wrap: false,
-    transformers: []
+    transformers: [],
+    langAlias: {}
   },
   remarkPlugins: [],
   rehypePlugins: [],
@@ -117,7 +118,7 @@ function prefixError(err, prefix) {
       err.message = `${prefix}:
 ${err.message}`;
       return err;
-    } catch (error) {
+    } catch {
     }
   }
   const wrappedError = new Error(`${prefix}${err ? `: ${err}` : ""}`);

package/dist/rehype-collect-headings.js

@@ -13,7 +13,7 @@ function rehypeHeadingIds() {
       if (node.type !== "element") return;
       const { tagName } = node;
       if (tagName[0] !== "h") return;
-      const [, level] = tagName.match(/h([0-6])/) ?? [];
+      const [, level] = /h([0-6])/.exec(tagName) ?? [];
       if (!level) return;
       const depth = Number.parseInt(level);
       let text = "";
@@ -22,7 +22,7 @@ function rehypeHeadingIds() {
           return;
         }
         if (child.type === "raw") {
-          if (child.value.match(/^\n?<.*>\n?$/)) {
+          if (/^\n?<.*>\n?$/.test(child.value)) {
             return;
           }
         }

package/dist/shiki.d.ts

@@ -9,4 +9,4 @@ export interface ShikiHighlighter {
         meta?: string;
     }): Promise<string>;
 }
-export declare function createShikiHighlighter({ langs, theme, themes, wrap, transformers, }?: ShikiConfig): Promise<ShikiHighlighter>;
+export declare function createShikiHighlighter({ langs, theme, themes, defaultColor, wrap, transformers, langAlias, }?: ShikiConfig): Promise<ShikiHighlighter>;

package/dist/shiki.js

@@ -18,23 +18,28 @@ async function createShikiHighlighter({
   langs = [],
   theme = "github-dark",
   themes = {},
+  defaultColor,
   wrap = false,
-  transformers = []
+  transformers = [],
+  langAlias = {}
 } = {}) {
   theme = theme === "css-variables" ? cssVariablesTheme() : theme;
   const highlighter = await getHighlighter({
     langs: ["plaintext", ...langs],
+    langAlias,
     themes: Object.values(themes).length ? Object.values(themes) : [theme]
   });
   return {
     async highlight(code, lang = "plaintext", options) {
+      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) {
+          const langStr = lang === resolvedLang ? `"${lang}"` : `"${lang}" (aliased to "${resolvedLang}")`;
           console.warn(
-            `[Shiki] The language "${lang}" doesn't exist, falling back to "plaintext".`
+            `[Shiki] The language ${langStr} doesn't exist, falling back to "plaintext".`
           );
           lang = "plaintext";
         }
@@ -43,6 +48,7 @@ async function createShikiHighlighter({
       const inline = options?.inline ?? false;
       return highlighter.codeToHtml(code, {
         ...themeOptions,
+        defaultColor,
         lang,
         // NOTE: while we can spread `options.attributes` here so that Shiki can auto-serialize this as rendered
         // attributes on the top-level tag, it's not clear whether it is fine to pass all attributes as meta, as
@@ -71,7 +77,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

@@ -1,9 +1,9 @@
 import type * as hast from 'hast';
 import type * as mdast from 'mdast';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
-import type { BuiltinTheme, LanguageRegistration, ShikiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
+import type { BuiltinTheme, HighlighterCoreOptions, LanguageRegistration, ShikiTransformer, ThemeRegistration, ThemeRegistrationRaw } from 'shiki';
 import type * as unified from 'unified';
-import type { VFile } from 'vfile';
+import type { DataMap, VFile } from 'vfile';
 export type { Node } from 'unist';
 export type MarkdownAstroData = {
     frontmatter: Record<string, any>;
@@ -16,8 +16,10 @@ export type RemarkRehype = RemarkRehypeOptions;
 export type ThemePresets = BuiltinTheme | 'css-variables';
 export interface ShikiConfig {
     langs?: LanguageRegistration[];
+    langAlias?: HighlighterCoreOptions['langAlias'];
     theme?: ThemePresets | ThemeRegistration | ThemeRegistrationRaw;
     themes?: Record<string, ThemePresets | ThemeRegistration | ThemeRegistrationRaw>;
+    defaultColor?: 'light' | 'dark' | string | false;
     wrap?: boolean | null;
     transformers?: ShikiTransformer[];
 }
@@ -51,7 +53,7 @@ export interface MarkdownHeading {
     text: string;
 }
 export interface MarkdownVFile extends VFile {
-    data: {
+    data: Record<string, unknown> & Partial<DataMap> & {
         __astroHeadings?: MarkdownHeading[];
         imagePaths?: Set<string>;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "5.1.1",
+  "version": "5.3.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -27,31 +27,31 @@
   ],
   "dependencies": {
     "github-slugger": "^2.0.0",
-    "hast-util-from-html": "^2.0.1",
+    "hast-util-from-html": "^2.0.3",
     "hast-util-to-text": "^4.0.2",
     "import-meta-resolve": "^4.1.0",
     "mdast-util-definitions": "^6.0.0",
     "rehype-raw": "^7.0.0",
-    "rehype-stringify": "^10.0.0",
+    "rehype-stringify": "^10.0.1",
     "remark-gfm": "^4.0.0",
     "remark-parse": "^11.0.0",
-    "remark-rehype": "^11.1.0",
-    "remark-smartypants": "^3.0.1",
-    "shiki": "^1.9.0",
+    "remark-rehype": "^11.1.1",
+    "remark-smartypants": "^3.0.2",
+    "shiki": "^1.22.0",
     "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.1",
+    "vfile": "^6.0.3",
     "@astrojs/prism": "3.1.0"
   },
   "devDependencies": {
-    "@types/estree": "^1.0.5",
+    "@types/estree": "^1.0.6",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.4",
-    "@types/unist": "^3.0.2",
+    "@types/unist": "^3.0.3",
     "esbuild": "^0.21.5",
-    "mdast-util-mdx-expression": "^2.0.0",
+    "mdast-util-mdx-expression": "^2.0.1",
     "astro-scripts": "0.0.14"
   },
   "publishConfig": {
@@ -61,7 +61,6 @@
     "prepublish": "pnpm build",
     "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "postbuild": "astro-scripts copy \"src/**/*.js\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
     "test": "astro-scripts test \"test/**/*.test.js\""
   }