@astrojs/markdown-remark 5.1.1 → 6.0.0-alpha.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

@@ -117,7 +117,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, }?: ShikiConfig): Promise<ShikiHighlighter>;

package/dist/shiki.js

@@ -3,21 +3,13 @@ import {
   getHighlighter,
   isSpecialLang
 } from "shiki";
-import { visit } from "unist-util-visit";
-const ASTRO_COLOR_REPLACEMENTS = {
-  "--astro-code-foreground": "--astro-code-color-text",
-  "--astro-code-background": "--astro-code-color-background"
-};
-const COLOR_REPLACEMENT_REGEX = new RegExp(
-  `${Object.keys(ASTRO_COLOR_REPLACEMENTS).join("|")}`,
-  "g"
-);
 let _cssVariablesTheme;
 const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = createCssVariablesTheme({ variablePrefix: "--astro-code-" }));
 async function createShikiHighlighter({
   langs = [],
   theme = "github-dark",
   themes = {},
+  defaultColor,
   wrap = false,
   transformers = []
 } = {}) {
@@ -43,6 +35,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
@@ -92,19 +85,6 @@ async function createShikiHighlighter({
               if (inline) {
                 return node.children[0];
               }
-            },
-            root(node) {
-              if (Object.values(themes).length) {
-                return;
-              }
-              const themeName = typeof theme === "string" ? theme : theme.name;
-              if (themeName === "css-variables") {
-                visit(node, "element", (child) => {
-                  if (child.properties?.style) {
-                    child.properties.style = replaceCssVariables(child.properties.style);
-                  }
-                });
-              }
             }
           },
           ...transformers
@@ -116,9 +96,6 @@ async function createShikiHighlighter({
 function normalizePropAsString(value) {
   return Array.isArray(value) ? value.join(" ") : value;
 }
-function replaceCssVariables(str) {
-  return str.replace(COLOR_REPLACEMENT_REGEX, (match) => ASTRO_COLOR_REPLACEMENTS[match] || match);
-}
 export {
   createShikiHighlighter
 };

package/dist/types.d.ts

@@ -3,7 +3,7 @@ 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 * 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>;
@@ -18,6 +18,7 @@ export interface ShikiConfig {
     langs?: LanguageRegistration[];
     theme?: ThemePresets | ThemeRegistration | ThemeRegistrationRaw;
     themes?: Record<string, ThemePresets | ThemeRegistration | ThemeRegistrationRaw>;
+    defaultColor?: 'light' | 'dark' | string | false;
     wrap?: boolean | null;
     transformers?: ShikiTransformer[];
 }
@@ -51,7 +52,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": "6.0.0-alpha.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -36,20 +36,20 @@
     "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-smartypants": "^3.0.2",
+    "shiki": "^1.14.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.1",
+    "vfile": "^6.0.2",
     "@astrojs/prism": "3.1.0"
   },
   "devDependencies": {
     "@types/estree": "^1.0.5",
     "@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",
     "astro-scripts": "0.0.14"