[pull] main from withastro:main

.changeset/fix-dev-quit-fonts-dist.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where stopping the dev server with `q+enter` incorrectly created a `dist` folder and copied font files when using the experimental Fonts API

.changeset/fix-react-mdx-nested-hydration.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes hydration for React components nested inside HTML elements in MDX files

.github/renovate.json5

@@ -11,7 +11,7 @@
   "labels": ["dependencies"],
   "rangeStrategy": "bump",
   "postUpdateOptions": ["pnpmDedupe"],
-  "lockfileMaintenance": {
+  "lockFileMaintenance": {
     "enabled": true
   },
   "ignorePaths": [

packages/astro/e2e/fixtures/react-component/src/pages/nested-in-div.mdx

@@ -0,0 +1,16 @@
+export { default } from '../components/Layout.astro';
+import Counter from '../components/Counter.jsx';
+
+export const someProps = {
+	count: 0,
+};
+
+# Nested React Components in MDX
+
+This tests that React components nested inside HTML elements still hydrate correctly.
+
+<div class="wrapper">
+	<Counter id="nested-counter" {...someProps} client:load>
+		# Hello from nested component!
+	</Counter>
+</div>

packages/astro/e2e/react-component.test.js

@@ -1,5 +1,6 @@
 import { expect } from '@playwright/test';
 import { prepareTestFactory } from './shared-component-tests.js';
+import { waitForHydrate } from './test-utils.js';
 
 const { test, createTests } = prepareTestFactory(import.meta.url, {
 	root: './fixtures/react-component/',
@@ -37,6 +38,25 @@ test.describe('dev', () => {
 	});
 });
 
+test.describe('React components nested in HTML elements in MDX', () => {
+	test('client:load nested in div', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/nested-in-div/'));
+
+		const counter = page.locator('#nested-counter');
+		await expect(counter, 'component is visible').toBeVisible();
+
+		const count = counter.locator('pre');
+		await expect(count, 'initial count is 0').toHaveText('0');
+
+		await waitForHydrate(page, counter);
+
+		const inc = counter.locator('.increment');
+		await inc.click();
+
+		await expect(count, 'count incremented by 1').toHaveText('1');
+	});
+});
+
 test.describe('React client id generation', () => {
 	test('react components generate unique ids', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));

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

@@ -308,7 +308,7 @@ export function fontsPlugin({ settings, sync, logger }: Options): Plugin {
 			}
 		},
 		async buildEnd() {
-			if (sync || settings.config.experimental.fonts!.length === 0) {
+			if (sync || settings.config.experimental.fonts!.length === 0 || !isBuild) {
 				cleanup();
 				return;
 			}

packages/astro/src/runtime/server/render/component.ts

@@ -24,19 +24,9 @@ import {
 } from './common.js';
 import { componentIsHTMLElement, renderHTMLElement } from './dom.js';
 import { maybeRenderHead } from './head.js';
-import {
-	createRenderInstruction,
-	isRenderInstruction,
-	type RenderInstruction,
-} from './instruction.js';
+import { createRenderInstruction } from './instruction.js';
 import { containsServerDirective, ServerIslandComponent } from './server-islands.js';
-import {
-	type ComponentSlots,
-	mergeSlotInstructions,
-	renderSlots,
-	renderSlotToString,
-	SlotString,
-} from './slot.js';
+import { type ComponentSlots, renderSlots, renderSlotToString } from './slot.js';
 import { formatList, internalSpreadAttributes, renderElement, voidElementNames } from './util.js';
 
 const needsHeadRenderingSymbol = Symbol.for('astro.needsHeadRendering');
@@ -534,7 +524,6 @@ export async function renderComponentToString(
 	route?: RouteData,
 ): Promise<string> {
 	let str = '';
-	let instructions: RenderInstruction[] | null = null;
 	let renderedFirstPageChunk = false;
 
 	// Handle head injection if required. Note that this needs to run early so
@@ -559,21 +548,7 @@ export async function renderComponentToString(
 				// `renderToString` doesn't work with emitting responses, so ignore here
 				if (chunk instanceof Response) return;
 
-				// For pages, stringify immediately (final output)
-				// For non-pages (slots/components), collect instructions for deferred processing
-				if (isPage) {
-					str += chunkToString(result, chunk);
-				} else {
-					if (chunk instanceof SlotString) {
-						str += chunk;
-						instructions = mergeSlotInstructions(instructions, chunk);
-					} else if (isRenderInstruction(chunk)) {
-						instructions ??= [];
-						instructions.push(chunk);
-					} else {
-						str += chunkToString(result, chunk);
-					}
-				}
+				str += chunkToString(result, chunk);
 			},
 		};
 
@@ -594,11 +569,7 @@ export async function renderComponentToString(
 		throw e;
 	}
 
-	// For pages, return plain string. For non-pages, return SlotString to preserve instructions.
-	if (isPage) {
-		return str;
-	}
-	return new SlotString(str, instructions) as unknown as string;
+	return str;
 }
 
 export type NonAstroPageComponent = {

packages/astro/test/fonts.test.js

@@ -1,5 +1,6 @@
 // @ts-check
 import assert from 'node:assert/strict';
+import { existsSync } from 'node:fs';
 import { readdir } from 'node:fs/promises';
 import { describe, it } from 'node:test';
 import { fontProviders } from 'astro/config';
@@ -11,6 +12,7 @@ import { loadFixture } from './test-utils.js';
  */
 async function createDevFixture(inlineConfig) {
 	const fixture = await loadFixture({ root: './fixtures/fonts/', ...inlineConfig });
+	await fixture.clean();
 	const devServer = await fixture.startDevServer();
 
 	return {
@@ -200,6 +202,25 @@ describe('astro fonts', () => {
 				assert.equal(parsed[0].src[0].url.startsWith('/_astro/fonts/'), true);
 			});
 		});
+
+		it('Does not create dist folder or copy fonts when dev server stops', async () => {
+			const { fixture, run } = await createDevFixture({
+				experimental: {
+					fonts: [
+						{
+							name: 'Poppins',
+							cssVariable: '--font-test',
+							provider: fontProviders.fontsource(),
+							weights: [400, 500],
+						},
+					],
+				},
+			});
+			await run(async () => {
+				await fixture.fetch('/');
+			});
+			assert.equal(existsSync(fixture.config.outDir), false);
+		});
 	});
 
 	describe('build', () => {