@astrojs/markdown-remark 3.0.0 → 3.1.0

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 import type { AstroMarkdownOptions, MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 export { rehypeHeadingIds } from './rehype-collect-headings.js';
 export { remarkCollectImages } from './remark-collect-images.js';
+export { remarkPrism } from './remark-prism.js';
+export { remarkShiki } from './remark-shiki.js';
 export * from './types.js';
 export declare const markdownConfigDefaults: Omit<Required<AstroMarkdownOptions>, 'drafts'>;
 /** Shared utility for rendering markdown */

package/dist/index.js

@@ -2,9 +2,8 @@ import { toRemarkInitializeAstroData } from "./frontmatter-injection.js";
 import { loadPlugins } from "./load-plugins.js";
 import { rehypeHeadingIds } from "./rehype-collect-headings.js";
 import { remarkCollectImages } from "./remark-collect-images.js";
-import remarkPrism from "./remark-prism.js";
-import scopedStyles from "./remark-scoped-styles.js";
-import remarkShiki from "./remark-shiki.js";
+import { remarkPrism } from "./remark-prism.js";
+import { remarkShiki } from "./remark-shiki.js";
 import rehypeRaw from "rehype-raw";
 import rehypeStringify from "rehype-stringify";
 import remarkGfm from "remark-gfm";
@@ -16,6 +15,8 @@ import { VFile } from "vfile";
 import { rehypeImages } from "./rehype-images.js";
 import { rehypeHeadingIds as rehypeHeadingIds2 } from "./rehype-collect-headings.js";
 import { remarkCollectImages as remarkCollectImages2 } from "./remark-collect-images.js";
+import { remarkPrism as remarkPrism2 } from "./remark-prism.js";
+import { remarkShiki as remarkShiki2 } from "./remark-shiki.js";
 export * from "./types.js";
 const markdownConfigDefaults = {
   syntaxHighlight: "shiki",
@@ -44,7 +45,6 @@ async function renderMarkdown(content, opts) {
     frontmatter: userFrontmatter = {}
   } = opts;
   const input = new VFile({ value: content, path: fileURL });
-  const scopedClassName = opts.$?.scopedClassName;
   let parser = unified().use(markdown).use(toRemarkInitializeAstroData({ userFrontmatter })).use([]);
   if (!isPerformanceBenchmark && gfm) {
     if (gfm) {
@@ -60,15 +60,12 @@ async function renderMarkdown(content, opts) {
     parser.use([[plugin, pluginOpts]]);
   });
   if (!isPerformanceBenchmark) {
-    if (scopedClassName) {
-      parser.use([scopedStyles(scopedClassName)]);
-    }
     if (syntaxHighlight === "shiki") {
-      parser.use([await remarkShiki(shikiConfig, scopedClassName)]);
+      parser.use(remarkShiki, shikiConfig);
     } else if (syntaxHighlight === "prism") {
-      parser.use([remarkPrism(scopedClassName)]);
+      parser.use(remarkPrism);
     }
-    parser.use([remarkCollectImages]);
+    parser.use(remarkCollectImages);
   }
   parser.use([
     [
@@ -124,5 +121,7 @@ export {
   markdownConfigDefaults,
   rehypeHeadingIds2 as rehypeHeadingIds,
   remarkCollectImages2 as remarkCollectImages,
+  remarkPrism2 as remarkPrism,
+  remarkShiki2 as remarkShiki,
   renderMarkdown
 };

package/dist/remark-prism.d.ts

@@ -1,3 +1,2 @@
-type MaybeString = string | null | undefined;
-declare function plugin(className: MaybeString): () => (tree: any) => void;
-export default plugin;
+import type { RemarkPlugin } from './types.js';
+export declare function remarkPrism(): ReturnType<RemarkPlugin>;

package/dist/remark-prism.js

@@ -1,27 +1,19 @@
 import { runHighlighterWithAstro } from "@astrojs/prism/dist/highlighter";
 import { visit } from "unist-util-visit";
-function transformer(className) {
+function remarkPrism() {
   return function(tree) {
-    const visitor = (node) => {
+    visit(tree, "code", (node) => {
       let { lang, value } = node;
       node.type = "html";
       let { html, classLanguage } = runHighlighterWithAstro(lang, value);
       let classes = [classLanguage];
-      if (className) {
-        classes.push(className);
-      }
       node.value = `<pre class="${classes.join(
         " "
       )}"><code is:raw class="${classLanguage}">${html}</code></pre>`;
       return node;
-    };
-    return visit(tree, "code", visitor);
+    });
   };
 }
-function plugin(className) {
-  return transformer.bind(null, className);
-}
-var remark_prism_default = plugin;
 export {
-  remark_prism_default as default
+  remarkPrism
 };

package/dist/remark-shiki.d.ts

@@ -1,3 +1,2 @@
-import type { ShikiConfig } from './types.js';
-declare const remarkShiki: ({ langs, theme, wrap }: ShikiConfig, scopedClassName?: string | null) => Promise<() => (tree: any) => void>;
-export default remarkShiki;
+import type { RemarkPlugin, ShikiConfig } from './types.js';
+export declare function remarkShiki({ langs, theme, wrap, }?: ShikiConfig): ReturnType<RemarkPlugin>;

package/dist/remark-shiki.js

@@ -1,7 +1,11 @@
 import { getHighlighter } from "shiki";
 import { visit } from "unist-util-visit";
 const highlighterCacheAsync = /* @__PURE__ */ new Map();
-const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false }, scopedClassName) => {
+function remarkShiki({
+  langs = [],
+  theme = "github-dark",
+  wrap = false
+} = {}) {
   const cacheID = typeof theme === "string" ? theme : theme.name;
   let highlighterAsync = highlighterCacheAsync.get(cacheID);
   if (!highlighterAsync) {
@@ -23,11 +27,14 @@ const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false },
     });
     highlighterCacheAsync.set(cacheID, highlighterAsync);
   }
-  const highlighter = await highlighterAsync;
-  for (const lang of langs) {
-    await highlighter.loadLanguage(lang);
-  }
-  return () => (tree) => {
+  let highlighter;
+  return async (tree) => {
+    if (!highlighter) {
+      highlighter = await highlighterAsync;
+      for (const lang of langs) {
+        await highlighter.loadLanguage(lang);
+      }
+    }
     visit(tree, "code", (node) => {
       let lang;
       if (typeof node.lang === "string") {
@@ -42,10 +49,7 @@ const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false },
         lang = "plaintext";
       }
       let html = highlighter.codeToHtml(node.value, { lang });
-      html = html.replace(
-        /<pre class="(.*?)shiki(.*?)"/,
-        `<pre is:raw class="$1astro-code$2${scopedClassName ? " " + scopedClassName : ""}"`
-      );
+      html = html.replace(/<pre class="(.*?)shiki(.*?)"/, `<pre is:raw class="$1astro-code$2"`);
       if (node.lang === "diff") {
         html = html.replace(
           /<span class="line"><span style="(.*?)">([\+|\-])/g,
@@ -60,16 +64,12 @@ const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false },
           'style="$1; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"'
         );
       }
-      if (scopedClassName) {
-        html = html.replace(/\<span class="line"\>/g, `<span class="line ${scopedClassName}"`);
-      }
       node.type = "html";
       node.value = html;
       node.children = [];
     });
   };
-};
-var remark_shiki_default = remarkShiki;
+}
 export {
-  remark_shiki_default as default
+  remarkShiki
 };

package/dist/types.d.ts

@@ -40,10 +40,6 @@ export interface ImageMetadata {
 export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     /** @internal */
     fileURL?: URL;
-    /** @internal */
-    $?: {
-        scopedClassName: string | null;
-    };
     /** Used for frontmatter injection plugins */
     frontmatter?: Record<string, any>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -20,7 +20,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "astro": "^3.0.0"
+    "astro": "^3.0.11"
   },
   "dependencies": {
     "@astrojs/prism": "^3.0.0",

package/dist/remark-scoped-styles.d.ts

@@ -1,2 +0,0 @@
-/**  */
-export default function scopedStyles(className: string): () => (tree: any) => void;

package/dist/remark-scoped-styles.js

@@ -1,18 +0,0 @@
-import { visit } from "unist-util-visit";
-const noVisit = /* @__PURE__ */ new Set(["root", "html", "text"]);
-function scopedStyles(className) {
-  const visitor = (node) => {
-    if (noVisit.has(node.type))
-      return;
-    const { data } = node;
-    let currentClassName = data?.hProperties?.class ?? "";
-    node.data = node.data || {};
-    node.data.hProperties = node.data.hProperties || {};
-    node.data.hProperties.class = `${className} ${currentClassName}`.trim();
-    return node;
-  };
-  return () => (tree) => visit(tree, visitor);
-}
-export {
-  scopedStyles as default
-};