@astrojs/markdown-remark 0.8.3 → 0.9.3

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @astrojs/markdown-remark
 
+## 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
+
+- [#3152](https://github.com/withastro/astro/pull/3152) [`9ba1f4f8`](https://github.com/withastro/astro/commit/9ba1f4f8251155b69398a8af22d6ab8587b96120) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix JSX expression inconsistencies within markdown files
+
+## 0.9.1
+
+### Patch Changes
+
+- [#3108](https://github.com/withastro/astro/pull/3108) [`ef198ff8`](https://github.com/withastro/astro/commit/ef198ff8351ac8fbc868e209f9cd410dc8b6f265) Thanks [@FredKSchott](https://github.com/FredKSchott)! - shiki: Add `diff` symbol handling to disable `user-select` on `+`/`-` symbols.
+
+## 0.9.0
+
+### Minor Changes
+
+- [`53162534`](https://github.com/withastro/astro/commit/53162534450e160f65b95e7ef1523a106347ca28) Thanks [@FredKSchott](https://github.com/FredKSchott)! - - Removed `renderMarkdownWithFrontmatter` because it wasn't being used
+  - All options of `renderMarkdown` are now required — see the exported interface `AstroMarkdownOptions`
+  - New types: RemarkPlugin, RehypePlugin and ShikiConfig
+
+## 0.8.2
+
+### Patch Changes
+
+- [#2970](https://github.com/withastro/astro/pull/2970) [`b835e285`](https://github.com/withastro/astro/commit/b835e285defb4f31fc5ac1039c7f607c07f3c00b) Thanks [@JuanM04](https://github.com/JuanM04)! - Improved type checking
+
 ## 0.8.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,26 +1,6 @@
-import type { AstroMarkdownOptions, MarkdownRenderingOptions, ShikiConfig, Plugin } from './types';
-export { AstroMarkdownOptions, MarkdownRenderingOptions, ShikiConfig, Plugin };
-/** Internal utility for rendering a full markdown file and extracting Frontmatter data */
-export declare function renderMarkdownWithFrontmatter(contents: string, opts?: MarkdownRenderingOptions | null): Promise<{
-    frontmatter: {
-        [key: string]: any;
-    };
-    metadata: {
-        headers: any[];
-        source: string;
-        html: string;
-    };
-    code: string;
-}>;
+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[];
 /** Shared utility for rendering markdown */
-export declare function renderMarkdown(content: string, opts?: MarkdownRenderingOptions | null): Promise<{
-    metadata: {
-        headers: any[];
-        source: string;
-        html: string;
-    };
-    code: string;
-}>;
-export default renderMarkdownWithFrontmatter;
+export declare function renderMarkdown(content: string, opts: MarkdownRenderingOptions): Promise<MarkdownRenderingResult>;

package/dist/index.js

@@ -1,22 +1,3 @@
-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 createCollectHeaders from "./rehype-collect-headers.js";
 import scopedStyles from "./remark-scoped-styles.js";
 import { remarkExpressions, loadRemarkExpressions } from "./remark-expressions.js";
@@ -34,21 +15,13 @@ import markdown from "remark-parse";
 import markdownToHtml from "remark-rehype";
 import rehypeStringify from "rehype-stringify";
 import rehypeRaw from "rehype-raw";
-import matter from "gray-matter";
-async function renderMarkdownWithFrontmatter(contents, opts) {
-  const { data: frontmatter, content } = matter(contents);
-  const value = await renderMarkdown(content, opts);
-  return __spreadProps(__spreadValues({}, value), { frontmatter });
-}
+export * from "./types.js";
 const DEFAULT_REMARK_PLUGINS = ["remark-gfm", "remark-smartypants"];
-const DEFAULT_REHYPE_PLUGINS = ["rehype-slug"];
+const DEFAULT_REHYPE_PLUGINS = [];
 async function renderMarkdown(content, opts) {
   var _a;
-  let { remarkPlugins = [], rehypePlugins = [] } = opts ?? {};
-  const scopedClassName = (_a = opts == null ? void 0 : opts.$) == null ? void 0 : _a.scopedClassName;
-  const mode = (opts == null ? void 0 : opts.mode) ?? "mdx";
-  const syntaxHighlight = (opts == null ? void 0 : opts.syntaxHighlight) ?? "shiki";
-  const shikiConfig = (opts == null ? void 0 : opts.shikiConfig) ?? {};
+  let { mode, syntaxHighlight, shikiConfig, remarkPlugins, rehypePlugins } = opts;
+  const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
   const isMDX = mode === "mdx";
   const { headers, rehypeCollectHeaders } = createCollectHeaders();
   await Promise.all([loadRemarkExpressions(), loadRemarkJsx()]);
@@ -96,11 +69,8 @@ async function renderMarkdown(content, opts) {
     code: result.toString()
   };
 }
-var src_default = renderMarkdownWithFrontmatter;
 export {
   DEFAULT_REHYPE_PLUGINS,
   DEFAULT_REMARK_PLUGINS,
-  src_default as default,
-  renderMarkdown,
-  renderMarkdownWithFrontmatter
+  renderMarkdown
 };

package/dist/load-plugins.d.ts

@@ -1,3 +1,2 @@
 import * as unified from 'unified';
-import type { Plugin } from './types';
-export declare function loadPlugins(items: Plugin[]): Promise<[unified.Plugin, any?]>[];
+export declare function loadPlugins(items: (string | [string, any] | unified.Plugin<any[], any> | [unified.Plugin<any[], any>, any])[]): Promise<[unified.Plugin, any?]>[];

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;
@@ -19,10 +19,11 @@ function createCollectHeaders() {
         visit(node, "text", (child) => {
           text += child.value;
         });
-        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") {
+          node.properties.id = slugger.slug(text);
+        }
+        headers.push({ depth, slug: node.properties.id, text });
       });
     };
   }

package/dist/rehype-islands.js

@@ -22,7 +22,7 @@ const visit = _visit;
 function rehypeIslands() {
   return function(node) {
     return visit(node, "element", (el) => {
-      if (el.tagName == "astro-root") {
+      if (el.tagName == "astro-island") {
         visit(el, "text", (child, index, parent) => {
           if (child.type === "text") {
             if (parent && child.value.indexOf("<!--") > -1 && index != null) {

package/dist/remark-expressions.js

@@ -1,10 +1,8 @@
-let mdxExpression;
 let mdxExpressionFromMarkdown;
 let mdxExpressionToMarkdown;
 function remarkExpressions(options) {
   let settings = options || {};
   let data = this.data();
-  add("micromarkExtensions", mdxExpression({}));
   add("fromMarkdownExtensions", mdxExpressionFromMarkdown);
   add("toMarkdownExtensions", mdxExpressionToMarkdown);
   function add(field, value) {
@@ -15,10 +13,6 @@ function remarkExpressions(options) {
   }
 }
 async function loadRemarkExpressions() {
-  if (!mdxExpression) {
-    const micromarkMdxExpression = await import("micromark-extension-mdx-expression");
-    mdxExpression = micromarkMdxExpression.mdxExpression;
-  }
   if (!mdxExpressionFromMarkdown || !mdxExpressionToMarkdown) {
     const mdastUtilMdxExpression = await import("mdast-util-mdx-expression");
     mdxExpressionFromMarkdown = mdastUtilMdxExpression.mdxExpressionFromMarkdown;

package/dist/remark-shiki.d.ts

@@ -1,30 +1,3 @@
-import type * as shiki from 'shiki';
-export interface ShikiConfig {
-    /**
-     * The languages loaded to Shiki.
-     * Supports all languages listed here: https://github.com/shikijs/shiki/blob/main/docs/languages.md#all-languages
-     * Instructions for loading a custom language: https://github.com/shikijs/shiki/blob/main/docs/languages.md#supporting-your-own-languages-with-shiki
-     *
-     * @default []
-     */
-    langs?: shiki.ILanguageRegistration[];
-    /**
-     * The styling theme.
-     * Supports all themes listed here: https://github.com/shikijs/shiki/blob/main/docs/themes.md#all-themes
-     * Instructions for loading a custom theme: https://github.com/shikijs/shiki/blob/main/docs/themes.md#loading-theme
-     *
-     * @default "github-dark"
-     */
-    theme?: shiki.IThemeRegistration;
-    /**
-     * Enable word wrapping.
-     *  - true: enabled.
-     *  - false: enabled.
-     *  - null: All overflow styling removed. Code will overflow the element by default.
-     *
-     * @default false
-     */
-    wrap?: boolean | null;
-}
+import type { ShikiConfig } from './types.js';
 declare const remarkShiki: ({ langs, theme, wrap }: ShikiConfig, scopedClassName?: string | null | undefined) => Promise<() => (tree: any) => void>;
 export default remarkShiki;

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 = "github-dark", wrap = false }, scopedClassName) => {
+const remarkShiki = async ({ langs, theme, wrap }, scopedClassName) => {
   const cacheID = typeof theme === "string" ? theme : theme.name;
   let highlighterAsync = highlighterCacheAsync.get(cacheID);
   if (!highlighterAsync) {
@@ -17,6 +17,9 @@ const remarkShiki = async ({ langs = [], theme = "github-dark", wrap = false },
       let html = highlighter.codeToHtml(node.value, { lang: node.lang ?? "plaintext" });
       html = html.replace('<pre class="shiki"', `<pre is:raw class="astro-code${scopedClassName ? " " + scopedClassName : ""}"`);
       html = html.replace(/style="(background-)?color: var\(--shiki-/g, 'style="$1color: var(--astro-code-');
+      if (node.lang === "diff") {
+        html = html.replace(/<span class="line"><span style="(.*?)">([\+|\-])/g, '<span class="line"><span style="$1"><span style="user-select: none;">$2</span>');
+      }
       if (wrap === false) {
         html = html.replace(/style="(.*?)"/, 'style="$1; overflow-x: auto;"');
       } else if (wrap === true) {

package/dist/remark-unwrap.js

@@ -7,10 +7,10 @@ function remarkUnwrap() {
     insideAstroRoot = false;
     astroRootNodes.clear();
     visit(tree, "html", (node) => {
-      if (node.value.indexOf("<astro-root") > -1 && !insideAstroRoot) {
+      if (node.value.indexOf("<astro-island") > -1 && !insideAstroRoot) {
         insideAstroRoot = true;
       }
-      if (node.value.indexOf("</astro-root") > -1 && insideAstroRoot) {
+      if (node.value.indexOf("</astro-island") > -1 && insideAstroRoot) {
         insideAstroRoot = false;
       }
       astroRootNodes.add(node);

package/dist/types.d.ts

@@ -1,17 +1,42 @@
 import type * as unified from 'unified';
-import type { ShikiConfig } from './remark-shiki';
-export { ShikiConfig };
-export declare type Plugin = string | [string, any] | unified.Plugin | [unified.Plugin, any];
+import type * as mdast from 'mdast';
+import type * as hast from 'hast';
+import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
+export type { Node } from 'unist';
+export declare type RemarkPlugin<PluginParameters extends any[] = any[]> = unified.Plugin<PluginParameters, mdast.Root>;
+export declare type RemarkPlugins = (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
+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;
+}
 export interface AstroMarkdownOptions {
-    mode?: 'md' | 'mdx';
-    syntaxHighlight?: 'shiki' | 'prism' | false;
-    shikiConfig?: ShikiConfig;
-    remarkPlugins?: Plugin[];
-    rehypePlugins?: Plugin[];
+    mode: 'md' | 'mdx';
+    drafts: boolean;
+    syntaxHighlight: 'shiki' | 'prism' | false;
+    shikiConfig: ShikiConfig;
+    remarkPlugins: RemarkPlugins;
+    rehypePlugins: RehypePlugins;
 }
-export interface MarkdownRenderingOptions extends Partial<AstroMarkdownOptions> {
+export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
     /** @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.8.3",
+  "version": "0.9.3",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -26,15 +26,12 @@
     "@astrojs/prism": "^0.4.1",
     "assert": "^2.0.0",
     "github-slugger": "^1.4.0",
-    "gray-matter": "^4.0.3",
     "mdast-util-mdx-expression": "^1.2.0",
     "mdast-util-mdx-jsx": "^1.2.0",
     "mdast-util-to-string": "^3.1.0",
-    "micromark-extension-mdx-expression": "^1.0.3",
     "micromark-extension-mdx-jsx": "^1.0.3",
-    "prismjs": "^1.27.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",
@@ -47,7 +44,10 @@
   },
   "devDependencies": {
     "@types/github-slugger": "^1.3.0",
+    "@types/hast": "^2.3.4",
+    "@types/mdast": "^3.0.10",
     "@types/prismjs": "^1.26.0",
+    "@types/unist": "^2.0.6",
     "astro-scripts": "workspace:*"
   }
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import type { AstroMarkdownOptions, MarkdownRenderingOptions, ShikiConfig, Plugin } from './types';
+import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 
 import createCollectHeaders from './rehype-collect-headers.js';
 import scopedStyles from './remark-scoped-styles.js';
@@ -18,31 +18,19 @@ import markdown from 'remark-parse';
 import markdownToHtml from 'remark-rehype';
 import rehypeStringify from 'rehype-stringify';
 import rehypeRaw from 'rehype-raw';
-import matter from 'gray-matter';
-
-export { AstroMarkdownOptions, MarkdownRenderingOptions, ShikiConfig, Plugin };
-
-/** Internal utility for rendering a full markdown file and extracting Frontmatter data */
-export async function renderMarkdownWithFrontmatter(
-	contents: string,
-	opts?: MarkdownRenderingOptions | null
-) {
-	const { data: frontmatter, content } = matter(contents);
-	const value = await renderMarkdown(content, opts);
-	return { ...value, frontmatter };
-}
 
-export const DEFAULT_REMARK_PLUGINS = ['remark-gfm', 'remark-smartypants'];
+export * from './types.js';
 
-export const DEFAULT_REHYPE_PLUGINS = ['rehype-slug'];
+export const DEFAULT_REMARK_PLUGINS = ['remark-gfm', 'remark-smartypants'];
+export const DEFAULT_REHYPE_PLUGINS = [];
 
 /** Shared utility for rendering markdown */
-export async function renderMarkdown(content: string, opts?: MarkdownRenderingOptions | null) {
-	let { remarkPlugins = [], rehypePlugins = [] } = opts ?? {};
-	const scopedClassName = opts?.$?.scopedClassName;
-	const mode = opts?.mode ?? 'mdx';
-	const syntaxHighlight = opts?.syntaxHighlight ?? 'shiki';
-	const shikiConfig = opts?.shikiConfig ?? {};
+export async function renderMarkdown(
+	content: string,
+	opts: MarkdownRenderingOptions
+): Promise<MarkdownRenderingResult> {
+	let { mode, syntaxHighlight, shikiConfig, remarkPlugins, rehypePlugins } = opts;
+	const scopedClassName = opts.$?.scopedClassName;
 	const isMDX = mode === 'mdx';
 	const { headers, rehypeCollectHeaders } = createCollectHeaders();
 
@@ -111,5 +99,3 @@ export async function renderMarkdown(content: string, opts?: MarkdownRenderingOp
 		code: result.toString(),
 	};
 }
-
-export default renderMarkdownWithFrontmatter;

package/src/load-plugins.ts

@@ -1,5 +1,4 @@
 import * as unified from 'unified';
-import type { Plugin } from './types';
 
 async function importPlugin(p: string | unified.Plugin): Promise<unified.Plugin> {
 	if (typeof p === 'string') {
@@ -10,7 +9,9 @@ async function importPlugin(p: string | unified.Plugin): Promise<unified.Plugin>
 	return p;
 }
 
-export function loadPlugins(items: Plugin[]): Promise<[unified.Plugin, any?]>[] {
+export function loadPlugins(
+	items: (string | [string, any] | unified.Plugin<any[], any> | [unified.Plugin<any[], any>, any])[]
+): Promise<[unified.Plugin, any?]>[] {
 	return items.map((p) => {
 		return new Promise((resolve, reject) => {
 			if (Array.isArray(p)) {

package/src/rehype-collect-headers.ts

@@ -1,12 +1,14 @@
 import { visit } from 'unist-util-visit';
-import slugger from 'github-slugger';
+import Slugger from 'github-slugger';
+
+import type { MarkdownHeader, RehypePlugin } from './types.js';
 
-/**  */
 export default function createCollectHeaders() {
-	const headers: any[] = [];
+	const headers: MarkdownHeader[] = [];
+	const slugger = new Slugger();
 
-	function rehypeCollectHeaders() {
-		return function (tree: any) {
+	function rehypeCollectHeaders(): ReturnType<RehypePlugin> {
+		return function (tree) {
 			visit(tree, (node) => {
 				if (node.type !== 'element') return;
 				const { tagName } = node;
@@ -21,11 +23,12 @@ export default function createCollectHeaders() {
 					text += child.value;
 				});
 
-				let slug = node?.properties?.id || slugger.slug(text);
-
 				node.properties = node.properties || {};
-				node.properties.id = slug;
-				headers.push({ depth, slug, text });
+				if (typeof node.properties.id !== 'string') {
+					node.properties.id = slugger.slug(text);
+				}
+
+				headers.push({ depth, slug: node.properties.id, text });
 			});
 		};
 	}

package/src/rehype-islands.ts

@@ -9,14 +9,14 @@ const visit = _visit as (
 ) => any;
 
 // This fixes some confusing bugs coming from somewhere inside of our Markdown pipeline.
-// `unist`/`remark`/`rehype` (not sure) often generate malformed HTML inside of <astro-root>
+// `unist`/`remark`/`rehype` (not sure) often generate malformed HTML inside of <astro-island>
 // For hydration to work properly, frameworks need the DOM to be the exact same on server/client.
 // This reverts some "helpful corrections" that are applied to our perfectly valid HTML!
 export default function rehypeIslands(): any {
 	return function (node: any): any {
 		return visit(node, 'element', (el) => {
-			// Bugs only happen inside of <astro-root> islands
-			if (el.tagName == 'astro-root') {
+			// Bugs only happen inside of <astro-island> islands
+			if (el.tagName == 'astro-island') {
 				visit(el, 'text', (child, index, parent) => {
 					if (child.type === 'text') {
 						// Sometimes comments can be trapped as text, which causes them to be escaped

package/src/remark-expressions.ts

@@ -1,5 +1,4 @@
 // Vite bug: dynamically import() modules needed for CJS. Cache in memory to keep side effects
-let mdxExpression: any;
 let mdxExpressionFromMarkdown: any;
 let mdxExpressionToMarkdown: any;
 
@@ -7,7 +6,6 @@ export function remarkExpressions(this: any, options: any) {
 	let settings = options || {};
 	let data = this.data();
 
-	add('micromarkExtensions', mdxExpression({}));
 	add('fromMarkdownExtensions', mdxExpressionFromMarkdown);
 	add('toMarkdownExtensions', mdxExpressionToMarkdown);
 
@@ -19,10 +17,6 @@ export function remarkExpressions(this: any, options: any) {
 }
 
 export async function loadRemarkExpressions() {
-	if (!mdxExpression) {
-		const micromarkMdxExpression = await import('micromark-extension-mdx-expression');
-		mdxExpression = micromarkMdxExpression.mdxExpression;
-	}
 	if (!mdxExpressionFromMarkdown || !mdxExpressionToMarkdown) {
 		const mdastUtilMdxExpression = await import('mdast-util-mdx-expression');
 		mdxExpressionFromMarkdown = mdastUtilMdxExpression.mdxExpressionFromMarkdown;

package/src/remark-shiki.ts

@@ -1,34 +1,7 @@
 import type * as shiki from 'shiki';
 import { getHighlighter } from 'shiki';
 import { visit } from 'unist-util-visit';
-
-export interface ShikiConfig {
-	/**
-	 * The languages loaded to Shiki.
-	 * Supports all languages listed here: https://github.com/shikijs/shiki/blob/main/docs/languages.md#all-languages
-	 * Instructions for loading a custom language: https://github.com/shikijs/shiki/blob/main/docs/languages.md#supporting-your-own-languages-with-shiki
-	 *
-	 * @default []
-	 */
-	langs?: shiki.ILanguageRegistration[];
-	/**
-	 * The styling theme.
-	 * Supports all themes listed here: https://github.com/shikijs/shiki/blob/main/docs/themes.md#all-themes
-	 * Instructions for loading a custom theme: https://github.com/shikijs/shiki/blob/main/docs/themes.md#loading-theme
-	 *
-	 * @default "github-dark"
-	 */
-	theme?: shiki.IThemeRegistration;
-	/**
-	 * Enable word wrapping.
-	 *  - true: enabled.
-	 *  - false: enabled.
-	 *  - null: All overflow styling removed. Code will overflow the element by default.
-	 *
-	 * @default false
-	 */
-	wrap?: boolean | null;
-}
+import type { ShikiConfig } from './types.js';
 
 /**
  * getHighlighter() is the most expensive step of Shiki. Instead of calling it on every page,
@@ -38,7 +11,7 @@ export interface ShikiConfig {
 const highlighterCacheAsync = new Map<string, Promise<shiki.Highlighter>>();
 
 const remarkShiki = async (
-	{ langs = [], theme = 'github-dark', wrap = false }: ShikiConfig,
+	{ langs, theme, wrap }: ShikiConfig,
 	scopedClassName?: string | null
 ) => {
 	const cacheID: string = typeof theme === 'string' ? theme : theme.name;
@@ -75,6 +48,13 @@ const remarkShiki = async (
 				/style="(background-)?color: var\(--shiki-/g,
 				'style="$1color: var(--astro-code-'
 			);
+			// Add "user-select: none;" for "+"/"-" diff symbols
+			if (node.lang === 'diff') {
+				html = html.replace(
+					/<span class="line"><span style="(.*?)">([\+|\-])/g,
+					'<span class="line"><span style="$1"><span style="user-select: none;">$2</span>'
+				);
+			}
 			// Handle code wrapping
 			// if wrap=null, do nothing.
 			if (wrap === false) {

package/src/remark-unwrap.ts

@@ -8,7 +8,7 @@ const visit = _visit as (
 	callback?: (node: any, index: number, parent: any) => any
 ) => any;
 
-// Remove the wrapping paragraph for <astro-root> islands
+// Remove the wrapping paragraph for <astro-island> islands
 export default function remarkUnwrap() {
 	const astroRootNodes = new Set();
 	let insideAstroRoot = false;
@@ -19,10 +19,10 @@ export default function remarkUnwrap() {
 		astroRootNodes.clear();
 
 		visit(tree, 'html', (node) => {
-			if (node.value.indexOf('<astro-root') > -1 && !insideAstroRoot) {
+			if (node.value.indexOf('<astro-island') > -1 && !insideAstroRoot) {
 				insideAstroRoot = true;
 			}
-			if (node.value.indexOf('</astro-root') > -1 && insideAstroRoot) {
+			if (node.value.indexOf('</astro-island') > -1 && insideAstroRoot) {
 				insideAstroRoot = false;
 			}
 			astroRootNodes.add(node);

package/src/types.ts

@@ -1,20 +1,59 @@
 import type * as unified from 'unified';
-import type { ShikiConfig } from './remark-shiki';
-export { ShikiConfig };
+import type * as mdast from 'mdast';
+import type * as hast from 'hast';
+import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
 
-export type Plugin = string | [string, any] | unified.Plugin | [unified.Plugin, any];
+export type { Node } from 'unist';
+
+export type RemarkPlugin<PluginParameters extends any[] = any[]> = unified.Plugin<
+	PluginParameters,
+	mdast.Root
+>;
+
+export type RemarkPlugins = (string | [string, any] | RemarkPlugin | [RemarkPlugin, any])[];
+
+export type RehypePlugin<PluginParameters extends any[] = any[]> = unified.Plugin<
+	PluginParameters,
+	hast.Root
+>;
+
+export type RehypePlugins = (string | [string, any] | RehypePlugin | [RehypePlugin, any])[];
+
+export interface ShikiConfig {
+	langs: ILanguageRegistration[];
+	theme: Theme | IThemeRegistration;
+	wrap: boolean | null;
+}
 
 export interface AstroMarkdownOptions {
-	mode?: 'md' | 'mdx';
-	syntaxHighlight?: 'shiki' | 'prism' | false;
-	shikiConfig?: ShikiConfig;
-	remarkPlugins?: Plugin[];
-	rehypePlugins?: Plugin[];
+	mode: 'md' | 'mdx';
+	drafts: boolean;
+	syntaxHighlight: 'shiki' | 'prism' | false;
+	shikiConfig: ShikiConfig;
+	remarkPlugins: RemarkPlugins;
+	rehypePlugins: RehypePlugins;
 }
 
-export interface MarkdownRenderingOptions extends Partial<AstroMarkdownOptions> {
+export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
 	/** @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/.turbo/turbo-build.log

@@ -1,5 +0,0 @@
-@astrojs/markdown-remark:build: cache hit, replaying output 5817ab166c77bc86
-@astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@0.8.1 build /Users/fks/Code/astro/packages/markdown/remark
-@astrojs/markdown-remark:build: > astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
-@astrojs/markdown-remark:build: 

package/dist/remark-slug.d.ts

@@ -1,10 +0,0 @@
-/**
- * @typedef {import('mdast').Root} Root
- * @typedef {import('hast').Properties} Properties
- */
-/**
- * Plugin to add anchors headings using GitHub’s algorithm.
- *
- * @type {import('unified').Plugin<void[], Root>}
- */
-export default function remarkSlug(): (tree: any) => void;

package/dist/remark-slug.js

@@ -1,23 +0,0 @@
-import { toString } from "mdast-util-to-string";
-import { visit } from "unist-util-visit";
-import BananaSlug from "github-slugger";
-const slugs = new BananaSlug();
-function remarkSlug() {
-  return (tree) => {
-    slugs.reset();
-    visit(tree, (node) => {
-      console.log(node);
-    });
-    visit(tree, "heading", (node) => {
-      const data = node.data || (node.data = {});
-      const props = data.hProperties || (data.hProperties = {});
-      let id = props.id;
-      id = id ? slugs.slug(String(id), true) : slugs.slug(toString(node));
-      data.id = id;
-      props.id = id;
-    });
-  };
-}
-export {
-  remarkSlug as default
-};

package/src/remark-slug.ts

@@ -1,32 +0,0 @@
-/**
- * @typedef {import('mdast').Root} Root
- * @typedef {import('hast').Properties} Properties
- */
-
-import { toString } from 'mdast-util-to-string';
-import { visit } from 'unist-util-visit';
-import BananaSlug from 'github-slugger';
-
-const slugs = new BananaSlug();
-
-/**
- * Plugin to add anchors headings using GitHub’s algorithm.
- *
- * @type {import('unified').Plugin<void[], Root>}
- */
-export default function remarkSlug() {
-	return (tree: any) => {
-		slugs.reset();
-		visit(tree, (node) => {
-			console.log(node);
-		});
-		visit(tree, 'heading', (node) => {
-			const data = node.data || (node.data = {});
-			const props = /** @type {Properties} */ data.hProperties || (data.hProperties = {});
-			let id = props.id;
-			id = id ? slugs.slug(String(id), true) : slugs.slug(toString(node));
-			data.id = id;
-			props.id = id;
-		});
-	};
-}