@astrojs/markdown-remark 0.8.2 → 0.9.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "0.8.2",
+  "version": "0.9.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -29,7 +29,6 @@
     "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",
     "rehype-raw": "^6.1.1",

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) {