Bugfix/extra whitespace in code (#12570)

Co-authored-by: Bjorn Lu <[email protected]>
withastro · Dec 5, 2024 · 87231b1 · 87231b1
1 parent a5b1735
commit 87231b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.changeset/twelve-pens-remain.md b/.changeset/twelve-pens-remain.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/markdown-remark": patch
+---
+
+Removes trailing new line in code blocks to prevent generating a trailing empty `<span />` tag
diff --git a/packages/markdown/remark/src/shiki.ts b/packages/markdown/remark/src/shiki.ts
@@ -103,6 +103,8 @@ export async function createShikiHighlighter({
 			}
 		}
 
+		code = code.replace(/(?:\r\n|\r|\n)$/, '');
+
 		const themeOptions = Object.values(themes).length ? { themes } : { theme };
 		const inline = options?.inline ?? false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -103,6 +103,8 @@ export async function createShikiHighlighter({ @@
     			}
     		}
+    		code = code.replace(/(?:\r\n|\r|\n)$/, '');
     		const themeOptions = Object.values(themes).length ? { themes } : { theme };
     		const inline = options?.inline ?? false;
@@ Expand Down @@