Merge of #6165

Mergifyio · Mar 5, 2025 · 6ef4d2e · 6ef4d2e
2 parents 219ad45 + b5d51a7
commit 6ef4d2e
Show file tree

Hide file tree

Showing 12 changed files with 430 additions and 225 deletions.
diff --git a/astro.config.ts b/astro.config.ts
@@ -1,5 +1,6 @@
 import mdx from '@astrojs/mdx';
 import { defineConfig } from 'astro/config';
+import { RemarkPlugin } from '@astrojs/markdown-remark';
 import AutoImport from 'astro-auto-import';
 import { astroExpressiveCode } from 'astro-expressive-code';
 import rehypeAutolinkHeadings from 'rehype-autolink-headings';
@@ -68,7 +69,7 @@ export default defineConfig({
 			remarkGraphvizPlugin(),
 			remarkAlgolia(),
 			[
-				remarkSmartypants,
+				remarkSmartypants as RemarkPlugin,
 				{
 					dashes: false,
 				},

diff --git a/integrations/astro-asides.ts b/integrations/astro-asides.ts
@@ -47,7 +47,7 @@ function remarkAsides(): unified.Plugin<[], mdast.Root> {
 			// title prop, and remove the paragraph from children.
 			let title: string | undefined;
 			remove(node, (child) => {
-				if (child.data?.directiveLabel) {
+				if ((child.data as { directiveLabel?: string })?.directiveLabel) {
 					if ('children' in child && 'value' in child.children[0]) {
 						title = child.children[0].value;
 					}
@@ -59,7 +59,7 @@ function remarkAsides(): unified.Plugin<[], mdast.Root> {
 			parent.children[index] = makeComponentNode(
 				AsideTagname,
 				{ attributes: { type, title } },
-				...node.children
+				...node.children as mdast.BlockContent[]
 			);
 		});
 	};

diff --git a/integrations/astro-youtube-embed.ts b/integrations/astro-youtube-embed.ts
@@ -22,13 +22,12 @@ export const youtubeAutoImport: Record<string, [string, string][]> = {
 function remarkYoutubeEmbed(): unified.Plugin<[], mdast.Root> {
 	const transformer: unified.Transformer<mdast.Root> = (tree) => {
 		visit(tree, (node, index, parent) => {
-			// @ts-expect-error Possibly infinite type instantiation we can’t do anything about.
 			if (!parent || index === null || node.type !== 'leafDirective' || node.name !== 'youtube')
 				return;
 			let title: string | undefined;
 
 			remove(node, (child) => {
-				if (child.data?.directiveLabel) {
+				if ((child.data as { directiveLabel?: string })?.directiveLabel) {
 					if ('children' in child && 'value' in child.children[0]) {
 						title = child.children[0].value;
 					}
@@ -40,7 +39,7 @@ function remarkYoutubeEmbed(): unified.Plugin<[], mdast.Root> {
 			parent.children[index] = makeComponentNode(
 				YoutubeTagname,
 				{ attributes: { title, video: node.attributes.v } },
-				...node.children
+				...node.children as mdast.BlockContent[]
 			);
 		});
 	};