@astrojs/markdown-remark 0.9.2 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @astrojs/markdown-remark
 
+## 0.10.0
+
+### Minor Changes
+
+- [#3410](https://github.com/withastro/astro/pull/3410) [`cfae9760`](https://github.com/withastro/astro/commit/cfae9760b252052b6189e96398b819a4337634a8) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Significantally more stable behavior for "Markdown + Components" usage, which now handles component serialization much more similarly to MDX. Also supports switching between Components and Markdown without extra newlines, removes wrapping `<p>` tags from standalone components, and improves JSX expression handling.
+
+## 0.9.4
+
+### Patch Changes
+
+- [#3275](https://github.com/withastro/astro/pull/3275) [`8f8f05c1`](https://github.com/withastro/astro/commit/8f8f05c1b99d073a43af3020ba3922ea2d5b466d) Thanks [@matthewp](https://github.com/matthewp)! - Fixes regression in passing JS args to islands
+
+## 0.9.3
+
+### Patch Changes
+
+- [#3234](https://github.com/withastro/astro/pull/3234) [`de123b28`](https://github.com/withastro/astro/commit/de123b28b3ff398b800cb598f20326ca85a0fb60) Thanks [@JuanM04](https://github.com/JuanM04)! - Removed `rehype-slug` in favor of our own implementation. The behavior of the slugging should remain the same
+
+* [#3234](https://github.com/withastro/astro/pull/3234) [`de123b28`](https://github.com/withastro/astro/commit/de123b28b3ff398b800cb598f20326ca85a0fb60) Thanks [@JuanM04](https://github.com/JuanM04)! - Moved some type from `astro` to `@astrojs/markdown-remark`
+
 ## 0.9.2
 
 ### Patch Changes

package/LICENSE

@@ -0,0 +1,61 @@
+MIT License
+
+Copyright (c) 2021 Fred K. Schott
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
+
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
+
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""

package/dist/index.d.ts

@@ -1,13 +1,7 @@
-import type { MarkdownRenderingOptions } from './types';
+import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 export * from './types.js';
 export declare const DEFAULT_REMARK_PLUGINS: string[];
-export declare const DEFAULT_REHYPE_PLUGINS: string[];
+export declare const DEFAULT_REHYPE_PLUGINS: never[];
+export declare function slug(value: string): string;
 /** Shared utility for rendering markdown */
-export declare function renderMarkdown(content: string, opts: MarkdownRenderingOptions): Promise<{
-    metadata: {
-        headers: any[];
-        source: string;
-        html: string;
-    };
-    code: string;
-}>;
+export declare function renderMarkdown(content: string, opts?: MarkdownRenderingOptions): Promise<MarkdownRenderingResult>;

package/dist/index.js

@@ -1,9 +1,9 @@
 import createCollectHeaders from "./rehype-collect-headers.js";
 import scopedStyles from "./remark-scoped-styles.js";
-import { remarkExpressions, loadRemarkExpressions } from "./remark-expressions.js";
 import rehypeExpressions from "./rehype-expressions.js";
 import rehypeIslands from "./rehype-islands.js";
-import { remarkJsx, loadRemarkJsx } from "./remark-jsx.js";
+import remarkMdxish from "./remark-mdxish.js";
+import remarkMarkAndUnravel from "./remark-mark-and-unravel.js";
 import rehypeJsx from "./rehype-jsx.js";
 import rehypeEscape from "./rehype-escape.js";
 import remarkPrism from "./remark-prism.js";
@@ -15,17 +15,30 @@ import markdown from "remark-parse";
 import markdownToHtml from "remark-rehype";
 import rehypeStringify from "rehype-stringify";
 import rehypeRaw from "rehype-raw";
+import Slugger from "github-slugger";
+import { VFile } from "vfile";
 export * from "./types.js";
 const DEFAULT_REMARK_PLUGINS = ["remark-gfm", "remark-smartypants"];
-const DEFAULT_REHYPE_PLUGINS = ["rehype-slug"];
-async function renderMarkdown(content, opts) {
+const DEFAULT_REHYPE_PLUGINS = [];
+const slugger = new Slugger();
+function slug(value) {
+  return slugger.slug(value);
+}
+async function renderMarkdown(content, opts = {}) {
   var _a;
-  let { mode, syntaxHighlight, shikiConfig, remarkPlugins, rehypePlugins } = opts;
+  let {
+    fileURL,
+    mode = "mdx",
+    syntaxHighlight = "shiki",
+    shikiConfig = {},
+    remarkPlugins = [],
+    rehypePlugins = []
+  } = opts;
+  const input = new VFile({ value: content, path: fileURL });
   const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
   const isMDX = mode === "mdx";
   const { headers, rehypeCollectHeaders } = createCollectHeaders();
-  await Promise.all([loadRemarkExpressions(), loadRemarkJsx()]);
-  let parser = unified().use(markdown).use(isMDX ? [remarkJsx, remarkExpressions] : []).use([remarkUnwrap]);
+  let parser = unified().use(markdown).use(isMDX ? [remarkMdxish, remarkMarkAndUnravel] : []).use([remarkUnwrap]);
   if (remarkPlugins.length === 0 && rehypePlugins.length === 0) {
     remarkPlugins = [...DEFAULT_REMARK_PLUGINS];
     rehypePlugins = [...DEFAULT_REHYPE_PLUGINS];
@@ -48,7 +61,13 @@ async function renderMarkdown(content, opts) {
       markdownToHtml,
       {
         allowDangerousHtml: true,
-        passThrough: ["raw", "mdxTextExpression", "mdxJsxTextElement", "mdxJsxFlowElement"]
+        passThrough: [
+          "raw",
+          "mdxFlowExpression",
+          "mdxJsxFlowElement",
+          "mdxJsxTextElement",
+          "mdxTextExpression"
+        ]
       }
     ]
   ]);
@@ -58,7 +77,7 @@ async function renderMarkdown(content, opts) {
   parser.use(isMDX ? [rehypeJsx, rehypeExpressions] : [rehypeRaw]).use(rehypeEscape).use(rehypeIslands);
   let result;
   try {
-    const vfile = await parser.use([rehypeCollectHeaders]).use(rehypeStringify, { allowDangerousHtml: true }).process(content);
+    const vfile = await parser.use([rehypeCollectHeaders]).use(rehypeStringify, { allowDangerousHtml: true }).process(input);
     result = vfile.toString();
   } catch (err) {
     console.error(err);
@@ -72,5 +91,6 @@ async function renderMarkdown(content, opts) {
 export {
   DEFAULT_REHYPE_PLUGINS,
   DEFAULT_REMARK_PLUGINS,
-  renderMarkdown
+  renderMarkdown,
+  slug
 };

package/dist/mdast-util-mdxish.d.ts

@@ -0,0 +1,2 @@
+export declare function mdxFromMarkdown(): any;
+export declare function mdxToMarkdown(): any;

package/dist/mdast-util-mdxish.js

@@ -0,0 +1,14 @@
+import { mdxExpressionFromMarkdown, mdxExpressionToMarkdown } from "mdast-util-mdx-expression";
+import { mdxJsxFromMarkdown, mdxJsxToMarkdown } from "mdast-util-mdx-jsx";
+function mdxFromMarkdown() {
+  return [mdxExpressionFromMarkdown, mdxJsxFromMarkdown];
+}
+function mdxToMarkdown() {
+  return {
+    extensions: [mdxExpressionToMarkdown, mdxJsxToMarkdown]
+  };
+}
+export {
+  mdxFromMarkdown,
+  mdxToMarkdown
+};

package/dist/rehype-collect-headers.d.ts

@@ -1,5 +1,5 @@
-/**  */
+import type { MarkdownHeader, RehypePlugin } from './types.js';
 export default function createCollectHeaders(): {
-    headers: any[];
-    rehypeCollectHeaders: () => (tree: any) => void;
+    headers: MarkdownHeader[];
+    rehypeCollectHeaders: () => ReturnType<RehypePlugin>;
 };

package/dist/rehype-collect-headers.js

@@ -1,11 +1,11 @@
 import { visit } from "unist-util-visit";
-import slugger from "github-slugger";
+import Slugger from "github-slugger";
 function createCollectHeaders() {
   const headers = [];
+  const slugger = new Slugger();
   function rehypeCollectHeaders() {
     return function(tree) {
       visit(tree, (node) => {
-        var _a;
         if (node.type !== "element")
           return;
         const { tagName } = node;
@@ -15,14 +15,36 @@ function createCollectHeaders() {
         if (!level)
           return;
         const depth = Number.parseInt(level);
+        let raw = "";
         let text = "";
-        visit(node, "text", (child) => {
-          text += child.value;
+        let isJSX = false;
+        visit(node, (child) => {
+          if (child.type === "element") {
+            return;
+          }
+          if (child.type === "raw") {
+            if (child.value.startsWith("\n<") || child.value.endsWith(">\n")) {
+              raw += child.value.replace(/^\n|\n$/g, "");
+              return;
+            }
+          }
+          if (child.type === "text" || child.type === "raw") {
+            raw += child.value;
+            text += child.value;
+            isJSX = isJSX || child.value.includes("{");
+          }
         });
-        let slug = ((_a = node == null ? void 0 : node.properties) == null ? void 0 : _a.id) || slugger.slug(text);
         node.properties = node.properties || {};
-        node.properties.id = slug;
-        headers.push({ depth, slug, text });
+        if (typeof node.properties.id !== "string") {
+          if (isJSX) {
+            node.properties.id = `$$slug(\`${text.replace(/\{/g, "${")}\`)`;
+            node.type = "raw";
+            node.value = `<${node.tagName} id={${node.properties.id}}>${raw}</${node.tagName}>`;
+          } else {
+            node.properties.id = slugger.slug(text);
+          }
+        }
+        headers.push({ depth, slug: node.properties.id, text });
       });
     };
   }

package/dist/rehype-expressions.js

@@ -1,9 +1,34 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { map } from "unist-util-map";
 function rehypeExpressions() {
   return function(node) {
     return map(node, (child) => {
+      if (child.type === "text") {
+        return __spreadProps(__spreadValues({}, child), { type: "raw" });
+      }
       if (child.type === "mdxTextExpression") {
-        return { type: "text", value: `{${child.value}}` };
+        return { type: "raw", value: `{${child.value}}` };
+      }
+      if (child.type === "mdxFlowExpression") {
+        return { type: "raw", value: `{${child.value}}` };
       }
       return child;
     });

package/dist/rehype-jsx.js

@@ -26,18 +26,41 @@ function rehypeJsx() {
         return __spreadProps(__spreadValues({}, child), { tagName: `${child.tagName}` });
       }
       if (MDX_ELEMENTS.has(child.type)) {
+        const attrs = child.attributes.reduce((acc, entry) => {
+          let attr = entry.value;
+          if (attr && typeof attr === "object") {
+            attr = `{${attr.value}}`;
+          } else if (attr && entry.type === "mdxJsxExpressionAttribute") {
+            attr = `{${attr}}`;
+          } else if (attr === null) {
+            attr = "";
+          } else if (typeof attr === "string") {
+            attr = `"${attr}"`;
+          }
+          if (!entry.name) {
+            return acc + ` ${attr}`;
+          }
+          return acc + ` ${entry.name}${attr ? "=" : ""}${attr}`;
+        }, "");
+        if (child.children.length === 0) {
+          return {
+            type: "raw",
+            value: `<${child.name}${attrs} />`
+          };
+        }
+        child.children.splice(0, 0, {
+          type: "raw",
+          value: `
+<${child.name}${attrs}>`
+        });
+        child.children.push({
+          type: "raw",
+          value: `</${child.name}>
+`
+        });
         return __spreadProps(__spreadValues({}, child), {
           type: "element",
-          tagName: `${child.name}`,
-          properties: child.attributes.reduce((acc, entry) => {
-            let attr = entry.value;
-            if (attr && typeof attr === "object") {
-              attr = `{${attr.value}}`;
-            } else if (attr === null) {
-              attr = `{true}`;
-            }
-            return Object.assign(acc, { [entry.name]: attr });
-          }, {})
+          tagName: `Fragment`
         });
       }
       return child;

package/dist/remark-mark-and-unravel.d.ts

@@ -0,0 +1,17 @@
+/**
+ * @typedef {import('mdast').Root} Root
+ * @typedef {import('mdast').Content} Content
+ * @typedef {Root|Content} Node
+ * @typedef {Extract<Node, import('unist').Parent>} Parent
+ *
+ * @typedef {import('remark-mdx')} DoNotTouchAsThisImportItIncludesMdxInTree
+ */
+/**
+ * A tiny plugin that unravels `<p><h1>x</h1></p>` but also
+ * `<p><Component /></p>` (so it has no knowledge of “HTML”).
+ * It also marks JSX as being explicitly JSX, so when a user passes a `h1`
+ * component, it is used for `# heading` but not for `<h1>heading</h1>`.
+ *
+ * @type {import('unified').Plugin<Array<void>, Root>}
+ */
+export default function remarkMarkAndUnravel(): (tree: any) => void;

package/dist/remark-mark-and-unravel.js

@@ -0,0 +1,45 @@
+import { visit } from "unist-util-visit";
+function remarkMarkAndUnravel() {
+  return (tree) => {
+    visit(tree, (node, index, parent_) => {
+      const parent = parent_;
+      let offset = -1;
+      let all = true;
+      let oneOrMore;
+      if (parent && typeof index === "number" && node.type === "paragraph") {
+        const children = node.children;
+        while (++offset < children.length) {
+          const child = children[offset];
+          if (child.type === "mdxJsxTextElement" || child.type === "mdxTextExpression") {
+            oneOrMore = true;
+          } else if (child.type === "text" && /^[\t\r\n ]+$/.test(String(child.value))) {
+          } else {
+            all = false;
+            break;
+          }
+        }
+        if (all && oneOrMore) {
+          offset = -1;
+          while (++offset < children.length) {
+            const child = children[offset];
+            if (child.type === "mdxJsxTextElement") {
+              child.type = "mdxJsxFlowElement";
+            }
+            if (child.type === "mdxTextExpression") {
+              child.type = "mdxFlowExpression";
+            }
+          }
+          parent.children.splice(index, 1, ...children);
+          return index;
+        }
+      }
+      if (node.type === "mdxJsxFlowElement" || node.type === "mdxJsxTextElement") {
+        const data = node.data || (node.data = {});
+        data._mdxExplicitJsx = true;
+      }
+    });
+  };
+}
+export {
+  remarkMarkAndUnravel as default
+};

package/dist/remark-mdxish.d.ts

@@ -0,0 +1 @@
+export default function remarkMdxish(this: any, options?: {}): void;

package/dist/remark-mdxish.js

@@ -0,0 +1,15 @@
+import { mdxjs } from "micromark-extension-mdxjs";
+import { mdxFromMarkdown, mdxToMarkdown } from "./mdast-util-mdxish.js";
+function remarkMdxish(options = {}) {
+  const data = this.data();
+  add("micromarkExtensions", mdxjs(options));
+  add("fromMarkdownExtensions", mdxFromMarkdown());
+  add("toMarkdownExtensions", mdxToMarkdown());
+  function add(field, value) {
+    const list = data[field] ? data[field] : data[field] = [];
+    list.push(value);
+  }
+}
+export {
+  remarkMdxish as default
+};

package/dist/remark-shiki.js

@@ -1,7 +1,7 @@
 import { getHighlighter } from "shiki";
 import { visit } from "unist-util-visit";
 const highlighterCacheAsync = /* @__PURE__ */ new Map();
-const remarkShiki = async ({ langs, theme, wrap }, scopedClassName) => {
+const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false }, scopedClassName) => {
   const cacheID = typeof theme === "string" ? theme : theme.name;
   let highlighterAsync = highlighterCacheAsync.get(cacheID);
   if (!highlighterAsync) {

package/dist/types.d.ts

@@ -8,21 +8,37 @@ export declare type RemarkPlugins = (string | [string, any] | RemarkPlugin | [Re
 export declare type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, hast.Root>;
 export declare type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
 export interface ShikiConfig {
-    langs: ILanguageRegistration[];
-    theme: Theme | IThemeRegistration;
-    wrap: boolean | null;
+    langs?: ILanguageRegistration[];
+    theme?: Theme | IThemeRegistration;
+    wrap?: boolean | null;
 }
 export interface AstroMarkdownOptions {
-    mode: 'md' | 'mdx';
-    drafts: boolean;
-    syntaxHighlight: 'shiki' | 'prism' | false;
-    shikiConfig: ShikiConfig;
-    remarkPlugins: RemarkPlugins;
-    rehypePlugins: RehypePlugins;
+    mode?: 'md' | 'mdx';
+    drafts?: boolean;
+    syntaxHighlight?: 'shiki' | 'prism' | false;
+    shikiConfig?: ShikiConfig;
+    remarkPlugins?: RemarkPlugins;
+    rehypePlugins?: RehypePlugins;
 }
 export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
+    /** @internal */
+    fileURL?: URL;
     /** @internal */
     $?: {
         scopedClassName: string | null;
     };
 }
+export interface MarkdownHeader {
+    depth: number;
+    slug: string;
+    text: string;
+}
+export interface MarkdownMetadata {
+    headers: MarkdownHeader[];
+    source: string;
+    html: string;
+}
+export interface MarkdownRenderingResult {
+    metadata: MarkdownMetadata;
+    code: string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -15,13 +15,6 @@
   "exports": {
     ".": "./dist/index.js"
   },
-  "scripts": {
-    "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\""
-  },
   "dependencies": {
     "@astrojs/prism": "^0.4.1",
     "assert": "^2.0.0",
@@ -30,9 +23,9 @@
     "mdast-util-mdx-jsx": "^1.2.0",
     "mdast-util-to-string": "^3.1.0",
     "micromark-extension-mdx-jsx": "^1.0.3",
-    "prismjs": "^1.27.0",
+    "micromark-extension-mdxjs": "^1.0.0",
+    "prismjs": "^1.28.0",
     "rehype-raw": "^6.1.1",
-    "rehype-slug": "^5.0.1",
     "rehype-stringify": "^9.0.3",
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
@@ -40,15 +33,28 @@
     "remark-smartypants": "^2.0.0",
     "shiki": "^0.10.1",
     "unified": "^10.1.2",
-    "unist-util-map": "^3.0.1",
-    "unist-util-visit": "^4.1.0"
+    "unist-util-map": "^3.1.1",
+    "unist-util-visit": "^4.1.0",
+    "vfile": "^5.3.2"
   },
   "devDependencies": {
+    "@types/chai": "^4.3.1",
     "@types/github-slugger": "^1.3.0",
     "@types/hast": "^2.3.4",
     "@types/mdast": "^3.0.10",
+    "@types/mocha": "^9.1.1",
     "@types/prismjs": "^1.26.0",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "workspace:*"
+    "astro-scripts": "0.0.4",
+    "chai": "^4.3.6",
+    "mocha": "^9.2.2"
+  },
+  "scripts": {
+    "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": "mocha --exit --timeout 20000"
   }
-}
+}

package/src/index.ts

@@ -1,11 +1,11 @@
-import type { MarkdownRenderingOptions } from './types';
+import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 
 import createCollectHeaders from './rehype-collect-headers.js';
 import scopedStyles from './remark-scoped-styles.js';
-import { remarkExpressions, loadRemarkExpressions } from './remark-expressions.js';
 import rehypeExpressions from './rehype-expressions.js';
 import rehypeIslands from './rehype-islands.js';
-import { remarkJsx, loadRemarkJsx } from './remark-jsx.js';
+import remarkMdxish from './remark-mdxish.js';
+import remarkMarkAndUnravel from './remark-mark-and-unravel.js';
 import rehypeJsx from './rehype-jsx.js';
 import rehypeEscape from './rehype-escape.js';
 import remarkPrism from './remark-prism.js';
@@ -18,25 +18,40 @@ import markdown from 'remark-parse';
 import markdownToHtml from 'remark-rehype';
 import rehypeStringify from 'rehype-stringify';
 import rehypeRaw from 'rehype-raw';
+import Slugger from 'github-slugger';
+import { VFile } from 'vfile';
 
 export * from './types.js';
 
 export const DEFAULT_REMARK_PLUGINS = ['remark-gfm', 'remark-smartypants'];
+export const DEFAULT_REHYPE_PLUGINS = [];
 
-export const DEFAULT_REHYPE_PLUGINS = ['rehype-slug'];
+const slugger = new Slugger();
+export function slug(value: string): string {
+	return slugger.slug(value);
+}
 
 /** Shared utility for rendering markdown */
-export async function renderMarkdown(content: string, opts: MarkdownRenderingOptions) {
-	let { mode, syntaxHighlight, shikiConfig, remarkPlugins, rehypePlugins } = opts;
+export async function renderMarkdown(
+	content: string,
+	opts: MarkdownRenderingOptions = {}
+): Promise<MarkdownRenderingResult> {
+	let {
+		fileURL,
+		mode = 'mdx',
+		syntaxHighlight = 'shiki',
+		shikiConfig = {},
+		remarkPlugins = [],
+		rehypePlugins = [],
+	} = opts;
+	const input = new VFile({ value: content, path: fileURL });
 	const scopedClassName = opts.$?.scopedClassName;
 	const isMDX = mode === 'mdx';
 	const { headers, rehypeCollectHeaders } = createCollectHeaders();
 
-	await Promise.all([loadRemarkExpressions(), loadRemarkJsx()]); // Vite bug: dynamically import() these because of CJS interop (this will cache)
-
 	let parser = unified()
 		.use(markdown)
-		.use(isMDX ? [remarkJsx, remarkExpressions] : [])
+		.use(isMDX ? [remarkMdxish, remarkMarkAndUnravel] : [])
 		.use([remarkUnwrap]);
 
 	if (remarkPlugins.length === 0 && rehypePlugins.length === 0) {
@@ -66,7 +81,13 @@ export async function renderMarkdown(content: string, opts: MarkdownRenderingOpt
 			markdownToHtml as any,
 			{
 				allowDangerousHtml: true,
-				passThrough: ['raw', 'mdxTextExpression', 'mdxJsxTextElement', 'mdxJsxFlowElement'],
+				passThrough: [
+					'raw',
+					'mdxFlowExpression',
+					'mdxJsxFlowElement',
+					'mdxJsxTextElement',
+					'mdxTextExpression',
+				],
 			},
 		],
 	]);
@@ -85,7 +106,7 @@ export async function renderMarkdown(content: string, opts: MarkdownRenderingOpt
 		const vfile = await parser
 			.use([rehypeCollectHeaders])
 			.use(rehypeStringify, { allowDangerousHtml: true })
-			.process(content);
+			.process(input);
 		result = vfile.toString();
 	} catch (err) {
 		console.error(err);