fix: unsufficient regex

Author: florian-lefebvre

packages/astro/src/core/util.ts

@@ -4,6 +4,8 @@ import { fileURLToPath } from 'node:url';
 import type { AstroSettings } from '../types/astro.js';
 import type { AstroConfig } from '../types/public/config.js';
 import type { RouteData } from '../types/public/internal.js';
+import { hasSpecialQueries } from '../vite-plugin-utils/index.js';
+import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from './constants.js';
 import { removeQueryString, removeTrailingForwardSlash, slash } from './path.js';
 
 /** Returns true if argument is an object of any prototype/class (but not null). */
@@ -16,6 +18,19 @@ export function isURL(value: unknown): value is URL {
 	return Object.prototype.toString.call(value) === '[object URL]';
 }
 
+/** Check if a file is a markdown file based on its extension */
+export function isMarkdownFile(fileId: string, option?: { suffix?: string }): boolean {
+	if (hasSpecialQueries(fileId)) {
+		return false;
+	}
+	const id = removeQueryString(fileId);
+	const _suffix = option?.suffix ?? '';
+	for (let markdownFileExtension of SUPPORTED_MARKDOWN_FILE_EXTENSIONS) {
+		if (id.endsWith(`${markdownFileExtension}${_suffix}`)) return true;
+	}
+	return false;
+}
+
 /** Wraps an object in an array. If an array is passed, ignore it. */
 export function arraify<T>(target: T | T[]): T[] {
 	return Array.isArray(target) ? target : [target];

packages/astro/src/vite-plugin-markdown/index.ts

@@ -9,7 +9,7 @@ import type { Plugin } from 'vite';
 import { safeParseFrontmatter } from '../content/utils.js';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
 import type { Logger } from '../core/logger/core.js';
-import { isPage } from '../core/util.js';
+import { isMarkdownFile, isPage } from '../core/util.js';
 import { normalizePath } from '../core/viteUtils.js';
 import { shorthash } from '../runtime/server/shorthash.js';
 import type { AstroSettings } from '../types/astro.js';
@@ -68,6 +68,11 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
 				},
 			},
 			async handler(id) {
+				// The id filter also matches file extensions in search params which we do not want.
+				// So we check another time, but at least it will run for less ids
+				if (!isMarkdownFile(id)) {
+					return;
+				}
 				const { fileId, fileUrl } = getFileInfo(id, settings.config);
 				const rawFile = await fs.promises.readFile(fileId, 'utf-8');
 				const raw = safeParseFrontmatter(rawFile, id);