Merge branch 'main' into fix/upgrade-error

withastro · Nov 28, 2023 · 8553c6f · 8553c6f
2 parents 390e7ca + 0dc99c9
commit 8553c6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.changeset/dull-deers-accept.md b/.changeset/dull-deers-accept.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Prevents the Code component from crashing if the lang isn't supported by falling back to `plaintext`.
diff --git a/packages/astro/components/Code.astro b/packages/astro/components/Code.astro
@@ -10,6 +10,7 @@ import type {
 	ThemeRegistration,
 	ThemeRegistrationRaw,
 } from 'shikiji';
+import { bundledLanguages } from 'shikiji/langs';
 import { getCachedHighlighter } from '../dist/core/shiki.js';
 
 interface Props {
@@ -92,7 +93,13 @@ if (typeof lang === 'object') {
 }
 
 const highlighter = await getCachedHighlighter({
-	langs: [lang],
+	langs: [
+		typeof lang === 'string'
+			? Object.keys(bundledLanguages).includes(lang)
+				? lang
+				: 'plaintext'
+			: lang,
+	],
 	theme,
 	experimentalThemes,
 	wrap,