@astrojs/markdown-remark 5.1.0 → 5.2.0

package/dist/frontmatter-injection.d.ts

@@ -1,4 +1,4 @@
-import type { VFile, VFileData as Data } from 'vfile';
+import type { VFileData as Data, VFile } from 'vfile';
 import type { MarkdownAstroData } from './types.js';
 export declare class InvalidAstroDataError extends TypeError {
 }

package/dist/highlight.d.ts

@@ -8,7 +8,7 @@ type Highlighter = (code: string, language: string, options?: {
  * @param tree
  *   The hast tree in which to syntax highlight code blocks.
  * @param highlighter
- *   A fnction which receives the code and language, and returns the HTML of a syntax
+ *   A function which receives the code and language, and returns the HTML of a syntax
  *   highlighted `<pre>` element.
  */
 export declare function highlightCodeBlocks(tree: Root, highlighter: Highlighter): Promise<void>;

package/dist/rehype-collect-headings.js

@@ -10,14 +10,11 @@ function rehypeHeadingIds() {
     const isMDX = isMDXFile(file);
     const astroData = safelyGetAstroData(file.data);
     visit(tree, (node) => {
-      if (node.type !== "element")
-        return;
+      if (node.type !== "element") return;
       const { tagName } = node;
-      if (tagName[0] !== "h")
-        return;
+      if (tagName[0] !== "h") return;
       const [, level] = tagName.match(/h([0-6])/) ?? [];
-      if (!level)
-        return;
+      if (!level) return;
       const depth = Number.parseInt(level);
       let text = "";
       visit(node, (child, __, parent) => {
@@ -50,8 +47,7 @@ function rehypeHeadingIds() {
       node.properties = node.properties || {};
       if (typeof node.properties.id !== "string") {
         let slug = slugger.slug(text);
-        if (slug.endsWith("-"))
-          slug = slug.slice(0, -1);
+        if (slug.endsWith("-")) slug = slug.slice(0, -1);
         node.properties.id = slug;
       }
       headings.push({ depth, slug: node.properties.id, text });
@@ -63,8 +59,7 @@ function isMDXFile(file) {
   return Boolean(file.history[0]?.endsWith(".mdx"));
 }
 function getMdxFrontmatterVariablePath(node) {
-  if (!node.data?.estree || node.data.estree.body.length !== 1)
-    return new Error();
+  if (!node.data?.estree || node.data.estree.body.length !== 1) return new Error();
   const statement = node.data.estree.body[0];
   if (statement?.type !== "ExpressionStatement" || statement.expression.type !== "MemberExpression")
     return new Error();
@@ -76,15 +71,13 @@ function getMdxFrontmatterVariablePath(node) {
     );
     expression = expression.object;
   }
-  if (expression.type !== "Identifier" || expression.name !== "frontmatter")
-    return new Error();
+  if (expression.type !== "Identifier" || expression.name !== "frontmatter") return new Error();
   return expressionPath.reverse();
 }
 function getMdxFrontmatterVariableValue(astroData, path) {
   let value = astroData.frontmatter;
   for (const key of path) {
-    if (!value[key])
-      return void 0;
+    if (!value[key]) return void 0;
     value = value[key];
   }
   return value;

package/dist/rehype-images.js

@@ -3,10 +3,8 @@ function rehypeImages() {
   return () => function(tree, file) {
     const imageOccurrenceMap = /* @__PURE__ */ new Map();
     visit(tree, (node) => {
-      if (node.type !== "element")
-        return;
-      if (node.tagName !== "img")
-        return;
+      if (node.type !== "element") return;
+      if (node.tagName !== "img") return;
       if (node.properties?.src) {
         node.properties.src = decodeURI(node.properties.src);
         if (file.data.imagePaths?.has(node.properties.src)) {

package/dist/remark-collect-images.js

@@ -2,20 +2,18 @@ import { definitions } from "mdast-util-definitions";
 import { visit } from "unist-util-visit";
 function remarkCollectImages() {
   return function(tree, vfile) {
-    if (typeof vfile?.path !== "string")
-      return;
+    if (typeof vfile?.path !== "string") return;
     const definition = definitions(tree);
     const imagePaths = /* @__PURE__ */ new Set();
     visit(tree, ["image", "imageReference"], (node) => {
       if (node.type === "image") {
-        if (shouldOptimizeImage(node.url))
-          imagePaths.add(node.url);
+        if (shouldOptimizeImage(node.url)) imagePaths.add(decodeURI(node.url));
       }
       if (node.type === "imageReference") {
         const imageDefinition = definition(node.identifier);
         if (imageDefinition) {
           if (shouldOptimizeImage(imageDefinition.url))
-            imagePaths.add(imageDefinition.url);
+            imagePaths.add(decodeURI(imageDefinition.url));
         }
       }
     });

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

@@ -18,6 +18,7 @@ async function createShikiHighlighter({
   langs = [],
   theme = "github-dark",
   themes = {},
+  defaultColor,
   wrap = false,
   transformers = []
 } = {}) {
@@ -43,6 +44,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

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.0",
+  "version": "5.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,33 +26,31 @@
     "dist"
   ],
   "dependencies": {
-    "@astrojs/prism": "^3.1.0",
     "github-slugger": "^2.0.0",
-    "hast-util-from-html": "^2.0.0",
-    "hast-util-to-text": "^4.0.0",
-    "import-meta-resolve": "^4.0.0",
+    "hast-util-from-html": "^2.0.1",
+    "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",
     "remark-gfm": "^4.0.0",
     "remark-parse": "^11.0.0",
-    "remark-rehype": "^11.0.0",
-    "remark-smartypants": "^2.0.0",
-    "shiki": "^1.1.2",
-    "unified": "^11.0.4",
+    "remark-rehype": "^11.1.0",
+    "remark-smartypants": "^3.0.2",
+    "shiki": "^1.10.3",
+    "unified": "^11.0.5",
     "unist-util-remove-position": "^5.0.0",
     "unist-util-visit": "^5.0.0",
-    "unist-util-visit-parents": "^6.0.0",
-    "vfile": "^6.0.1"
+    "unist-util-visit-parents": "^6.0.1",
+    "vfile": "^6.0.2",
+    "@astrojs/prism": "3.1.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.3.10",
     "@types/estree": "^1.0.5",
-    "@types/hast": "^3.0.3",
-    "@types/mdast": "^4.0.3",
-    "@types/mocha": "^10.0.4",
+    "@types/hast": "^3.0.4",
+    "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.2",
-    "esbuild": "^0.19.6",
+    "esbuild": "^0.21.5",
     "mdast-util-mdx-expression": "^2.0.0",
     "astro-scripts": "0.0.14"
   },