From 57ead0d5938e5988e3f896f3d6f8ef4516c4923f Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Wed, 17 Jun 2026 11:57:14 +0200
Subject: [PATCH 1/9] feat: make jsx whitespace handling the default (#16965)

Co-authored-by: Armand Philippot <git@armand.philippot.eu>
---
 .changeset/compress-html-jsx-default.md       |   9 ++
 packages/astro/package.json                   |   2 +-
 packages/astro/src/core/build/generate.ts     |   2 +-
 .../astro/src/core/config/schemas/base.ts     |   2 +-
 packages/astro/src/types/public/config.ts     |  12 +-
 .../test/astro-script-template-dedup.test.ts  |  16 +--
 .../astro.config.mjs                          |   5 +
 .../minification-html-default/package.json    |   8 ++
 .../src/pages/index.astro                     |  23 ++++
 packages/astro/test/minification-html.test.ts |  55 +++++++-
 packages/astro/test/serializeManifest.test.ts |   2 +-
 .../test/units/manifest/serialized.test.ts    |   4 +-
 packages/astro/test/units/test-utils.ts       |   2 +-
 pnpm-lock.yaml                                | 119 +++++++++++-------
 14 files changed, 193 insertions(+), 68 deletions(-)
 create mode 100644 .changeset/compress-html-jsx-default.md
 create mode 100644 packages/astro/test/fixtures/minification-html-default/astro.config.mjs
 create mode 100644 packages/astro/test/fixtures/minification-html-default/package.json
 create mode 100644 packages/astro/test/fixtures/minification-html-default/src/pages/index.astro

diff --git a/.changeset/compress-html-jsx-default.md b/.changeset/compress-html-jsx-default.md
new file mode 100644
index 000000000000..3da7a85972b8
--- /dev/null
+++ b/.changeset/compress-html-jsx-default.md
@@ -0,0 +1,9 @@
+---
+'astro': major
+---
+
+Makes `'jsx'` the default value for `compressHTML`
+
+Astro now strips whitespace from your HTML using JSX rules by default, the same way frameworks like React do. Whitespace and line breaks around elements are removed, but meaningful whitespace within a single line — like a space between two inline elements — is preserved. To keep a space that would otherwise be removed, write it explicitly in your source, for example with `{" "}`.
+
+This can change rendered output where whitespace between inline elements was previously meaningful. To keep Astro's earlier behavior, set `compressHTML: true` for HTML-aware compression, or `compressHTML: false` to preserve all whitespace.
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 8e4f1aeb13d1..100fa9bf9b24 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -133,7 +133,7 @@
     "test:integration": "astro-scripts test \"test/*.test.ts\" --parallel --strip-types"
   },
   "dependencies": {
-    "@astrojs/compiler-rs": "^0.1.10",
+    "@astrojs/compiler-rs": "^0.2.2",
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/markdown-satteri": "workspace:*",
     "@astrojs/telemetry": "workspace:*",
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 28c946082b3b..073d84462680 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -470,7 +470,7 @@ export async function renderPath({
 			relativeLocation: locationSite,
 			from: fromPath,
 		});
-		if (config.compressHTML === true) {
+		if (config.compressHTML) {
 			body = body.replaceAll('\n', '');
 		}
 		if (route.type !== 'redirect') {
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index 2b47a419d85b..d931cb6cda9b 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -85,7 +85,7 @@ export const ASTRO_CONFIG_DEFAULTS = {
 	devToolbar: {
 		enabled: true,
 	},
-	compressHTML: true,
+	compressHTML: 'jsx',
 	server: {
 		host: false,
 		port: 4321,
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 46eeaec198a6..89ecdd45ae87 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -474,22 +474,22 @@ export interface AstroUserConfig<
 	 * @docs
 	 * @name compressHTML
 	 * @type {boolean | "jsx"}
-	 * @default `true`
+	 * @default `'jsx'`
 	 * @description
 	 *
 	 * Controls how Astro handles whitespace in your HTML. This affects both development mode and the final build output.
 	 *
-	 * By default, Astro removes whitespace from your HTML, including line breaks, in a lossless manner from `.astro` components. Some whitespace may be preserved as needed to maintain the visual rendering of your HTML.
+	 * Since v7.0,  Astro applies by default the JSX whitespace rules used by frameworks like React. This removes whitespace and line breaks around elements, collapses multi-line text onto a single line, and preserves whitespace within a single line (e.g. a space between two inline elements). To keep a space that would otherwise be removed, include it explicitly in the source through constructs such as `{" "}`.
 	 *
-	 * Since 6.2.0, this option can also be set to `"jsx"`, Astro will apply the JSX whitespace stripping rules used by frameworks like React. Leading and trailing whitespace is only preserved when explicitly included in the source code through constructs such as `{" "}`, and is otherwise removed entirely.
+	 * Setting this option to `true` instead removes whitespace, including line breaks, in a lossless manner from `.astro` components. Some whitespace may be preserved as needed to maintain the visual rendering of your HTML.
 	 *
-	 * Setting this option to false disables HTML compression and preserves all whitespace.
+	 * Setting this option to `false` disables HTML compression and preserves all whitespace.
 	 *
 	 * ```js
 	 * {
-	 *   compressHTML: false
+	 *   compressHTML: true
 	 *   // or:
-	 *   // compressHTML: 'jsx'
+	 *   // compressHTML: false
 	 * }
 	 * ```
 	 */
diff --git a/packages/astro/test/astro-script-template-dedup.test.ts b/packages/astro/test/astro-script-template-dedup.test.ts
index 5272a50cc6a0..9628e4f5d25f 100644
--- a/packages/astro/test/astro-script-template-dedup.test.ts
+++ b/packages/astro/test/astro-script-template-dedup.test.ts
@@ -29,8 +29,8 @@ describe('Scripts inside template elements', () => {
 		const $ = cheerio.load(html);
 
 		// One script inside the <template> (inert), one outside (executes)
-		assert.equal($('script').length, 1);
-		assert.equal(countSubstring(html, '<script type="module">'), 1);
+		assert.equal($('script').length, 2);
+		assert.equal(countSubstring(html, '<script type="module">'), 2);
 	});
 
 	it('renders script outside template when component is used outside first, then in template', async () => {
@@ -38,8 +38,8 @@ describe('Scripts inside template elements', () => {
 		const $ = cheerio.load(html);
 
 		// One script outside (executes, deduplicated normally), one inside the template
-		assert.equal($('script').length, 1);
-		assert.equal(countSubstring(html, '<script type="module">'), 1);
+		assert.equal($('script').length, 2);
+		assert.equal(countSubstring(html, '<script type="module">'), 2);
 	});
 
 	it('renders script outside nested templates', async () => {
@@ -47,8 +47,8 @@ describe('Scripts inside template elements', () => {
 		const $ = cheerio.load(html);
 
 		// One script outside (executes), one inside the nested templates
-		assert.equal($('script').length, 1);
-		assert.equal(countSubstring(html, '<script type="module">'), 1);
+		assert.equal($('script').length, 2);
+		assert.equal(countSubstring(html, '<script type="module">'), 2);
 	});
 
 	it('deduplicates scripts outside template while keeping one inside', async () => {
@@ -57,7 +57,7 @@ describe('Scripts inside template elements', () => {
 
 		// Two components outside the template should still deduplicate to one script.
 		// The template gets its own (inert) copy. Total: 2 scripts.
-		assert.equal($('script').length, 1);
-		assert.equal(countSubstring(html, '<script type="module">'), 1);
+		assert.equal($('script').length, 2);
+		assert.equal(countSubstring(html, '<script type="module">'), 2);
 	});
 });
diff --git a/packages/astro/test/fixtures/minification-html-default/astro.config.mjs b/packages/astro/test/fixtures/minification-html-default/astro.config.mjs
new file mode 100644
index 000000000000..0e82d35d4efe
--- /dev/null
+++ b/packages/astro/test/fixtures/minification-html-default/astro.config.mjs
@@ -0,0 +1,5 @@
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+// Intentionally does not set `compressHTML` so the default value is exercised.
+export default defineConfig({});
diff --git a/packages/astro/test/fixtures/minification-html-default/package.json b/packages/astro/test/fixtures/minification-html-default/package.json
new file mode 100644
index 000000000000..f5581f16315b
--- /dev/null
+++ b/packages/astro/test/fixtures/minification-html-default/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/minification-html-default",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/minification-html-default/src/pages/index.astro b/packages/astro/test/fixtures/minification-html-default/src/pages/index.astro
new file mode 100644
index 000000000000..b6d18b67d495
--- /dev/null
+++ b/packages/astro/test/fixtures/minification-html-default/src/pages/index.astro
@@ -0,0 +1,23 @@
+---
+---
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>default minification</title>
+  </head>
+  <body>
+    <p id="multi-line">
+      Hello
+      world
+    </p>
+    <div id="inline">
+      <span>hello</span>
+      <em>world</em>
+    </div>
+    <pre id="preserved">
+  keep
+    this
+      whitespace
+    </pre>
+  </body>
+</html>
diff --git a/packages/astro/test/minification-html.test.ts b/packages/astro/test/minification-html.test.ts
index c6bc8b18c90f..71354be64a79 100644
--- a/packages/astro/test/minification-html.test.ts
+++ b/packages/astro/test/minification-html.test.ts
@@ -116,9 +116,62 @@ describe('HTML minification (JSX mode)', () => {
 
 		it('should preserve inline text and elements on the same line', () => {
 			assert.ok(
-				html.includes('<span>hello</span><em>world</em>'),
+				html.includes('<span>hello</span> <em>world</em>'),
 				'inline elements should preserve spacing',
 			);
 		});
 	});
 });
+
+describe('HTML minification (default)', () => {
+	let html: string;
+	before(async () => {
+		// This fixture intentionally leaves `compressHTML` unset to exercise the default.
+		const fixture = await loadFixture({
+			root: './fixtures/minification-html-default/',
+			build: { inlineStylesheets: 'never' },
+			outDir: './dist/minification-html-default/',
+		});
+		await fixture.build();
+		html = await fixture.readFile('/index.html');
+	});
+
+	it('strips whitespace between inline elements, following JSX rules', () => {
+		// The discriminator: HTML-aware compression (`true`) keeps a single space
+		// here, while the default JSX rules remove it entirely.
+		assert.ok(
+			html.includes('<span>hello</span><em>world</em>'),
+			'whitespace between inline elements should be removed',
+		);
+	});
+
+	it('collapses multi-line text into a single line', () => {
+		assert.ok(html.includes('<p id="multi-line">Hello world</p>'));
+	});
+
+	it('preserves whitespace inside <pre> tags', () => {
+		assert.match(html, /<pre id="preserved">\n\s+keep\n\s+this\n\s+whitespace/);
+	});
+
+	it('removes every newline outside of <pre>', () => {
+		const withoutPre = html.replace(/<pre[\s\S]*?<\/pre>/g, '');
+		assert.equal(NEW_LINES.test(withoutPre), false);
+	});
+});
+
+describe('HTML minification (compressHTML: true differs from the default)', () => {
+	it('keeps a single space between inline elements', async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/minification-html-default/',
+			build: { inlineStylesheets: 'never' },
+			outDir: './dist/minification-html-true/',
+			compressHTML: true,
+		});
+		await fixture.build();
+		const html = await fixture.readFile('/index.html');
+		assert.ok(
+			html.includes('<span>hello</span> <em>world</em>'),
+			'HTML-aware compression should preserve inline whitespace as a single space',
+		);
+	});
+});
diff --git a/packages/astro/test/serializeManifest.test.ts b/packages/astro/test/serializeManifest.test.ts
index 36915cc0a42d..80c170640c66 100644
--- a/packages/astro/test/serializeManifest.test.ts
+++ b/packages/astro/test/serializeManifest.test.ts
@@ -39,7 +39,7 @@ describe('astro:config/client', () => {
 						format: 'directory',
 					},
 					trailingSlash: 'always',
-					compressHTML: true,
+					compressHTML: 'jsx',
 					site: 'https://example.com',
 				}),
 			);
diff --git a/packages/astro/test/units/manifest/serialized.test.ts b/packages/astro/test/units/manifest/serialized.test.ts
index 28e74d110a5f..f61fcc70da5a 100644
--- a/packages/astro/test/units/manifest/serialized.test.ts
+++ b/packages/astro/test/units/manifest/serialized.test.ts
@@ -165,10 +165,10 @@ describe('serializedManifestPlugin - dev mode', () => {
 	});
 
 	describe('compressHTML', () => {
-		it('is true by default', async () => {
+		it("is 'jsx' by default", async () => {
 			const settings = await createBasicSettings({});
 			const manifest = await getManifest(settings);
-			assert.equal(manifest.compressHTML, true);
+			assert.equal(manifest.compressHTML, 'jsx');
 		});
 
 		it('is false when explicitly disabled', async () => {
diff --git a/packages/astro/test/units/test-utils.ts b/packages/astro/test/units/test-utils.ts
index b78a2d31085b..ee8464644946 100644
--- a/packages/astro/test/units/test-utils.ts
+++ b/packages/astro/test/units/test-utils.ts
@@ -162,7 +162,7 @@ export function createBasicPipeline(
 		adapterName?: string;
 		clientDirectives?: Map<string, string>;
 		inlinedScripts?: Map<string, string>;
-		compressHTML?: boolean;
+		compressHTML?: boolean | 'jsx';
 		i18n?: SSRManifest['i18n'];
 		middleware?: SSRManifest['middleware'];
 		routeCache?: RouteCache;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d40fd3e5f533..bb01a417db00 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -528,8 +528,8 @@ importers:
   packages/astro:
     dependencies:
       '@astrojs/compiler-rs':
-        specifier: ^0.1.10
-        version: 0.1.10(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+        specifier: ^0.2.2
+        version: 0.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
       '@astrojs/internal-helpers':
         specifier: workspace:*
         version: link:../internal-helpers
@@ -3434,6 +3434,12 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/minification-html-default:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/minification-html-jsx:
     dependencies:
       '@astrojs/react':
@@ -6764,69 +6770,69 @@ packages:
     resolution: {integrity: sha512-bVzyKzEpIwqjihBU/aUzt1LQckJuHK0agd3/ITdXhPUYculrc6K1/K7H+XG4rwjXtg+ikT3PM05V1MVYWiIvQw==}
     engines: {node: '>=18.14.1'}
 
-  '@astrojs/compiler-binding-darwin-arm64@0.1.10':
-    resolution: {integrity: sha512-zDYwHvXVCm91XUm5xBRPbZK6yx9foM+Ut2qHiL0L37r1daF1bGLhnYjNV/VP35OLH5o/A1j+9uvl1xEX2a3ftw==}
+  '@astrojs/compiler-binding-darwin-arm64@0.2.2':
+    resolution: {integrity: sha512-1WxpECx3izz5X4Ha3l6ex79HZlUHpKBTElGJsfOosnhVvXhccfcXAsBlrYPNmUOKJWiG7mcrje0ELSr1KPE69Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@astrojs/compiler-binding-darwin-x64@0.1.10':
-    resolution: {integrity: sha512-EqugPJFuQdG11sG6TtO8uq0njcEyv9y/5gdpBRZJE6aSoM3yWFmTQ/aNU8PWIiz1upZFjdNQ/UUnVNzYd7N7Uw==}
+  '@astrojs/compiler-binding-darwin-x64@0.2.2':
+    resolution: {integrity: sha512-PdIQidwQ4nUX/qNL0JXzSwNYadr+yX/Yoo+kZSCxBZqlAqug9SlKR/1H5EG5jSEpkEDRo2d1JdrO1W4kU6uNHw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@astrojs/compiler-binding-linux-arm64-gnu@0.1.10':
-    resolution: {integrity: sha512-h1UN8yx2vO/0uwnExN/8MNfsDr7OFADVM3Vv0JWeSpmUO6sFOvTsGVAeBBl29up6c4sdT3QJ5rf6sczQsc25dA==}
+  '@astrojs/compiler-binding-linux-arm64-gnu@0.2.2':
+    resolution: {integrity: sha512-5sZicPkJCoyxTEOW2he+u6UV97pTXY4c7fbHOZ/aslu9ewsunD0231QUBSvnjBB9hRFzzP2JRfNCLY+IvWfw0Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@astrojs/compiler-binding-linux-arm64-musl@0.1.10':
-    resolution: {integrity: sha512-ot1Lksml0FqrrlYa89wGXQM+n290ncj65PZAq8siEWmXsmwoNCYCbqRSwRO6I/cT+PDlmmV0AcFTrp1DEO3PUA==}
+  '@astrojs/compiler-binding-linux-arm64-musl@0.2.2':
+    resolution: {integrity: sha512-Vto5fqRzMepQNJPeEhQLOIkmAoNbSBQNlpMe64OHTjEbAtQpJYVHEwe+8WJLaEGLA9qBksLv7ctiYPLLxgVVYQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@astrojs/compiler-binding-linux-x64-gnu@0.1.10':
-    resolution: {integrity: sha512-RGKGCbCvDat+DppnQbiWIhif6ptvkyXMdqOa7NjES4UoqIIUjE3YZfRn8gp3bXUe4ReWv4hGO1TQd2eitONt1g==}
+  '@astrojs/compiler-binding-linux-x64-gnu@0.2.2':
+    resolution: {integrity: sha512-NJTTaUDU49WEJT+ImS9evlv3i3x42HN8PbcqdyydI9picnKtuf5TxRL94naoW09YDMYWpkrwVeVqaG7GTSIepQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@astrojs/compiler-binding-linux-x64-musl@0.1.10':
-    resolution: {integrity: sha512-UemMv5Xq9c7trG9Cel4MHAo2wYiCxZ6qIKUnI4NJqBXDtOBqAjcMoqMbw78KYkb9vg2OIewVaJ+YvQrFZs5VBg==}
+  '@astrojs/compiler-binding-linux-x64-musl@0.2.2':
+    resolution: {integrity: sha512-9nFdNDkWaU35bhWUIciDmi439W0fq2ZNgv1GCi2A/LSb+8vTw9l9z+fVW4YEn7Tlvbs8gyQkJvbc62ZD1H76xA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@astrojs/compiler-binding-wasm32-wasi@0.1.10':
-    resolution: {integrity: sha512-SwawjgiYnm7s5neVKRoHIsnGG06vhuFhKg0iMBO6EsnL19xVbUp61V50gVtdgFlsfXalfH6SHuv2wQw8FhFSNg==}
+  '@astrojs/compiler-binding-wasm32-wasi@0.2.2':
+    resolution: {integrity: sha512-3NWaxRc3KSwr9zHBEGcQ147rMgAhi/HzZWZJPRN2YLbtuLhoeBPruhdX1MIlOYAg3FvJPYdzGCAKvvWWU6pF0A==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
-  '@astrojs/compiler-binding-win32-arm64-msvc@0.1.10':
-    resolution: {integrity: sha512-DKGOtbS8AZztvKUUdzvf+bOp7QLudmQiMHSYobSZKFanryQH5SllOMrZsL2pbDAcfBBrf0WsYWp9R+/ga7gGhQ==}
+  '@astrojs/compiler-binding-win32-arm64-msvc@0.2.2':
+    resolution: {integrity: sha512-QsyOgocLGOwDm8zAyuAiziALMzbTTevaqBLv5lvdhyhj2JC5yjp0H3yeEBtE0owRLr1gDQdX0+1qBSc5tTwp4g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@astrojs/compiler-binding-win32-x64-msvc@0.1.10':
-    resolution: {integrity: sha512-de9Y0GPm19G6SPgUk86ycZNuWEw7AA7vLZvsi/+cNR7tr/vOabU931O22L4bjjS138PFWmBz+qYOH9CT6h6BDA==}
+  '@astrojs/compiler-binding-win32-x64-msvc@0.2.2':
+    resolution: {integrity: sha512-+/C8Oh9YS8C0fwtaqDtUSPniKwlJqgiQbxp7XuzxCP0RI/Jf7yOlz9ZHNr6jD3ZJa4CHdq0mYq7pd8QFiNGIZA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
 
-  '@astrojs/compiler-binding@0.1.10':
-    resolution: {integrity: sha512-XvsWOM1JTjTDETD4qK2rIIHyPSMtBP+t7+Hmgk1kd4/iiUxLPnyLjnwLKX7N5t1MBHNmGiEA39DOslSMtlnfeg==}
+  '@astrojs/compiler-binding@0.2.2':
+    resolution: {integrity: sha512-PkCo+UcSxMt9pufjv28kRy8YU88O/XNgm7apwkyhkrCecLY62QCj5UA3nOTMO88PPyVKnUh/6FZbPefBhDD5IA==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
-  '@astrojs/compiler-rs@0.1.10':
-    resolution: {integrity: sha512-Mul2veNSpEzwd1Zk6coIAu9TKyk6RjBJMWaOOrelBBA+ZmcGXhj7MabjowNTOMgvRUU8YHXAHadzoKD0y49uxw==}
+  '@astrojs/compiler-rs@0.2.2':
+    resolution: {integrity: sha512-C0qoz7Hxa2krlwMYfzQ1ZxOjR6cGmO+iskjRXXCdUM85W/cAPGTi/MSQlLkv0ADMz+Go1/lqeRBjL8AZwsFffQ==}
 
   '@astrojs/compiler@2.13.1':
     resolution: {integrity: sha512-f3FN83d2G/v32ipNClRKgYv30onQlMZX1vCeZMjPsMMPl1mDpmbl0+N5BYo4S/ofzqJyS5hvwacEo0CCVDn/Qg==}
@@ -8630,6 +8636,12 @@ packages:
       '@emnapi/core': ^1.7.1
       '@emnapi/runtime': ^1.7.1
 
+  '@napi-rs/wasm-runtime@1.1.5':
+    resolution: {integrity: sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1
+      '@emnapi/runtime': ^1.7.1
+
   '@netlify/ai@0.4.1':
     resolution: {integrity: sha512-ETLtV/9taYrcGhszwO+BLFgFJJ2MCnJp8BwxfwV6Z/+z3SsaUG4ExC8x4xzNCdB2GPWxXrXkvR2LFNsPFSLcRA==}
     engines: {node: '>=20.6.1'}
@@ -9687,6 +9699,9 @@ packages:
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
+  '@tybys/wasm-util@0.10.2':
+    resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==}
+
   '@types/alpinejs@3.13.11':
     resolution: {integrity: sha512-3KhGkDixCPiLdL3Z/ok1GxHwLxEWqQOKJccgaQL01wc0EVM2tCTaqlC3NIedmxAXkVzt/V6VTM8qPgnOHKJ1MA==}
 
@@ -15766,56 +15781,56 @@ snapshots:
       log-update: 5.0.1
       sisteransi: 1.0.5
 
-  '@astrojs/compiler-binding-darwin-arm64@0.1.10':
+  '@astrojs/compiler-binding-darwin-arm64@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-darwin-x64@0.1.10':
+  '@astrojs/compiler-binding-darwin-x64@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-linux-arm64-gnu@0.1.10':
+  '@astrojs/compiler-binding-linux-arm64-gnu@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-linux-arm64-musl@0.1.10':
+  '@astrojs/compiler-binding-linux-arm64-musl@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-linux-x64-gnu@0.1.10':
+  '@astrojs/compiler-binding-linux-x64-gnu@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-linux-x64-musl@0.1.10':
+  '@astrojs/compiler-binding-linux-x64-musl@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-wasm32-wasi@0.1.10(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+  '@astrojs/compiler-binding-wasm32-wasi@0.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
     optional: true
 
-  '@astrojs/compiler-binding-win32-arm64-msvc@0.1.10':
+  '@astrojs/compiler-binding-win32-arm64-msvc@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding-win32-x64-msvc@0.1.10':
+  '@astrojs/compiler-binding-win32-x64-msvc@0.2.2':
     optional: true
 
-  '@astrojs/compiler-binding@0.1.10(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+  '@astrojs/compiler-binding@0.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
     optionalDependencies:
-      '@astrojs/compiler-binding-darwin-arm64': 0.1.10
-      '@astrojs/compiler-binding-darwin-x64': 0.1.10
-      '@astrojs/compiler-binding-linux-arm64-gnu': 0.1.10
-      '@astrojs/compiler-binding-linux-arm64-musl': 0.1.10
-      '@astrojs/compiler-binding-linux-x64-gnu': 0.1.10
-      '@astrojs/compiler-binding-linux-x64-musl': 0.1.10
-      '@astrojs/compiler-binding-wasm32-wasi': 0.1.10(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
-      '@astrojs/compiler-binding-win32-arm64-msvc': 0.1.10
-      '@astrojs/compiler-binding-win32-x64-msvc': 0.1.10
+      '@astrojs/compiler-binding-darwin-arm64': 0.2.2
+      '@astrojs/compiler-binding-darwin-x64': 0.2.2
+      '@astrojs/compiler-binding-linux-arm64-gnu': 0.2.2
+      '@astrojs/compiler-binding-linux-arm64-musl': 0.2.2
+      '@astrojs/compiler-binding-linux-x64-gnu': 0.2.2
+      '@astrojs/compiler-binding-linux-x64-musl': 0.2.2
+      '@astrojs/compiler-binding-wasm32-wasi': 0.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+      '@astrojs/compiler-binding-win32-arm64-msvc': 0.2.2
+      '@astrojs/compiler-binding-win32-x64-msvc': 0.2.2
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
 
-  '@astrojs/compiler-rs@0.1.10(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+  '@astrojs/compiler-rs@0.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
     dependencies:
-      '@astrojs/compiler-binding': 0.1.10(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+      '@astrojs/compiler-binding': 0.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
@@ -17813,6 +17828,13 @@ snapshots:
       '@tybys/wasm-util': 0.10.1
     optional: true
 
+  '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+    dependencies:
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@tybys/wasm-util': 0.10.2
+    optional: true
+
   '@netlify/ai@0.4.1':
     dependencies:
       '@netlify/api': 14.0.18
@@ -18949,6 +18971,11 @@ snapshots:
       tslib: 2.8.1
     optional: true
 
+  '@tybys/wasm-util@0.10.2':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   '@types/alpinejs@3.13.11': {}
 
   '@types/aria-query@5.0.4': {}

From e84ebc0af84a13a26ea412460cbc491f81135ae5 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Wed, 17 Jun 2026 07:20:33 -0400
Subject: [PATCH 2/9] Remove unfiltered transform hook from head-metadata-build
 plugin (#17095)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The astro:head-metadata-build plugin had an unfiltered transform hook that ran
on every module in the build to scan source code for the "use astro:head-inject"
directive. In HiDeoo's Starlight PLUGIN_TIMINGS report, this plugin consumed 36%
of total plugin time during builds.

The directive only appeared in two places we control:
1. ?astroPropagatedAssets modules (content render entries) — already identified
   by the PROPAGATED_ASSET_FLAG query param on their module ID
2. The virtual astro:content module (templates/content/module.mjs) — already has
   propagation: 'in-tree' set directly on module metadata in the load hook

Replaced the source-scanning approach with an ID-based check for
PROPAGATED_ASSET_FLAG in generateBundle. This eliminates the unfiltered transform
hook entirely — Rolldown no longer needs to route every module through the JS
plugin hook boundary for this plugin.

Also applied the same change to the dev plugin's transform hook (astro:head-metadata)
for consistency, and removed the now-unused hasHeadPropagationCall function and its
test file.

Manual verification with examples/blog confirmed:
- CSS from components imported in MDX content appears on the individual post page
- CSS does not bleed onto the blog index page
- Disabling commentPropagationSeeds showed no regression because MDX uses the
  metadata path (propagation: 'self' via selfPropagationSeeds), which is independent

Related: 501a385e (introduced the transform hook as a workaround for Rolldown
stripping directives during bundling)
---
 .changeset/fifty-ways-swim.md                 |  5 +++
 .../astro/src/core/head-propagation/hint.ts   | 10 ------
 packages/astro/src/vite-plugin-head/index.ts  | 28 ++++++----------
 packages/astro/templates/content/module.mjs   |  1 -
 .../render/head-propagation/hint.test.ts      | 33 -------------------
 5 files changed, 15 insertions(+), 62 deletions(-)
 create mode 100644 .changeset/fifty-ways-swim.md
 delete mode 100644 packages/astro/src/core/head-propagation/hint.ts
 delete mode 100644 packages/astro/test/units/render/head-propagation/hint.test.ts

diff --git a/.changeset/fifty-ways-swim.md b/.changeset/fifty-ways-swim.md
new file mode 100644
index 000000000000..8061ec1f570a
--- /dev/null
+++ b/.changeset/fifty-ways-swim.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Improves build performance by removing an unfiltered transform hook from the `astro:head-metadata-build` plugin. Head propagation modules are now identified by their module ID (`?astroPropagatedAssets`) instead of scanning every module's source code.
diff --git a/packages/astro/src/core/head-propagation/hint.ts b/packages/astro/src/core/head-propagation/hint.ts
deleted file mode 100644
index ee1952815f96..000000000000
--- a/packages/astro/src/core/head-propagation/hint.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Detect the `"use astro:head-inject"` directive in source code.
-// This directive marks a module as needing head propagation (CSS/script injection into <head>).
-const HEAD_PROPAGATION_HINT = '"use astro:head-inject"';
-
-/**
- * Returns true when source contains the `"use astro:head-inject"` directive.
- */
-export function hasHeadPropagationCall(source: string): boolean {
-	return source.includes(HEAD_PROPAGATION_HINT);
-}
diff --git a/packages/astro/src/vite-plugin-head/index.ts b/packages/astro/src/vite-plugin-head/index.ts
index 501a385e7fd7..90027730965c 100644
--- a/packages/astro/src/vite-plugin-head/index.ts
+++ b/packages/astro/src/vite-plugin-head/index.ts
@@ -1,12 +1,12 @@
 import type * as vite from 'vite';
 import type { DevEnvironment } from 'vite';
-import { hasHeadPropagationCall } from '../core/head-propagation/hint.js';
 import {
 	buildImporterGraphFromModuleInfo,
 	computeInTreeAncestors,
 } from '../core/head-propagation/graph.js';
 import { getTopLevelPageModuleInfos } from '../core/build/graph.js';
 import type { BuildInternals } from '../core/build/internal.js';
+import { PROPAGATED_ASSET_FLAG } from '../content/consts.js';
 import type { SSRComponentMetadata, SSRResult } from '../types/public/internal.js';
 import { getAstroMetadata } from '../vite-plugin-astro/index.js';
 import type { PluginMetadata } from '../vite-plugin-astro/types.js';
@@ -182,15 +182,15 @@ export default function configHeadVitePlugin(): vite.Plugin {
 				});
 			}
 		},
-		transform(source, id) {
+		transform(_source, id) {
 			let info = this.getModuleInfo(id);
 			if (info && getAstroMetadata(info)?.containsHead) {
 				// Keep bubbling `containsHead` when this module was already marked earlier.
 				propagateMetadata.call(this, id, 'containsHead', true);
 			}
 
-			if (hasHeadPropagationCall(source)) {
-				// `"use astro:head-inject"` directive opts a module into bubbling.
+			if (id.includes(PROPAGATED_ASSET_FLAG)) {
+				// Content render entries with ?astroPropagatedAssets need head propagation.
 				propagateMetadata.call(this, id, 'propagation', 'in-tree');
 			}
 
@@ -200,11 +200,6 @@ export default function configHeadVitePlugin(): vite.Plugin {
 }
 
 export function astroHeadBuildPlugin(internals: BuildInternals): vite.Plugin {
-	// Collect module IDs that contain a head propagation marker in their raw source
-	// (before bundling). This is necessary because Rolldown may strip comments and
-	// directives when concatenating modules into chunks, so scanning `mod.code` in
-	// `generateBundle` alone is not reliable.
-	const headPropagationModuleIds = new Set<string>();
 	return {
 		name: 'astro:head-metadata-build',
 		applyToEnvironment(environment) {
@@ -213,11 +208,6 @@ export function astroHeadBuildPlugin(internals: BuildInternals): vite.Plugin {
 				environment.name === ASTRO_VITE_ENVIRONMENT_NAMES.prerender
 			);
 		},
-		transform(source, id) {
-			if (hasHeadPropagationCall(source)) {
-				headPropagationModuleIds.add(id);
-			}
-		},
 		generateBundle(_opts, bundle) {
 			const map: SSRResult['componentMetadata'] = internals.componentMetadata;
 			const moduleIds = new Set<string>();
@@ -237,7 +227,7 @@ export function astroHeadBuildPlugin(internals: BuildInternals): vite.Plugin {
 
 			for (const [, output] of Object.entries(bundle)) {
 				if (output.type !== 'chunk') continue;
-				for (const [id, mod] of Object.entries(output.modules)) {
+				for (const [id] of Object.entries(output.modules)) {
 					moduleIds.add(id);
 					const modinfo = this.getModuleInfo(id);
 
@@ -256,9 +246,11 @@ export function astroHeadBuildPlugin(internals: BuildInternals): vite.Plugin {
 					}
 
 					// Head propagation (aka bubbling)
-					// Check both post-bundle code and pre-bundle transform results,
-					// since Rolldown may strip markers (comments, directives) during bundling.
-					if ((mod.code && hasHeadPropagationCall(mod.code)) || headPropagationModuleIds.has(id)) {
+					// Modules with the ?astroPropagatedAssets query param are content render
+					// entries that need head propagation. We identify them by their module ID
+					// rather than scanning source code, which avoids an unfiltered transform
+					// hook that would run on every module in the build.
+					if (id.includes(PROPAGATED_ASSET_FLAG)) {
 						commentPropagationSeeds.add(id);
 					}
 				}
diff --git a/packages/astro/templates/content/module.mjs b/packages/astro/templates/content/module.mjs
index 1c33bcbb7c7b..52cdda1f62ee 100644
--- a/packages/astro/templates/content/module.mjs
+++ b/packages/astro/templates/content/module.mjs
@@ -1,4 +1,3 @@
-'use astro:head-inject';
 import {
 	createDeprecatedFunction,
 	createGetCollection,
diff --git a/packages/astro/test/units/render/head-propagation/hint.test.ts b/packages/astro/test/units/render/head-propagation/hint.test.ts
deleted file mode 100644
index 9cd78be47faf..000000000000
--- a/packages/astro/test/units/render/head-propagation/hint.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import { hasHeadPropagationCall } from '../../../../dist/core/head-propagation/hint.js';
-
-describe('head propagation directive detection', () => {
-	it('detects "use astro:head-inject" directive at start of source', () => {
-		assert.equal(hasHeadPropagationCall('"use astro:head-inject";\nexport default 1;'), true);
-	});
-
-	it('detects "use astro:head-inject" directive anywhere in source', () => {
-		assert.equal(hasHeadPropagationCall('const a = 1;\n"use astro:head-inject";'), true);
-	});
-
-	it('detects "use astro:head-inject" directive in the middle of a line', () => {
-		assert.equal(hasHeadPropagationCall('export const x = "use astro:head-inject";'), true);
-	});
-
-	it('does not match unrelated comments', () => {
-		assert.equal(hasHeadPropagationCall('// something else'), false);
-	});
-
-	it('does not match the old astro-head-inject comment marker', () => {
-		assert.equal(hasHeadPropagationCall('// astro-head-inject'), false);
-	});
-
-	it('does not match the old $$astro_head_inject marker', () => {
-		assert.equal(hasHeadPropagationCall('$$astro_head_inject()'), false);
-	});
-
-	it('does not match a partial directive', () => {
-		assert.equal(hasHeadPropagationCall('"use head-inject";'), false);
-	});
-});

From 4585fe57dda06226058118f90a809f9e33d4b2af Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Wed, 17 Jun 2026 13:41:10 +0200
Subject: [PATCH 3/9] fix(integrations): Export container renderers from a
 dedicated export path to fix bundling issues (#17093)

---
 .changeset/container-renderer-export.md       | 21 ++++++++++++++++
 .../test/ReactWrapper.test.ts                 |  2 +-
 .../astro/src/virtual-modules/container.ts    |  2 +-
 packages/integrations/mdx/package.json        |  1 +
 .../mdx/src/container-renderer.ts             |  8 +++++++
 packages/integrations/mdx/src/index.ts        | 12 ++++++----
 .../src/pages/index.astro                     |  2 +-
 packages/integrations/preact/package.json     |  1 +
 .../preact/src/container-renderer.ts          | 11 +++++++++
 packages/integrations/preact/src/index.ts     | 20 +++++++++-------
 packages/integrations/react/package.json      |  1 +
 .../react/src/container-renderer.ts           | 23 ++++++++++++++++++
 packages/integrations/react/src/index.ts      | 24 +++++++++----------
 packages/integrations/solid/package.json      |  1 +
 .../solid/src/container-renderer.ts           |  9 +++++++
 packages/integrations/solid/src/index.ts      | 19 ++++++++-------
 packages/integrations/svelte/package.json     |  1 +
 .../svelte/src/container-renderer.ts          |  9 +++++++
 packages/integrations/svelte/src/index.ts     | 19 ++++++++-------
 packages/integrations/vue/package.json        |  1 +
 .../vue/src/container-renderer.ts             |  9 +++++++
 packages/integrations/vue/src/index.ts        | 21 ++++++++--------
 22 files changed, 161 insertions(+), 56 deletions(-)
 create mode 100644 .changeset/container-renderer-export.md
 create mode 100644 packages/integrations/mdx/src/container-renderer.ts
 create mode 100644 packages/integrations/preact/src/container-renderer.ts
 create mode 100644 packages/integrations/react/src/container-renderer.ts
 create mode 100644 packages/integrations/solid/src/container-renderer.ts
 create mode 100644 packages/integrations/svelte/src/container-renderer.ts
 create mode 100644 packages/integrations/vue/src/container-renderer.ts

diff --git a/.changeset/container-renderer-export.md b/.changeset/container-renderer-export.md
new file mode 100644
index 000000000000..03534a9de538
--- /dev/null
+++ b/.changeset/container-renderer-export.md
@@ -0,0 +1,21 @@
+---
+'@astrojs/react': minor
+'@astrojs/preact': minor
+'@astrojs/svelte': minor
+'@astrojs/solid-js': minor
+'@astrojs/vue': minor
+'@astrojs/mdx': minor
+---
+
+Replaces the import entrypoint of `getContainerRenderer()`
+
+A new `container-renderer` entrypoint exporting `getContainerRenderer()` has been added to the following integrations: React, Preact, Svelte, SolidJS, Vue, and MDX. This prevents bundlers from trying to bundle unrelated exports from the package root when only the Container API is used.
+
+If you are using the Container API, update your import statements to use the new entrypoint. The following example updates the `getContainerRenderer()` import for React:
+
+```diff
+- import { getContainerRenderer } from '@astrojs/react';
++ import { getContainerRenderer } from '@astrojs/react/container-renderer';
+```
+
+Importing `getContainerRenderer()` from the package root still works, but is now deprecated and logs a warning.
diff --git a/examples/container-with-vitest/test/ReactWrapper.test.ts b/examples/container-with-vitest/test/ReactWrapper.test.ts
index 0f2505a78482..b27ce5d9f1d8 100644
--- a/examples/container-with-vitest/test/ReactWrapper.test.ts
+++ b/examples/container-with-vitest/test/ReactWrapper.test.ts
@@ -1,5 +1,5 @@
 import { loadRenderers } from 'astro:container';
-import { getContainerRenderer } from '@astrojs/react';
+import { getContainerRenderer } from '@astrojs/react/container-renderer';
 import { experimental_AstroContainer as AstroContainer } from 'astro/container';
 import { expect, test } from 'vitest';
 import ReactWrapper from '../src/components/ReactWrapper.astro';
diff --git a/packages/astro/src/virtual-modules/container.ts b/packages/astro/src/virtual-modules/container.ts
index 4908f0607993..b0c80553cadb 100644
--- a/packages/astro/src/virtual-modules/container.ts
+++ b/packages/astro/src/virtual-modules/container.ts
@@ -5,7 +5,7 @@ import type { SSRLoadedRenderer } from '../types/public/internal.js';
  * Use this function to provide renderers to the `AstroContainer`:
  *
  * ```js
- * import { getContainerRenderer } from "@astrojs/react";
+ * import { getContainerRenderer } from "@astrojs/react/container-renderer";
  * import { experimental_AstroContainer as AstroContainer } from "astro/container";
  * import { loadRenderers } from "astro:container"; // use this only when using vite/vitest
  *
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index 1e36060e07bd..f6ed184c9c11 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -20,6 +20,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/mdx/",
   "exports": {
     ".": "./dist/index.js",
+    "./container-renderer": "./dist/container-renderer.js",
     "./server.js": "./dist/server.js",
     "./package.json": "./package.json"
   },
diff --git a/packages/integrations/mdx/src/container-renderer.ts b/packages/integrations/mdx/src/container-renderer.ts
new file mode 100644
index 000000000000..50f4d9715648
--- /dev/null
+++ b/packages/integrations/mdx/src/container-renderer.ts
@@ -0,0 +1,8 @@
+import type { AstroRenderer } from 'astro';
+
+export function getContainerRenderer(): AstroRenderer {
+	return {
+		name: 'astro:jsx',
+		serverEntrypoint: '@astrojs/mdx/server.js',
+	};
+}
diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts
index e9eb427dd36a..a054545d204c 100644
--- a/packages/integrations/mdx/src/index.ts
+++ b/packages/integrations/mdx/src/index.ts
@@ -14,6 +14,7 @@ import type {
 import type { MarkdownProcessor } from 'astro/markdown';
 import type { Options as RemarkRehypeOptions } from 'remark-rehype';
 import type { PluggableList } from 'unified';
+import { getContainerRenderer as getContainerRendererImpl } from './container-renderer.js';
 import { isSatteriProcessor, isUnifiedProcessor } from './processor-guards.js';
 import type { OptimizeOptions } from './rehype-optimize-static.js';
 import { ignoreStringPlugins, safeParseFrontmatter } from './utils.js';
@@ -72,11 +73,14 @@ type SetupHookParams = HookParameters<'astro:config:setup'> & {
 	addContentEntryType: (contentEntryType: ContentEntryType) => void;
 };
 
+/**
+ * @deprecated Import `getContainerRenderer` from `@astrojs/mdx/container-renderer` instead.
+ */
 export function getContainerRenderer(): AstroRenderer {
-	return {
-		name: 'astro:jsx',
-		serverEntrypoint: '@astrojs/mdx/server.js',
-	};
+	console.warn(
+		'[@astrojs/mdx] Importing `getContainerRenderer` from `@astrojs/mdx` is deprecated. Import it from `@astrojs/mdx/container-renderer` instead.',
+	);
+	return getContainerRendererImpl();
 }
 
 export default function mdx(partialMdxOptions: Partial<MdxOptions> = {}): AstroIntegration {
diff --git a/packages/integrations/mdx/test/fixtures/mdx-astro-container-escape/src/pages/index.astro b/packages/integrations/mdx/test/fixtures/mdx-astro-container-escape/src/pages/index.astro
index ad97478445be..bfec503af0bb 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-astro-container-escape/src/pages/index.astro
+++ b/packages/integrations/mdx/test/fixtures/mdx-astro-container-escape/src/pages/index.astro
@@ -1,7 +1,7 @@
 ---
 import { experimental_AstroContainer } from "astro/container";
 import { loadRenderers } from "astro:container";
-import { getContainerRenderer } from "@astrojs/mdx";
+import { getContainerRenderer } from "@astrojs/mdx/container-renderer";
 import { Content } from '../posts/post.mdx'
 
 const renderers = await loadRenderers([getContainerRenderer()]);
diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json
index 2e1df5f249a6..175842a66f5f 100644
--- a/packages/integrations/preact/package.json
+++ b/packages/integrations/preact/package.json
@@ -21,6 +21,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/preact/",
   "exports": {
     ".": "./dist/index.js",
+    "./container-renderer": "./dist/container-renderer.js",
     "./client.js": "./dist/client.js",
     "./client-dev.js": "./dist/client-dev.js",
     "./server.js": "./dist/server.js",
diff --git a/packages/integrations/preact/src/container-renderer.ts b/packages/integrations/preact/src/container-renderer.ts
new file mode 100644
index 000000000000..0d10897fb102
--- /dev/null
+++ b/packages/integrations/preact/src/container-renderer.ts
@@ -0,0 +1,11 @@
+import type { AstroRenderer } from 'astro';
+
+export function getRenderer(development: boolean): AstroRenderer {
+	return {
+		name: '@astrojs/preact',
+		clientEntrypoint: development ? '@astrojs/preact/client-dev.js' : '@astrojs/preact/client.js',
+		serverEntrypoint: '@astrojs/preact/server.js',
+	};
+}
+
+export const getContainerRenderer = (): AstroRenderer => getRenderer(false);
diff --git a/packages/integrations/preact/src/index.ts b/packages/integrations/preact/src/index.ts
index 205c696c6e04..ef8a6aa45518 100644
--- a/packages/integrations/preact/src/index.ts
+++ b/packages/integrations/preact/src/index.ts
@@ -3,20 +3,24 @@ import { preact, type PreactPluginOptions as VitePreactPluginOptions } from '@pr
 import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
 import * as devalue from 'devalue';
 import type { EnvironmentOptions, Plugin } from 'vite';
+import {
+	getContainerRenderer as getContainerRendererImpl,
+	getRenderer,
+} from './container-renderer.js';
 import type { VirtualModuleOptions } from './types.js';
 
 const babelCwd = new URL('../', import.meta.url);
 
-function getRenderer(development: boolean): AstroRenderer {
-	return {
-		name: '@astrojs/preact',
-		clientEntrypoint: development ? '@astrojs/preact/client-dev.js' : '@astrojs/preact/client.js',
-		serverEntrypoint: '@astrojs/preact/server.js',
-	};
+/**
+ * @deprecated Import `getContainerRenderer` from `@astrojs/preact/container-renderer` instead.
+ */
+export function getContainerRenderer(): AstroRenderer {
+	console.warn(
+		'[@astrojs/preact] Importing `getContainerRenderer` from `@astrojs/preact` is deprecated. Import it from `@astrojs/preact/container-renderer` instead.',
+	);
+	return getContainerRendererImpl();
 }
 
-export const getContainerRenderer = (): AstroRenderer => getRenderer(false);
-
 function optionsPlugin(include: Options['include'], exclude: Options['exclude']): Plugin {
 	const virtualModule = 'astro:preact:opts';
 	const virtualModuleId = '\0' + virtualModule;
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index a62fb23f3d47..fde0d790c6e4 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -21,6 +21,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/react/",
   "exports": {
     ".": "./dist/index.js",
+    "./container-renderer": "./dist/container-renderer.js",
     "./actions": "./dist/actions.js",
     "./client.js": "./dist/client.js",
     "./client-v17.js": "./dist/client-v17.js",
diff --git a/packages/integrations/react/src/container-renderer.ts b/packages/integrations/react/src/container-renderer.ts
new file mode 100644
index 000000000000..65d0686ce7cd
--- /dev/null
+++ b/packages/integrations/react/src/container-renderer.ts
@@ -0,0 +1,23 @@
+import type { AstroRenderer } from 'astro';
+import {
+	getReactMajorVersion,
+	isSupportedReactVersion,
+	type ReactVersionConfig,
+	versionsConfig,
+} from './version.js';
+
+export function getRenderer(reactConfig: ReactVersionConfig): AstroRenderer {
+	return {
+		name: '@astrojs/react',
+		clientEntrypoint: reactConfig.client,
+		serverEntrypoint: reactConfig.server,
+	};
+}
+
+export function getContainerRenderer(): AstroRenderer {
+	const majorVersion = getReactMajorVersion();
+	if (!isSupportedReactVersion(majorVersion)) {
+		throw new Error(`Unsupported React version: ${majorVersion}.`);
+	}
+	return getRenderer(versionsConfig[majorVersion]);
+}
diff --git a/packages/integrations/react/src/index.ts b/packages/integrations/react/src/index.ts
index 302b75bd5cb5..64d1a1060ae2 100644
--- a/packages/integrations/react/src/index.ts
+++ b/packages/integrations/react/src/index.ts
@@ -1,6 +1,10 @@
 import react, { type Options as ViteReactPluginOptions } from '@vitejs/plugin-react';
 import type { AstroIntegration, AstroRenderer } from 'astro';
 import type * as vite from 'vite';
+import {
+	getContainerRenderer as getContainerRendererImpl,
+	getRenderer,
+} from './container-renderer.js';
 import {
 	getReactMajorVersion,
 	isSupportedReactVersion,
@@ -24,14 +28,6 @@ export type ReactIntegrationOptions = Pick<
 
 const FAST_REFRESH_PREAMBLE = react.preambleCode;
 
-function getRenderer(reactConfig: ReactVersionConfig) {
-	return {
-		name: '@astrojs/react',
-		clientEntrypoint: reactConfig.client,
-		serverEntrypoint: reactConfig.server,
-	};
-}
-
 function optionsPlugin({
 	include,
 	exclude,
@@ -213,10 +209,12 @@ export default function ({
 	};
 }
 
+/**
+ * @deprecated Import `getContainerRenderer` from `@astrojs/react/container-renderer` instead.
+ */
 export function getContainerRenderer(): AstroRenderer {
-	const majorVersion = getReactMajorVersion();
-	if (!isSupportedReactVersion(majorVersion)) {
-		throw new Error(`Unsupported React version: ${majorVersion}.`);
-	}
-	return getRenderer(versionsConfig[majorVersion]);
+	console.warn(
+		'[@astrojs/react] Importing `getContainerRenderer` from `@astrojs/react` is deprecated. Import it from `@astrojs/react/container-renderer` instead.',
+	);
+	return getContainerRendererImpl();
 }
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json
index 7bfee4589ca3..375abbd9abda 100644
--- a/packages/integrations/solid/package.json
+++ b/packages/integrations/solid/package.json
@@ -21,6 +21,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/solid-js/",
   "exports": {
     ".": "./dist/index.js",
+    "./container-renderer": "./dist/container-renderer.js",
     "./client.js": "./dist/client.js",
     "./server.js": "./dist/server.js",
     "./package.json": "./package.json"
diff --git a/packages/integrations/solid/src/container-renderer.ts b/packages/integrations/solid/src/container-renderer.ts
new file mode 100644
index 000000000000..d5b81962d001
--- /dev/null
+++ b/packages/integrations/solid/src/container-renderer.ts
@@ -0,0 +1,9 @@
+import type { AstroRenderer } from 'astro';
+
+export function getContainerRenderer(): AstroRenderer {
+	return {
+		name: '@astrojs/solid-js',
+		clientEntrypoint: '@astrojs/solid-js/client.js',
+		serverEntrypoint: '@astrojs/solid-js/server.js',
+	};
+}
diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts
index 91712fc8ccec..76ce554739bb 100644
--- a/packages/integrations/solid/src/index.ts
+++ b/packages/integrations/solid/src/index.ts
@@ -1,6 +1,7 @@
 import type { AstroIntegration, AstroIntegrationLogger, AstroRenderer } from 'astro';
 import type { PluginOption, Plugin } from 'vite';
 import solid, { type Options as ViteSolidPluginOptions } from 'vite-plugin-solid';
+import { getContainerRenderer as getContainerRendererImpl } from './container-renderer.js';
 
 // TODO: keep in sync with https://github.com/thetarnav/solid-devtools/blob/main/packages/main/src/vite/index.ts#L7
 type DevtoolsPluginOptions = {
@@ -56,16 +57,16 @@ function getViteConfiguration(
 	return { plugins };
 }
 
-function getRenderer(): AstroRenderer {
-	return {
-		name: '@astrojs/solid-js',
-		clientEntrypoint: '@astrojs/solid-js/client.js',
-		serverEntrypoint: '@astrojs/solid-js/server.js',
-	};
+/**
+ * @deprecated Import `getContainerRenderer` from `@astrojs/solid-js/container-renderer` instead.
+ */
+export function getContainerRenderer(): AstroRenderer {
+	console.warn(
+		'[@astrojs/solid-js] Importing `getContainerRenderer` from `@astrojs/solid-js` is deprecated. Import it from `@astrojs/solid-js/container-renderer` instead.',
+	);
+	return getContainerRendererImpl();
 }
 
-export { getRenderer as getContainerRenderer };
-
 export interface Options extends Pick<ViteSolidPluginOptions, 'include' | 'exclude'> {
 	devtools?: boolean;
 }
@@ -86,7 +87,7 @@ export default function (options: Options = {}): AstroIntegration {
 					!!options.devtools && command === 'dev',
 				);
 
-				addRenderer(getRenderer());
+				addRenderer(getContainerRendererImpl());
 				updateConfig({
 					vite: getViteConfiguration(options, devtoolsPlugin),
 				});
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 751acd9db9ea..9c8b9e7ed2f5 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -21,6 +21,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/svelte/",
   "exports": {
     ".": "./dist/index.js",
+    "./container-renderer": "./dist/container-renderer.js",
     "./editor": "./dist/editor.cjs",
     "./client.js": "./dist/client.svelte.js",
     "./server.js": "./dist/server.js",
diff --git a/packages/integrations/svelte/src/container-renderer.ts b/packages/integrations/svelte/src/container-renderer.ts
new file mode 100644
index 000000000000..166dc371526f
--- /dev/null
+++ b/packages/integrations/svelte/src/container-renderer.ts
@@ -0,0 +1,9 @@
+import type { AstroRenderer } from 'astro';
+
+export function getContainerRenderer(): AstroRenderer {
+	return {
+		name: '@astrojs/svelte',
+		clientEntrypoint: '@astrojs/svelte/client.js',
+		serverEntrypoint: '@astrojs/svelte/server.js',
+	};
+}
diff --git a/packages/integrations/svelte/src/index.ts b/packages/integrations/svelte/src/index.ts
index 2c34aec547f3..88f46202ac07 100644
--- a/packages/integrations/svelte/src/index.ts
+++ b/packages/integrations/svelte/src/index.ts
@@ -4,23 +4,24 @@ import type { AstroIntegration, AstroRenderer } from 'astro';
 import { fileURLToPath } from 'node:url';
 import type { Plugin } from 'vite';
 import { crawlFrameworkPkgs } from 'vitefu';
+import { getContainerRenderer as getContainerRendererImpl } from './container-renderer.js';
 
-function getRenderer(): AstroRenderer {
-	return {
-		name: '@astrojs/svelte',
-		clientEntrypoint: '@astrojs/svelte/client.js',
-		serverEntrypoint: '@astrojs/svelte/server.js',
-	};
+/**
+ * @deprecated Import `getContainerRenderer` from `@astrojs/svelte/container-renderer` instead.
+ */
+export function getContainerRenderer(): AstroRenderer {
+	console.warn(
+		'[@astrojs/svelte] Importing `getContainerRenderer` from `@astrojs/svelte` is deprecated. Import it from `@astrojs/svelte/container-renderer` instead.',
+	);
+	return getContainerRendererImpl();
 }
 
-export { getRenderer as getContainerRenderer };
-
 export default function svelteIntegration(options?: Options): AstroIntegration {
 	return {
 		name: '@astrojs/svelte',
 		hooks: {
 			'astro:config:setup': async ({ config, updateConfig, addRenderer }) => {
-				addRenderer(getRenderer());
+				addRenderer(getContainerRendererImpl());
 
 				// Svelte component libraries from `node_modules` must go through
 				// Vite's transform pipeline because Node can't import `.svelte`
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 1d883211cb09..77076c73856b 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -21,6 +21,7 @@
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/vue/",
   "exports": {
     ".": "./dist/index.js",
+    "./container-renderer": "./dist/container-renderer.js",
     "./editor": "./dist/editor.cjs",
     "./client.js": "./dist/client.js",
     "./server.js": "./dist/server.js",
diff --git a/packages/integrations/vue/src/container-renderer.ts b/packages/integrations/vue/src/container-renderer.ts
new file mode 100644
index 000000000000..1054d8466e3e
--- /dev/null
+++ b/packages/integrations/vue/src/container-renderer.ts
@@ -0,0 +1,9 @@
+import type { AstroRenderer } from 'astro';
+
+export function getContainerRenderer(): AstroRenderer {
+	return {
+		name: '@astrojs/vue',
+		clientEntrypoint: '@astrojs/vue/client.js',
+		serverEntrypoint: '@astrojs/vue/server.js',
+	};
+}
diff --git a/packages/integrations/vue/src/index.ts b/packages/integrations/vue/src/index.ts
index 6e8cbe3a4d63..c74040f729e8 100644
--- a/packages/integrations/vue/src/index.ts
+++ b/packages/integrations/vue/src/index.ts
@@ -6,6 +6,7 @@ import { MagicString } from '@vue/compiler-sfc';
 import type { AstroIntegration, AstroRenderer, HookParameters } from 'astro';
 import type { EnvironmentOptions, Plugin, PluginOption } from 'vite';
 import type { VitePluginVueDevToolsOptions } from 'vite-plugin-vue-devtools';
+import { getContainerRenderer as getContainerRendererImpl } from './container-renderer.js';
 
 const VIRTUAL_MODULE_ID = 'virtual:astro:vue-app';
 const RESOLVED_VIRTUAL_MODULE_ID = `\0${VIRTUAL_MODULE_ID}`;
@@ -16,14 +17,6 @@ interface Options extends VueOptions {
 	devtools?: boolean | Omit<VitePluginVueDevToolsOptions, 'appendTo'>;
 }
 
-function getRenderer(): AstroRenderer {
-	return {
-		name: '@astrojs/vue',
-		clientEntrypoint: '@astrojs/vue/client.js',
-		serverEntrypoint: '@astrojs/vue/server.js',
-	};
-}
-
 function getJsxRenderer(): AstroRenderer {
 	return {
 		name: '@astrojs/vue (jsx)',
@@ -32,7 +25,15 @@ function getJsxRenderer(): AstroRenderer {
 	};
 }
 
-export { getRenderer as getContainerRenderer };
+/**
+ * @deprecated Import `getContainerRenderer` from `@astrojs/vue/container-renderer` instead.
+ */
+export function getContainerRenderer(): AstroRenderer {
+	console.warn(
+		'[@astrojs/vue] Importing `getContainerRenderer` from `@astrojs/vue` is deprecated. Import it from `@astrojs/vue/container-renderer` instead.',
+	);
+	return getContainerRendererImpl();
+}
 
 function virtualAppEntrypoint(options?: Options): Plugin {
 	let isBuild: boolean;
@@ -191,7 +192,7 @@ export default function (options?: Options): AstroIntegration {
 		name: '@astrojs/vue',
 		hooks: {
 			'astro:config:setup': async ({ addRenderer, updateConfig, command }) => {
-				addRenderer(getRenderer());
+				addRenderer(getContainerRendererImpl());
 				if (options?.jsx) {
 					addRenderer(getJsxRenderer());
 				}

From b074a37c5ab9364529080b3283cf9be8a6350e34 Mon Sep 17 00:00:00 2001
From: Konrad Szajna <it@iseraph.dev>
Date: Wed, 17 Jun 2026 13:49:50 +0200
Subject: [PATCH 4/9] Preserve `Astro.props.error` on the custom 500 page when
 middleware throws (#17104)

* fix(astro): preserve the original error on the skip-middleware 500 retry

When user middleware throws, the error handler renders 500.astro by re-running the middleware chain, which throws again, so it retries with middleware skipped. That retry was dropping the original error, leaving Astro.props.error undefined on the custom 500 page. Carry the error through the retry so the page can show what failed. Affects the standard adapter and the astro/hono composable handlers.

* Apply suggestions from code review

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>

---------

Co-authored-by: Emanuele Stoppa <my.burning@gmail.com>
---
 .changeset/fix-middleware-500-error-prop.md   |  5 ++++
 .../astro/src/core/errors/default-handler.ts  |  1 +
 packages/astro/test/units/fetch/index.test.ts | 26 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 .changeset/fix-middleware-500-error-prop.md

diff --git a/.changeset/fix-middleware-500-error-prop.md b/.changeset/fix-middleware-500-error-prop.md
new file mode 100644
index 000000000000..1ab745231cec
--- /dev/null
+++ b/.changeset/fix-middleware-500-error-prop.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes the custom `500.astro` page receiving an empty `error` prop when the error originated in middleware.
diff --git a/packages/astro/src/core/errors/default-handler.ts b/packages/astro/src/core/errors/default-handler.ts
index be7f2e57c86d..d1624110e682 100644
--- a/packages/astro/src/core/errors/default-handler.ts
+++ b/packages/astro/src/core/errors/default-handler.ts
@@ -123,6 +123,7 @@ export class DefaultErrorHandler implements ErrorHandler {
 					return this.renderError(request, {
 						...resolvedRenderOptions,
 						status,
+						error,
 						response: originalResponse,
 						skipMiddleware: true,
 						pathname: resolvedPathname,
diff --git a/packages/astro/test/units/fetch/index.test.ts b/packages/astro/test/units/fetch/index.test.ts
index 1334bdd6cda3..bba7334056a9 100644
--- a/packages/astro/test/units/fetch/index.test.ts
+++ b/packages/astro/test/units/fetch/index.test.ts
@@ -284,6 +284,32 @@ describe('middleware()', () => {
 		assert.match(text, /<h1>my custom 500<\/h1>/);
 	});
 
+	it('passes the thrown error to the custom 500 page when user middleware throws', async () => {
+		const errorPage = createComponent((_result: any, props: any, _slots: any) => {
+			const err = props.error;
+			const message = err instanceof Error ? err.message : String(err ?? '');
+			return render`<h1>my custom 500</h1><pre>${message}</pre>`;
+		});
+		const app = createTestApp(
+			[createPage(simplePage, { route: '/' }), createPage(errorPage, { route: '/500' })],
+			{
+				middleware: async () => ({
+					onRequest: async () => {
+						throw new Error('boom from middleware');
+					},
+				}),
+			},
+		);
+		const request = stampApp(new Request('http://example.com/'), app);
+		const state = new FetchState(request);
+
+		const response = await middleware(state, async () => new Response('page'));
+
+		assert.equal(response.status, 500);
+		const text = await response.text();
+		assert.match(text, /boom from middleware/);
+	});
+
 	it('re-throws errors from the next callback instead of rendering the 500 page', async () => {
 		// A throw from `next` originates downstream of Astro's middleware (the
 		// host framework's chain), so it must propagate to the host's own error

From 25f05feb527beb49282f9d31ef2f88567d187f34 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Wed, 17 Jun 2026 08:05:42 -0400
Subject: [PATCH 5/9] Unescape literal \\n in triage bot comments before
 posting (#17102)

---
 .flue/workflows/issue-triage.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.flue/workflows/issue-triage.ts b/.flue/workflows/issue-triage.ts
index a44ef969ba84..fcb8ffa6c55d 100644
--- a/.flue/workflows/issue-triage.ts
+++ b/.flue/workflows/issue-triage.ts
@@ -367,12 +367,17 @@ export async function run({ init, payload }: FlueContext) {
 		),
 	});
 
-	await postGitHubComment(issueNumber, comment);
+	// The LLM sometimes returns literal "\n" (two characters) instead of actual
+	// newlines when producing a string via a tool-call result. Unescape them so
+	// the GitHub comment renders with real line breaks.
+	const normalizedComment = comment.replace(/\\n/g, '\n');
+
+	await postGitHubComment(issueNumber, normalizedComment);
 
 	if (triageResult.reproducible) {
 		await removeGitHubLabel(issueNumber, 'needs triage');
 		const selectedLabels = await selectTriageLabels(session, {
-			comment,
+			comment: normalizedComment,
 			priorityLabels,
 			packageLabels,
 		});

From 637a1b6c6fe58fd271faf4ee7555787e4f4a0b9a Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Wed, 17 Jun 2026 08:19:08 -0400
Subject: [PATCH 6/9] Move internal response metadata into FetchState (#17098)

* Move internal response metadata from headers to FetchState

The low-level pages() fetch handler returned raw PagesHandler responses. PagesHandler used internal response headers like X-Astro-Route-Type and X-Astro-Reroute to communicate with later Astro routing/i18n/error handling. The full astro() handler eventually stripped those headers via prepareResponse(), but direct pages() composition could leak them to users.

Move that internal metadata onto FetchState instead:
- responseRouteType tracks page/fallback responses for i18n finalization
- skipErrorReroute tracks responses that should bypass error-page rerouting
- state.isRewriting already tracks rewrite responses for logging

PagesHandler now sets FetchState metadata instead of headers. AstroHandler and I18n.finalize() read the state fields. Endpoint reroute suppression is set by PagesHandler after renderEndpoint() returns, so renderEndpoint no longer mutates response headers. The public astro:i18n notFound() helper uses getFetchStateFromAPIContext() when available and keeps a header fallback for mocked/non-Astro contexts.

Also removes the unused no-op middleware header.

Verified:
- pnpm -C packages/astro build
- test/units/fetch/index.test.ts
- test/units/i18n/manual-routing.test.ts
- test/units/i18n/manual-middleware.test.ts
- test/units/routing/routing-app.test.ts
- test/endpoint-routing.test.ts

* Fix endpoint reroute and i18n header compatibility after FetchState metadata move

The initial FetchState metadata refactor changed endpoint reroute behavior too broadly. Missing endpoint handlers return a null-body 404 that should still reroute to the configured 404 page; only user endpoint handlers that explicitly return a 404/500 response should opt out of error-page rerouting.

Pass FetchState into renderEndpoint and set skipErrorReroute only after a user handler returns a reroutable status. This restores the previous distinction while keeping the metadata off response headers.

I18n.finalize also had unit coverage for direct usage with synthetic responses carrying the legacy internal headers. Keep FetchState as the primary path, but fall back to ROUTE_TYPE_HEADER and REROUTE_DIRECTIVE_HEADER when state metadata is unset so those direct calls remain compatible.

* Remove remaining internal i18n header fallback after FetchState metadata move

The previous fix kept compatibility reads for X-Astro-Route-Type and X-Astro-Reroute inside I18n.finalize(). That contradicted the goal of moving internal routing metadata off response headers entirely.

Remove those fallback header reads and update i18n tests to use FetchState metadata instead. The public notFound() helper now requires the FetchState-backed APIContext path and records skipErrorReroute on state rather than writing X-Astro-Reroute.

* Remove obsolete Astro internal response header constants

Follow up to the FetchState metadata move by deleting the unused internal response header constants and the prepareResponse stripping loop. No internal code writes or reads X-Astro-Route-Type, X-Astro-Reroute, X-Astro-Rewrite, or X-Astro-Noop anymore.

Update i18n tests to use FetchState metadata instead of encoding internal state through response headers.
---
 .changeset/ripe-bottles-fetch.md              |  5 ++
 .../astro/src/core/app/prepare-response.ts    | 13 ++---
 packages/astro/src/core/constants.ts          | 52 -------------------
 packages/astro/src/core/fetch/fetch-state.ts  |  9 ++++
 packages/astro/src/core/i18n/handler.ts       | 21 +++-----
 .../src/core/middleware/noop-middleware.ts    |  2 -
 packages/astro/src/core/pages/handler.ts      | 24 ++++-----
 packages/astro/src/core/routing/handler.ts    | 12 ++---
 packages/astro/src/i18n/index.ts              | 14 ++---
 packages/astro/src/runtime/server/endpoint.ts | 22 ++------
 packages/astro/test/units/fetch/index.test.ts | 20 ++++---
 .../test/units/i18n/i18n-middleware.test.ts   | 32 ++++++------
 .../test/units/i18n/manual-routing.test.ts    | 26 +++++-----
 .../astro/test/units/i18n/test-helpers.ts     |  7 ++-
 14 files changed, 94 insertions(+), 165 deletions(-)
 create mode 100644 .changeset/ripe-bottles-fetch.md

diff --git a/.changeset/ripe-bottles-fetch.md b/.changeset/ripe-bottles-fetch.md
new file mode 100644
index 000000000000..72161fa2819c
--- /dev/null
+++ b/.changeset/ripe-bottles-fetch.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes internal Astro headers leaking from direct `pages()` handler responses
diff --git a/packages/astro/src/core/app/prepare-response.ts b/packages/astro/src/core/app/prepare-response.ts
index fab466f2dcee..b380523abd63 100644
--- a/packages/astro/src/core/app/prepare-response.ts
+++ b/packages/astro/src/core/app/prepare-response.ts
@@ -1,10 +1,9 @@
-import { INTERNAL_RESPONSE_HEADERS, responseSentSymbol } from '../constants.js';
+import { responseSentSymbol } from '../constants.js';
 import { getSetCookiesFromResponse } from '../cookies/index.js';
 
 /**
- * Strips internal-only headers from the response before sending it to the
- * user agent, and optionally appends cookies written via `Astro.cookie.set()`
- * to the `Set-Cookie` header.
+ * Appends cookies written via `Astro.cookie.set()` to the `Set-Cookie` header
+ * and marks the response as sent.
  *
  * This is a pure function with no dependencies on the app; it is shared by
  * `AstroHandler` and the various error handlers.
@@ -13,12 +12,6 @@ export function prepareResponse(
 	response: Response,
 	{ addCookieHeader }: { addCookieHeader: boolean },
 ): void {
-	for (const headerName of INTERNAL_RESPONSE_HEADERS) {
-		if (response.headers.has(headerName)) {
-			response.headers.delete(headerName);
-		}
-	}
-
 	if (addCookieHeader) {
 		for (const setCookieHeaderValue of getSetCookiesFromResponse(response)) {
 			response.headers.append('set-cookie', setCookieHeaderValue);
diff --git a/packages/astro/src/core/constants.ts b/packages/astro/src/core/constants.ts
index 4cb0b7c824d1..d110d2fc75b6 100644
--- a/packages/astro/src/core/constants.ts
+++ b/packages/astro/src/core/constants.ts
@@ -3,58 +3,6 @@ export const ASTRO_VERSION = process.env.PACKAGE_VERSION ?? 'development';
 
 export const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
 
-/**
- * The name for the header used to help rerouting behavior.
- * When set to "no", astro will NOT try to reroute an error response to the corresponding error page, which is the default behavior that can sometimes lead to loops.
- *
- * ```ts
- * const response = new Response("keep this content as-is", {
- *     status: 404,
- *     headers: {
- *         // note that using a variable name as the key of an object needs to be wrapped in square brackets in javascript
- *         // without them, the header name will be interpreted as "REROUTE_DIRECTIVE_HEADER" instead of "X-Astro-Reroute"
- *         [REROUTE_DIRECTIVE_HEADER]: 'no',
- *     }
- * })
- * ```
- * Alternatively...
- * ```ts
- * response.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
- * ```
- */
-export const REROUTE_DIRECTIVE_HEADER = 'X-Astro-Reroute';
-
-/**
- * Header and value that are attached to a Response object when a **user rewrite** occurs.
- *
- * This metadata is used to determine the origin of a Response. If a rewrite has occurred, it should be prioritised over other logic.
- */
-export const REWRITE_DIRECTIVE_HEADER_KEY = 'X-Astro-Rewrite';
-
-export const REWRITE_DIRECTIVE_HEADER_VALUE = 'yes';
-
-/**
- * This header is set by the no-op Astro middleware.
- */
-export const NOOP_MIDDLEWARE_HEADER = 'X-Astro-Noop';
-
-/**
- * The name for the header used to help i18n middleware, which only needs to act on "page" and "fallback" route types.
- */
-export const ROUTE_TYPE_HEADER = 'X-Astro-Route-Type';
-
-/**
- * Internal headers that should be stripped from the response before
- * sending it to the user agent. Add new internal headers here so
- * `prepareResponse` removes them automatically.
- */
-export const INTERNAL_RESPONSE_HEADERS = [
-	REROUTE_DIRECTIVE_HEADER,
-	REWRITE_DIRECTIVE_HEADER_KEY,
-	NOOP_MIDDLEWARE_HEADER,
-	ROUTE_TYPE_HEADER,
-] as const;
-
 /**
  * Set by internal handlers (e.g. PagesHandler) to signal that a
  * response should be replaced with the corresponding error page.
diff --git a/packages/astro/src/core/fetch/fetch-state.ts b/packages/astro/src/core/fetch/fetch-state.ts
index e7312e51c4eb..816dc94758f3 100644
--- a/packages/astro/src/core/fetch/fetch-state.ts
+++ b/packages/astro/src/core/fetch/fetch-state.ts
@@ -193,6 +193,10 @@ export class FetchState implements AstroFetchState {
 	clientAddress: string | undefined;
 	/** Whether this is a partial render (container API). */
 	partial: boolean | undefined;
+	/** Internal metadata about the current response route type. */
+	responseRouteType: 'page' | 'fallback' | undefined;
+	/** Internal flag to prevent rerouting this response to an error page. */
+	skipErrorReroute = false;
 	/** Whether to inject CSP meta tags. */
 	shouldInjectCspMetaTags: boolean | undefined;
 	/** Request-scoped locals object, shared with user middleware. */
@@ -1128,4 +1132,9 @@ export class FetchState implements AstroFetchState {
 		this.actionApiContext = null;
 		this.apiContext = null;
 	}
+
+	resetResponseMetadata(): void {
+		this.responseRouteType = undefined;
+		this.skipErrorReroute = false;
+	}
 }
diff --git a/packages/astro/src/core/i18n/handler.ts b/packages/astro/src/core/i18n/handler.ts
index ea56a6fc2ccc..e798c7fde7e3 100644
--- a/packages/astro/src/core/i18n/handler.ts
+++ b/packages/astro/src/core/i18n/handler.ts
@@ -4,7 +4,6 @@ import { I18nRouter, type I18nRouterContext } from '../../i18n/router.js';
 import { PipelineFeatures } from '../base-pipeline.js';
 import type { SSRManifest } from '../app/types.js';
 import { shouldAppendForwardSlash } from '../build/util.js';
-import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from '../constants.js';
 import type { FetchState } from '../fetch/fetch-state.js';
 
 /**
@@ -59,21 +58,15 @@ export class I18n {
 	async finalize(state: FetchState, response: Response): Promise<Response> {
 		state.pipeline.usedFeatures |= PipelineFeatures.i18n;
 		const i18n = this.#i18n;
-		const typeHeader = response.headers.get(ROUTE_TYPE_HEADER);
-		// We don't need this header anymore, and we shouldn't pass downstream to users.
-		if (typeHeader) {
-			response.headers.delete(ROUTE_TYPE_HEADER);
-		}
 
 		// This is a case where we are internally rendering a 404/500, so we
 		// need to bypass checks that were done already.
-		const isReroute = response.headers.get(REROUTE_DIRECTIVE_HEADER);
-		if (isReroute === 'no' && typeof i18n.fallback === 'undefined') {
+		if (state.skipErrorReroute && typeof i18n.fallback === 'undefined') {
 			return response;
 		}
 
 		// If the route we're processing is not a page, then we ignore it
-		if (typeHeader !== 'page' && typeHeader !== 'fallback') {
+		if (state.responseRouteType !== 'page' && state.responseRouteType !== 'fallback') {
 			return response;
 		}
 
@@ -81,12 +74,12 @@ export class I18n {
 		const currentLocale = state.computeCurrentLocale();
 		const isPrerendered = state.routeData!.prerender;
 
-		// Build context for router (typeHeader is guaranteed to be 'page' | 'fallback' here)
+		// Build context for router (responseRouteType is guaranteed to be 'page' | 'fallback' here)
 		const routerContext: I18nRouterContext = {
 			currentLocale,
 			currentDomain: url.hostname,
-			routeType: typeHeader as 'page' | 'fallback',
-			isReroute: isReroute === 'yes',
+			routeType: state.responseRouteType,
+			isReroute: false,
 		};
 
 		// Step 1: Apply routing strategy
@@ -113,7 +106,7 @@ export class I18n {
 						status: 404,
 						headers: response.headers,
 					});
-					prerenderedRes.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
+					state.skipErrorReroute = true;
 					if (routeDecision.location) {
 						prerenderedRes.headers.set('Location', routeDecision.location);
 					}
@@ -137,7 +130,7 @@ export class I18n {
 			// The fallback sentinel (X-Astro-Route-Type: fallback, status 500) signals
 			// that the render pipeline couldn't find this page in the current locale.
 			// Treat it as a 404 so computeFallbackRoute will apply fallback logic.
-			const effectiveStatus = typeHeader === 'fallback' ? 404 : response.status;
+			const effectiveStatus = state.responseRouteType === 'fallback' ? 404 : response.status;
 			const fallbackDecision = computeFallbackRoute({
 				pathname: url.pathname,
 				responseStatus: effectiveStatus,
diff --git a/packages/astro/src/core/middleware/noop-middleware.ts b/packages/astro/src/core/middleware/noop-middleware.ts
index 6c5b4049af8b..d0d6a3df4a4a 100644
--- a/packages/astro/src/core/middleware/noop-middleware.ts
+++ b/packages/astro/src/core/middleware/noop-middleware.ts
@@ -1,8 +1,6 @@
 import type { MiddlewareHandler } from '../../types/public/common.js';
-import { NOOP_MIDDLEWARE_HEADER } from '../constants.js';
 
 export const NOOP_MIDDLEWARE_FN: MiddlewareHandler = async (_ctx, next) => {
 	const response = await next();
-	response.headers.set(NOOP_MIDDLEWARE_HEADER, 'true');
 	return response;
 };
diff --git a/packages/astro/src/core/pages/handler.ts b/packages/astro/src/core/pages/handler.ts
index 06077fa110f0..27d2d1c3f60f 100644
--- a/packages/astro/src/core/pages/handler.ts
+++ b/packages/astro/src/core/pages/handler.ts
@@ -4,13 +4,7 @@ import type { APIContext } from '../../types/public/context.js';
 import type { BaseApp } from '../app/base.js';
 import type { FetchState } from '../fetch/fetch-state.js';
 import type { Pipeline } from '../base-pipeline.js';
-import {
-	ASTRO_ERROR_HEADER,
-	REROUTE_DIRECTIVE_HEADER,
-	REWRITE_DIRECTIVE_HEADER_KEY,
-	REWRITE_DIRECTIVE_HEADER_VALUE,
-	ROUTE_TYPE_HEADER,
-} from '../constants.js';
+import { ASTRO_ERROR_HEADER } from '../constants.js';
 import { getCookiesFromResponse } from '../cookies/response.js';
 
 // Shared empty-slots object so we don't allocate `{}` on every render for
@@ -40,6 +34,7 @@ export class PagesHandler {
 	async handle(state: FetchState, ctx: APIContext): Promise<Response> {
 		const pipeline = this.#pipeline;
 		const { logger, streaming } = pipeline;
+		state.resetResponseMetadata();
 
 		let response: Response;
 
@@ -51,6 +46,7 @@ export class PagesHandler {
 					ctx,
 					state.routeData!.prerender,
 					logger,
+					state,
 				);
 				break;
 			}
@@ -59,14 +55,14 @@ export class PagesHandler {
 				const actionApiContext = state.getActionAPIContext();
 				const result = await state.createResult(componentInstance!, actionApiContext);
 				try {
-					response = await renderPage(
+				response = await renderPage(
 						result,
 						componentInstance?.default as any,
 						props,
 						state.slots ?? EMPTY_SLOTS,
 						streaming,
 						state.routeData!,
-					);
+				);
 				} catch (e) {
 					// If there is an error in the page's frontmatter or instantiation of the RenderTemplate fails midway,
 					// we signal to the rest of the internals that we can ignore the results of existing renders and avoid kicking off more of them.
@@ -75,13 +71,10 @@ export class PagesHandler {
 				}
 
 				// Signal to the i18n middleware to maybe act on this response
-				response.headers.set(ROUTE_TYPE_HEADER, 'page');
+				state.responseRouteType = 'page';
 				// Signal to the error-page-rerouting infra to let this response pass through to avoid loops
 				if (state.routeData!.route === '/404' || state.routeData!.route === '/500') {
-					response.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
-				}
-				if (state.isRewriting) {
-					response.headers.set(REWRITE_DIRECTIVE_HEADER_KEY, REWRITE_DIRECTIVE_HEADER_VALUE);
+					state.skipErrorReroute = true;
 				}
 				break;
 			}
@@ -89,7 +82,8 @@ export class PagesHandler {
 				return new Response(null, { status: 404, headers: { [ASTRO_ERROR_HEADER]: 'true' } });
 			}
 			case 'fallback': {
-				return new Response(null, { status: 500, headers: { [ROUTE_TYPE_HEADER]: 'fallback' } });
+				state.responseRouteType = 'fallback';
+				return new Response(null, { status: 500 });
 			}
 		}
 		// We need to merge the cookies from the response back into the cookies
diff --git a/packages/astro/src/core/routing/handler.ts b/packages/astro/src/core/routing/handler.ts
index 4f93459a3974..c900921908a8 100644
--- a/packages/astro/src/core/routing/handler.ts
+++ b/packages/astro/src/core/routing/handler.ts
@@ -1,10 +1,6 @@
 import { ActionHandler } from '../../actions/handler.js';
 import type { APIContext } from '../../types/public/context.js';
-import {
-	REROUTABLE_STATUS_CODES,
-	REROUTE_DIRECTIVE_HEADER,
-	REWRITE_DIRECTIVE_HEADER_KEY,
-} from '../constants.js';
+import { REROUTABLE_STATUS_CODES } from '../constants.js';
 import { TrailingSlashHandler } from './trailing-slash-handler.js';
 import { CacheHandler, provideCache } from '../cache/handler.js';
 import { I18n } from '../i18n/handler.js';
@@ -159,13 +155,11 @@ export class AstroHandler {
 				response = await this.#cacheHandler.handle(state, runPipeline);
 			}
 
-			const isRewrite = response.headers.has(REWRITE_DIRECTIVE_HEADER_KEY);
-
 			this.#app.logThisRequest({
 				pathname,
 				method: request.method,
 				statusCode: response.status,
-				isRewrite,
+				isRewrite: state.isRewriting,
 				timeStart: state.timeStart,
 			});
 		} catch (err: any) {
@@ -186,7 +180,7 @@ export class AstroHandler {
 			// If the body isn't null, that means the user sets the 404 status
 			// but uses the current route to handle the 404
 			response.body === null &&
-			response.headers.get(REROUTE_DIRECTIVE_HEADER) !== 'no'
+			!state.skipErrorReroute
 		) {
 			return this.#app.renderError(request, {
 				...state.renderOptions,
diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
index f9a1c85231fa..e33646ec192f 100644
--- a/packages/astro/src/i18n/index.ts
+++ b/packages/astro/src/i18n/index.ts
@@ -6,7 +6,7 @@ import {
 import type { RoutingStrategies } from '../core/app/common.js';
 import type { SSRManifest } from '../core/app/types.js';
 import { shouldAppendForwardSlash } from '../core/build/util.js';
-import { REROUTE_DIRECTIVE_HEADER } from '../core/constants.js';
+import { getFetchStateFromAPIContext } from '../core/fetch/fetch-state.js';
 import { i18nNoLocaleFoundInPath, MissingLocale } from '../core/errors/errors-data.js';
 import { AstroError } from '../core/errors/index.js';
 import type { AstroConfig, Locales, ValidRedirectStatus } from '../types/public/config.js';
@@ -331,10 +331,9 @@ export function redirectToDefaultLocale({
 // NOTE: public function exported to the users via `astro:i18n` module
 export function notFound({ base, locales, fallback }: MiddlewarePayload) {
 	return function (context: APIContext, response?: Response): Response | undefined {
-		if (
-			response?.headers.get(REROUTE_DIRECTIVE_HEADER) === 'no' &&
-			typeof fallback === 'undefined'
-		) {
+		const fetchState = getFetchStateFromAPIContext(context);
+
+		if (fetchState.skipErrorReroute && typeof fallback === 'undefined') {
 			return response;
 		}
 
@@ -344,8 +343,8 @@ export function notFound({ base, locales, fallback }: MiddlewarePayload) {
 		// - the URL doesn't contain a locale
 		const isRoot = url.pathname === base + '/' || url.pathname === base;
 		if (!(isRoot || pathHasLocale(url.pathname, locales))) {
+			fetchState.skipErrorReroute = true;
 			if (response) {
-				response.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
 				return new Response(response.body, {
 					status: 404,
 					headers: response.headers,
@@ -353,9 +352,6 @@ export function notFound({ base, locales, fallback }: MiddlewarePayload) {
 			} else {
 				return new Response(null, {
 					status: 404,
-					headers: {
-						[REROUTE_DIRECTIVE_HEADER]: 'no',
-					},
 				});
 			}
 		}
diff --git a/packages/astro/src/runtime/server/endpoint.ts b/packages/astro/src/runtime/server/endpoint.ts
index d3d99f954004..a62ed258b14a 100644
--- a/packages/astro/src/runtime/server/endpoint.ts
+++ b/packages/astro/src/runtime/server/endpoint.ts
@@ -1,7 +1,8 @@
 import colors from 'piccolore';
-import { REROUTABLE_STATUS_CODES, REROUTE_DIRECTIVE_HEADER } from '../../core/constants.js';
+import { REROUTABLE_STATUS_CODES } from '../../core/constants.js';
 import { AstroError } from '../../core/errors/errors.js';
 import { EndpointDidNotReturnAResponse } from '../../core/errors/errors-data.js';
+import type { FetchState } from '../../core/fetch/fetch-state.js';
 import type { AstroLogger } from '../../core/logger/core.js';
 import type { APIRoute } from '../../types/public/common.js';
 import type { APIContext } from '../../types/public/context.js';
@@ -14,6 +15,7 @@ export async function renderEndpoint(
 	context: APIContext,
 	isPrerendered: boolean,
 	logger: AstroLogger,
+	state?: FetchState,
 ) {
 	const { request, url } = context;
 
@@ -58,28 +60,14 @@ export async function renderEndpoint(
 	}
 
 	let response = await handler.call(mod, context);
-
 	if (!response || response instanceof Response === false) {
 		throw new AstroError(EndpointDidNotReturnAResponse);
 	}
 
 	// Endpoints explicitly returning 404 or 500 response status should
 	// NOT be subject to rerouting to 404.astro or 500.astro.
-	if (REROUTABLE_STATUS_CODES.includes(response.status)) {
-		try {
-			response.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
-		} catch (err) {
-			// In some cases the response may have immutable headers
-			// This is the case if, for example, the user directly returns a `fetch` response
-			// There's no clean way to check if the headers are immutable, so we just catch the error
-			// Note that response.clone() still has immutable headers!
-			if ((err as Error).message?.includes('immutable')) {
-				response = new Response(response.body, response);
-				response.headers.set(REROUTE_DIRECTIVE_HEADER, 'no');
-			} else {
-				throw err;
-			}
-		}
+	if (state && REROUTABLE_STATUS_CODES.includes(response.status)) {
+		state.skipErrorReroute = true;
 	}
 
 	if (method === 'HEAD') {
diff --git a/packages/astro/test/units/fetch/index.test.ts b/packages/astro/test/units/fetch/index.test.ts
index bba7334056a9..03d27fb696a2 100644
--- a/packages/astro/test/units/fetch/index.test.ts
+++ b/packages/astro/test/units/fetch/index.test.ts
@@ -381,6 +381,8 @@ describe('pages()', () => {
 		const response = await pages(state);
 
 		assert.equal(response.status, 200);
+		assert.equal(response.headers.get('x-astro-route-type'), null);
+		assert.equal(response.headers.get('x-astro-reroute'), null);
 		const text = await response.text();
 		assert.match(text, /<h1>Hello<\/h1>/);
 	});
@@ -399,6 +401,8 @@ describe('pages()', () => {
 		const response = await pages(state);
 
 		assert.equal(response.status, 404);
+		assert.equal(response.headers.get('x-astro-route-type'), null);
+		assert.equal(response.headers.get('x-astro-reroute'), null);
 		const text = await response.text();
 		assert.match(text, /<h1>Not Found<\/h1>/);
 	});
@@ -460,6 +464,8 @@ describe('pages()', () => {
 		const response = await pages(state);
 
 		assert.equal(response.status, 200);
+		assert.equal(response.headers.get('x-astro-route-type'), null);
+		assert.equal(response.headers.get('x-astro-reroute'), null);
 		assert.equal(response.headers.get('Content-Type'), 'application/json');
 		const body = await response.json();
 		assert.equal(body.ok, true);
@@ -475,6 +481,8 @@ describe('pages()', () => {
 		const response = await pages(state);
 
 		assert.equal(response.status, 404);
+		assert.equal(response.headers.get('x-astro-route-type'), null);
+		assert.equal(response.headers.get('x-astro-reroute'), null);
 	});
 });
 
@@ -509,9 +517,8 @@ describe('i18n()', () => {
 		const request = stampApp(new Request('http://example.com/about'), app);
 		const state = new FetchState(request);
 
-		const pageResponse = new Response('page body', {
-			headers: { 'X-Astro-Route-Type': 'page' },
-		});
+		state.responseRouteType = 'page';
+		const pageResponse = new Response('page body');
 		const result = await i18n(state, pageResponse);
 
 		assert.equal(result.status, 404);
@@ -532,9 +539,8 @@ describe('i18n()', () => {
 		const request = stampApp(new Request('http://example.com/en/about'), app);
 		const state = new FetchState(request);
 
-		const pageResponse = new Response('page body', {
-			headers: { 'X-Astro-Route-Type': 'page' },
-		});
+		state.responseRouteType = 'page';
+		const pageResponse = new Response('page body');
 		const result = await i18n(state, pageResponse);
 
 		assert.equal(result.status, 200);
@@ -556,7 +562,7 @@ describe('i18n()', () => {
 		const request = stampApp(new Request('http://example.com/api/data'), app);
 		const state = new FetchState(request);
 
-		// No X-Astro-Route-Type header — simulates an endpoint response
+		// No responseRouteType — simulates an endpoint response
 		const apiResponse = new Response('{"ok":true}');
 		const result = await i18n(state, apiResponse);
 
diff --git a/packages/astro/test/units/i18n/i18n-middleware.test.ts b/packages/astro/test/units/i18n/i18n-middleware.test.ts
index 68031e96ab3b..24708b7cb3f2 100644
--- a/packages/astro/test/units/i18n/i18n-middleware.test.ts
+++ b/packages/astro/test/units/i18n/i18n-middleware.test.ts
@@ -3,13 +3,13 @@ import { beforeEach, describe, it } from 'node:test';
 import type { MiddlewareHandler } from 'astro';
 import type { RoutingStrategies } from '../../../dist/core/app/common.js';
 import type { Locales } from '../../../dist/types/public/config.js';
+import { getFetchStateFromAPIContext } from '../../../dist/core/fetch/fetch-state.js';
 import { createI18nMiddleware } from '../../../dist/i18n/middleware.js';
 import { createMockAPIContext } from '../mocks.ts';
 
 /**
  * Creates a "page" response that mimics what the render pipeline returns.
- * The `X-Astro-Route-Type: page` header is what the i18n middleware reads
- * to decide whether to apply routing logic.
+ * Route type metadata is stored on FetchState by the render pipeline.
  */
 function makePageResponse(
 	body: string,
@@ -18,14 +18,13 @@ function makePageResponse(
 ): Response {
 	return new Response(body, {
 		status,
-		headers: { 'X-Astro-Route-Type': 'page', ...extraHeaders },
+		headers: extraHeaders,
 	});
 }
 
 function makeFallbackSentinelResponse(): Response {
 	return new Response(null, {
 		status: 500,
-		headers: { 'X-Astro-Route-Type': 'fallback' },
 	});
 }
 
@@ -57,9 +56,14 @@ function makeI18nManifest(overrides: I18nManifestOverrides = {}) {
 /** Calls the handler and asserts the result is a Response (not void). */
 async function callHandler(
 	handler: MiddlewareHandler,
-	...args: Parameters<MiddlewareHandler>
+	context: Parameters<MiddlewareHandler>[0],
+	next: Parameters<MiddlewareHandler>[1],
+	routeType: 'page' | 'fallback' | null = 'page',
 ): Promise<Response> {
-	const result = await handler(...args);
+	if (routeType) {
+		getFetchStateFromAPIContext(context).responseRouteType = routeType;
+	}
+	const result = await handler(context, next);
 	assert.ok(result instanceof Response, 'expected handler to return a Response');
 	return result;
 }
@@ -213,7 +217,7 @@ describe('createI18nMiddleware', () => {
 			} as any);
 			const next = async () => makeFallbackSentinelResponse();
 
-			const result = await callHandler(handler, ctx, next);
+			const result = await callHandler(handler, ctx, next, 'fallback');
 
 			assert.equal(result.status, 200);
 			assert.match(await result.text(), /about page/);
@@ -221,7 +225,7 @@ describe('createI18nMiddleware', () => {
 	});
 
 	describe('early-return guards', () => {
-		it('passes through when X-Astro-Reroute is no and no fallback is configured', async () => {
+		it('passes through when skipErrorReroute is true and no fallback is configured', async () => {
 			const handler = createI18nMiddleware(
 				makeI18nManifest({ fallback: undefined }),
 				'/',
@@ -229,10 +233,8 @@ describe('createI18nMiddleware', () => {
 				'directory',
 			);
 			const ctx = createMockAPIContext({ url: 'http://localhost/404' });
-			const pageResponse = new Response('not found', {
-				status: 404,
-				headers: { 'X-Astro-Route-Type': 'page', 'X-Astro-Reroute': 'no' },
-			});
+			const pageResponse = new Response('not found', { status: 404 });
+			getFetchStateFromAPIContext(ctx).skipErrorReroute = true;
 
 			const result = await callHandler(handler, ctx, async () => pageResponse);
 
@@ -242,11 +244,9 @@ describe('createI18nMiddleware', () => {
 		it('passes through when route type is not page or fallback', async () => {
 			const handler = createI18nMiddleware(makeI18nManifest(), '/', 'ignore', 'directory');
 			const ctx = createMockAPIContext({ url: 'http://localhost/api/data' });
-			const endpointResponse = new Response('{"ok":true}', {
-				headers: { 'X-Astro-Route-Type': 'endpoint' },
-			});
+			const endpointResponse = new Response('{"ok":true}');
 
-			const result = await callHandler(handler, ctx, async () => endpointResponse);
+			const result = await callHandler(handler, ctx, async () => endpointResponse, null);
 
 			assert.equal(result, endpointResponse, 'should return the exact same response');
 		});
diff --git a/packages/astro/test/units/i18n/manual-routing.test.ts b/packages/astro/test/units/i18n/manual-routing.test.ts
index 26664b357721..1b8deaf54b14 100644
--- a/packages/astro/test/units/i18n/manual-routing.test.ts
+++ b/packages/astro/test/units/i18n/manual-routing.test.ts
@@ -9,7 +9,7 @@ import {
 	notFound,
 	redirectToFallback,
 } from '../../../dist/i18n/index.js';
-import { REROUTE_DIRECTIVE_HEADER } from '../../../dist/core/constants.js';
+import { getFetchStateFromAPIContext } from '../../../dist/core/fetch/fetch-state.js';
 import type { Locales } from '../../../dist/types/public/config.js';
 import { createManualRoutingContext, createMiddlewarePayload } from './test-helpers.ts';
 
@@ -654,7 +654,7 @@ describe('notFound', () => {
 			assert.equal(response!.status, 404);
 		});
 
-		it('should set REROUTE_DIRECTIVE_HEADER to no', () => {
+		it('should set skipErrorReroute on FetchState', () => {
 			const payload = createMiddlewarePayload({
 				base: '',
 				locales: ['en', 'es'],
@@ -664,7 +664,8 @@ describe('notFound', () => {
 
 			const response = notFoundFn(context);
 
-			assert.equal(response!.headers.get(REROUTE_DIRECTIVE_HEADER), 'no');
+			assert.equal(response!.headers.get('x-astro-reroute'), null);
+			assert.equal(getFetchStateFromAPIContext(context).skipErrorReroute, true);
 		});
 	});
 
@@ -795,7 +796,7 @@ describe('notFound', () => {
 			assert.equal(response!.status, 404);
 		});
 
-		it('should set REROUTE_DIRECTIVE_HEADER on passed Response', () => {
+		it('should set skipErrorReroute on passed Response', () => {
 			const payload = createMiddlewarePayload({
 				base: '',
 				locales: ['en', 'es'],
@@ -806,10 +807,11 @@ describe('notFound', () => {
 
 			const response = notFoundFn(context, originalResponse);
 
-			assert.equal(response!.headers.get(REROUTE_DIRECTIVE_HEADER), 'no');
+			assert.equal(response!.headers.get('x-astro-reroute'), null);
+			assert.equal(getFetchStateFromAPIContext(context).skipErrorReroute, true);
 		});
 
-		it('should return original response when REROUTE_DIRECTIVE_HEADER is no and no fallback', () => {
+		it('should return original response when skipErrorReroute is true and no fallback', () => {
 			const payload = createMiddlewarePayload({
 				base: '',
 				locales: ['en', 'es'],
@@ -817,9 +819,8 @@ describe('notFound', () => {
 			});
 			const notFoundFn = notFound(payload);
 			const context = createManualRoutingContext({ pathname: '/blog' });
-			const originalResponse = new Response('body', {
-				headers: { [REROUTE_DIRECTIVE_HEADER]: 'no' },
-			});
+			getFetchStateFromAPIContext(context).skipErrorReroute = true;
+			const originalResponse = new Response('body');
 
 			const response = notFoundFn(context, originalResponse);
 
@@ -842,7 +843,7 @@ describe('notFound', () => {
 			assert.equal(response!.status, 404);
 		});
 
-		it('should not return original response with fallback when REROUTE_DIRECTIVE_HEADER is no', () => {
+		it('should not return original response with fallback when skipErrorReroute is true', () => {
 			const payload = createMiddlewarePayload({
 				base: '',
 				locales: ['en', 'es'],
@@ -850,9 +851,8 @@ describe('notFound', () => {
 			});
 			const notFoundFn = notFound(payload);
 			const context = createManualRoutingContext({ pathname: '/blog' });
-			const originalResponse = new Response('body', {
-				headers: { [REROUTE_DIRECTIVE_HEADER]: 'no' },
-			});
+			getFetchStateFromAPIContext(context).skipErrorReroute = true;
+			const originalResponse = new Response('body');
 
 			const response = notFoundFn(context, originalResponse);
 
diff --git a/packages/astro/test/units/i18n/test-helpers.ts b/packages/astro/test/units/i18n/test-helpers.ts
index fe910ad044d3..781741424682 100644
--- a/packages/astro/test/units/i18n/test-helpers.ts
+++ b/packages/astro/test/units/i18n/test-helpers.ts
@@ -1,6 +1,9 @@
 import type { RoutingStrategies } from '../../../dist/core/app/common.js';
 import type { Locales } from '../../../dist/types/public/config.js';
 import type { MiddlewarePayload } from '../../../dist/i18n/index.js';
+import { FetchState } from '../../../dist/core/fetch/fetch-state.js';
+import { fetchStateSymbol } from '../../../dist/core/constants.js';
+import { createBasicPipeline } from '../test-utils.ts';
 
 export function makeI18nRouterConfig({
 	strategy = 'pathname-prefix-other-locales',
@@ -81,7 +84,7 @@ export function createManualRoutingContext({
 	const request = new Request(url.toString(), { method });
 
 	// Cast to any — this is a partial mock of APIContext for unit tests
-	return {
+	const context = {
 		url,
 		request,
 		currentLocale,
@@ -92,6 +95,8 @@ export function createManualRoutingContext({
 			});
 		},
 	} as any;
+	Reflect.set(context, fetchStateSymbol, new FetchState(createBasicPipeline(), request));
+	return context;
 }
 
 export function createMiddlewarePayload({

From 3124ec796e667893aec4db95086800b4e87f2825 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewp@users.noreply.github.com>
Date: Wed, 17 Jun 2026 12:20:47 +0000
Subject: [PATCH 7/9] [ci] format

---
 packages/astro/src/core/pages/handler.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/src/core/pages/handler.ts b/packages/astro/src/core/pages/handler.ts
index 27d2d1c3f60f..855822b7b67e 100644
--- a/packages/astro/src/core/pages/handler.ts
+++ b/packages/astro/src/core/pages/handler.ts
@@ -55,14 +55,14 @@ export class PagesHandler {
 				const actionApiContext = state.getActionAPIContext();
 				const result = await state.createResult(componentInstance!, actionApiContext);
 				try {
-				response = await renderPage(
+					response = await renderPage(
 						result,
 						componentInstance?.default as any,
 						props,
 						state.slots ?? EMPTY_SLOTS,
 						streaming,
 						state.routeData!,
-				);
+					);
 				} catch (e) {
 					// If there is an error in the page's frontmatter or instantiation of the RenderTemplate fails midway,
 					// we signal to the rest of the internals that we can ignore the results of existing renders and avoid kicking off more of them.

From 4ff2a70a01c46898560a05d68dc67bcc7c003e80 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewphillips@cloudflare.com>
Date: Wed, 17 Jun 2026 08:35:34 -0400
Subject: [PATCH 8/9] Fix fix-verification workflow model to claude-sonnet-4-6
 (#17106)

---
 .flue/workflows/fix-verification.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.flue/workflows/fix-verification.ts b/.flue/workflows/fix-verification.ts
index 6adf40fdc48f..8b6fb21dd749 100644
--- a/.flue/workflows/fix-verification.ts
+++ b/.flue/workflows/fix-verification.ts
@@ -17,7 +17,7 @@ const agent = createAgent(() => ({
 			GH_TOKEN: GITHUB_TOKEN_BASE,
 		},
 	}),
-	model: 'anthropic/claude-sonnet-4-20250801',
+	model: 'anthropic/claude-sonnet-4-6',
 }));
 
 export async function run({ init, payload }: FlueContext) {

From 714e8c7e1d3f8268465226e600547af71753dcc6 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Wed, 17 Jun 2026 06:00:08 -0700
Subject: [PATCH 9/9] fix(cloudflare): relocate  to assets root when base is
 set (#17107)

---
 packages/integrations/cloudflare/src/index.ts        |  2 +-
 .../test/fixtures/with-base/public/_redirects        |  1 +
 .../integrations/cloudflare/test/with-base.test.ts   | 12 ++++++++++++
 pnpm-lock.yaml                                       |  9 +++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 packages/integrations/cloudflare/test/fixtures/with-base/public/_redirects

diff --git a/packages/integrations/cloudflare/src/index.ts b/packages/integrations/cloudflare/src/index.ts
index 0542b0b9af6d..2f04fcc6a020 100644
--- a/packages/integrations/cloudflare/src/index.ts
+++ b/packages/integrations/cloudflare/src/index.ts
@@ -501,7 +501,7 @@ export default function createIntegration({
 				// Move platform files from the base-prefixed client dir to the
 				// original client root, since Cloudflare reads them from there.
 				if (_config.base !== '/') {
-					for (const file of ['.assetsignore', '_headers']) {
+					for (const file of ['.assetsignore', '_headers', '_redirects']) {
 						try {
 							await rename(
 								new URL(`./${file}`, _config.build.client),
diff --git a/packages/integrations/cloudflare/test/fixtures/with-base/public/_redirects b/packages/integrations/cloudflare/test/fixtures/with-base/public/_redirects
new file mode 100644
index 000000000000..cd99fa153591
--- /dev/null
+++ b/packages/integrations/cloudflare/test/fixtures/with-base/public/_redirects
@@ -0,0 +1 @@
+/external/old /external/new 301
diff --git a/packages/integrations/cloudflare/test/with-base.test.ts b/packages/integrations/cloudflare/test/with-base.test.ts
index bf22ddb43454..1a0d810b1f93 100644
--- a/packages/integrations/cloudflare/test/with-base.test.ts
+++ b/packages/integrations/cloudflare/test/with-base.test.ts
@@ -75,6 +75,18 @@ describe('base', () => {
 		);
 	});
 
+	it('keeps _redirects at the client root', async () => {
+		assert.ok(
+			fixture.pathExists('client/_redirects'),
+			'_redirects should be at client/_redirects (not under base)',
+		);
+	});
+
+	it('preserves user-defined redirects from public/_redirects', async () => {
+		const content = await fixture.readFile('client/_redirects');
+		assert.match(content, /\/external\/old\s+\/external\/new\s+301/);
+	});
+
 	it('injects cache headers for assets with base prefix', async () => {
 		const content = await fixture.readFile('client/_headers');
 		assert.match(content, /\/blog\/_astro\/\*/);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bb01a417db00..7802ca208afc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4297,6 +4297,15 @@ importers:
         specifier: ^4.83.0
         version: 4.95.0(@cloudflare/workers-types@4.20260527.1)
 
+  packages/integrations/cloudflare/test/fixtures/base-redirects:
+    dependencies:
+      '@astrojs/cloudflare':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/cloudflare/test/fixtures/binding-image-service:
     dependencies:
       '@astrojs/cloudflare':