@astrojs/markdown-remark 0.11.0 → 0.11.3

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @astrojs/markdown-remark
 
+## 0.11.3
+
+### Patch Changes
+
+- [#3638](https://github.com/withastro/astro/pull/3638) [`80c71c7c`](https://github.com/withastro/astro/commit/80c71c7c56d15dc05ec0c5a848130aad222d7d51) Thanks [@tony-sull](https://github.com/tony-sull)! - Fix: HTML comments in markdown code blocks should not be wrapped in JS comments
+
+* [#3612](https://github.com/withastro/astro/pull/3612) [`fca58cfd`](https://github.com/withastro/astro/commit/fca58cfd91b68501ec82350ab023170b208d8ce7) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: "vpath" import error when building for netlify edge
+
+- [#3630](https://github.com/withastro/astro/pull/3630) [`48e67fe0`](https://github.com/withastro/astro/commit/48e67fe05398dc4b1fca12db36c1b37bb341277a) Thanks [@tony-sull](https://github.com/tony-sull)! - Encodes ampersand characters in code blocks
+
+* [#3620](https://github.com/withastro/astro/pull/3620) [`05aa7244`](https://github.com/withastro/astro/commit/05aa72442cd4512b94abdb39623e8caa2c1839b0) Thanks [@hippotastic](https://github.com/hippotastic)! - Remove extra newlines around Markdown components
+
+## 0.11.2
+
+### Patch Changes
+
+- [#3572](https://github.com/withastro/astro/pull/3572) [`5c73f614`](https://github.com/withastro/astro/commit/5c73f614e8f579e04fe61c948b69be7bc6d81d5d) Thanks [@hippotastic](https://github.com/hippotastic)! - Fix remarkMdxish performance issue on huge sites
+
+## 0.11.1
+
+### Patch Changes
+
+- [#3564](https://github.com/withastro/astro/pull/3564) [`76fb01cf`](https://github.com/withastro/astro/commit/76fb01cff1002f2a37e93869378802156c4eca7c) Thanks [@hippotastic](https://github.com/hippotastic)! - Fix autolinking of URLs inside links
+
+* [#3554](https://github.com/withastro/astro/pull/3554) [`c549f161`](https://github.com/withastro/astro/commit/c549f161cadd76a666672556f2c2d63b5f97f00d) Thanks [@hippotastic](https://github.com/hippotastic)! - Allow AlpineJS syntax extensions in Markdown
+
 ## 0.11.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -2,6 +2,5 @@ import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types'
 export * from './types.js';
 export declare const DEFAULT_REMARK_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<MarkdownRenderingResult>;

package/dist/index.js

@@ -1,29 +1,25 @@
+import { loadPlugins } from "./load-plugins.js";
 import createCollectHeaders from "./rehype-collect-headers.js";
-import scopedStyles from "./remark-scoped-styles.js";
+import rehypeEscape from "./rehype-escape.js";
 import rehypeExpressions from "./rehype-expressions.js";
 import rehypeIslands from "./rehype-islands.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 remarkEscape from "./remark-escape.js";
+import remarkMarkAndUnravel from "./remark-mark-and-unravel.js";
+import remarkMdxish from "./remark-mdxish.js";
 import remarkPrism from "./remark-prism.js";
+import scopedStyles from "./remark-scoped-styles.js";
 import remarkShiki from "./remark-shiki.js";
 import remarkUnwrap from "./remark-unwrap.js";
-import { loadPlugins } from "./load-plugins.js";
-import { unified } from "unified";
+import rehypeRaw from "rehype-raw";
+import rehypeStringify from "rehype-stringify";
 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 { unified } from "unified";
 import { VFile } from "vfile";
 export * from "./types.js";
 const DEFAULT_REMARK_PLUGINS = ["remark-gfm", "remark-smartypants"];
 const DEFAULT_REHYPE_PLUGINS = [];
-const slugger = new Slugger();
-function slug(value) {
-  return slugger.slug(value);
-}
 async function renderMarkdown(content, opts = {}) {
   var _a;
   let {
@@ -38,7 +34,7 @@ async function renderMarkdown(content, opts = {}) {
   const scopedClassName = (_a = opts.$) == null ? void 0 : _a.scopedClassName;
   const isMDX = mode === "mdx";
   const { headers, rehypeCollectHeaders } = createCollectHeaders();
-  let parser = unified().use(markdown).use(isMDX ? [remarkMdxish, remarkMarkAndUnravel] : []).use([remarkUnwrap]);
+  let parser = unified().use(markdown).use(isMDX ? [remarkMdxish, remarkMarkAndUnravel] : []).use([remarkUnwrap, remarkEscape]);
   if (remarkPlugins.length === 0 && rehypePlugins.length === 0) {
     remarkPlugins = [...DEFAULT_REMARK_PLUGINS];
     rehypePlugins = [...DEFAULT_REHYPE_PLUGINS];
@@ -74,10 +70,10 @@ async function renderMarkdown(content, opts = {}) {
   loadedRehypePlugins.forEach(([plugin, opts2]) => {
     parser.use([[plugin, opts2]]);
   });
-  parser.use(isMDX ? [rehypeJsx, rehypeExpressions] : [rehypeRaw]).use(rehypeEscape).use(rehypeIslands);
+  parser.use(isMDX ? [rehypeJsx, rehypeExpressions] : [rehypeRaw]).use(rehypeEscape).use(rehypeIslands).use([rehypeCollectHeaders]).use(rehypeStringify, { allowDangerousHtml: true });
   let result;
   try {
-    const vfile = await parser.use([rehypeCollectHeaders]).use(rehypeStringify, { allowDangerousHtml: true }).process(input);
+    const vfile = await parser.process(input);
     result = vfile.toString();
   } catch (err) {
     err = prefixError(err, `Failed to parse Markdown file "${input.path}"`);
@@ -109,6 +105,5 @@ ${err.message}`;
 export {
   DEFAULT_REHYPE_PLUGINS,
   DEFAULT_REMARK_PLUGINS,
-  renderMarkdown,
-  slug
+  renderMarkdown
 };

package/dist/mdxjs.d.ts

@@ -0,0 +1,3 @@
+import type { Options } from 'micromark-extension-mdx-expression';
+import type { Extension } from 'micromark-util-types';
+export declare function mdxjs(options: Options): Extension;

package/dist/mdxjs.js

@@ -0,0 +1,17 @@
+import { mdxJsx } from "@astrojs/micromark-extension-mdx-jsx";
+import { Parser } from "acorn";
+import acornJsx from "acorn-jsx";
+import { mdxExpression } from "micromark-extension-mdx-expression";
+import { mdxMd } from "micromark-extension-mdx-md";
+import { combineExtensions } from "micromark-util-combine-extensions";
+function mdxjs(options) {
+  const settings = Object.assign({
+    acorn: Parser.extend(acornJsx()),
+    acornOptions: { ecmaVersion: 2020, sourceType: "module" },
+    addResult: true
+  }, options);
+  return combineExtensions([mdxExpression(settings), mdxJsx(settings), mdxMd]);
+}
+export {
+  mdxjs
+};

package/dist/rehype-collect-headers.js

@@ -1,6 +1,6 @@
-import { visit } from "unist-util-visit";
-import { toHtml } from "hast-util-to-html";
 import Slugger from "github-slugger";
+import { toHtml } from "hast-util-to-html";
+import { visit } from "unist-util-visit";
 function createCollectHeaders() {
   const headers = [];
   const slugger = new Slugger();
@@ -23,7 +23,7 @@ function createCollectHeaders() {
             return;
           }
           if (child.type === "raw") {
-            if (child.value.startsWith("\n<") || child.value.endsWith(">\n")) {
+            if (child.value.match(/^\n?<.*>\n?$/)) {
               return;
             }
           }

package/dist/rehype-escape.js

@@ -5,7 +5,7 @@ function rehypeEscape() {
       if (el.tagName === "code" || el.tagName === "pre") {
         el.properties["is:raw"] = true;
         visit(el, "raw", (raw) => {
-          raw.value = raw.value.replace(/</g, "&lt;").replace(/>/g, "&gt;");
+          raw.value = raw.value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         });
       }
       return el;

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/rehype-jsx.d.ts

@@ -1 +1,2 @@
-export default function rehypeJsx(): any;
+import type { RehypePlugin } from './types.js';
+export default function rehypeJsx(): ReturnType<RehypePlugin>;

package/dist/rehype-jsx.js

@@ -1,14 +1,11 @@
 import { visit } from "unist-util-visit";
 const MDX_ELEMENTS = ["mdxJsxFlowElement", "mdxJsxTextElement"];
 function rehypeJsx() {
-  return function(node) {
-    visit(node, "element", (child) => {
-      child.tagName = `${child.tagName}`;
-    });
-    visit(node, MDX_ELEMENTS, (child, index, parent) => {
+  return function(tree) {
+    visit(tree, MDX_ELEMENTS, (node, index, parent) => {
       if (index === null || !Boolean(parent))
         return;
-      const attrs = child.attributes.reduce((acc, entry) => {
+      const attrs = node.attributes.reduce((acc, entry) => {
         let attr = entry.value;
         if (attr && typeof attr === "object") {
           attr = `{${attr.value}}`;
@@ -24,22 +21,28 @@ function rehypeJsx() {
         }
         return acc + ` ${entry.name}${attr ? "=" : ""}${attr}`;
       }, "");
-      if (child.children.length === 0) {
-        child.type = "raw";
-        child.value = `<${child.name}${attrs} />`;
+      if (node.children.length === 0) {
+        node.type = "raw";
+        node.value = `<${node.name}${attrs} />`;
         return;
       }
+      if (node.name === "a") {
+        visit(node, "element", (el, elIndex, elParent) => {
+          const isAutolink = el.tagName === "a" && el.children.length === 1 && el.children[0].type === "text" && el.children[0].value.match(/^(https?:\/\/|www\.)/i);
+          if (isAutolink) {
+            elParent.children.splice(elIndex, 1, el.children[0]);
+          }
+        });
+      }
       const openingTag = {
         type: "raw",
-        value: `
-<${child.name}${attrs}>`
+        value: `<${node.name}${attrs}>`
       };
       const closingTag = {
         type: "raw",
-        value: `</${child.name}>
-`
+        value: `</${node.name}>`
       };
-      parent.children.splice(index, 1, openingTag, ...child.children, closingTag);
+      parent.children.splice(index, 1, openingTag, ...node.children, closingTag);
     });
   };
 }

package/dist/remark-escape.d.ts

@@ -0,0 +1 @@
+export default function remarkEscape(): (tree: any) => void;

package/dist/remark-escape.js

@@ -0,0 +1,13 @@
+import { visit } from "unist-util-visit";
+function remarkEscape() {
+  return (tree) => {
+    visit(tree, "code", removeCommentWrapper);
+    visit(tree, "inlineCode", removeCommentWrapper);
+  };
+  function removeCommentWrapper(node) {
+    node.value = node.value.replace(/{\/\*<!--/gs, "<!--").replace(/-->\*\/}/gs, "-->");
+  }
+}
+export {
+  remarkEscape as default
+};

package/dist/remark-mdxish.d.ts

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

package/dist/remark-mdxish.js

@@ -1,10 +1,13 @@
-import { mdxjs } from "micromark-extension-mdxjs";
 import { mdxFromMarkdown, mdxToMarkdown } from "./mdast-util-mdxish.js";
-function remarkMdxish(options = {}) {
+import { mdxjs } from "./mdxjs.js";
+const extMdxJs = mdxjs({});
+const extMdxFromMarkdown = makeFromMarkdownLessStrict(mdxFromMarkdown());
+const extMdxToMarkdown = mdxToMarkdown();
+function remarkMdxish() {
   const data = this.data();
-  add("micromarkExtensions", mdxjs(options));
-  add("fromMarkdownExtensions", makeFromMarkdownLessStrict(mdxFromMarkdown()));
-  add("toMarkdownExtensions", mdxToMarkdown());
+  add("micromarkExtensions", extMdxJs);
+  add("fromMarkdownExtensions", extMdxFromMarkdown);
+  add("toMarkdownExtensions", extMdxToMarkdown);
   function add(field, value) {
     const list = data[field] ? data[field] : data[field] = [];
     list.push(value);

package/dist/remark-prism.js

@@ -1,7 +1,7 @@
-import { visit } from "unist-util-visit";
-import Prism from "prismjs";
 import { addAstro } from "@astrojs/prism/internal";
+import Prism from "prismjs";
 import loadLanguages from "prismjs/components/index.js";
+import { visit } from "unist-util-visit";
 const noVisit = /* @__PURE__ */ new Set(["root", "html", "text"]);
 const languageMap = /* @__PURE__ */ new Map([["ts", "typescript"]]);
 function runHighlighter(lang, code) {

package/dist/remark-unwrap.js

@@ -1,4 +1,4 @@
-import { visit as _visit, SKIP } from "unist-util-visit";
+import { SKIP, visit as _visit } from "unist-util-visit";
 const visit = _visit;
 function remarkUnwrap() {
   const astroRootNodes = /* @__PURE__ */ new Set();
@@ -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/ssr-utils.d.ts

@@ -0,0 +1,2 @@
+/** @see {@link "/packages/astro/vite-plugin-markdown"} */
+export declare function slug(value: string): string;

package/dist/ssr-utils.js

@@ -0,0 +1,8 @@
+import Slugger from "github-slugger";
+const slugger = new Slugger();
+function slug(value) {
+  return slugger.slug(value);
+}
+export {
+  slug
+};

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-import type * as unified from 'unified';
-import type * as mdast from 'mdast';
 import type * as hast from 'hast';
+import type * as mdast from 'mdast';
 import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
+import type * as unified from 'unified';
 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])[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "0.11.0",
+  "version": "0.11.3",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -13,17 +13,22 @@
   "homepage": "https://astro.build",
   "main": "./dist/index.js",
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/index.js",
+    "./ssr-utils": "./dist/ssr-utils.js"
   },
   "dependencies": {
+    "@astrojs/micromark-extension-mdx-jsx": "^1.0.3",
     "@astrojs/prism": "^0.4.1",
+    "acorn": "^8.7.1",
+    "acorn-jsx": "^5.3.2",
     "assert": "^2.0.0",
     "github-slugger": "^1.4.0",
     "mdast-util-mdx-expression": "^1.2.0",
     "mdast-util-mdx-jsx": "^1.2.0",
     "mdast-util-to-string": "^3.1.0",
-    "micromark-extension-mdx-jsx": "^1.0.3",
-    "micromark-extension-mdxjs": "^1.0.0",
+    "micromark-extension-mdx-expression": "^1.0.3",
+    "micromark-extension-mdx-md": "^1.0.0",
+    "micromark-util-combine-extensions": "^1.0.0",
     "prismjs": "^1.28.0",
     "rehype-raw": "^6.1.1",
     "rehype-stringify": "^9.0.3",
@@ -47,6 +52,7 @@
     "@types/unist": "^2.0.6",
     "astro-scripts": "0.0.4",
     "chai": "^4.3.6",
+    "micromark-util-types": "^1.0.2",
     "mocha": "^9.2.2"
   },
   "scripts": {

package/src/index.ts

@@ -1,24 +1,24 @@
 import type { MarkdownRenderingOptions, MarkdownRenderingResult } from './types';
 
+import { loadPlugins } from './load-plugins.js';
 import createCollectHeaders from './rehype-collect-headers.js';
-import scopedStyles from './remark-scoped-styles.js';
+import rehypeEscape from './rehype-escape.js';
 import rehypeExpressions from './rehype-expressions.js';
 import rehypeIslands from './rehype-islands.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 remarkEscape from './remark-escape.js';
+import remarkMarkAndUnravel from './remark-mark-and-unravel.js';
+import remarkMdxish from './remark-mdxish.js';
 import remarkPrism from './remark-prism.js';
+import scopedStyles from './remark-scoped-styles.js';
 import remarkShiki from './remark-shiki.js';
 import remarkUnwrap from './remark-unwrap.js';
-import { loadPlugins } from './load-plugins.js';
 
-import { unified } from 'unified';
+import rehypeRaw from 'rehype-raw';
+import rehypeStringify from 'rehype-stringify';
 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 { unified } from 'unified';
 import { VFile } from 'vfile';
 
 export * from './types.js';
@@ -26,11 +26,6 @@ export * from './types.js';
 export const DEFAULT_REMARK_PLUGINS = ['remark-gfm', 'remark-smartypants'];
 export const DEFAULT_REHYPE_PLUGINS = [];
 
-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,
@@ -52,7 +47,7 @@ export async function renderMarkdown(
 	let parser = unified()
 		.use(markdown)
 		.use(isMDX ? [remarkMdxish, remarkMarkAndUnravel] : [])
-		.use([remarkUnwrap]);
+		.use([remarkUnwrap, remarkEscape]);
 
 	if (remarkPlugins.length === 0 && rehypePlugins.length === 0) {
 		remarkPlugins = [...DEFAULT_REMARK_PLUGINS];
@@ -99,14 +94,13 @@ export async function renderMarkdown(
 	parser
 		.use(isMDX ? [rehypeJsx, rehypeExpressions] : [rehypeRaw])
 		.use(rehypeEscape)
-		.use(rehypeIslands);
+		.use(rehypeIslands)
+		.use([rehypeCollectHeaders])
+		.use(rehypeStringify, { allowDangerousHtml: true });
 
 	let result: string;
 	try {
-		const vfile = await parser
-			.use([rehypeCollectHeaders])
-			.use(rehypeStringify, { allowDangerousHtml: true })
-			.process(input);
+		const vfile = await parser.process(input);
 		result = vfile.toString();
 	} catch (err) {
 		// Ensure that the error message contains the input filename

package/src/mdxjs.ts

@@ -0,0 +1,27 @@
+// Note: The code in this file is based on `micromark-extension-mdxjs`
+// and was adapted to use our fork `@astrojs/micromark-extension-mdx-jsx`
+// instead of `micromark-extension-mdx-jsx` to allow some extended syntax.
+// See `@astrojs/micromark-extension-mdx-jsx` on NPM for more details.
+// Also, support for ESM imports & exports in Markdown content was removed.
+
+import { mdxJsx } from '@astrojs/micromark-extension-mdx-jsx';
+import { Parser } from 'acorn';
+import acornJsx from 'acorn-jsx';
+import type { Options } from 'micromark-extension-mdx-expression';
+import { mdxExpression } from 'micromark-extension-mdx-expression';
+import { mdxMd } from 'micromark-extension-mdx-md';
+import { combineExtensions } from 'micromark-util-combine-extensions';
+import type { Extension } from 'micromark-util-types';
+
+export function mdxjs(options: Options): Extension {
+	const settings: any = Object.assign(
+		{
+			acorn: Parser.extend(acornJsx()),
+			acornOptions: { ecmaVersion: 2020, sourceType: 'module' },
+			addResult: true,
+		},
+		options
+	);
+
+	return combineExtensions([mdxExpression(settings), mdxJsx(settings), mdxMd]);
+}

package/src/rehype-collect-headers.ts

@@ -1,6 +1,6 @@
-import { visit } from 'unist-util-visit';
-import { toHtml } from 'hast-util-to-html';
 import Slugger from 'github-slugger';
+import { toHtml } from 'hast-util-to-html';
+import { visit } from 'unist-util-visit';
 
 import type { MarkdownHeader, RehypePlugin } from './types.js';
 
@@ -25,7 +25,7 @@ export default function createCollectHeaders() {
 						return;
 					}
 					if (child.type === 'raw') {
-						if (child.value.startsWith('\n<') || child.value.endsWith('>\n')) {
+						if (child.value.match(/^\n?<.*>\n?$/)) {
 							return;
 						}
 					}

package/src/rehype-escape.ts

@@ -1,4 +1,4 @@
-import { SKIP, visit } from 'unist-util-visit';
+import { visit } from 'unist-util-visit';
 
 export default function rehypeEscape(): any {
 	return function (node: any): any {
@@ -8,7 +8,7 @@ export default function rehypeEscape(): any {
 				// Visit all raw children and escape HTML tags to prevent Markdown code
 				// like "This is a `<script>` tag" from actually opening a script tag
 				visit(el, 'raw', (raw) => {
-					raw.value = raw.value.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+					raw.value = raw.value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 				});
 			}
 			return el;

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/rehype-jsx.ts

@@ -1,15 +1,14 @@
 import { visit } from 'unist-util-visit';
+import type { RehypePlugin } from './types.js';
 
 const MDX_ELEMENTS = ['mdxJsxFlowElement', 'mdxJsxTextElement'];
-export default function rehypeJsx(): any {
-	return function (node: any): any {
-		visit(node, 'element', (child: any) => {
-			child.tagName = `${child.tagName}`;
-		});
-		visit(node, MDX_ELEMENTS, (child: any, index: number | null, parent: any) => {
+
+export default function rehypeJsx(): ReturnType<RehypePlugin> {
+	return function (tree) {
+		visit(tree, MDX_ELEMENTS, (node: any, index: number | null, parent: any) => {
 			if (index === null || !Boolean(parent)) return;
 
-			const attrs = child.attributes.reduce((acc: any[], entry: any) => {
+			const attrs = node.attributes.reduce((acc: any[], entry: any) => {
 				let attr = entry.value;
 				if (attr && typeof attr === 'object') {
 					attr = `{${attr.value}}`;
@@ -26,23 +25,41 @@ export default function rehypeJsx(): any {
 				return acc + ` ${entry.name}${attr ? '=' : ''}${attr}`;
 			}, '');
 
-			if (child.children.length === 0) {
-				child.type = 'raw';
-				child.value = `<${child.name}${attrs} />`;
+			if (node.children.length === 0) {
+				node.type = 'raw';
+				node.value = `<${node.name}${attrs} />`;
 				return;
 			}
 
-			// Replace the current child node with its children
+			// If the current node is a JSX <a> element, remove autolinks from its children
+			// to prevent Markdown code like `<a href="/">**Go to www.example.com now!**</a>`
+			// from creating a nested link to `www.example.com`
+			if (node.name === 'a') {
+				visit(node, 'element', (el, elIndex, elParent) => {
+					const isAutolink =
+						el.tagName === 'a' &&
+						el.children.length === 1 &&
+						el.children[0].type === 'text' &&
+						el.children[0].value.match(/^(https?:\/\/|www\.)/i);
+
+					// If we found an autolink, remove it by replacing it with its text-only child
+					if (isAutolink) {
+						elParent.children.splice(elIndex, 1, el.children[0]);
+					}
+				});
+			}
+
+			// Replace the current node with its children
 			// wrapped by raw opening and closing tags
 			const openingTag = {
 				type: 'raw',
-				value: `\n<${child.name}${attrs}>`,
+				value: `<${node.name}${attrs}>`,
 			};
 			const closingTag = {
 				type: 'raw',
-				value: `</${child.name}>\n`,
+				value: `</${node.name}>`,
 			};
-			parent.children.splice(index, 1, openingTag, ...child.children, closingTag);
+			parent.children.splice(index, 1, openingTag, ...node.children, closingTag);
 		});
 	};
 }

package/src/remark-escape.ts

@@ -0,0 +1,15 @@
+import type { Literal } from 'unist';
+import { visit } from 'unist-util-visit';
+
+// In code blocks, this removes the JS comment wrapper added to
+// HTML comments by vite-plugin-markdown.
+export default function remarkEscape() {
+	return (tree: any) => {
+		visit(tree, 'code', removeCommentWrapper);
+		visit(tree, 'inlineCode', removeCommentWrapper);
+	};
+
+	function removeCommentWrapper(node: Literal<string>) {
+		node.value = node.value.replace(/{\/\*<!--/gs, '<!--').replace(/-->\*\/}/gs, '-->');
+	}
+}

package/src/remark-mdxish.ts

@@ -1,14 +1,19 @@
-import { mdxjs } from 'micromark-extension-mdxjs';
-import { mdxFromMarkdown, mdxToMarkdown } from './mdast-util-mdxish.js';
 import type * as fromMarkdown from 'mdast-util-from-markdown';
 import type { Tag } from 'mdast-util-mdx-jsx';
+import { mdxFromMarkdown, mdxToMarkdown } from './mdast-util-mdxish.js';
+import { mdxjs } from './mdxjs.js';
+
+// Prepare markdown extensions once to prevent performance issues
+const extMdxJs = mdxjs({});
+const extMdxFromMarkdown = makeFromMarkdownLessStrict(mdxFromMarkdown());
+const extMdxToMarkdown = mdxToMarkdown();
 
-export default function remarkMdxish(this: any, options = {}) {
+export default function remarkMdxish(this: any) {
 	const data = this.data();
 
-	add('micromarkExtensions', mdxjs(options));
-	add('fromMarkdownExtensions', makeFromMarkdownLessStrict(mdxFromMarkdown()));
-	add('toMarkdownExtensions', mdxToMarkdown());
+	add('micromarkExtensions', extMdxJs);
+	add('fromMarkdownExtensions', extMdxFromMarkdown);
+	add('toMarkdownExtensions', extMdxToMarkdown);
 
 	function add(field: string, value: unknown) {
 		const list = data[field] ? data[field] : (data[field] = []);

package/src/remark-prism.ts

@@ -1,7 +1,7 @@
-import { visit } from 'unist-util-visit';
-import Prism from 'prismjs';
 import { addAstro } from '@astrojs/prism/internal';
+import Prism from 'prismjs';
 import loadLanguages from 'prismjs/components/index.js';
+import { visit } from 'unist-util-visit';
 const noVisit = new Set(['root', 'html', 'text']);
 
 const languageMap = new Map([['ts', 'typescript']]);

package/src/remark-unwrap.ts

@@ -1,4 +1,4 @@
-import { visit as _visit, SKIP } from 'unist-util-visit';
+import { SKIP, visit as _visit } from 'unist-util-visit';
 
 // This is a workaround.
 // It fixes a compatibility issue between different, incompatible ASTs given by plugins to Unist
@@ -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/ssr-utils.ts

@@ -0,0 +1,8 @@
+/** Utilities used in deployment-ready SSR bundles */
+import Slugger from 'github-slugger';
+
+const slugger = new Slugger();
+/** @see {@link "/packages/astro/vite-plugin-markdown"} */
+export function slug(value: string): string {
+	return slugger.slug(value);
+}

package/src/types.ts

@@ -1,7 +1,7 @@
-import type * as unified from 'unified';
-import type * as mdast from 'mdast';
 import type * as hast from 'hast';
+import type * as mdast from 'mdast';
 import type { ILanguageRegistration, IThemeRegistration, Theme } from 'shiki';
+import type * as unified from 'unified';
 
 export type { Node } from 'unist';
 

package/test/autolinking.test.js

@@ -0,0 +1,92 @@
+import { renderMarkdown } from '../dist/index.js';
+import chai from 'chai';
+
+describe('autolinking', () => {
+	it('autolinks URLs starting with a protocol in plain text', async () => {
+		const { code } = await renderMarkdown(`See https://example.com for more.`, {});
+
+		chai
+			.expect(code.replace(/\n/g, ''))
+			.to.equal(`<p>See <a href="https://example.com">https://example.com</a> for more.</p>`);
+	});
+
+	it('autolinks URLs starting with "www." in plain text', async () => {
+		const { code } = await renderMarkdown(`See www.example.com for more.`, {});
+
+		chai
+			.expect(code.trim())
+			.to.equal(`<p>See <a href="http://www.example.com">www.example.com</a> for more.</p>`);
+	});
+
+	it('does not autolink URLs in code blocks', async () => {
+		const { code } = await renderMarkdown(
+			'See `https://example.com` or `www.example.com` for more.',
+			{}
+		);
+
+		chai
+			.expect(code.trim())
+			.to.equal(
+				`<p>See <code is:raw>https://example.com</code> or ` +
+					`<code is:raw>www.example.com</code> for more.</p>`
+			);
+	});
+
+	it('does not autolink URLs in fenced code blocks', async () => {
+		const { code } = await renderMarkdown(
+			'Example:\n```\nGo to https://example.com or www.example.com now.\n```',
+			{}
+		);
+
+		chai
+			.expect(code)
+			.to.contain(`<pre is:raw`)
+			.to.contain(`Go to https://example.com or www.example.com now.`);
+	});
+
+	it('does not autolink URLs starting with a protocol when nested inside links', async () => {
+		const { code } = await renderMarkdown(
+			`See [http://example.com](http://example.com) or ` +
+				`<a test href="https://example.com">https://example.com</a>`,
+			{}
+		);
+
+		chai
+			.expect(code.replace(/\n/g, ''))
+			.to.equal(
+				`<p>See <a href="http://example.com">http://example.com</a> or ` +
+					`<a test href="https://example.com">https://example.com</a></p>`
+			);
+	});
+
+	it('does not autolink URLs starting with "www." when nested inside links', async () => {
+		const { code } = await renderMarkdown(
+			`See [www.example.com](https://www.example.com) or ` +
+				`<a test href="https://www.example.com">www.example.com</a>`,
+			{}
+		);
+
+		chai
+			.expect(code.replace(/\n/g, ''))
+			.to.equal(
+				`<p>See <a href="https://www.example.com">www.example.com</a> or ` +
+					`<a test href="https://www.example.com">www.example.com</a></p>`
+			);
+	});
+
+	it('does not autolink URLs when nested several layers deep inside links', async () => {
+		const { code } = await renderMarkdown(
+			`<a href="https://www.example.com">**Visit _our www.example.com or ` +
+				`http://localhost pages_ for more!**</a>`,
+			{}
+		);
+
+		chai
+			.expect(code.replace(/\n/g, ''))
+			.to.equal(
+				`<a href="https://www.example.com"><strong>` +
+					`Visit <em>our www.example.com or http://localhost pages</em> for more!` +
+					`</strong></a>`
+			);
+	});
+});

package/test/components.test.js

@@ -49,7 +49,7 @@ describe('components', () => {
 	it('should normalize children', async () => {
 		const { code } = await renderMarkdown(`<Component bool={true}>Hello world!</Component>`, {});
 
-		chai.expect(code).to.equal(`\n<Component bool={true}>Hello world!</Component>\n`);
+		chai.expect(code).to.equal(`<Component bool={true}>Hello world!</Component>`);
 	});
 
 	it('should be able to nest components', async () => {
@@ -60,7 +60,7 @@ describe('components', () => {
 
 		chai
 			.expect(code)
-			.to.equal(`\n<Component bool={true}>\n<Component>Hello world!</Component>\n</Component>\n`);
+			.to.equal(`<Component bool={true}><Component>Hello world!</Component></Component>`);
 	});
 
 	it('should allow markdown without many spaces', async () => {
@@ -71,6 +71,6 @@ describe('components', () => {
 			{}
 		);
 
-		chai.expect(code).to.equal(`\n<Component><h1 id="hello-world">Hello world!</h1></Component>\n`);
+		chai.expect(code).to.equal(`<Component><h1 id="hello-world">Hello world!</h1></Component>`);
 	});
 });

package/test/expressions.test.js

@@ -1,5 +1,5 @@
 import { renderMarkdown } from '../dist/index.js';
-import chai from 'chai';
+import chai, { expect } from 'chai';
 
 describe('expressions', () => {
 	it('should be able to serialize bare expression', async () => {
@@ -11,7 +11,7 @@ describe('expressions', () => {
 	it('should be able to serialize expression inside component', async () => {
 		const { code } = await renderMarkdown(`<Component>{a}</Component>`, {});
 
-		chai.expect(code).to.equal(`\n<Component>{a}</Component>\n`);
+		chai.expect(code).to.equal(`<Component>{a}</Component>`);
 	});
 
 	it('should be able to serialize expression inside markdown', async () => {
@@ -71,6 +71,29 @@ describe('expressions', () => {
 			);
 	});
 
+	it('should be able to encode ampersand characters in code blocks', async () => {
+		const { code } = await renderMarkdown(
+			'The ampersand in `&nbsp;` must be encoded in code blocks.',
+			{}
+		);
+
+		chai
+			.expect(code)
+			.to.equal(
+				'<p>The ampersand in <code is:raw>&amp;nbsp;</code> must be encoded in code blocks.</p>'
+			);
+	});
+
+	it('should be able to encode ampersand characters in fenced code blocks', async () => {
+		const { code } = await renderMarkdown(`
+		\`\`\`md
+			The ampersand in \`&nbsp;\` must be encoded in code blocks.
+		\`\`\`
+		`);
+
+		chai.expect(code).to.match(/^<pre is:raw.*<code>.*The ampersand in `&amp;nbsp;`/);
+	});
+
 	it('should be able to serialize function expression', async () => {
 		const { code } = await renderMarkdown(
 			`{frontmatter.list.map(item => <p id={item}>{item}</p>)}`,
@@ -79,4 +102,22 @@ describe('expressions', () => {
 
 		chai.expect(code).to.equal(`{frontmatter.list.map(item => <p id={item}>{item}</p>)}`);
 	});
+
+	it('should unwrap HTML comments in inline code blocks', async () => {
+		const { code } = await renderMarkdown(`\`{/*<!-- HTML comment -->*/}\``);
+
+		chai.expect(code).to.equal('<p><code is:raw>&lt;!-- HTML comment --&gt;</code></p>');
+	});
+
+	it('should unwrap HTML comments in code fences', async () => {
+		const { code } = await renderMarkdown(
+			`
+			  \`\`\`
+				<!-- HTML comment -->
+				\`\`\`
+			`
+		);
+
+		chai.expect(code).to.match(/(?<!{\/\*)&lt;!-- HTML comment --&gt;(?!\*\/})/);
+	});
 });

package/test/strictness.test.js

@@ -15,4 +15,85 @@ describe('strictness', () => {
 					`<img src="hi.jpg" /></p>`
 			);
 	});
+
+	it('should allow attribute names starting with ":" after element names', async () => {
+		const { code } = await renderMarkdown(`<div :class="open ? '' : 'hidden'">Test</div>`, {});
+
+		chai.expect(code.trim()).to.equal(`<div :class="open ? '' : 'hidden'">Test</div>`);
+	});
+
+	it('should allow attribute names starting with ":" after local element names', async () => {
+		const { code } = await renderMarkdown(`<div.abc :class="open ? '' : 'hidden'">x</div.abc>`, {});
+
+		chai.expect(code.trim()).to.equal(`<div.abc :class="open ? '' : 'hidden'">x</div.abc>`);
+	});
+
+	it('should allow attribute names starting with ":" after attribute names', async () => {
+		const { code } = await renderMarkdown(`<input type="text" disabled :placeholder="hi">`, {});
+
+		chai.expect(code.trim()).to.equal(`<input type="text" disabled :placeholder="hi" />`);
+	});
+
+	it('should allow attribute names starting with ":" after local attribute names', async () => {
+		const { code } = await renderMarkdown(
+			`<input type="text" x-test:disabled :placeholder="hi">`,
+			{}
+		);
+
+		chai.expect(code.trim()).to.equal(`<input type="text" x-test:disabled :placeholder="hi" />`);
+	});
+
+	it('should allow attribute names starting with ":" after attribute values', async () => {
+		const { code } = await renderMarkdown(`<input type="text" :placeholder="placeholder">`, {});
+
+		chai.expect(code.trim()).to.equal(`<input type="text" :placeholder="placeholder" />`);
+	});
+
+	it('should allow attribute names starting with "@" after element names', async () => {
+		const { code } = await renderMarkdown(`<button @click="handleClick">Test</button>`, {});
+
+		chai.expect(code.trim()).to.equal(`<button @click="handleClick">Test</button>`);
+	});
+
+	it('should allow attribute names starting with "@" after local element names', async () => {
+		const { code } = await renderMarkdown(
+			`<button.local @click="handleClick">Test</button.local>`,
+			{}
+		);
+
+		chai.expect(code.trim()).to.equal(`<button.local @click="handleClick">Test</button.local>`);
+	});
+
+	it('should allow attribute names starting with "@" after attribute names', async () => {
+		const { code } = await renderMarkdown(
+			`<button disabled @click="handleClick">Test</button>`,
+			{}
+		);
+
+		chai.expect(code.trim()).to.equal(`<button disabled @click="handleClick">Test</button>`);
+	});
+
+	it('should allow attribute names starting with "@" after local attribute names', async () => {
+		const { code } = await renderMarkdown(
+			`<button x-test:disabled @click="handleClick">Test</button>`,
+			{}
+		);
+
+		chai.expect(code.trim()).to.equal(`<button x-test:disabled @click="handleClick">Test</button>`);
+	});
+
+	it('should allow attribute names starting with "@" after attribute values', async () => {
+		const { code } = await renderMarkdown(
+			`<button type="submit" @click="handleClick">Test</button>`,
+			{}
+		);
+
+		chai.expect(code.trim()).to.equal(`<button type="submit" @click="handleClick">Test</button>`);
+	});
+
+	it('should allow attribute names containing dots', async () => {
+		const { code } = await renderMarkdown(`<input x-on:input.debounce.500ms="fetchResults">`, {});
+
+		chai.expect(code.trim()).to.equal(`<input x-on:input.debounce.500ms="fetchResults" />`);
+	});
 });