@astrojs/markdown-remark 7.0.0-alpha.0 → 7.0.0-beta.10

package/dist/rehype-images.js

@@ -1,4 +1,10 @@
 import { visit } from "unist-util-visit";
+const HAST_PRESERVED_PROPERTIES = [
+  // HAST: className -> HTML: class
+  "className",
+  // HAST: htmlFor -> HTML: for
+  "htmlFor"
+];
 function rehypeImages() {
   return function(tree, file) {
     if (!file.data.astro?.localImagePaths?.length && !file.data.astro?.remoteImagePaths?.length) {
@@ -9,11 +15,11 @@ function rehypeImages() {
       if (node.tagName !== "img") return;
       if (typeof node.properties?.src !== "string") return;
       const src = decodeURI(node.properties.src);
-      let newProperties;
+      let imageProperties;
       if (file.data.astro?.localImagePaths?.includes(src)) {
-        newProperties = { ...node.properties, src };
+        imageProperties = { ...node.properties, src };
       } else if (file.data.astro?.remoteImagePaths?.includes(src)) {
-        newProperties = {
+        imageProperties = {
           // By default, markdown images won't have width and height set. However, just in case another user plugin does set these, we should respect them.
           inferSize: "width" in node.properties && "height" in node.properties ? void 0 : true,
           ...node.properties,
@@ -22,9 +28,19 @@ function rehypeImages() {
       } else {
         return;
       }
+      const hastProperties = {};
+      for (const key of HAST_PRESERVED_PROPERTIES) {
+        if (key in imageProperties) {
+          hastProperties[key] = imageProperties[key];
+          delete imageProperties[key];
+        }
+      }
       const index = imageOccurrenceMap.get(node.properties.src) || 0;
       imageOccurrenceMap.set(node.properties.src, index + 1);
-      node.properties = { __ASTRO_IMAGE_: JSON.stringify({ ...newProperties, index }) };
+      node.properties = {
+        ...hastProperties,
+        __ASTRO_IMAGE_: JSON.stringify({ ...imageProperties, index })
+      };
     });
   };
 }

package/dist/rehype-prism.js

@@ -7,7 +7,7 @@ const rehypePrism = (excludeLangs) => {
       (code, language) => {
         let { html, classLanguage } = runHighlighterWithAstro(language, code);
         return Promise.resolve(
-          `<pre class="${classLanguage}" data-language="${language}"><code is:raw class="${classLanguage}">${html}</code></pre>`
+          `<pre class="${classLanguage}" data-language="${language}"><code class="${classLanguage}">${html}</code></pre>`
         );
       },
       excludeLangs

package/dist/shiki-engine-default.d.ts

@@ -0,0 +1,2 @@
+import type { RegexEngine } from 'shiki';
+export declare function loadShikiEngine(): Promise<RegexEngine>;

package/dist/shiki-engine-default.js

@@ -0,0 +1,7 @@
+import { createOnigurumaEngine } from "shiki/engine/oniguruma";
+function loadShikiEngine() {
+  return createOnigurumaEngine(import("shiki/wasm"));
+}
+export {
+  loadShikiEngine
+};

package/dist/shiki-engine-workerd.d.ts

@@ -0,0 +1,2 @@
+import type { RegexEngine } from 'shiki';
+export declare function loadShikiEngine(): Promise<RegexEngine>;

package/dist/shiki-engine-workerd.js

@@ -0,0 +1,7 @@
+import { createOnigurumaEngine } from "shiki/engine/oniguruma";
+function loadShikiEngine() {
+  return createOnigurumaEngine(import("shiki/onig.wasm"));
+}
+export {
+  loadShikiEngine
+};

package/dist/shiki.d.ts

@@ -40,4 +40,5 @@ export interface ShikiHighlighterHighlightOptions {
      */
     meta?: string;
 }
-export declare function createShikiHighlighter({ langs, theme, themes, langAlias, }?: CreateShikiHighlighterOptions): Promise<ShikiHighlighter>;
+export declare function createShikiHighlighter(options?: CreateShikiHighlighterOptions): Promise<ShikiHighlighter>;
+export type { ThemePresets };

package/dist/shiki.js

@@ -3,21 +3,68 @@ import {
   createHighlighter,
   isSpecialLang
 } from "shiki";
+import { loadShikiEngine } from "#shiki-engine";
 let _cssVariablesTheme;
 const cssVariablesTheme = () => _cssVariablesTheme ?? (_cssVariablesTheme = createCssVariablesTheme({
   variablePrefix: "--astro-code-"
 }));
-async function createShikiHighlighter({
+const cachedHighlighters = /* @__PURE__ */ new Map();
+function clearShikiHighlighterCache() {
+  cachedHighlighters.clear();
+}
+function createShikiHighlighter(options) {
+  const key = getCacheKey(options);
+  let highlighterPromise = cachedHighlighters.get(key);
+  if (!highlighterPromise) {
+    highlighterPromise = createShikiHighlighterInternal(options);
+    cachedHighlighters.set(key, highlighterPromise);
+  }
+  return ensureLanguagesLoaded(highlighterPromise, options?.langs);
+}
+function getCacheKey(options) {
+  const keyCache = [];
+  const { theme, themes, langAlias } = options ?? {};
+  if (theme) {
+    keyCache.push(theme);
+  }
+  if (themes) {
+    keyCache.push(Object.entries(themes).sort());
+  }
+  if (langAlias) {
+    keyCache.push(Object.entries(langAlias).sort());
+  }
+  return keyCache.length > 0 ? JSON.stringify(keyCache) : "";
+}
+async function ensureLanguagesLoaded(promise, langs) {
+  const highlighter = await promise;
+  if (!langs) {
+    return highlighter;
+  }
+  const loadedLanguages = highlighter.getLoadedLanguages();
+  for (const lang of langs) {
+    if (typeof lang === "string" && (isSpecialLang(lang) || loadedLanguages.includes(lang))) {
+      continue;
+    }
+    await highlighter.loadLanguage(lang);
+  }
+  return highlighter;
+}
+let shikiEngine = void 0;
+async function createShikiHighlighterInternal({
   langs = [],
   theme = "github-dark",
   themes = {},
   langAlias = {}
 } = {}) {
   theme = theme === "css-variables" ? cssVariablesTheme() : theme;
+  if (shikiEngine === void 0) {
+    shikiEngine = await loadShikiEngine();
+  }
   const highlighter = await createHighlighter({
     langs: ["plaintext", ...langs],
     langAlias,
-    themes: Object.values(themes).length ? Object.values(themes) : [theme]
+    themes: Object.values(themes).length ? Object.values(themes) : [theme],
+    engine: shikiEngine
   });
   async function highlight(code, lang = "plaintext", options, to) {
     const resolvedLang = langAlias[lang] ?? lang;
@@ -98,6 +145,12 @@ async function createShikiHighlighter({
     },
     codeToHtml(code, lang, options = {}) {
       return highlight(code, lang, options, "html");
+    },
+    loadLanguage(...newLangs) {
+      return highlighter.loadLanguage(...newLangs);
+    },
+    getLoadedLanguages() {
+      return highlighter.getLoadedLanguages();
     }
   };
 }
@@ -105,5 +158,6 @@ function normalizePropAsString(value) {
   return Array.isArray(value) ? value.join(" ") : value;
 }
 export {
+  clearShikiHighlighterCache,
   createShikiHighlighter
 };

package/dist/types.d.ts

@@ -54,6 +54,8 @@ export interface MarkdownProcessor {
     render: (content: string, opts?: MarkdownProcessorRenderOptions) => Promise<MarkdownProcessorRenderResult>;
 }
 export interface MarkdownProcessorRenderOptions {
+    /** The URL of the file being rendered, used for resolving relative image paths */
+    fileURL?: URL;
     /** Used for frontmatter injection plugins */
     frontmatter?: Record<string, any>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "7.0.0-alpha.0",
+  "version": "7.0.0-beta.10",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -13,12 +13,17 @@
   "homepage": "https://astro.build",
   "main": "./dist/index.js",
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/index.js",
+    "./shiki": "./dist/shiki.js"
   },
   "imports": {
     "#import-plugin": {
       "browser": "./dist/import-plugin-browser.js",
       "default": "./dist/import-plugin-default.js"
+    },
+    "#shiki-engine": {
+      "workerd": "./dist/shiki-engine-workerd.js",
+      "default": "./dist/shiki-engine-default.js"
     }
   },
   "files": [
@@ -28,7 +33,7 @@
     "github-slugger": "^2.0.0",
     "hast-util-from-html": "^2.0.3",
     "hast-util-to-text": "^4.0.2",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "mdast-util-definitions": "^6.0.0",
     "rehype-raw": "^7.0.0",
     "rehype-stringify": "^10.0.1",
@@ -36,15 +41,15 @@
     "remark-parse": "^11.0.0",
     "remark-rehype": "^11.1.2",
     "remark-smartypants": "^3.0.2",
-    "shiki": "^3.13.0",
-    "smol-toml": "^1.4.2",
+    "shiki": "^4.0.0",
+    "smol-toml": "^1.6.0",
     "unified": "^11.0.5",
     "unist-util-remove-position": "^5.0.0",
-    "unist-util-visit": "^5.0.0",
+    "unist-util-visit": "^5.1.0",
     "unist-util-visit-parents": "^6.0.2",
     "vfile": "^6.0.3",
-    "@astrojs/prism": "4.0.0-alpha.0",
-    "@astrojs/internal-helpers": "0.7.4"
+    "@astrojs/prism": "4.0.0-beta.2",
+    "@astrojs/internal-helpers": "0.8.0-beta.2"
   },
   "devDependencies": {
     "@types/estree": "^1.0.8",
@@ -52,7 +57,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mdast": "^4.0.4",
     "@types/unist": "^3.0.3",
-    "esbuild": "^0.24.2",
+    "esbuild": "^0.27.3",
     "mdast-util-mdx-expression": "^2.0.1",
     "astro-scripts": "0.0.14"
   },