Merge branch 'main' into ensure-outdir-assetsdir-treeshaking

.changeset/blue-dolls-melt.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Updates the `HTMLAttributes` type exported from `astro` to allow data attributes

.changeset/eighty-pumpkins-float.md

@@ -0,0 +1,6 @@
+---
+"@astrojs/markdown-remark": patch
+---
+
+This patch allows Shiki to use all of its reserved languages instead of the
+previous behavior of forcing unknown languages to plaintext.

packages/astro/types.d.ts

@@ -4,11 +4,14 @@ import type { Simplify } from './dist/type-utils.js';
 
 /** Any supported HTML or SVG element name, as defined by the HTML specification */
 export type HTMLTag = keyof astroHTML.JSX.DefinedIntrinsicElements;
+
 /** The built-in attributes for any known HTML or SVG element name */
 export type HTMLAttributes<Tag extends HTMLTag> = Omit<
 	astroHTML.JSX.IntrinsicElements[Tag],
 	keyof Omit<AstroBuiltinAttributes, 'class:list'>
->;
+> & {
+	[key: string]: string | number | boolean | null | undefined;
+};
 
 /**
  * All the CSS properties available, as defined by the CSS specification

packages/markdown/remark/src/shiki.ts

@@ -1,5 +1,5 @@
 import type { Properties } from 'hast';
-import { bundledLanguages, createCssVariablesTheme, getHighlighter } from 'shiki';
+import { bundledLanguages, createCssVariablesTheme, getHighlighter, isSpecialLang } from 'shiki';
 import { visit } from 'unist-util-visit';
 import type { ShikiConfig } from './types.js';
 
@@ -51,7 +51,7 @@ export async function createShikiHighlighter({
 
 	return {
 		highlight(code, lang = 'plaintext', options) {
-			if (lang !== 'plaintext' && !loadedLanguages.includes(lang)) {
+			if (!isSpecialLang(lang) && !loadedLanguages.includes(lang)) {
 				// eslint-disable-next-line no-console
 				console.warn(`[Shiki] The language "${lang}" doesn't exist, falling back to "plaintext".`);
 				lang = 'plaintext';