Fix HMR in MDX deps in Content Collections (#9956)

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
Co-authored-by: bluwy <bjornlu.dev@gmail.com>

.changeset/soft-bags-flash.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes HMR for MDX dependencies in Content Collections

packages/astro/e2e/content-collections.test.js

@@ -0,0 +1,32 @@
+import { expect } from '@playwright/test';
+import { testFactory } from './test-utils.js';
+
+const test = testFactory({ root: './fixtures/content-collections/' });
+
+let devServer;
+
+test.beforeAll(async ({ astro }) => {
+	devServer = await astro.startDevServer();
+});
+
+test.afterAll(async ({ astro }) => {
+	await devServer.stop();
+	astro.resetAllFiles();
+});
+
+test.describe('Content Collections', () => {
+	test('HMR', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/'));
+
+		await astro.editFile('./src/components/MyComponent.astro', (original) =>
+			original.replace('red', 'green')
+		);
+
+		const h1 = page.locator('#my-heading');
+
+		await expect(h1, 'should have green color').toHaveCSS(
+			'color',
+			'rgb(0, 128, 0)'
+		);
+	});
+});

packages/astro/e2e/fixtures/content-collections/astro.config.mjs

@@ -0,0 +1,9 @@
+import { defineConfig } from 'astro/config';
+import mdx from '@astrojs/mdx';
+
+// https://astro.build/config
+export default defineConfig({
+	integrations: [
+		mdx(),
+	],
+});

packages/astro/e2e/fixtures/content-collections/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@e2e/content-collections",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/mdx": "workspace:*",
+    "astro": "workspace:*"
+  }
+}

packages/astro/e2e/fixtures/content-collections/src/components/MyComponent.astro

@@ -0,0 +1,10 @@
+<h1 id="my-heading">
+  Some text here
+</h1>
+
+
+<style>
+  h1 {
+    color: red;
+  }
+</style>

packages/astro/e2e/fixtures/content-collections/src/content/posts/post-1.mdx

@@ -0,0 +1,6 @@
+---
+---
+
+import MyComponent from '../../components/MyComponent.astro';
+
+<MyComponent />

packages/astro/e2e/fixtures/content-collections/src/pages/index.astro

@@ -0,0 +1,8 @@
+---
+import { getEntryBySlug } from 'astro:content'
+
+const post = await getEntryBySlug('posts', 'post-1')
+const { Content } = await post.render();
+---
+
+<Content/>

packages/astro/src/content/vite-plugin-content-assets.ts

@@ -64,13 +64,29 @@ export function astroContentAssetPropagationPlugin({
 					if (!devModuleLoader.getModuleById(basePath)?.ssrModule) {
 						await devModuleLoader.import(basePath);
 					}
-					const { styles, urls } = await getStylesForURL(pathToFileURL(basePath), devModuleLoader);
+					const {
+						styles,
+						urls,
+						crawledFiles: styleCrawledFiles,
+					} = await getStylesForURL(pathToFileURL(basePath), devModuleLoader);
 
-					const hoistedScripts = await getScriptsForURL(
+					const { scripts: hoistedScripts, crawledFiles: scriptCrawledFiles } =
-						pathToFileURL(basePath),
+						await getScriptsForURL(pathToFileURL(basePath), settings.config.root, devModuleLoader);
-						settings.config.root,
+
-						devModuleLoader
+					// Register files we crawled to be able to retrieve the rendered styles and scripts,
-					);
+					// as when they get updated, we need to re-transform ourselves.
+					// We also only watch files within the user source code, as changes in node_modules
+					// are usually also ignored by Vite.
+					for (const file of styleCrawledFiles) {
+						if (!file.includes('node_modules')) {
+							this.addWatchFile(file);
+						}
+					}
+					for (const file of scriptCrawledFiles) {
+						if (!file.includes('node_modules')) {
+							this.addWatchFile(file);
+						}
+					}
 
 					stringifiedLinks = JSON.stringify([...urls]);
 					stringifiedStyles = JSON.stringify(styles.map((s) => s.content));

packages/astro/src/core/module-loader/loader.ts

@@ -41,6 +41,7 @@ export interface ModuleLoader {
 export interface ModuleNode {
 	id: string | null;
 	url: string;
+	file: string | null;
 	ssrModule: Record<string, any> | null;
 	ssrTransformResult: {
 		deps?: string[];

packages/astro/src/vite-plugin-astro-server/css.ts

@@ -13,12 +13,16 @@ interface ImportedStyle {
 export async function getStylesForURL(
 	filePath: URL,
 	loader: ModuleLoader
-): Promise<{ urls: Set<string>; styles: ImportedStyle[] }> {
+): Promise<{ urls: Set<string>; styles: ImportedStyle[]; crawledFiles: Set<string> }> {
 	const importedCssUrls = new Set<string>();
 	// Map of url to injected style object. Use a `url` key to deduplicate styles
 	const importedStylesMap = new Map<string, ImportedStyle>();
+	const crawledFiles = new Set<string>();
 
 	for await (const importedModule of crawlGraph(loader, viteID(filePath), true)) {
+		if (importedModule.file) {
+			crawledFiles.add(importedModule.file);
+		}
 		if (isBuildableCSSRequest(importedModule.url)) {
 			// In dev, we inline all styles if possible
 			let css = '';
@@ -60,5 +64,6 @@ export async function getStylesForURL(
 	return {
 		urls: importedCssUrls,
 		styles: [...importedStylesMap.values()],
+		crawledFiles,
 	};
 }

packages/astro/src/vite-plugin-astro-server/route.ts

@@ -393,7 +393,7 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
 	const settings = pipeline.getSettings();
 	const mode = pipeline.getEnvironment().mode;
 	// Add hoisted script tags
-	const scripts = await getScriptsForURL(filePath, settings.config.root, moduleLoader);
+	const { scripts } = await getScriptsForURL(filePath, settings.config.root, moduleLoader);
 
 	// Inject HMR scripts
 	if (isPage(filePath, settings) && mode === 'development') {

packages/astro/src/vite-plugin-astro-server/scripts.ts

@@ -9,12 +9,16 @@ export async function getScriptsForURL(
 	filePath: URL,
 	root: URL,
 	loader: ModuleLoader
-): Promise<Set<SSRElement>> {
+): Promise<{ scripts: Set<SSRElement>; crawledFiles: Set<string> }> {
 	const elements = new Set<SSRElement>();
+	const crawledFiles = new Set<string>();
 	const rootID = viteID(filePath);
 	const modInfo = loader.getModuleInfo(rootID);
 	addHoistedScripts(elements, modInfo, root);
 	for await (const moduleNode of crawlGraph(loader, rootID, true)) {
+		if (moduleNode.file) {
+			crawledFiles.add(moduleNode.file);
+		}
 		const id = moduleNode.id;
 		if (id) {
 			const info = loader.getModuleInfo(id);
@@ -22,7 +26,7 @@ export async function getScriptsForURL(
 		}
 	}
 
-	return elements;
+	return { scripts: elements, crawledFiles };
 }
 
 function addHoistedScripts(set: Set<SSRElement>, info: ModuleInfo | null, root: URL) {

pnpm-lock.yaml

@@ -935,6 +935,15 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/e2e/fixtures/content-collections:
+    dependencies:
+      '@astrojs/mdx':
+        specifier: workspace:*
+        version: link:../../../../integrations/mdx
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/e2e/fixtures/css:
     dependencies:
       astro: