@astrojs/markdown-remark 0.9.0 → 0.9.4

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @astrojs/markdown-remark
 
+## 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
+
+- [#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

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,6 @@
-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[];
 /** 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

@@ -17,7 +17,7 @@ import rehypeStringify from "rehype-stringify";
 import rehypeRaw from "rehype-raw";
 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 { mode, syntaxHighlight, shikiConfig, remarkPlugins, rehypePlugins } = opts;

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/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.js

@@ -17,6 +17,9 @@ const remarkShiki = async ({ langs, theme, wrap }, scopedClassName) => {
       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/types.d.ts

@@ -26,3 +26,17 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
         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.0",
+  "version": "0.9.4",
   "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",
@@ -29,11 +22,9 @@
     "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",
@@ -50,6 +41,13 @@
     "@types/mdast": "^3.0.10",
     "@types/prismjs": "^1.26.0",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "workspace:*"
+    "astro-scripts": "0.0.3"
+  },
+  "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\""
   }
-}
+}

package/src/index.ts

@@ -1,4 +1,4 @@
-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';
@@ -22,11 +22,13 @@ import rehypeRaw from 'rehype-raw';
 export * from './types.js';
 
 export const DEFAULT_REMARK_PLUGINS = ['remark-gfm', 'remark-smartypants'];
-
-export const DEFAULT_REHYPE_PLUGINS = ['rehype-slug'];
+export const DEFAULT_REHYPE_PLUGINS = [];
 
 /** Shared utility for rendering markdown */
-export async function renderMarkdown(content: string, opts: MarkdownRenderingOptions) {
+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';

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/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

@@ -48,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/types.ts

@@ -40,3 +40,20 @@ export interface MarkdownRenderingOptions extends AstroMarkdownOptions {
 		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/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;
-		});
-	};
-}