From 7a231e476380b2cf384c4afc20908932e3e347a4 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Mon, 4 Dec 2023 05:24:22 -0800
Subject: [PATCH 01/59] [Toolbar] Fix tooltip overlap bug (#9283)

---
 .../src/runtime/client/dev-overlay/plugins/utils/highlight.ts | 4 ++++
 packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
index 9dad2b0f597c..73d7fe112757 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
@@ -57,9 +57,12 @@ export function attachTooltipToHighlight(
 	originalElement: Element
 ) {
 	highlight.shadowRoot.append(tooltip);
+	// Track the original z-index so that we can restore it after hover
+	const originalZIndex = highlight.style.zIndex;
 
 	(['mouseover', 'focus'] as const).forEach((event) => {
 		highlight.addEventListener(event, () => {
+			highlight.style.zIndex = '9999999999';
 			tooltip.dataset.show = 'true';
 			const originalRect = originalElement.getBoundingClientRect();
 			const dialogRect = tooltip.getBoundingClientRect();
@@ -77,6 +80,7 @@ export function attachTooltipToHighlight(
 	(['mouseout', 'blur'] as const).forEach((event) => {
 		highlight.addEventListener(event, () => {
 			tooltip.dataset.show = 'false';
+			highlight.style.zIndex = originalZIndex;
 		});
 	});
 }
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index ed1be3edead5..8ce16f7c4f6c 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -80,7 +80,6 @@ export default {
 				const rect = islandElement.getBoundingClientRect();
 				const highlight = createHighlight(rect);
 				const tooltip = buildIslandTooltip(island);
-				attachTooltipToHighlight(highlight, tooltip, islandElement);
 
 				// Set the z-index to be 1 higher than the greatest z-index in the stack.
 				// And also set the highlight/tooltip as being fixed position if they are inside
@@ -94,6 +93,7 @@ export default {
 					tooltip.style.position = highlight.style.position = 'fixed';
 				}
 
+				attachTooltipToHighlight(highlight, tooltip, islandElement);
 				canvas.append(highlight);
 				islandsOverlays.push({ highlightElement: highlight, island: islandElement });
 			});

From 97e43022defaa9ddccd7bb62956d6cdda74bb36b Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Mon, 4 Dec 2023 05:25:10 -0800
Subject: [PATCH 02/59] [Toolbar] Improve third party plugin load performance
 (#9281)

---
 .../astro/src/runtime/client/dev-overlay/entrypoint.ts    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
index 2124c21e07e0..d2145d9ee643 100644
--- a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
@@ -1,12 +1,14 @@
 import type { DevOverlayPlugin as DevOverlayPluginDefinition } from '../../../@types/astro.js';
 import { type AstroDevOverlay, type DevOverlayPlugin } from './overlay.js';
 import { settings } from './settings.js';
+// @ts-expect-error
+import {loadDevOverlayPlugins} from 'astro:dev-overlay';
 
 let overlay: AstroDevOverlay;
 
 document.addEventListener('DOMContentLoaded', async () => {
 	const [
-		{ loadDevOverlayPlugins },
+		customPluginsDefinitions,
 		{ default: astroDevToolPlugin },
 		{ default: astroAuditPlugin },
 		{ default: astroXrayPlugin },
@@ -23,8 +25,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 			DevOverlayIcon,
 		},
 	] = await Promise.all([
-		// @ts-expect-error
-		import('astro:dev-overlay'),
+		loadDevOverlayPlugins() as DevOverlayPluginDefinition[],
 		import('./plugins/astro.js'),
 		import('./plugins/audit.js'),
 		import('./plugins/xray.js'),
@@ -239,7 +240,6 @@ document.addEventListener('DOMContentLoaded', async () => {
 		},
 	} satisfies DevOverlayPluginDefinition;
 
-	const customPluginsDefinitions = (await loadDevOverlayPlugins()) as DevOverlayPluginDefinition[];
 	const plugins: DevOverlayPlugin[] = [
 		...[
 			astroDevToolPlugin,

From 54fac60ee0826608ea7b1b00c1b233561b666de0 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <Princesseuh@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:26:20 +0000
Subject: [PATCH 03/59] [ci] format

---
 packages/astro/src/runtime/client/dev-overlay/entrypoint.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
index d2145d9ee643..773d2493104e 100644
--- a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
@@ -2,7 +2,7 @@ import type { DevOverlayPlugin as DevOverlayPluginDefinition } from '../../../@t
 import { type AstroDevOverlay, type DevOverlayPlugin } from './overlay.js';
 import { settings } from './settings.js';
 // @ts-expect-error
-import {loadDevOverlayPlugins} from 'astro:dev-overlay';
+import { loadDevOverlayPlugins } from 'astro:dev-overlay';
 
 let overlay: AstroDevOverlay;
 

From 29fa5044672988393878f1b7ba8eeb3acca7b270 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Mon, 4 Dec 2023 05:26:34 -0800
Subject: [PATCH 04/59] [Toolbar] Final style polish and code cleanup (#9282)

Co-authored-by: Princesseuh <3019731+Princesseuh@users.noreply.github.com>
---
 packages/astro/e2e/dev-overlay.test.js        |  2 +-
 .../src/runtime/client/dev-overlay/overlay.ts | 36 ++++-------------
 .../client/dev-overlay/plugins/audit.ts       | 26 ++++++++++++-
 .../client/dev-overlay/plugins/settings.ts    | 25 +++++++-----
 .../client/dev-overlay/plugins/xray.ts        | 39 ++++++++++++++-----
 .../client/dev-overlay/ui-library/tooltip.ts  |  9 ++++-
 .../client/dev-overlay/ui-library/window.ts   |  4 ++
 7 files changed, 91 insertions(+), 50 deletions(-)

diff --git a/packages/astro/e2e/dev-overlay.test.js b/packages/astro/e2e/dev-overlay.test.js
index a5e3560e905a..b4188b1e7817 100644
--- a/packages/astro/e2e/dev-overlay.test.js
+++ b/packages/astro/e2e/dev-overlay.test.js
@@ -200,7 +200,7 @@ test.describe('Dev Overlay', () => {
 		await expect(settingsWindow).toHaveCount(1);
 		await expect(settingsWindow).toBeVisible();
 
-		const hideOverlay = settingsWindow.getByRole('heading', { name: 'Hide overlay' });
+		const hideOverlay = settingsWindow.getByRole('heading', { name: 'Hide toolbar' });
 		await expect(hideOverlay).toBeVisible();
 	});
 });
diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index 2def988020ac..1a3457ceb153 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -71,7 +71,7 @@ export class AstroDevOverlay extends HTMLElement {
 			}
 
 			#dev-overlay[data-hidden] #dev-bar .item {
-				opacity: 0;
+				opacity: 0.2;
 			}
 
 			#dev-bar-hitbox-above,
@@ -340,38 +340,18 @@ export class AstroDevOverlay extends HTMLElement {
 			});
 		});
 
-		// On click, show the overlay if it's hidden, it's likely the user wants to interact with it
-		this.shadowRoot.addEventListener('click', () => {
-			if (!this.isHidden()) return;
-			this.setOverlayVisible(true);
-		});
-
-		this.devOverlay!.addEventListener('keyup', (event) => {
-			if (event.code === 'Space' || event.code === 'Enter') {
-				if (!this.isHidden()) return;
-				this.setOverlayVisible(true);
-			}
-			if (event.key === 'Escape') {
-				if (this.isHidden()) return;
-				if (this.getActivePlugin()) return;
-				this.setOverlayVisible(false);
-			}
-		});
-
 		document.addEventListener('keyup', (event) => {
-			if (event.key !== 'Escape') {
-				return;
-			}
-			if (this.isHidden()) {
-				return;
-			}
+			if (event.key !== 'Escape') return;
+			if (this.isHidden()) return;
 			const activePlugin = this.getActivePlugin();
 			if (activePlugin) {
-				this.setPluginStatus(activePlugin, false);
-				return;
+				this.togglePluginStatus(activePlugin);
+			} else {
+				this.setOverlayVisible(false);
 			}
-			this.setOverlayVisible(false);
 		});
+
+
 	}
 
 	async initPlugin(plugin: DevOverlayPlugin) {
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts
index 51d63f7ab42c..08c8b6434ff2 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts
@@ -31,6 +31,27 @@ export default {
 		document.addEventListener('astro:after-swap', async () => lint());
 		document.addEventListener('astro:page-load', async () => refreshLintPositions);
 
+		function onPageClick(event: MouseEvent) {
+			const target = event.target as Element | null;
+			if (!target) return;
+			if (!target.closest) return;
+			if (target.closest('astro-dev-toolbar')) return;
+			eventTarget.dispatchEvent(
+				new CustomEvent('toggle-plugin', {
+					detail: {
+						state: false,
+					},
+				})
+			);
+		}
+		eventTarget.addEventListener('plugin-toggled', (event: any) => {
+			if (event.detail.state === true) {
+				document.addEventListener('click', onPageClick, true);
+			} else {
+				document.removeEventListener('click', onPageClick, true);
+			}
+		});
+
 		async function lint() {
 			audits.forEach(({ highlightElement }) => {
 				highlightElement.remove();
@@ -89,8 +110,11 @@ export default {
 						}
 					</style>
 					<header>
-						<h1><astro-dev-toolbar-icon icon="check-circle"></astro-dev-toolbar-icon>No issues detected.</h1>
+						<h1><astro-dev-toolbar-icon icon="check-circle"></astro-dev-toolbar-icon>No accessibility issues detected.</h1>
 					</header>
+					<p>
+						Nice work! This app scans the page and highlights common accessibility issues for you, like a missing "alt" attribute on an image.
+					</p>
 					`
 				);
 
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
index daf1cae00031..672b7bbda36a 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
@@ -80,7 +80,7 @@ export default {
 						font-size: 16px;
 						font-weight: 400;
 						color: white;
-						margin-bottom: 0;
+						margin-bottom: 4px;
 					}
 
 					label {
@@ -114,30 +114,37 @@ export default {
 						padding: .3em;
 					}
 
+					label > section {
+						max-width: 67%;
+					}
 					p {
-						line-height: 2em;
+						line-height: 1.5em;
 					}
-
 					a, a:visited {
 						color: var(--color-purple);
 					}
+					a:hover {
+						color: #f4ecfd;
+					}
 				</style>
 				<header>
 					<h1><astro-dev-toolbar-icon icon="gear"></astro-dev-toolbar-icon> Settings</h1>
 				</header>
 
-				<hr />
+				<hr id="general"/>
 
-				<h2 id="general">General</h2>
-				<hr />
-				<h3>Hide overlay</h3>
-				<p>Run <code>astro preferences disable devOverlay</code> in your terminal to disable this dev overlay in this project. <a href="https://docs.astro.build/en/reference/cli-reference/#astro-preferences">Learn more</a>.</p>
+				<label class="setting-row">
+					<section>
+						<h3>Hide toolbar</h3>
+						Run <code>astro preferences disable devToolbar</code> in your terminal to disable the toolbar. <a href="https://docs.astro.build/en/reference/cli-reference/#astro-preferences" target="_blank">Learn more</a>.
+					</section>
+				</label>
 				`
 			);
 			const general = windowElement.querySelector('#general')!;
 			for (const settingsRow of settingsRows) {
-				general.after(getElementForSettingAsString(settingsRow));
 				general.after(document.createElement('hr'));
+				general.after(getElementForSettingAsString(settingsRow));
 			}
 			canvas.append(windowElement);
 
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index 8ce16f7c4f6c..a460e2a3b04b 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -15,7 +15,7 @@ export default {
 	id: 'astro:xray',
 	name: 'Inspect',
 	icon: icon,
-	init(canvas) {
+	init(canvas, eventTarget) {
 		let islandsOverlays: { highlightElement: DevOverlayHighlight; island: HTMLElement }[] = [];
 
 		addIslandsOverlay();
@@ -23,6 +23,30 @@ export default {
 		document.addEventListener('astro:after-swap', addIslandsOverlay);
 		document.addEventListener('astro:page-load', refreshIslandsOverlayPositions);
 
+		function onPageClick(event: MouseEvent) {
+			const target = event.target as Element | null;
+			if (!target) return;
+			if (!target.closest) return;
+			if (target.closest('astro-dev-toolbar')) return;
+			event.preventDefault();
+			event.stopPropagation();
+			eventTarget.dispatchEvent(
+				new CustomEvent('toggle-plugin', {
+					detail: {
+						state: false,
+					},
+				})
+			);
+		}
+
+		eventTarget.addEventListener('plugin-toggled', (event: any) => {
+			if (event.detail.state === true) {
+				document.addEventListener('click', onPageClick, true);
+			} else {
+				document.removeEventListener('click', onPageClick, true);
+			}
+		});
+
 		function addIslandsOverlay() {
 			islandsOverlays.forEach(({ highlightElement }) => {
 				highlightElement.remove();
@@ -60,6 +84,9 @@ export default {
 					<header>
 						<h1><astro-dev-toolbar-icon icon="lightbulb"></astro-dev-toolbar-icon>No islands detected.</h1>
 					</header>
+					<p>
+						It looks like there are no interactive component islands on this page. Did you forget to add a client directive to your interactive UI component?
+					</p>
 					`
 				);
 
@@ -131,9 +158,8 @@ export default {
 			if (Object.keys(islandProps).length > 0) {
 				tooltip.sections.push({
 					title: 'Props',
-					content: `${Object.entries(islandProps)
-						.map((prop) => `<code>${prop[0]}=${getPropValue(prop[1] as any)}</code>`)
-						.join(', ')}`,
+					content: `<pre><code>${JSON.stringify(Object.fromEntries(Object.entries(islandProps)
+						.map((prop: any) =>([prop[0], prop[1][1]]))), undefined, 2)}</code></pre>`,
 				});
 			}
 
@@ -159,10 +185,5 @@ export default {
 
 			return tooltip;
 		}
-
-		function getPropValue(prop: [number, any]) {
-			const [_, value] = prop;
-			return JSON.stringify(value, null, 2);
-		}
 	},
 } satisfies DevOverlayPlugin;
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
index dbd7add5dd51..d535865cf79e 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
@@ -101,13 +101,18 @@ export class DevOverlayTooltip extends HTMLElement {
 				cursor: pointer;
 			}
 
-			code {
-				background: rgba(136, 58, 234, 0.33);
+			pre, code {
+				background: rgb(78, 27, 145);
 				font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 				border-radius: 2px;
 				font-size: 14px;
 				padding: 2px;
 			}
+			pre {
+				padding: 1em;
+				margin: 0 0;
+				overflow: auto;
+			}
 			`;
 
 		const fragment = new DocumentFragment();
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts
index 0873d888d8a9..bab936d4bbd8 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/window.ts
@@ -70,6 +70,10 @@ export class DevOverlayWindow extends HTMLElement {
 					border: 1px solid rgba(27, 30, 36, 1);
 					margin: 1em 0;
 				}
+
+				p, ::slotted(p) {
+					line-height: 1.5em;
+				}
 			</style>
 
 			<slot />

From 2fdcd6d71997bc50ea1b4b36a5c775b03f42ce9b Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <Princesseuh@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:27:45 +0000
Subject: [PATCH 05/59] [ci] format

---
 packages/astro/src/runtime/client/dev-overlay/overlay.ts | 2 --
 .../astro/src/runtime/client/dev-overlay/plugins/xray.ts | 9 +++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index 1a3457ceb153..98663911434d 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -350,8 +350,6 @@ export class AstroDevOverlay extends HTMLElement {
 				this.setOverlayVisible(false);
 			}
 		});
-
-
 	}
 
 	async initPlugin(plugin: DevOverlayPlugin) {
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index a460e2a3b04b..5b7327029686 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -158,8 +158,13 @@ export default {
 			if (Object.keys(islandProps).length > 0) {
 				tooltip.sections.push({
 					title: 'Props',
-					content: `<pre><code>${JSON.stringify(Object.fromEntries(Object.entries(islandProps)
-						.map((prop: any) =>([prop[0], prop[1][1]]))), undefined, 2)}</code></pre>`,
+					content: `<pre><code>${JSON.stringify(
+						Object.fromEntries(
+							Object.entries(islandProps).map((prop: any) => [prop[0], prop[1][1]])
+						),
+						undefined,
+						2
+					)}</code></pre>`,
 				});
 			}
 

From bd9907867b0a491cb6c747ec51c2313687af501e Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Mon, 4 Dec 2023 08:43:57 -0500
Subject: [PATCH 06/59] chore: remove `experimental` from i18n configuration
 (#9264)

* update types and schema

* update typescript files

* update tests

* chore: update JSDoc
---
 packages/astro/src/@types/astro.ts            | 226 +++++++++---------
 packages/astro/src/core/build/generate.ts     |  14 +-
 .../src/core/build/plugins/plugin-manifest.ts |  10 +-
 packages/astro/src/core/build/util.ts         |   4 +-
 packages/astro/src/core/config/schema.ts      | 144 +++++------
 packages/astro/src/core/create-vite.ts        |   2 +-
 .../astro/src/core/routing/manifest/create.ts |   3 +-
 packages/astro/src/i18n/vite-plugin-i18n.ts   |   2 +-
 .../src/vite-plugin-astro-server/plugin.ts    |  10 +-
 .../src/vite-plugin-astro-server/route.ts     |  16 +-
 .../i18n-routing-base/astro.config.mjs        |   2 -
 .../i18n-routing-fallback/astro.config.mjs    |   2 -
 .../astro.config.mjs                          |   4 +-
 .../astro.config.mjs                          |  13 +-
 .../astro.config.mjs                          |  14 +-
 .../fixtures/i18n-routing/astro.config.mjs    |   2 -
 packages/astro/test/i18n-routing.test.js      | 218 ++++++++---------
 .../test/units/config/config-validate.test.js |  84 +++----
 18 files changed, 360 insertions(+), 410 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index a689c0479e5e..df475e3d6b69 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1414,145 +1414,147 @@ export interface AstroUserConfig {
 	 * Astro offers experimental flags to give users early access to new features.
 	 * These flags are not guaranteed to be stable.
 	 */
-	experimental?: {
+
+	/**
+	 * @docs
+	 * @name i18n
+	 * @type {object}
+	 * @version 3.5.0
+	 * @type {object}
+	 * @description
+	 *
+	 * Configures experimental i18n routing and allows you to specify some customization options.
+	 *
+	 * See our guide for more information on [internationalization in Astro](/en/guides/internationalization/)
+	 */
+	i18n?: {
 		/**
 		 * @docs
-		 * @name experimental.optimizeHoistedScript
-		 * @type {boolean}
-		 * @default `false`
-		 * @version 2.10.4
+		 * @kind h4
+		 * @name i18n.defaultLocale
+		 * @type {string}
+		 * @version 3.5.0
 		 * @description
-		 * Prevents unused components' scripts from being included in a page unexpectedly.
-		 * The optimization is best-effort and may inversely miss including the used scripts. Make sure to double-check your built pages
-		 * before publishing.
-		 * Enable hoisted script analysis optimization by adding the experimental flag:
 		 *
-		 * ```js
-		 * {
-		 * 	experimental: {
-		 *		optimizeHoistedScript: true,
-		 * 	},
-		 * }
-		 * ```
+		 * The default locale of your website/application. This is a required field.
+		 *
+		 * No particular language format or syntax is enforced, but we suggest using lower-case and hyphens as needed (e.g. "es", "pt-br") for greatest compatibility.
 		 */
-		optimizeHoistedScript?: boolean;
+		defaultLocale: string;
+		/**
+		 * @docs
+		 * @kind h4
+		 * @name i18n.locales
+		 * @type {Locales}
+		 * @version 3.5.0
+		 * @description
+		 *
+		 * A list of all locales supported by the website, including the `defaultLocale`. This is a required field.
+		 *
+		 * Languages can be listed either as individual codes (e.g. `['en', 'es', 'pt-br']`) or mapped to a shared `path` of codes (e.g.  `{ path: "english", codes: ["en", "en-US"]}`). These codes will be used to determine the URL structure of your deployed site.
+		 *
+		 * No particular language code format or syntax is enforced, but your project folders containing your content files must match exactly the `locales` items in the list. In the case of multiple `codes` pointing to a custom URL path prefix, store your content files in a folder with the same name as the `path` configured.
+		 */
+		locales: Locales;
 
 		/**
 		 * @docs
-		 * @name experimental.i18n
-		 * @type {object}
+		 * @kind h4
+		 * @name i18n.fallback
+		 * @type {Record<string, string>}
 		 * @version 3.5.0
-		 * @type {object}
 		 * @description
 		 *
-		 * Configures experimental i18n routing and allows you to specify some customization options.
+		 * The fallback strategy when navigating to pages that do not exist (e.g. a translated page has not been created).
+		 *
+		 * Use this object to declare a fallback `locale` route for each language you support. If no fallback is specified, then unavailable pages will return a 404.
 		 *
-		 * See our guide for more information on [internationalization in Astro](/en/guides/internationalization/)
+		 * ##### Example
+		 *
+		 * The following example configures your content fallback strategy to redirect unavailable pages in `/pt-br/` to their `es` version, and unavailable pages in `/fr/` to their `en` version. Unavailable `/es/` pages will return a 404.
+		 *
+		 * ```js
+		 * export default defineConfig({
+		 * 	experimental: {
+		 * 		i18n: {
+		 * 			defaultLocale: "en",
+		 * 			locales: ["en", "fr", "pt-br", "es"],
+		 * 			fallback: {
+		 * 				pt: "es",
+		 * 			  fr: "en"
+		 * 			}
+		 * 		}
+		 * 	}
+		 * })
+		 * ```
 		 */
-		i18n?: {
-			/**
-			 * @docs
-			 * @kind h4
-			 * @name experimental.i18n.defaultLocale
-			 * @type {string}
-			 * @version 3.5.0
-			 * @description
-			 *
-			 * The default locale of your website/application. This is a required field.
-			 *
-			 * No particular language format or syntax is enforced, but we suggest using lower-case and hyphens as needed (e.g. "es", "pt-br") for greatest compatibility.
-			 */
-			defaultLocale: string;
-			/**
-			 * @docs
-			 * @kind h4
-			 * @name experimental.i18n.locales
-			 * @type {Locales}
-			 * @version 3.5.0
-			 * @description
-			 *
-			 * A list of all locales supported by the website, including the `defaultLocale`. This is a required field.
-			 *
-			 * Languages can be listed either as individual codes (e.g. `['en', 'es', 'pt-br']`) or mapped to a shared `path` of codes (e.g.  `{ path: "english", codes: ["en", "en-US"]}`). These codes will be used to determine the URL structure of your deployed site.
-			 *
-			 * No particular language code format or syntax is enforced, but your project folders containing your content files must match exactly the `locales` items in the list. In the case of multiple `codes` pointing to a custom URL path prefix, store your content files in a folder with the same name as the `path` configured.
-			 */
-			locales: Locales;
+		fallback?: Record<string, string>;
 
+		/**
+		 * @docs
+		 * @kind h4
+		 * @name i18n.routing
+		 * @type {Routing}
+		 * @version 3.7.0
+		 * @description
+		 *
+		 * Controls the routing strategy to determine your site URLs. Set this based on your folder/URL path configuration for your default language.
+		 */
+		routing?: {
 			/**
 			 * @docs
-			 * @kind h4
-			 * @name experimental.i18n.fallback
-			 * @type {Record<string, string>}
-			 * @version 3.5.0
+			 * @name i18n.routing.prefixDefaultLocale
+			 * @type {boolean}
+			 * @default `false`
+			 * @version 3.7.0
 			 * @description
 			 *
-			 * The fallback strategy when navigating to pages that do not exist (e.g. a translated page has not been created).
-			 *
-			 * Use this object to declare a fallback `locale` route for each language you support. If no fallback is specified, then unavailable pages will return a 404.
+			 * When `false`, only non-default languages will display a language prefix.
+			 * The `defaultLocale` will not show a language prefix and content files do not exist in a localized folder.
+			 *  URLs will be of the form `example.com/[locale]/content/` for all non-default languages, but `example.com/content/` for the default locale.
 			 *
-			 * ##### Example
-			 *
-			 * The following example configures your content fallback strategy to redirect unavailable pages in `/pt-br/` to their `es` version, and unavailable pages in `/fr/` to their `en` version. Unavailable `/es/` pages will return a 404.
-			 *
-			 * ```js
-			 * export default defineConfig({
-			 * 	experimental: {
-			 * 		i18n: {
-			 * 			defaultLocale: "en",
-			 * 			locales: ["en", "fr", "pt-br", "es"],
-			 * 			fallback: {
-			 * 				pt: "es",
-			 * 			  fr: "en"
-			 * 			}
-			 * 		}
-			 * 	}
-			 * })
-			 * ```
+			 * When `true`, all URLs will display a language prefix.
+			 * URLs will be of the form `example.com/[locale]/content/` for every route, including the default language.
+			 * Localized folders are used for every language, including the default.
 			 */
-			fallback?: Record<string, string>;
+			prefixDefaultLocale: boolean;
 
 			/**
-			 * @docs
-			 * @kind h4
-			 * @name experimental.i18n.routing
-			 * @type {Routing}
+			 * @name i18n.routing.strategy
+			 * @type {"pathname"}
+			 * @default `"pathname"`
 			 * @version 3.7.0
 			 * @description
 			 *
-			 * Controls the routing strategy to determine your site URLs. Set this based on your folder/URL path configuration for your default language.
+			 * - `"pathanme": The strategy is applied to the pathname of the URLs
 			 */
-			routing?: {
-				/**
-				 * @docs
-				 * @name experimental.i18n.routing.prefixDefaultLocale
-				 * @type {boolean}
-				 * @default `false`
-				 * @version 3.7.0
-				 * @description
-				 *
-				 * When `false`, only non-default languages will display a language prefix.
-				 * The `defaultLocale` will not show a language prefix and content files do not exist in a localized folder.
-				 *  URLs will be of the form `example.com/[locale]/content/` for all non-default languages, but `example.com/content/` for the default locale.
-				 *
-				 * When `true`, all URLs will display a language prefix.
-				 * URLs will be of the form `example.com/[locale]/content/` for every route, including the default language.
-				 * Localized folders are used for every language, including the default.
-				 */
-				prefixDefaultLocale: boolean;
-
-				/**
-				 * @name experimental.i18n.routing.strategy
-				 * @type {"pathname"}
-				 * @default `"pathname"`
-				 * @version 3.7.0
-				 * @description
-				 *
-				 * - `"pathanme": The strategy is applied to the pathname of the URLs
-				 */
-				strategy: 'pathname';
-			};
+			strategy: 'pathname';
 		};
+	};
+
+	experimental?: {
+		/**
+		 * @docs
+		 * @name experimental.optimizeHoistedScript
+		 * @type {boolean}
+		 * @default `false`
+		 * @version 2.10.4
+		 * @description
+		 * Prevents unused components' scripts from being included in a page unexpectedly.
+		 * The optimization is best-effort and may inversely miss including the used scripts. Make sure to double-check your built pages
+		 * before publishing.
+		 * Enable hoisted script analysis optimization by adding the experimental flag:
+		 *
+		 * ```js
+		 * {
+		 * 	experimental: {
+		 *		optimizeHoistedScript: true,
+		 * 	},
+		 * }
+		 * ```
+		 */
+		optimizeHoistedScript?: boolean;
+
 		/**
 		 * @docs
 		 * @name experimental.contentCollectionCache
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 5fc439c154d4..d9c061567d57 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -270,7 +270,7 @@ async function generatePage(
 		pipeline.getManifest().base,
 		pipeline.getManifest().trailingSlash
 	);
-	if (config.experimental.i18n && i18nMiddleware) {
+	if (config.i18n && i18nMiddleware) {
 		if (onRequest) {
 			pipeline.setMiddlewareFunction(sequence(i18nMiddleware, onRequest));
 		} else {
@@ -546,7 +546,7 @@ async function generatePath(
 		logger: pipeline.getLogger(),
 		ssr,
 	});
-	const i18n = pipeline.getConfig().experimental.i18n;
+	const i18n = pipeline.getConfig().i18n;
 
 	const renderContext = await createRenderContext({
 		pathname,
@@ -629,12 +629,12 @@ export function createBuildManifest(
 	renderers: SSRLoadedRenderer[]
 ): SSRManifest {
 	let i18nManifest: SSRManifestI18n | undefined = undefined;
-	if (settings.config.experimental.i18n) {
+	if (settings.config.i18n) {
 		i18nManifest = {
-			fallback: settings.config.experimental.i18n.fallback,
-			routing: settings.config.experimental.i18n.routing,
-			defaultLocale: settings.config.experimental.i18n.defaultLocale,
-			locales: settings.config.experimental.i18n.locales,
+			fallback: settings.config.i18n.fallback,
+			routing: settings.config.i18n.routing,
+			defaultLocale: settings.config.i18n.defaultLocale,
+			locales: settings.config.i18n.locales,
 		};
 	}
 	return {
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 6f9ec6326e07..1a313b6bbdb4 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -240,12 +240,12 @@ function buildManifest(
 		entryModules[BEFORE_HYDRATION_SCRIPT_ID] = '';
 	}
 	let i18nManifest: SSRManifestI18n | undefined = undefined;
-	if (settings.config.experimental.i18n) {
+	if (settings.config.i18n) {
 		i18nManifest = {
-			fallback: settings.config.experimental.i18n.fallback,
-			routing: settings.config.experimental.i18n.routing,
-			locales: settings.config.experimental.i18n.locales,
-			defaultLocale: settings.config.experimental.i18n.defaultLocale,
+			fallback: settings.config.i18n.fallback,
+			routing: settings.config.i18n.routing,
+			locales: settings.config.i18n.locales,
+			defaultLocale: settings.config.i18n.defaultLocale,
 		};
 	}
 
diff --git a/packages/astro/src/core/build/util.ts b/packages/astro/src/core/build/util.ts
index fc12b486f164..3d59cf45ce9a 100644
--- a/packages/astro/src/core/build/util.ts
+++ b/packages/astro/src/core/build/util.ts
@@ -29,9 +29,9 @@ export function shouldAppendForwardSlash(
 }
 
 export function i18nHasFallback(config: AstroConfig): boolean {
-	if (config.experimental.i18n && config.experimental.i18n.fallback) {
+	if (config.i18n && config.i18n.fallback) {
 		// we have some fallback and the control is not none
-		return Object.keys(config.experimental.i18n.fallback).length > 0;
+		return Object.keys(config.i18n.fallback).length > 0;
 	}
 
 	return false;
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index 95e3964b43f6..833fd63d7faa 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -318,90 +318,90 @@ export const AstroConfigSchema = z.object({
 	vite: z
 		.custom<ViteUserConfig>((data) => data instanceof Object && !Array.isArray(data))
 		.default(ASTRO_CONFIG_DEFAULTS.vite),
-	experimental: z
-		.object({
-			optimizeHoistedScript: z
-				.boolean()
-				.optional()
-				.default(ASTRO_CONFIG_DEFAULTS.experimental.optimizeHoistedScript),
-			i18n: z.optional(
-				z
+	i18n: z.optional(
+		z
+			.object({
+				defaultLocale: z.string(),
+				locales: z.array(
+					z.union([
+						z.string(),
+						z.object({
+							path: z.string(),
+							codes: z.string().array().nonempty(),
+						}),
+					])
+				),
+				fallback: z.record(z.string(), z.string()).optional(),
+				routing: z
 					.object({
-						defaultLocale: z.string(),
-						locales: z.array(
-							z.union([
-								z.string(),
-								z.object({
-									path: z.string(),
-									codes: z.string().array().nonempty(),
-								}),
-							])
-						),
-						fallback: z.record(z.string(), z.string()).optional(),
-						routing: z
-							.object({
-								prefixDefaultLocale: z.boolean().default(false),
-								strategy: z.enum(['pathname']).default('pathname'),
-							})
-							.default({})
-							.transform((routing) => {
-								let strategy: RoutingStrategies;
-								switch (routing.strategy) {
-									case 'pathname': {
-										if (routing.prefixDefaultLocale === true) {
-											strategy = 'prefix-always';
-										} else {
-											strategy = 'prefix-other-locales';
-										}
-									}
-								}
-								return strategy;
-							}),
+						prefixDefaultLocale: z.boolean().default(false),
+						strategy: z.enum(['pathname']).default('pathname'),
 					})
-					.optional()
-					.superRefine((i18n, ctx) => {
-						if (i18n) {
-							const { defaultLocale, locales: _locales, fallback } = i18n;
-							const locales = _locales.map((locale) => {
-								if (typeof locale === 'string') {
-									return locale;
+					.default({})
+					.transform((routing) => {
+						let strategy: RoutingStrategies;
+						switch (routing.strategy) {
+							case 'pathname': {
+								if (routing.prefixDefaultLocale === true) {
+									strategy = 'prefix-always';
 								} else {
-									return locale.path;
+									strategy = 'prefix-other-locales';
 								}
-							});
-							if (!locales.includes(defaultLocale)) {
+							}
+						}
+						return strategy;
+					}),
+			})
+			.optional()
+			.superRefine((i18n, ctx) => {
+				if (i18n) {
+					const { defaultLocale, locales: _locales, fallback } = i18n;
+					const locales = _locales.map((locale) => {
+						if (typeof locale === 'string') {
+							return locale;
+						} else {
+							return locale.path;
+						}
+					});
+					if (!locales.includes(defaultLocale)) {
+						ctx.addIssue({
+							code: z.ZodIssueCode.custom,
+							message: `The default locale \`${defaultLocale}\` is not present in the \`i18n.locales\` array.`,
+						});
+					}
+					if (fallback) {
+						for (const [fallbackFrom, fallbackTo] of Object.entries(fallback)) {
+							if (!locales.includes(fallbackFrom)) {
 								ctx.addIssue({
 									code: z.ZodIssueCode.custom,
-									message: `The default locale \`${defaultLocale}\` is not present in the \`i18n.locales\` array.`,
+									message: `The locale \`${fallbackFrom}\` key in the \`i18n.fallback\` record doesn't exist in the \`i18n.locales\` array.`,
 								});
 							}
-							if (fallback) {
-								for (const [fallbackFrom, fallbackTo] of Object.entries(fallback)) {
-									if (!locales.includes(fallbackFrom)) {
-										ctx.addIssue({
-											code: z.ZodIssueCode.custom,
-											message: `The locale \`${fallbackFrom}\` key in the \`i18n.fallback\` record doesn't exist in the \`i18n.locales\` array.`,
-										});
-									}
 
-									if (fallbackFrom === defaultLocale) {
-										ctx.addIssue({
-											code: z.ZodIssueCode.custom,
-											message: `You can't use the default locale as a key. The default locale can only be used as value.`,
-										});
-									}
+							if (fallbackFrom === defaultLocale) {
+								ctx.addIssue({
+									code: z.ZodIssueCode.custom,
+									message: `You can't use the default locale as a key. The default locale can only be used as value.`,
+								});
+							}
 
-									if (!locales.includes(fallbackTo)) {
-										ctx.addIssue({
-											code: z.ZodIssueCode.custom,
-											message: `The locale \`${fallbackTo}\` value in the \`i18n.fallback\` record doesn't exist in the \`i18n.locales\` array.`,
-										});
-									}
-								}
+							if (!locales.includes(fallbackTo)) {
+								ctx.addIssue({
+									code: z.ZodIssueCode.custom,
+									message: `The locale \`${fallbackTo}\` value in the \`i18n.fallback\` record doesn't exist in the \`i18n.locales\` array.`,
+								});
 							}
 						}
-					})
-			),
+					}
+				}
+			})
+	),
+	experimental: z
+		.object({
+			optimizeHoistedScript: z
+				.boolean()
+				.optional()
+				.default(ASTRO_CONFIG_DEFAULTS.experimental.optimizeHoistedScript),
 			contentCollectionCache: z
 				.boolean()
 				.optional()
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 418e6387be14..bd3af4e292a5 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -141,7 +141,7 @@ export async function createVite(
 			astroPrefetch({ settings }),
 			astroTransitions({ settings }),
 			astroDevOverlay({ settings, logger }),
-			!!settings.config.experimental.i18n && astroInternationalization({ settings }),
+			!!settings.config.i18n && astroInternationalization({ settings }),
 		],
 		publicDir: fileURLToPath(settings.config.publicDir),
 		root: fileURLToPath(settings.config.root),
diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts
index c582281ec323..c9c0bb071685 100644
--- a/packages/astro/src/core/routing/manifest/create.ts
+++ b/packages/astro/src/core/routing/manifest/create.ts
@@ -18,7 +18,6 @@ import { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from '../../constants.js';
 import { removeLeadingForwardSlash, slash } from '../../path.js';
 import { resolvePages } from '../../util.js';
 import { getRouteGenerator } from './generator.js';
-import { getPathByLocale } from '../../../i18n/index.js';
 const require = createRequire(import.meta.url);
 
 interface Item {
@@ -491,7 +490,7 @@ export function createRouteManifest(
 		// Didn't find a good place, insert last
 		routes.push(routeData);
 	});
-	const i18n = settings.config.experimental.i18n;
+	const i18n = settings.config.i18n;
 	if (i18n) {
 		// In this block of code we group routes based on their locale
 
diff --git a/packages/astro/src/i18n/vite-plugin-i18n.ts b/packages/astro/src/i18n/vite-plugin-i18n.ts
index a28481cac513..cd4c3f854bd3 100644
--- a/packages/astro/src/i18n/vite-plugin-i18n.ts
+++ b/packages/astro/src/i18n/vite-plugin-i18n.ts
@@ -35,7 +35,7 @@ export default function astroInternationalization({
 					const trailingSlash =  ${JSON.stringify(settings.config.trailingSlash)};
 					const format =  ${JSON.stringify(settings.config.build.format)};
 					const site = ${JSON.stringify(settings.config.site)};
-					const i18n = ${JSON.stringify(settings.config.experimental.i18n)};
+					const i18n = ${JSON.stringify(settings.config.i18n)};
 					
 					export const getRelativeLocaleUrl = (locale, path = "", opts) => _getLocaleRelativeUrl({ 
 						locale,
diff --git a/packages/astro/src/vite-plugin-astro-server/plugin.ts b/packages/astro/src/vite-plugin-astro-server/plugin.ts
index d324dfdc6e4a..f0df0e3ebfc3 100644
--- a/packages/astro/src/vite-plugin-astro-server/plugin.ts
+++ b/packages/astro/src/vite-plugin-astro-server/plugin.ts
@@ -87,12 +87,12 @@ export default function createVitePluginAstroServer({
  */
 export function createDevelopmentManifest(settings: AstroSettings): SSRManifest {
 	let i18nManifest: SSRManifestI18n | undefined = undefined;
-	if (settings.config.experimental.i18n) {
+	if (settings.config.i18n) {
 		i18nManifest = {
-			fallback: settings.config.experimental.i18n.fallback,
-			routing: settings.config.experimental.i18n.routing,
-			defaultLocale: settings.config.experimental.i18n.defaultLocale,
-			locales: settings.config.experimental.i18n.locales,
+			fallback: settings.config.i18n.fallback,
+			routing: settings.config.i18n.routing,
+			defaultLocale: settings.config.i18n.defaultLocale,
+			locales: settings.config.i18n.locales,
 		};
 	}
 	return {
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index e677a81a745d..04e33d82797f 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -173,7 +173,7 @@ export async function handleRoute({
 	const config = pipeline.getConfig();
 	const moduleLoader = pipeline.getModuleLoader();
 	const { logger } = env;
-	if (!matchedRoute && !config.experimental.i18n) {
+	if (!matchedRoute && !config.i18n) {
 		if (isLoggedRequest(pathname)) {
 			logger.info(null, req({ url: pathname, method: incomingRequest.method, statusCode: 404 }));
 		}
@@ -190,8 +190,8 @@ export async function handleRoute({
 	const middleware = await loadMiddleware(moduleLoader);
 
 	if (!matchedRoute) {
-		if (config.experimental.i18n) {
-			const locales = config.experimental.i18n.locales;
+		if (config.i18n) {
+			const locales = config.i18n.locales;
 			const pathNameHasLocale = pathname
 				.split('/')
 				.filter(Boolean)
@@ -288,7 +288,7 @@ export async function handleRoute({
 			filePath: options.filePath,
 		});
 
-		const i18n = pipeline.getConfig().experimental.i18n;
+		const i18n = pipeline.getConfig().i18n;
 
 		renderContext = await createRenderContext({
 			request: options.request,
@@ -307,12 +307,8 @@ export async function handleRoute({
 	}
 
 	const onRequest = middleware?.onRequest as MiddlewareHandler | undefined;
-	if (config.experimental.i18n) {
-		const i18Middleware = createI18nMiddleware(
-			config.experimental.i18n,
-			config.base,
-			config.trailingSlash
-		);
+	if (config.i18n) {
+		const i18Middleware = createI18nMiddleware(config.i18n, config.base, config.trailingSlash);
 
 		if (i18Middleware) {
 			if (onRequest) {
diff --git a/packages/astro/test/fixtures/i18n-routing-base/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-base/astro.config.mjs
index 4d512896695c..ee4909209d5a 100644
--- a/packages/astro/test/fixtures/i18n-routing-base/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing-base/astro.config.mjs
@@ -2,7 +2,6 @@ import { defineConfig} from "astro/config";
 
 export default defineConfig({
 	base: "new-site",
-	experimental: {
 		i18n: {
 			defaultLocale: 'en',
 			locales: [
@@ -14,6 +13,5 @@ export default defineConfig({
 			routing: {
 				prefixDefaultLocale: true
 			}
-		}
 	}
 })
diff --git a/packages/astro/test/fixtures/i18n-routing-fallback/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-fallback/astro.config.mjs
index f7524a64210d..45c3b49a064d 100644
--- a/packages/astro/test/fixtures/i18n-routing-fallback/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing-fallback/astro.config.mjs
@@ -2,7 +2,6 @@ import { defineConfig} from "astro/config";
 
 export default defineConfig({
     base: "new-site",
-    experimental: {
         i18n: {
             defaultLocale: 'en',
             locales: [
@@ -13,5 +12,4 @@ export default defineConfig({
                 pt: "en"
             }
         }
-    }
 })
diff --git a/packages/astro/test/fixtures/i18n-routing-prefix-always/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-prefix-always/astro.config.mjs
index 03fd2b11d0e8..58eb50540ec1 100644
--- a/packages/astro/test/fixtures/i18n-routing-prefix-always/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing-prefix-always/astro.config.mjs
@@ -1,7 +1,6 @@
 import { defineConfig} from "astro/config";
 
 export default defineConfig({
-	experimental: {
 		i18n: {
 			defaultLocale: 'en',
 			locales: [
@@ -13,7 +12,6 @@ export default defineConfig({
 			routing: {
 				prefixDefaultLocale: true
 			}
-		}
-	},
+		},
 	base: "/new-site"
 })
diff --git a/packages/astro/test/fixtures/i18n-routing-prefix-other-locales/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-prefix-other-locales/astro.config.mjs
index 4eb0abf1bffc..93ecee2941b2 100644
--- a/packages/astro/test/fixtures/i18n-routing-prefix-other-locales/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing-prefix-other-locales/astro.config.mjs
@@ -1,14 +1,11 @@
 import { defineConfig} from "astro/config";
 
 export default defineConfig({
-	experimental: {
-		i18n: {
-			defaultLocale: 'en',
-			locales: [
-				'en', 'pt', 'it'
-			],
-		},
-		
+	i18n: {
+		defaultLocale: 'en',
+		locales: [
+			'en', 'pt', 'it'
+		],
 	},
 	base: "/new-site"
 })
diff --git a/packages/astro/test/fixtures/i18n-routing-redirect-preferred-language/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-redirect-preferred-language/astro.config.mjs
index 209ad40fd057..259b10d07d3f 100644
--- a/packages/astro/test/fixtures/i18n-routing-redirect-preferred-language/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing-redirect-preferred-language/astro.config.mjs
@@ -1,12 +1,10 @@
 import { defineConfig} from "astro/config";
 
 export default defineConfig({
-	experimental: {
-		i18n: {
-			defaultLocale: 'en',
-			locales: [
-				'en', 'pt', 'it'
-			]
-		}
-	},
+	i18n: {
+		defaultLocale: 'en',
+		locales: [
+			'en', 'pt', 'it'
+		]
+	}
 })
diff --git a/packages/astro/test/fixtures/i18n-routing/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing/astro.config.mjs
index a3ee1e9c605f..42559e778a30 100644
--- a/packages/astro/test/fixtures/i18n-routing/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing/astro.config.mjs
@@ -1,7 +1,6 @@
 import { defineConfig} from "astro/config";
 
 export default defineConfig({
-	experimental: {
 		i18n: {
 			defaultLocale: 'en',
 			locales: [
@@ -14,5 +13,4 @@ export default defineConfig({
 				}
 			]
 		}
-	},
 })
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
index f074cbb248ce..3c292ef2a48b 100644
--- a/packages/astro/test/i18n-routing.test.js
+++ b/packages/astro/test/i18n-routing.test.js
@@ -157,22 +157,20 @@ describe('[DEV] i18n routing', () => {
 		before(async () => {
 			fixture = await loadFixture({
 				root: './fixtures/i18n-routing-prefix-other-locales/',
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: [
-							'en',
-							'pt',
-							'it',
-							{
-								path: 'spanish',
-								codes: ['es', 'es-AR'],
-							},
-						],
-						fallback: {
-							it: 'en',
-							spanish: 'en',
+				i18n: {
+					defaultLocale: 'en',
+					locales: [
+						'en',
+						'pt',
+						'it',
+						{
+							path: 'spanish',
+							codes: ['es', 'es-AR'],
 						},
+					],
+					fallback: {
+						it: 'en',
+						spanish: 'en',
 					},
 				},
 			});
@@ -336,25 +334,23 @@ describe('[DEV] i18n routing', () => {
 		before(async () => {
 			fixture = await loadFixture({
 				root: './fixtures/i18n-routing-fallback/',
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: [
-							'en',
-							'pt',
-							'it',
-							{
-								path: 'spanish',
-								codes: ['es', 'es-AR'],
-							},
-						],
-						fallback: {
-							it: 'en',
-							spanish: 'en',
-						},
-						routing: {
-							prefixDefaultLocale: false,
+				i18n: {
+					defaultLocale: 'en',
+					locales: [
+						'en',
+						'pt',
+						'it',
+						{
+							path: 'spanish',
+							codes: ['es', 'es-AR'],
 						},
+					],
+					fallback: {
+						it: 'en',
+						spanish: 'en',
+					},
+					routing: {
+						prefixDefaultLocale: false,
 					},
 				},
 			});
@@ -703,22 +699,20 @@ describe('[SSG] i18n routing', () => {
 		before(async () => {
 			fixture = await loadFixture({
 				root: './fixtures/i18n-routing-fallback/',
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: [
-							'en',
-							'pt',
-							'it',
-							{
-								path: 'spanish',
-								codes: ['es', 'es-AR'],
-							},
-						],
-						fallback: {
-							it: 'en',
-							spanish: 'en',
+				i18n: {
+					defaultLocale: 'en',
+					locales: [
+						'en',
+						'pt',
+						'it',
+						{
+							path: 'spanish',
+							codes: ['es', 'es-AR'],
 						},
+					],
+					fallback: {
+						it: 'en',
+						spanish: 'en',
 					},
 				},
 			});
@@ -789,16 +783,14 @@ describe('[SSG] i18n routing', () => {
 		before(async () => {
 			fixture = await loadFixture({
 				root: './fixtures/i18n-routing-prefix-always/',
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: ['en', 'pt', 'it'],
-						fallback: {
-							it: 'en',
-						},
-						routing: {
-							prefixDefaultLocale: true,
-						},
+				i18n: {
+					defaultLocale: 'en',
+					locales: ['en', 'pt', 'it'],
+					fallback: {
+						it: 'en',
+					},
+					routing: {
+						prefixDefaultLocale: true,
 					},
 				},
 			});
@@ -825,13 +817,11 @@ describe('[SSG] i18n routing', () => {
 				redirects: {
 					'/': '/en',
 				},
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: ['en', 'pt', 'it'],
-						fallback: {
-							it: 'en',
-						},
+				i18n: {
+					defaultLocale: 'en',
+					locales: ['en', 'pt', 'it'],
+					fallback: {
+						it: 'en',
 					},
 				},
 			});
@@ -856,16 +846,14 @@ describe('[SSG] i18n routing', () => {
 				build: {
 					format: 'directory',
 				},
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: ['en', 'pt', 'it'],
-						fallback: {
-							it: 'en',
-						},
-						routing: {
-							prefixDefaultLocale: false,
-						},
+				i18n: {
+					defaultLocale: 'en',
+					locales: ['en', 'pt', 'it'],
+					fallback: {
+						it: 'en',
+					},
+					routing: {
+						prefixDefaultLocale: false,
 					},
 				},
 			});
@@ -1115,22 +1103,20 @@ describe('[SSR] i18n routing', () => {
 				root: './fixtures/i18n-routing-fallback/',
 				output: 'server',
 				adapter: testAdapter(),
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: [
-							'en',
-							'pt',
-							'it',
-							{
-								codes: ['es', 'es-AR'],
-								path: 'spanish',
-							},
-						],
-						fallback: {
-							it: 'en',
-							spanish: 'en',
+				i18n: {
+					defaultLocale: 'en',
+					locales: [
+						'en',
+						'pt',
+						'it',
+						{
+							codes: ['es', 'es-AR'],
+							path: 'spanish',
 						},
+					],
+					fallback: {
+						it: 'en',
+						spanish: 'en',
 					},
 				},
 			});
@@ -1178,16 +1164,14 @@ describe('[SSR] i18n routing', () => {
 					root: './fixtures/i18n-routing-fallback/',
 					output: 'server',
 					adapter: testAdapter(),
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: ['en', 'pt', 'it'],
-							fallback: {
-								it: 'en',
-							},
-							routing: {
-								prefixDefaultLocale: false,
-							},
+					i18n: {
+						defaultLocale: 'en',
+						locales: ['en', 'pt', 'it'],
+						fallback: {
+							it: 'en',
+						},
+						routing: {
+							prefixDefaultLocale: false,
 						},
 					},
 				});
@@ -1272,11 +1256,9 @@ describe('[SSR] i18n routing', () => {
 					root: './fixtures/i18n-routing/',
 					output: 'server',
 					adapter: testAdapter(),
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: ['en_AU', 'pt_BR', 'es_US'],
-						},
+					i18n: {
+						defaultLocale: 'en',
+						locales: ['en_AU', 'pt_BR', 'es_US'],
 					},
 				});
 				await fixture.build();
@@ -1303,16 +1285,14 @@ describe('[SSR] i18n routing', () => {
 					root: './fixtures/i18n-routing/',
 					output: 'server',
 					adapter: testAdapter(),
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: [
-								{
-									path: 'english',
-									codes: ['en', 'en-AU', 'pt-BR', 'es-US'],
-								},
-							],
-						},
+					i18n: {
+						defaultLocale: 'en',
+						locales: [
+							{
+								path: 'english',
+								codes: ['en', 'en-AU', 'pt-BR', 'es-US'],
+							},
+						],
 					},
 				});
 				await fixture.build();
@@ -1410,11 +1390,9 @@ describe('i18n routing does not break assets and endpoints', () => {
 		before(async () => {
 			fixture = await loadFixture({
 				root: './fixtures/core-image-base/',
-				experimental: {
-					i18n: {
-						defaultLocale: 'en',
-						locales: ['en', 'es'],
-					},
+				i18n: {
+					defaultLocale: 'en',
+					locales: ['en', 'es'],
 				},
 				base: '/blog',
 			});
diff --git a/packages/astro/test/units/config/config-validate.test.js b/packages/astro/test/units/config/config-validate.test.js
index f759be9b92b5..341ed47b422c 100644
--- a/packages/astro/test/units/config/config-validate.test.js
+++ b/packages/astro/test/units/config/config-validate.test.js
@@ -82,11 +82,9 @@ describe('Config Validation', () => {
 		it('defaultLocale is not in locales', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: ['es'],
-						},
+					i18n: {
+						defaultLocale: 'en',
+						locales: ['es'],
 					},
 				},
 				process.cwd()
@@ -100,17 +98,15 @@ describe('Config Validation', () => {
 		it('errors if codes are empty', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						i18n: {
-							defaultLocale: 'uk',
-							locales: [
-								'es',
-								{
-									path: 'something',
-									codes: [],
-								},
-							],
-						},
+					i18n: {
+						defaultLocale: 'uk',
+						locales: [
+							'es',
+							{
+								path: 'something',
+								codes: [],
+							},
+						],
 					},
 				},
 				process.cwd()
@@ -122,17 +118,15 @@ describe('Config Validation', () => {
 		it('errors if the default locale is not in path', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						i18n: {
-							defaultLocale: 'uk',
-							locales: [
-								'es',
-								{
-									path: 'something',
-									codes: ['en-UK'],
-								},
-							],
-						},
+					i18n: {
+						defaultLocale: 'uk',
+						locales: [
+							'es',
+							{
+								path: 'something',
+								codes: ['en-UK'],
+							},
+						],
 					},
 				},
 				process.cwd()
@@ -146,13 +140,11 @@ describe('Config Validation', () => {
 		it('errors if a fallback value does not exist', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: ['es', 'en'],
-							fallback: {
-								es: 'it',
-							},
+					i18n: {
+						defaultLocale: 'en',
+						locales: ['es', 'en'],
+						fallback: {
+							es: 'it',
 						},
 					},
 				},
@@ -167,13 +159,11 @@ describe('Config Validation', () => {
 		it('errors if a fallback key does not exist', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: ['es', 'en'],
-							fallback: {
-								it: 'en',
-							},
+					i18n: {
+						defaultLocale: 'en',
+						locales: ['es', 'en'],
+						fallback: {
+							it: 'en',
 						},
 					},
 				},
@@ -188,13 +178,11 @@ describe('Config Validation', () => {
 		it('errors if a fallback key contains the default locale', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						i18n: {
-							defaultLocale: 'en',
-							locales: ['es', 'en'],
-							fallback: {
-								en: 'es',
-							},
+					i18n: {
+						defaultLocale: 'en',
+						locales: ['es', 'en'],
+						fallback: {
+							en: 'es',
 						},
 					},
 				},

From 4aa80915829388e3e696975ac8c3b0332c47b5ea Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Mon, 4 Dec 2023 17:56:32 +0100
Subject: [PATCH 07/59] fix: enforce separate type imports (#9288)

---
 .eslintrc.cjs                                        | 10 ++++++++++
 packages/astro-rss/test/rss.test.js                  | 10 +++++-----
 packages/astro/src/assets/build/generate.ts          |  2 +-
 packages/astro/src/core/build/buildPipeline.ts       |  2 +-
 packages/astro/src/core/build/generate.ts            |  1 -
 packages/astro/src/core/build/index.ts               |  3 ++-
 packages/astro/src/core/compile/compile.ts           |  3 ++-
 packages/astro/src/core/dev/restart.ts               |  2 +-
 packages/astro/src/core/logger/node.ts               |  2 +-
 packages/astro/src/core/render/params-and-props.ts   |  3 ++-
 packages/astro/src/core/render/route-cache.ts        |  1 -
 packages/astro/src/integrations/index.ts             |  2 +-
 .../src/runtime/client/dev-overlay/entrypoint.ts     |  2 +-
 packages/astro/src/runtime/server/render/common.ts   |  3 ++-
 .../astro/src/runtime/server/render/component.ts     |  3 ++-
 packages/astro/src/transitions/router.ts             |  9 ++-------
 packages/astro/src/vite-plugin-astro/hmr.ts          |  8 ++------
 packages/astro/test/i18n-routing.test.js             |  2 +-
 packages/integrations/markdoc/components/TreeNode.ts | 12 ++++++------
 packages/integrations/node/src/types.ts              |  2 +-
 packages/integrations/sitemap/src/index.ts           |  8 ++------
 21 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index e6085ac647f6..95f00b476289 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -58,6 +58,16 @@ module.exports = {
     '@typescript-eslint/unbound-method': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
 
+    // Enforce separate type imports for type-only imports to avoid bundling unneeded code
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      {
+        prefer: 'type-imports',
+        fixStyle: 'separate-type-imports',
+        disallowTypeAnnotations: false,
+      },
+    ],
+
     // These rules enabled by the preset configs don't work well for us
     '@typescript-eslint/await-thenable': 'off',
     'prefer-const': 'off',
diff --git a/packages/astro-rss/test/rss.test.js b/packages/astro-rss/test/rss.test.js
index cc7bff82b2ed..e6f68a272f5f 100644
--- a/packages/astro-rss/test/rss.test.js
+++ b/packages/astro-rss/test/rss.test.js
@@ -1,18 +1,18 @@
-import rss, { getRssString } from '../dist/index.js';
-import { rssSchema } from '../dist/schema.js';
 import chai from 'chai';
 import chaiPromises from 'chai-as-promised';
 import chaiXml from 'chai-xml';
+import rss, { getRssString } from '../dist/index.js';
+import { rssSchema } from '../dist/schema.js';
 import {
-	title,
 	description,
-	site,
 	phpFeedItem,
 	phpFeedItemWithContent,
 	phpFeedItemWithCustomData,
+	site,
+	title,
 	web1FeedItem,
-	web1FeedItemWithContent,
 	web1FeedItemWithAllData,
+	web1FeedItemWithContent,
 } from './test-utils.js';
 
 chai.use(chaiPromises);
diff --git a/packages/astro/src/assets/build/generate.ts b/packages/astro/src/assets/build/generate.ts
index c4109ea1edb1..1c55a93b9874 100644
--- a/packages/astro/src/assets/build/generate.ts
+++ b/packages/astro/src/assets/build/generate.ts
@@ -1,7 +1,7 @@
 import { dim, green } from 'kleur/colors';
 import fs, { readFileSync } from 'node:fs';
 import { basename, join } from 'node:path/posix';
-import PQueue from 'p-queue';
+import type PQueue from 'p-queue';
 import type { AstroConfig } from '../../@types/astro.js';
 import type { BuildPipeline } from '../../core/build/buildPipeline.js';
 import { getOutDirWithinCwd } from '../../core/build/common.js';
diff --git a/packages/astro/src/core/build/buildPipeline.ts b/packages/astro/src/core/build/buildPipeline.ts
index 87166b4f4a1b..623e89630fcf 100644
--- a/packages/astro/src/core/build/buildPipeline.ts
+++ b/packages/astro/src/core/build/buildPipeline.ts
@@ -2,7 +2,7 @@ import type { AstroConfig, AstroSettings, SSRLoadedRenderer } from '../../@types
 import { getOutputDirectory, isServerLikeOutput } from '../../prerender/utils.js';
 import { BEFORE_HYDRATION_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
 import type { SSRManifest } from '../app/types.js';
-import { Logger } from '../logger/core.js';
+import type { Logger } from '../logger/core.js';
 import { Pipeline } from '../pipeline.js';
 import { routeIsFallback, routeIsRedirect } from '../redirects/helpers.js';
 import { createEnvironment } from '../render/index.js';
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index d9c061567d57..99a7ad121b79 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -10,7 +10,6 @@ import type {
 	GetStaticPathsItem,
 	RouteData,
 	RouteType,
-	SSRElement,
 	SSRError,
 	SSRLoadedRenderer,
 	SSRManifest,
diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts
index 0245e50c2ff1..fa45c9d6b6e3 100644
--- a/packages/astro/src/core/build/index.ts
+++ b/packages/astro/src/core/build/index.ts
@@ -24,7 +24,8 @@ import { resolveConfig } from '../config/config.js';
 import { createNodeLogger } from '../config/logging.js';
 import { createSettings } from '../config/settings.js';
 import { createVite } from '../create-vite.js';
-import { Logger, levels, timerMessage } from '../logger/core.js';
+import type { Logger } from '../logger/core.js';
+import { levels, timerMessage } from '../logger/core.js';
 import { apply as applyPolyfill } from '../polyfill.js';
 import { RouteCache } from '../render/route-cache.js';
 import { createRouteManifest } from '../routing/index.js';
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index 2985dcab963e..ed2369f7f328 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -5,7 +5,8 @@ import type { AstroConfig } from '../../@types/astro.js';
 import { transform } from '@astrojs/compiler';
 import { fileURLToPath } from 'node:url';
 import { normalizePath } from 'vite';
-import { AggregateError, AstroError, CompilerError } from '../errors/errors.js';
+import type { AstroError } from '../errors/errors.js';
+import { AggregateError, CompilerError } from '../errors/errors.js';
 import { AstroErrorData } from '../errors/index.js';
 import { resolvePath } from '../util.js';
 import { createStylePreprocessor } from './style.js';
diff --git a/packages/astro/src/core/dev/restart.ts b/packages/astro/src/core/dev/restart.ts
index b19eae4ac461..3d77ef0c0cc5 100644
--- a/packages/astro/src/core/dev/restart.ts
+++ b/packages/astro/src/core/dev/restart.ts
@@ -1,4 +1,4 @@
-import nodeFs from 'node:fs';
+import type nodeFs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import * as vite from 'vite';
 import type { AstroInlineConfig, AstroSettings } from '../../@types/astro.js';
diff --git a/packages/astro/src/core/logger/node.ts b/packages/astro/src/core/logger/node.ts
index 727cafd1b220..2c75968d2f85 100644
--- a/packages/astro/src/core/logger/node.ts
+++ b/packages/astro/src/core/logger/node.ts
@@ -1,5 +1,5 @@
 import debugPackage from 'debug';
-import { Writable } from 'node:stream';
+import type { Writable } from 'node:stream';
 import { getEventPrefix, levels, type LogMessage, type LogWritable } from './core.js';
 
 type ConsoleStream = Writable & {
diff --git a/packages/astro/src/core/render/params-and-props.ts b/packages/astro/src/core/render/params-and-props.ts
index 0ad5df205f5b..3532c5f83726 100644
--- a/packages/astro/src/core/render/params-and-props.ts
+++ b/packages/astro/src/core/render/params-and-props.ts
@@ -4,7 +4,8 @@ import type { Logger } from '../logger/core.js';
 import { routeIsFallback } from '../redirects/helpers.js';
 import { routeIsRedirect } from '../redirects/index.js';
 import { getParams } from '../routing/params.js';
-import { RouteCache, callGetStaticPaths, findPathItemByKey } from './route-cache.js';
+import type { RouteCache } from './route-cache.js';
+import { callGetStaticPaths, findPathItemByKey } from './route-cache.js';
 
 interface GetParamsAndPropsOptions {
 	mod: ComponentInstance | undefined;
diff --git a/packages/astro/src/core/render/route-cache.ts b/packages/astro/src/core/render/route-cache.ts
index 4db5b75fd494..8a4e821a523c 100644
--- a/packages/astro/src/core/render/route-cache.ts
+++ b/packages/astro/src/core/render/route-cache.ts
@@ -8,7 +8,6 @@ import type {
 	RouteData,
 	RuntimeMode,
 } from '../../@types/astro.js';
-import { AstroError, AstroErrorData } from '../errors/index.js';
 import type { Logger } from '../logger/core.js';
 
 import { stringifyParams } from '../routing/params.js';
diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts
index 9031eeb2dfe2..d082c438fbaa 100644
--- a/packages/astro/src/integrations/index.ts
+++ b/packages/astro/src/integrations/index.ts
@@ -18,7 +18,7 @@ import type { SerializedSSRManifest } from '../core/app/types.js';
 import type { PageBuildData } from '../core/build/types.js';
 import { buildClientDirectiveEntrypoint } from '../core/client-directive/index.js';
 import { mergeConfig } from '../core/config/index.js';
-import { AstroIntegrationLogger, type Logger } from '../core/logger/core.js';
+import type { AstroIntegrationLogger, Logger } from '../core/logger/core.js';
 import { isServerLikeOutput } from '../prerender/utils.js';
 import { validateSupportedFeatures } from './astroFeaturesValidation.js';
 
diff --git a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
index 773d2493104e..f7c09dea6d99 100644
--- a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
@@ -1,5 +1,5 @@
 import type { DevOverlayPlugin as DevOverlayPluginDefinition } from '../../../@types/astro.js';
-import { type AstroDevOverlay, type DevOverlayPlugin } from './overlay.js';
+import type { AstroDevOverlay, DevOverlayPlugin } from './overlay.js';
 import { settings } from './settings.js';
 // @ts-expect-error
 import { loadDevOverlayPlugins } from 'astro:dev-overlay';
diff --git a/packages/astro/src/runtime/server/render/common.ts b/packages/astro/src/runtime/server/render/common.ts
index 4087ef1a7ec5..f595dc78cf13 100644
--- a/packages/astro/src/runtime/server/render/common.ts
+++ b/packages/astro/src/runtime/server/render/common.ts
@@ -1,7 +1,8 @@
 import type { SSRResult } from '../../../@types/astro.js';
 import type { RenderInstruction } from './instruction.js';
 
-import { HTMLBytes, HTMLString, markHTMLString } from '../escape.js';
+import type { HTMLBytes, HTMLString } from '../escape.js';
+import { markHTMLString } from '../escape.js';
 import {
 	determineIfNeedsHydrationScript,
 	determinesIfNeedsDirectiveScript,
diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts
index dfc5d6c5b62a..42987f011e90 100644
--- a/packages/astro/src/runtime/server/render/component.ts
+++ b/packages/astro/src/runtime/server/render/component.ts
@@ -8,7 +8,8 @@ import { createRenderInstruction, type RenderInstruction } from './instruction.j
 
 import { clsx } from 'clsx';
 import { AstroError, AstroErrorData } from '../../../core/errors/index.js';
-import { HTMLBytes, markHTMLString } from '../escape.js';
+import type { HTMLBytes } from '../escape.js';
+import { markHTMLString } from '../escape.js';
 import { extractDirectives, generateHydrateScript } from '../hydration.js';
 import { serializeProps } from '../serialize.js';
 import { shorthash } from '../shorthash.js';
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
index 92d8bb4a219f..e5bf35b7fd51 100644
--- a/packages/astro/src/transitions/router.ts
+++ b/packages/astro/src/transitions/router.ts
@@ -1,10 +1,5 @@
-import {
-	TRANSITION_AFTER_SWAP,
-	TransitionBeforeSwapEvent,
-	doPreparation,
-	doSwap,
-	type TransitionBeforePreparationEvent,
-} from './events.js';
+import type { TransitionBeforePreparationEvent, TransitionBeforeSwapEvent } from './events.js';
+import { TRANSITION_AFTER_SWAP, doPreparation, doSwap } from './events.js';
 import type { Direction, Fallback, Options } from './types.js';
 
 type State = {
diff --git a/packages/astro/src/vite-plugin-astro/hmr.ts b/packages/astro/src/vite-plugin-astro/hmr.ts
index 4e5d3237dcb1..d06a8338f662 100644
--- a/packages/astro/src/vite-plugin-astro/hmr.ts
+++ b/packages/astro/src/vite-plugin-astro/hmr.ts
@@ -1,11 +1,7 @@
 import type { HmrContext, ModuleNode } from 'vite';
 import type { AstroConfig } from '../@types/astro.js';
-import {
-	cachedCompilation,
-	invalidateCompilation,
-	isCached,
-	type CompileResult,
-} from '../core/compile/index.js';
+import type { cachedCompilation } from '../core/compile/index.js';
+import { invalidateCompilation, isCached, type CompileResult } from '../core/compile/index.js';
 import type { Logger } from '../core/logger/core.js';
 import { isAstroSrcFile } from '../core/logger/vite.js';
 import { isAstroScript } from './query.js';
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
index 3c292ef2a48b..4b9a032306e3 100644
--- a/packages/astro/test/i18n-routing.test.js
+++ b/packages/astro/test/i18n-routing.test.js
@@ -1,7 +1,7 @@
-import { loadFixture } from './test-utils.js';
 import { expect } from 'chai';
 import * as cheerio from 'cheerio';
 import testAdapter from './test-adapter.js';
+import { loadFixture } from './test-utils.js';
 
 describe('astro:i18n virtual module', () => {
 	/** @type {import('./test-utils').Fixture} */
diff --git a/packages/integrations/markdoc/components/TreeNode.ts b/packages/integrations/markdoc/components/TreeNode.ts
index dce10f6cc422..abec17d7be7a 100644
--- a/packages/integrations/markdoc/components/TreeNode.ts
+++ b/packages/integrations/markdoc/components/TreeNode.ts
@@ -1,17 +1,17 @@
-import type { AstroInstance } from 'astro';
 import type { RenderableTreeNode } from '@markdoc/markdoc';
 import Markdoc from '@markdoc/markdoc';
+import type { AstroInstance } from 'astro';
+import type { HTMLString } from 'astro/runtime/server/index.js';
 import {
 	createComponent,
-	renderComponent,
+	createHeadAndContent,
+	isHTMLString,
 	render,
+	renderComponent,
 	renderScriptElement,
+	renderTemplate,
 	renderUniqueStylesheet,
-	createHeadAndContent,
 	unescapeHTML,
-	renderTemplate,
-	HTMLString,
-	isHTMLString,
 } from 'astro/runtime/server/index.js';
 
 export type TreeNode =
diff --git a/packages/integrations/node/src/types.ts b/packages/integrations/node/src/types.ts
index 1917d8cf3696..273b805292cc 100644
--- a/packages/integrations/node/src/types.ts
+++ b/packages/integrations/node/src/types.ts
@@ -1,4 +1,4 @@
-import { IncomingMessage, ServerResponse } from 'node:http';
+import type { IncomingMessage, ServerResponse } from 'node:http';
 
 export interface UserOptions {
 	/**
diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts
index 45f694887733..79f6f9dfcb07 100644
--- a/packages/integrations/sitemap/src/index.ts
+++ b/packages/integrations/sitemap/src/index.ts
@@ -1,12 +1,8 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import {
-	EnumChangefreq,
-	simpleSitemapAndIndex,
-	type LinkItem as LinkItemBase,
-	type SitemapItemLoose,
-} from 'sitemap';
+import type { EnumChangefreq, LinkItem as LinkItemBase, SitemapItemLoose } from 'sitemap';
+import { simpleSitemapAndIndex } from 'sitemap';
 import { ZodError } from 'zod';
 
 import { generateSitemap } from './generate-sitemap.js';

From 8a228fce0114daeea2100e50ddc5cf2ea0a03b5d Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Mon, 4 Dec 2023 11:16:27 -0600
Subject: [PATCH 08/59] Implement new a11y audits for the Dev Toolbar app
 (#9170)

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: Princesseuh <3019731+Princesseuh@users.noreply.github.com>
Co-authored-by: Fred K. Schott <fkschott@gmail.com>
---
 .changeset/orange-candles-sip.md              |   9 +
 LICENSE                                       |   2 -
 packages/astro/package.json                   |   3 +
 .../runtime/client/dev-overlay/entrypoint.ts  |   2 +-
 .../client/dev-overlay/plugins/audit/a11y.ts  | 628 ++++++++++++++++++
 .../plugins/{audit.ts => audit/index.ts}      |  86 ++-
 .../client/dev-overlay/ui-library/tooltip.ts  |   2 +-
 pnpm-lock.yaml                                |  19 +
 8 files changed, 727 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/orange-candles-sip.md
 create mode 100644 packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
 rename packages/astro/src/runtime/client/dev-overlay/plugins/{audit.ts => audit/index.ts} (74%)

diff --git a/.changeset/orange-candles-sip.md b/.changeset/orange-candles-sip.md
new file mode 100644
index 000000000000..442e386b7447
--- /dev/null
+++ b/.changeset/orange-candles-sip.md
@@ -0,0 +1,9 @@
+---
+'astro': patch
+---
+
+Adds new accessibility audits to the Dev Toolbar's built-in Audits app.
+
+The audits Astro performs are non-exhaustive and only capable of detecting a handful of common accessibility issues. Please take care to perform a thorough, **manual** audit of your site to ensure compliance with the [Web Content Accessibility Guidelines (WCAG) international standard](https://www.w3.org/WAI/standards-guidelines/wcag/) _before_ publishing your site.
+
+🧡 Huge thanks to the [Svelte](https://github.com/sveltejs/svelte) team for providing the basis of these accessibility audits!
diff --git a/LICENSE b/LICENSE
index 1f0bcaa7dcef..b3cd0c0f0e01 100644
--- a/LICENSE
+++ b/LICENSE
@@ -20,7 +20,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-
 """
 This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
 
@@ -33,7 +32,6 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
-
 """
 This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
 
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 23b2d68b08dd..7641ce2b5c83 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -124,6 +124,8 @@
     "@babel/types": "^7.23.3",
     "@types/babel__core": "^7.20.4",
     "acorn": "^8.11.2",
+    "aria-query": "^5.3.0",
+    "axobject-query": "^4.0.0",
     "boxen": "^7.1.1",
     "chokidar": "^3.5.3",
     "ci-info": "^4.0.0",
@@ -180,6 +182,7 @@
   "devDependencies": {
     "@astrojs/check": "^0.3.1",
     "@playwright/test": "1.40.0",
+    "@types/aria-query": "^5.0.4",
     "@types/babel__generator": "^7.6.7",
     "@types/babel__traverse": "^7.20.4",
     "@types/chai": "^4.3.10",
diff --git a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
index f7c09dea6d99..ffd9ea32b57f 100644
--- a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
@@ -27,7 +27,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 	] = await Promise.all([
 		loadDevOverlayPlugins() as DevOverlayPluginDefinition[],
 		import('./plugins/astro.js'),
-		import('./plugins/audit.js'),
+		import('./plugins/audit/index.js'),
 		import('./plugins/xray.js'),
 		import('./plugins/settings.js'),
 		import('./overlay.js'),
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
new file mode 100644
index 000000000000..fd3763564bca
--- /dev/null
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
@@ -0,0 +1,628 @@
+/**
+ * https://github.com/sveltejs/svelte/blob/61e5e53eee82e895c1a5b4fd36efb87eafa1fc2d/LICENSE.md
+ * @license MIT
+ *
+ * Copyright (c) 2016-23 [these people](https://github.com/sveltejs/svelte/graphs/contributors)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import type { ARIARoleDefinitionKey } from 'aria-query';
+import { aria, roles } from 'aria-query';
+import type { AuditRuleWithSelector } from './index.js';
+// @ts-expect-error package does not provide types
+import { AXObjectRoles, elementAXObjects } from 'axobject-query';
+
+const a11y_required_attributes = {
+	a: ['href'],
+	area: ['alt', 'aria-label', 'aria-labelledby'],
+	// html-has-lang
+	html: ['lang'],
+	// iframe-has-title
+	iframe: ['title'],
+	img: ['alt'],
+	object: ['title', 'aria-label', 'aria-labelledby'],
+};
+
+const interactiveElements = ['button', 'details', 'embed', 'iframe', 'label', 'select', 'textarea'];
+
+const aria_non_interactive_roles = [
+	'alert',
+	'alertdialog',
+	'application',
+	'article',
+	'banner',
+	'button',
+	'cell',
+	'checkbox',
+	'columnheader',
+	'combobox',
+	'complementary',
+	'contentinfo',
+	'definition',
+	'dialog',
+	'directory',
+	'document',
+	'feed',
+	'figure',
+	'form',
+	'grid',
+	'gridcell',
+	'group',
+	'heading',
+	'img',
+	'link',
+	'list',
+	'listbox',
+	'listitem',
+	'log',
+	'main',
+	'marquee',
+	'math',
+	'menu',
+	'menubar',
+	'menuitem',
+	'menuitemcheckbox',
+	'menuitemradio',
+	'navigation',
+	'none',
+	'note',
+	'option',
+	'presentation',
+	'progressbar',
+	'radio',
+	'radiogroup',
+	'region',
+	'row',
+	'rowgroup',
+	'rowheader',
+	'scrollbar',
+	'search',
+	'searchbox',
+	'separator',
+	'slider',
+	'spinbutton',
+	'status',
+	'switch',
+	'tab',
+	'tablist',
+	'tabpanel',
+	'term',
+	'textbox',
+	'timer',
+	'toolbar',
+	'tooltip',
+	'tree',
+	'treegrid',
+	'treeitem',
+];
+
+const a11y_required_content = [
+	// anchor-has-content
+	'a',
+	// heading-has-content
+	'h1',
+	'h2',
+	'h3',
+	'h4',
+	'h5',
+	'h6',
+];
+
+const a11y_distracting_elements = ['blink', 'marquee'];
+
+const a11y_nested_implicit_semantics = new Map([
+	['header', 'banner'],
+	['footer', 'contentinfo'],
+]);
+const a11y_implicit_semantics = new Map([
+	['a', 'link'],
+	['area', 'link'],
+	['article', 'article'],
+	['aside', 'complementary'],
+	['body', 'document'],
+	['button', 'button'],
+	['datalist', 'listbox'],
+	['dd', 'definition'],
+	['dfn', 'term'],
+	['dialog', 'dialog'],
+	['details', 'group'],
+	['dt', 'term'],
+	['fieldset', 'group'],
+	['figure', 'figure'],
+	['form', 'form'],
+	['h1', 'heading'],
+	['h2', 'heading'],
+	['h3', 'heading'],
+	['h4', 'heading'],
+	['h5', 'heading'],
+	['h6', 'heading'],
+	['hr', 'separator'],
+	['img', 'img'],
+	['li', 'listitem'],
+	['link', 'link'],
+	['main', 'main'],
+	['menu', 'list'],
+	['meter', 'progressbar'],
+	['nav', 'navigation'],
+	['ol', 'list'],
+	['option', 'option'],
+	['optgroup', 'group'],
+	['output', 'status'],
+	['progress', 'progressbar'],
+	['section', 'region'],
+	['summary', 'button'],
+	['table', 'table'],
+	['tbody', 'rowgroup'],
+	['textarea', 'textbox'],
+	['tfoot', 'rowgroup'],
+	['thead', 'rowgroup'],
+	['tr', 'row'],
+	['ul', 'list'],
+]);
+const menuitem_type_to_implicit_role = new Map([
+	['command', 'menuitem'],
+	['checkbox', 'menuitemcheckbox'],
+	['radio', 'menuitemradio'],
+]);
+const input_type_to_implicit_role = new Map([
+	['button', 'button'],
+	['image', 'button'],
+	['reset', 'button'],
+	['submit', 'button'],
+	['checkbox', 'checkbox'],
+	['radio', 'radio'],
+	['range', 'slider'],
+	['number', 'spinbutton'],
+	['email', 'textbox'],
+	['search', 'searchbox'],
+	['tel', 'textbox'],
+	['text', 'textbox'],
+	['url', 'textbox'],
+]);
+
+const ariaAttributes = new Set(
+	'activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby description details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext'.split(
+		' '
+	)
+);
+
+const ariaRoles = new Set(
+	'alert alertdialog application article banner button cell checkbox columnheader combobox complementary contentinfo definition dialog directory document feed figure form grid gridcell group heading img link list listbox listitem log main marquee math menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option presentation progressbar radio radiogroup region row rowgroup rowheader scrollbar search searchbox separator slider spinbutton status tab tablist tabpanel textbox timer toolbar tooltip tree treegrid treeitem'.split(
+		' '
+	)
+);
+
+export const a11y: AuditRuleWithSelector[] = [
+	{
+		code: 'a11y-accesskey',
+		title: 'Avoid using `accesskey`',
+		message:
+			"The `accesskey` attribute can cause accessibility issues. The shortcuts can conflict with the browser's or operating system's shortcuts, and they are difficult for users to discover and use.",
+		selector: '[accesskey]',
+	},
+	{
+		code: 'a11y-aria-activedescendant-has-tabindex',
+		title: 'Elements with attribute `aria-activedescendant` must be tabbable',
+		message:
+			'This element must either have an inherent `tabindex` or declare `tabindex` as an attribute.',
+		selector: '[aria-activedescendant]',
+		match(element) {
+			if (!(element as HTMLElement).tabIndex && !element.hasAttribute('tabindex')) return true;
+		},
+	},
+	{
+		code: 'a11y-aria-attributes',
+		title: 'Element does not support ARIA roles.',
+		message: 'Elements like `meta`, `html`, `script`, `style` do not support having ARIA roles.',
+		selector: ':is(meta, html, script, style)[role]',
+		match(element) {
+			for (const attribute of element.attributes) {
+				if (attribute.name.startsWith('aria-')) return true;
+			}
+		},
+	},
+	{
+		code: 'a11y-autofocus',
+		title: 'Avoid using `autofocus`',
+		message:
+			'The `autofocus` attribute can cause accessibility issues, as it can cause the focus to move around unexpectedly for screen reader users.',
+		selector: '[autofocus]',
+	},
+	{
+		code: 'a11y-distracting-elements',
+		title: 'Distracting elements should not be used',
+		message:
+			'Elements that can be visually distracting like `<marquee>` or `<blink>` can cause accessibility issues for visually impaired users and should be avoided.',
+		selector: `:is(${a11y_distracting_elements.join(',')})`,
+	},
+	{
+		code: 'a11y-hidden',
+		title: 'Certain DOM elements are useful for screen reader navigation and should not be hidden',
+		message: (element) => `${element.localName} element should not be hidden.`,
+		selector: '[aria-hidden]:is(h1,h2,h3,h4,h5,h6)',
+	},
+	{
+		code: 'a11y-img-redundant-alt',
+		title: 'Redundant text in alt attribute',
+		message:
+			'Screen readers already announce `img` elements as an image. There is no need to use words such as "image", "photo", and/or "picture".',
+		selector: 'img[alt]:not([aria-hidden])',
+		match: (img: HTMLImageElement) => /\b(image|picture|photo)\b/i.test(img.alt),
+	},
+	{
+		code: 'a11y-incorrect-aria-attribute-type',
+		title: 'Incorrect value for ARIA attribute.',
+		message: '`aria-hidden` should only receive a boolean.',
+		selector: '[aria-hidden]',
+		match(element) {
+			const value = element.getAttribute('aria-hidden');
+			if (!value) return true;
+			if (!['true', 'false'].includes(value)) return true;
+		},
+	},
+	{
+		code: 'a11y-invalid-attribute',
+		title: 'Attributes important for accessibility should have a valid value',
+		message: "`href` should not be empty, `'#'`, or `javascript:`.",
+		selector: 'a[href]:is([href=""], [href="#"], [href^="javascript:" i])',
+	},
+	{
+		code: 'a11y-label-has-associated-control',
+		title: '`label` tag should have an associated control and a text content.',
+		message:
+			'The `label` tag must be associated with a control using either `for` or having a nested input. Additionally, the `label` tag must have text content.',
+		selector: 'label:not([for])',
+		match(element) {
+			const inputChild = element.querySelector('input');
+			if (!inputChild?.textContent) return true;
+		},
+	},
+	{
+		code: 'a11y-media-has-caption',
+		title: 'Unmuted video elements should have captions',
+		message:
+			'Videos without captions can be difficult for deaf and hard-of-hearing users to follow along with. If the video does not need captions, add the `muted` attribute.',
+		selector: 'video:not([muted])',
+		match(element) {
+			const tracks = element.querySelectorAll('track');
+			if (!tracks.length) return true;
+
+			const hasCaptionTrack = Array.from(tracks).some(
+				(track) => track.getAttribute('kind') === 'captions'
+			);
+
+			return !hasCaptionTrack;
+		},
+	},
+	{
+		code: 'a11y-misplaced-scope',
+		title: 'The `scope` attribute should only be used on `<th>` elements',
+		message:
+			'The `scope` attribute tells the browser and screen readers how to navigate tables. In HTML5, it should only be used on `<th>` elements.',
+		selector: ':not(th)[scope]',
+	},
+	{
+		code: 'a11y-missing-attribute',
+		title: 'Required attributes missing.',
+		message: (element) => {
+			const requiredAttributes =
+				a11y_required_attributes[element.localName as keyof typeof a11y_required_attributes];
+
+			const missingAttributes = requiredAttributes.filter(
+				(attribute) => !element.hasAttribute(attribute)
+			);
+
+			return `${
+				element.localName
+			} element is missing required attributes for accessibility: ${missingAttributes.join(', ')} `;
+		},
+		selector: Object.keys(a11y_required_attributes).join(','),
+		match(element) {
+			const requiredAttributes =
+				a11y_required_attributes[element.localName as keyof typeof a11y_required_attributes];
+
+			if (!requiredAttributes) return true;
+			for (const attribute of requiredAttributes) {
+				if (!element.hasAttribute(attribute)) return true;
+			}
+
+			return false;
+		},
+	},
+	{
+		code: 'a11y-missing-content',
+		title: 'Missing content on element important for accessibility',
+		message: 'Headings and anchors must have content to be accessible.',
+		selector: a11y_required_content.join(','),
+		match(element) {
+			if (!element.textContent) return true;
+		},
+	},
+	{
+		code: 'a11y-no-redundant-roles',
+		title: 'HTML element has redundant ARIA roles',
+		message:
+			'Giving these elements an ARIA role that is already set by the browser has no effect and is redundant.',
+		selector: [...a11y_implicit_semantics.keys()].join(','),
+		match(element) {
+			const role = element.getAttribute('role');
+
+			if (element.localName === 'input') {
+				const type = element.getAttribute('type');
+				if (!type) return true;
+
+				const implicitRoleForType = input_type_to_implicit_role.get(type);
+				if (!implicitRoleForType) return true;
+
+				if (role === implicitRoleForType) return false;
+			}
+
+			// TODO: Handle menuitem and elements that inherit their role from their parent
+
+			const implicitRole = a11y_implicit_semantics.get(element.localName);
+			if (!implicitRole) return true;
+
+			if (role === implicitRole) return false;
+		},
+	},
+	{
+		code: 'a11y-no-interactive-element-to-noninteractive-role',
+		title: 'Non-interactive ARIA role used on interactive HTML element.',
+		message:
+			'Interactive HTML elements like `<a>` and `<button>` cannot use non-interactive roles like `heading`, `list`, `menu`, and `toolbar`.',
+		selector: `[role]:is(${interactiveElements.join(',')})`,
+		match(element) {
+			const role = element.getAttribute('role');
+			if (!role) return false;
+			if (!ariaRoles.has(role)) return false;
+
+			if (aria_non_interactive_roles.includes(role)) return true;
+		},
+	},
+	{
+		code: 'a11y-no-noninteractive-element-to-interactive-role',
+		title: 'Interactive ARIA role used on non-interactive HTML element.',
+		message:
+			'Interactive roles should not be used to convert a non-interactive element to an interactive element',
+		selector: `[role]:not(${interactiveElements.join(',')})`,
+		match(element) {
+			const role = element.getAttribute('role');
+			if (!role) return false;
+			if (!ariaRoles.has(role)) return false;
+			const exceptions =
+				a11y_non_interactive_element_to_interactive_role_exceptions[
+					element.localName as keyof typeof a11y_non_interactive_element_to_interactive_role_exceptions
+				];
+			if (exceptions?.includes(role)) return false;
+
+			if (!aria_non_interactive_roles.includes(role)) return true;
+		},
+	},
+	{
+		code: 'a11y-no-noninteractive-tabindex',
+		title: 'Invalid `tabindex` on non-interactive element',
+		message: (element) => `${element.localName} elements should not have \`tabindex\` attribute`,
+		selector: '[tabindex]',
+		match(element) {
+			// Scrollable elements are considered interactive
+			// See: https://www.w3.org/WAI/standards-guidelines/act/rules/0ssw9k/proposed/
+			const isScrollable =
+				element.scrollHeight > element.clientHeight || element.scrollWidth > element.clientWidth;
+			if (isScrollable) return false;
+
+			if (!interactiveElements.includes(element.localName)) return true;
+		},
+	},
+	{
+		code: 'a11y-positive-tabindex',
+		title: 'Avoid positive `tabindex` property values',
+		message:
+			'This will move elements out of the expected tab order, creating a confusing experience for keyboard users.',
+		selector: '[tabindex]:not([tabindex="-1"]):not([tabindex="0"])',
+	},
+	{
+		code: 'a11y-role-has-required-aria-props',
+		title: 'Missing attributes required for ARIA role',
+		message: (element) => {
+			const { __astro_role: role, __astro_missing_attributes: required } = element as any;
+			return `${
+				element.localName
+			} element is missing required attributes for its role (${role}): ${required.join(', ')}`;
+		},
+		selector: '*',
+		match(element) {
+			const role = getRole(element);
+			if (!role) return false;
+			if (is_semantic_role_element(role, element.localName, getAttributeObject(element))) {
+				return;
+			}
+			const { requiredProps } = roles.get(role)!;
+			const required_role_props = Object.keys(requiredProps);
+			const missingProps = required_role_props.filter((prop) => !element.hasAttribute(prop));
+			if (missingProps.length > 0) {
+				(element as any).__astro_role = role;
+				(element as any).__astro_missing_attributes = missingProps;
+				return true;
+			}
+		},
+	},
+	{
+		code: 'a11y-role-supports-aria-props',
+		title: 'Unsupported ARIA attribute',
+		message: (element) => {
+			const { __astro_role: role, __astro_unsupported_attributes: unsupported } = element as any;
+			return `${
+				element.localName
+			} element has ARIA attributes that are not supported by its role (${role}): ${unsupported.join(
+				', '
+			)}`;
+		},
+		selector: '*',
+		match(element) {
+			const role = getRole(element);
+			if (!role) return false;
+			const { props } = roles.get(role)!;
+			const attributes = getAttributeObject(element);
+			const unsupportedAttributes = aria.keys().filter((attribute) => !(attribute in props));
+			const invalidAttributes: string[] = Object.keys(attributes).filter(
+				(key) => key.startsWith('aria-') && unsupportedAttributes.includes(key as any)
+			);
+			if (invalidAttributes.length > 0) {
+				(element as any).__astro_role = role;
+				(element as any).__astro_unsupported_attributes = invalidAttributes;
+				return true;
+			}
+		},
+	},
+	{
+		code: 'a11y-structure',
+		title: 'Invalid DOM structure',
+		message:
+			'The DOM structure must be valid for accessibility of the page, for example `figcaption` must be a direct child of `figure`.',
+		selector: 'figcaption:not(figure > figcaption)',
+	},
+	{
+		code: 'a11y-unknown-aria-attribute',
+		title: 'Unknown ARIA attribute',
+		message: 'ARIA attributes prefixed with `aria-` must be valid, non-abstract ARIA attributes.',
+		selector: '*',
+		match(element) {
+			for (const attribute of element.attributes) {
+				if (attribute.name.startsWith('aria-')) {
+					if (!ariaAttributes.has(attribute.name.slice('aria-'.length))) return true;
+				}
+			}
+		},
+	},
+	{
+		code: 'a11y-unknown-role',
+		title: 'Unknown ARIA role',
+		message: 'ARIA roles must be valid, non-abstract ARIA roles.',
+		selector: '[role]',
+		match(element) {
+			const role = element.getAttribute('role');
+			if (!role) return true;
+			if (!ariaRoles.has(role)) return true;
+		},
+	},
+];
+
+const a11y_labelable = [
+	'button',
+	'input',
+	'keygen',
+	'meter',
+	'output',
+	'progress',
+	'select',
+	'textarea',
+];
+
+/**
+ * Exceptions to the rule which follows common A11y conventions
+ * TODO make this configurable by the user
+ * @type {Record<string, string[]>}
+ */
+const a11y_non_interactive_element_to_interactive_role_exceptions = {
+	ul: ['listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid'],
+	ol: ['listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid'],
+	li: ['menuitem', 'option', 'row', 'tab', 'treeitem'],
+	table: ['grid'],
+	td: ['gridcell'],
+	fieldset: ['radiogroup', 'presentation'],
+};
+
+const combobox_if_list = ['email', 'search', 'tel', 'text', 'url'];
+function input_implicit_role(attributes: Record<string, string>) {
+	if (!('type' in attributes)) return;
+	const { type, list } = attributes;
+	if (!type) return;
+	if (list && combobox_if_list.includes(type)) {
+		return 'combobox';
+	}
+	return input_type_to_implicit_role.get(type);
+}
+
+/** @param {Map<string, import('#compiler').Attribute>} attribute_map */
+function menuitem_implicit_role(attributes: Record<string, string>) {
+	if (!('type' in attributes)) return;
+	const { type } = attributes;
+	if (!type) return;
+	return menuitem_type_to_implicit_role.get(type);
+}
+
+function getRole(element: Element): ARIARoleDefinitionKey | undefined {
+	if (element.hasAttribute('role')) {
+		return element.getAttribute('role')! as ARIARoleDefinitionKey;
+	}
+	return getImplicitRole(element) as ARIARoleDefinitionKey;
+}
+
+function getImplicitRole(element: Element) {
+	const name = element.localName;
+	const attrs = getAttributeObject(element);
+	if (name === 'menuitem') {
+		return menuitem_implicit_role(attrs);
+	} else if (name === 'input') {
+		return input_implicit_role(attrs);
+	} else {
+		return a11y_implicit_semantics.get(name);
+	}
+}
+
+function getAttributeObject(element: Element): Record<string, string> {
+	let obj: Record<string, string> = {};
+	for (let i = 0; i < element.attributes.length; i++) {
+		const attribute = element.attributes.item(i)!;
+		obj[attribute.name] = attribute.value;
+	}
+	return obj;
+}
+
+/**
+ * @param {import('aria-query').ARIARoleDefinitionKey} role
+ * @param {string} tag_name
+ * @param {Map<string, import('#compiler').Attribute>} attribute_map
+ */
+function is_semantic_role_element(
+	role: string,
+	tag_name: string,
+	attributes: Record<string, string>
+) {
+	for (const [schema, ax_object] of elementAXObjects.entries()) {
+		if (
+			schema.name === tag_name &&
+			(!schema.attributes ||
+				schema.attributes.every((attr: any) => attributes[attr.name] === attr.value))
+		) {
+			for (const name of ax_object) {
+				const axRoles = AXObjectRoles.get(name);
+				if (axRoles) {
+					for (const { name: _name } of axRoles) {
+						if (_name === role) {
+							return true;
+						}
+					}
+				}
+			}
+		}
+	}
+	return false;
+}
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
similarity index 74%
rename from packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts
rename to packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
index 08c8b6434ff2..fc9a1e6d35bc 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
@@ -1,23 +1,47 @@
-import type { DevOverlayMetadata, DevOverlayPlugin } from '../../../../@types/astro.js';
-import type { DevOverlayHighlight } from '../ui-library/highlight.js';
-import { attachTooltipToHighlight, createHighlight, positionHighlight } from './utils/highlight.js';
-import { createWindowElement } from './utils/window.js';
+import type { DevOverlayMetadata, DevOverlayPlugin } from '../../../../../@types/astro.js';
+import type { DevOverlayHighlight } from '../../ui-library/highlight.js';
+import {
+	attachTooltipToHighlight,
+	createHighlight,
+	positionHighlight,
+} from '../utils/highlight.js';
+import { createWindowElement } from '../utils/window.js';
+import { a11y } from './a11y.js';
 
 const icon =
 	'<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 1 20 16"><path fill="#fff" d="M.6 2A1.1 1.1 0 0 1 1.7.9h16.6a1.1 1.1 0 1 1 0 2.2H1.6A1.1 1.1 0 0 1 .8 2Zm1.1 7.1h6a1.1 1.1 0 0 0 0-2.2h-6a1.1 1.1 0 0 0 0 2.2ZM9.3 13H1.8a1.1 1.1 0 1 0 0 2.2h7.5a1.1 1.1 0 1 0 0-2.2Zm11.3 1.9a1.1 1.1 0 0 1-1.5 0l-1.7-1.7a4.1 4.1 0 1 1 1.6-1.6l1.6 1.7a1.1 1.1 0 0 1 0 1.6Zm-5.3-3.4a1.9 1.9 0 1 0 0-3.8 1.9 1.9 0 0 0 0 3.8Z"/></svg>';
 
-interface AuditRule {
+type DynamicString = string | ((element: Element) => string);
+
+export interface AuditRule {
+	code: string;
+	title: DynamicString;
+	message: DynamicString;
+}
+
+export interface ResolvedAuditRule {
+	code: string;
 	title: string;
 	message: string;
 }
 
-const selectorBasedRules: (AuditRule & { selector: string })[] = [
-	{
-		title: 'Missing `alt` tag',
-		message: 'The alt attribute is important for accessibility.',
-		selector: 'img:not([alt])',
-	},
-];
+export interface AuditRuleWithSelector extends AuditRule {
+	selector: string;
+	match?: (element: Element) => boolean | null | undefined | void;
+}
+
+const rules = [...a11y];
+
+const dynamicAuditRuleKeys: Array<keyof AuditRule> = ['title', 'message'];
+function resolveAuditRule(rule: AuditRule, element: Element): ResolvedAuditRule {
+	let resolved: ResolvedAuditRule = { ...rule } as any;
+	for (const key of dynamicAuditRuleKeys) {
+		const value = rule[key];
+		if (typeof value === 'string') continue;
+		resolved[key] = value(element);
+	}
+	return resolved;
+}
 
 export default {
 	id: 'astro:audit',
@@ -58,11 +82,22 @@ export default {
 			});
 			audits = [];
 			canvas.getElementById('no-audit')?.remove();
-
-			for (const rule of selectorBasedRules) {
-				const elements = document.querySelectorAll(rule.selector);
-
-				for (const element of elements) {
+			const selectorCache = new Map<string, NodeListOf<Element>>();
+
+			for (const rule of rules) {
+				const elements =
+					selectorCache.get(rule.selector) ?? document.querySelectorAll(rule.selector);
+				let matches: Element[] = [];
+				if (typeof rule.match === 'undefined') {
+					matches = Array.from(elements);
+				} else {
+					for (const element of elements) {
+						if (rule.match(element)) {
+							matches.push(element);
+						}
+					}
+				}
+				for (const element of matches) {
 					await createAuditProblem(rule, element);
 				}
 			}
@@ -89,7 +124,7 @@ export default {
 						header {
 							display: flex;
 						}
-	
+
 						h1 {
 							display: flex;
 							align-items: center;
@@ -151,6 +186,7 @@ export default {
 
 			// If the element is hidden, don't do anything
 			if (targetedElement.offsetParent === null || computedStyle.display === 'none') {
+				audits.push();
 				return;
 			}
 
@@ -170,14 +206,15 @@ export default {
 
 		function buildAuditTooltip(rule: AuditRule, element: Element) {
 			const tooltip = document.createElement('astro-dev-toolbar-tooltip');
+			const { title, message } = resolveAuditRule(rule, element);
 
 			tooltip.sections = [
 				{
 					icon: 'warning',
-					title: rule.title,
+					title: escapeHtml(title),
 				},
 				{
-					content: rule.message,
+					content: escapeHtml(message),
 				},
 			];
 
@@ -203,5 +240,14 @@ export default {
 
 			return tooltip;
 		}
+
+		function escapeHtml(unsafe: string) {
+			return unsafe
+				.replace(/&/g, '&amp;')
+				.replace(/</g, '&lt;')
+				.replace(/>/g, '&gt;')
+				.replace(/"/g, '&quot;')
+				.replace(/'/g, '&#039;');
+		}
 	},
 } satisfies DevOverlayPlugin;
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
index d535865cf79e..6a8e19b0d973 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
@@ -35,7 +35,7 @@ export class DevOverlayTooltip extends HTMLElement {
 				z-index: 9999999;
 				max-width: 45ch;
 				width: fit-content;
-				min-width: 27ch;
+				min-width: 30ch;
 				box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.30), 0px 1px 2px 0px rgba(0, 0, 0, 0.29), 0px 4px 4px 0px rgba(0, 0, 0, 0.26), 0px 10px 6px 0px rgba(0, 0, 0, 0.15), 0px 17px 7px 0px rgba(0, 0, 0, 0.04), 0px 26px 7px 0px rgba(0, 0, 0, 0.01);
 			}
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7a5427d88069..9634d1de7eeb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -508,6 +508,12 @@ importers:
       acorn:
         specifier: ^8.11.2
         version: 8.11.2
+      aria-query:
+        specifier: ^5.3.0
+        version: 5.3.0
+      axobject-query:
+        specifier: ^4.0.0
+        version: 4.0.0
       boxen:
         specifier: ^7.1.1
         version: 7.1.1
@@ -666,6 +672,9 @@ importers:
       '@playwright/test':
         specifier: 1.40.0
         version: 1.40.0
+      '@types/aria-query':
+        specifier: ^5.0.4
+        version: 5.0.4
       '@types/babel__generator':
         specifier: ^7.6.7
         version: 7.6.7
@@ -7241,6 +7250,10 @@ packages:
     resolution: {integrity: sha512-BSNTroRhmBkNiyd7ELK/5Boja92hnQMST6H4z1BqXKeMVzHjp9o1j5poqd5Tyhjd8oMFwxYC4I00eghfg2xrTA==}
     dev: false
 
+  /@types/aria-query@5.0.4:
+    resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
+    dev: true
+
   /@types/babel__core@7.20.4:
     resolution: {integrity: sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==}
     dependencies:
@@ -8358,6 +8371,12 @@ packages:
     dependencies:
       dequal: 2.0.3
 
+  /axobject-query@4.0.0:
+    resolution: {integrity: sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==}
+    dependencies:
+      dequal: 2.0.3
+    dev: false
+
   /b4a@1.6.4:
     resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
     requiresBuild: true

From 6a9669b810ddfcae6c537165a438190ea1e7a4bc Mon Sep 17 00:00:00 2001
From: Martin Trapp <94928215+martrapp@users.noreply.github.com>
Date: Mon, 4 Dec 2023 18:33:34 +0100
Subject: [PATCH 09/59] Increase consistency between navigation with and
 without ViewTransitions (#9279)

* Greater consistency between navigations with and without ViewTransitions

* hmpf

* formatting and test fixing

* An attempt to explain

* fixed tests

* explain the event listener

* Update .changeset/nervous-beans-peel.md

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>

---------

Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 .changeset/nervous-beans-peel.md              |   6 +
 .../src/pages/long-page.astro                 |   6 +
 packages/astro/e2e/view-transitions.test.js   |   3 +
 packages/astro/src/transitions/router.ts      | 109 ++++++++----------
 4 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100644 .changeset/nervous-beans-peel.md

diff --git a/.changeset/nervous-beans-peel.md b/.changeset/nervous-beans-peel.md
new file mode 100644
index 000000000000..aaf464db0bdb
--- /dev/null
+++ b/.changeset/nervous-beans-peel.md
@@ -0,0 +1,6 @@
+---
+'astro': minor
+---
+
+Improves consistency between navigations with and without `<ViewTransitions>`. See [#9279](https://github.com/withastro/astro/pull/9279) for more details.
+
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro
index ebe918c680af..aa7c8b5e59c7 100644
--- a/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/long-page.astro
@@ -51,3 +51,9 @@ import Layout from '../components/Layout.astro';
 		Libero id faucibus nisl tincidunt eget nullam non. Faucibus a pellentesque sit amet porttitor eget dolor. Posuere urna nec tincidunt praesent semper feugiat nibh sed. Suspendisse ultrices gravida dictum fusce. Porttitor eget dolor morbi non arcu. Neque egestas congue quisque egestas diam in. Suscipit tellus mauris a diam maecenas sed enim ut sem. Luctus accumsan tortor posuere ac. Tortor posuere ac ut consequat semper viverra. Egestas tellus rutrum tellus pellentesque eu tincidunt tortor aliquam nulla. Senectus et netus et malesuada fames ac turpis egestas. Sed libero enim sed faucibus turpis in eu mi bibendum. Sollicitudin tempor id eu nisl nunc mi.
 	</article>
 </Layout>
+<script is:inline>
+	// let playwright know when navigate() is done
+	document.addEventListener('astro:before-swap', (e) => {
+		e.viewTransition.ready.then(()=>console.log("ready"))
+	});
+</script>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index fafea3e697fa..bfc5d7d4a92d 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -394,7 +394,10 @@ test.describe('View Transitions', () => {
 		await expect(locator).toBeInViewport();
 
 		// Scroll back to top
+		// back returns immediately, but we need to wait for navigate() to complete
+		const waitForReady = page.waitForEvent('console');
 		await page.goBack();
+		await waitForReady;
 		locator = page.locator('#longpage');
 		await expect(locator).toBeInViewport();
 
diff --git a/packages/astro/src/transitions/router.ts b/packages/astro/src/transitions/router.ts
index e5bf35b7fd51..ce92fd6308e5 100644
--- a/packages/astro/src/transitions/router.ts
+++ b/packages/astro/src/transitions/router.ts
@@ -25,9 +25,7 @@ export const transitionEnabledOnThisPage = () =>
 	inBrowser && !!document.querySelector('[name="astro-view-transitions-enabled"]');
 
 const samePage = (thisLocation: URL, otherLocation: URL) =>
-	thisLocation.origin === otherLocation.origin &&
-	thisLocation.pathname === otherLocation.pathname &&
-	thisLocation.search === otherLocation.search;
+	thisLocation.pathname === otherLocation.pathname && thisLocation.search === otherLocation.search;
 
 // When we traverse the history, the window.location is already set to the new location.
 // This variable tells us where we came from
@@ -418,16 +416,22 @@ async function transition(
 	options: Options,
 	historyState?: State
 ) {
+	// not ours
+	if (!transitionEnabledOnThisPage() || location.origin !== to.origin) {
+		location.href = to.href;
+		return;
+	}
+
 	const navigationType = historyState
 		? 'traverse'
 		: options.history === 'replace'
 		  ? 'replace'
 		  : 'push';
 
-	if (samePage(from, to) && !options.formData /* not yet: && to.hash*/) {
-		if (navigationType !== 'traverse') {
-			updateScrollPosition({ scrollX, scrollY });
-		}
+	if (navigationType !== 'traverse') {
+		updateScrollPosition({ scrollX, scrollY });
+	}
+	if (samePage(from, to) && !!to.hash) {
 		moveToLocation(to, from, options, historyState);
 		return;
 	}
@@ -447,61 +451,48 @@ async function transition(
 		return;
 	}
 
-	function pageMustReload(preparationEvent: TransitionBeforePreparationEvent) {
-		return (
-			preparationEvent.to.hash === '' ||
-			!samePage(preparationEvent.from, preparationEvent.to) ||
-			preparationEvent.sourceElement instanceof HTMLFormElement
-		);
-	}
-
 	async function defaultLoader(preparationEvent: TransitionBeforePreparationEvent) {
-		if (pageMustReload(preparationEvent)) {
-			const href = preparationEvent.to.href;
-			const init: RequestInit = {};
-			if (preparationEvent.formData) {
-				init.method = 'POST';
-				init.body = preparationEvent.formData;
-			}
-			const response = await fetchHTML(href, init);
-			// If there is a problem fetching the new page, just do an MPA navigation to it.
-			if (response === null) {
-				preparationEvent.preventDefault();
-				return;
-			}
-			// if there was a redirection, show the final URL in the browser's address bar
-			if (response.redirected) {
-				preparationEvent.to = new URL(response.redirected);
-			}
-
-			parser ??= new DOMParser();
-
-			preparationEvent.newDocument = parser.parseFromString(response.html, response.mediaType);
-			// The next line might look like a hack,
-			// but it is actually necessary as noscript elements
-			// and their contents are returned as markup by the parser,
-			// see https://developer.mozilla.org/en-US/docs/Web/API/DOMParser/parseFromString
-			preparationEvent.newDocument.querySelectorAll('noscript').forEach((el) => el.remove());
+		const href = preparationEvent.to.href;
+		const init: RequestInit = {};
+		if (preparationEvent.formData) {
+			init.method = 'POST';
+			init.body = preparationEvent.formData;
+		}
+		const response = await fetchHTML(href, init);
+		// If there is a problem fetching the new page, just do an MPA navigation to it.
+		if (response === null) {
+			preparationEvent.preventDefault();
+			return;
+		}
+		// if there was a redirection, show the final URL in the browser's address bar
+		if (response.redirected) {
+			preparationEvent.to = new URL(response.redirected);
+		}
 
-			// If ViewTransitions is not enabled on the incoming page, do a full page load to it.
-			// Unless this was a form submission, in which case we do not want to trigger another mutation.
-			if (
-				!preparationEvent.newDocument.querySelector('[name="astro-view-transitions-enabled"]') &&
-				!preparationEvent.formData
-			) {
-				preparationEvent.preventDefault();
-				return;
-			}
+		parser ??= new DOMParser();
 
-			const links = preloadStyleLinks(preparationEvent.newDocument);
-			links.length && (await Promise.all(links));
+		preparationEvent.newDocument = parser.parseFromString(response.html, response.mediaType);
+		// The next line might look like a hack,
+		// but it is actually necessary as noscript elements
+		// and their contents are returned as markup by the parser,
+		// see https://developer.mozilla.org/en-US/docs/Web/API/DOMParser/parseFromString
+		preparationEvent.newDocument.querySelectorAll('noscript').forEach((el) => el.remove());
 
-			if (import.meta.env.DEV)
-				await prepareForClientOnlyComponents(preparationEvent.newDocument, preparationEvent.to);
-		} else {
-			preparationEvent.newDocument = document;
+		// If ViewTransitions is not enabled on the incoming page, do a full page load to it.
+		// Unless this was a form submission, in which case we do not want to trigger another mutation.
+		if (
+			!preparationEvent.newDocument.querySelector('[name="astro-view-transitions-enabled"]') &&
+			!preparationEvent.formData
+		) {
+			preparationEvent.preventDefault();
 			return;
 		}
+
+		const links = preloadStyleLinks(preparationEvent.newDocument);
+		links.length && (await Promise.all(links));
+
+		if (import.meta.env.DEV)
+			await prepareForClientOnlyComponents(preparationEvent.newDocument, preparationEvent.to);
 	}
 
 	skipTransition = false;
@@ -566,12 +557,6 @@ export async function navigate(href: string, options?: Options) {
 		}
 		return;
 	}
-
-	// not ours
-	if (!transitionEnabledOnThisPage()) {
-		location.href = href;
-		return;
-	}
 	await transition('forward', originalLocation, new URL(href, location.href), options ?? {});
 }
 

From 9887f241241f800e2907afe7079db070f3bfcfab Mon Sep 17 00:00:00 2001
From: Alexander Niebuhr <alexander@nbhr.io>
Date: Mon, 4 Dec 2023 18:46:21 +0100
Subject: [PATCH 10/59] chore: also export `DevToolbarApp` type for API (#9273)

* chore: also export `DevToolbarApp` type for API

* chore: changeset

* chore: resolve review comments

Co-authored-by: Nate Moore <7118177+natemoo-re@users.noreply.github.com>

* Update .changeset/smooth-gifts-train.md

---------

Co-authored-by: Nate Moore <7118177+natemoo-re@users.noreply.github.com>
Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 .changeset/smooth-gifts-train.md   | 5 +++++
 packages/astro/src/@types/astro.ts | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/smooth-gifts-train.md

diff --git a/.changeset/smooth-gifts-train.md b/.changeset/smooth-gifts-train.md
new file mode 100644
index 000000000000..95ebda97e142
--- /dev/null
+++ b/.changeset/smooth-gifts-train.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Exports type for Dev Toolbar App under correct name
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index df475e3d6b69..773fb4be748b 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -2578,7 +2578,7 @@ export interface ClientDirectiveConfig {
 	entrypoint: string;
 }
 
-export interface DevOverlayPlugin {
+export interface DevToolbarApp {
 	id: string;
 	name: string;
 	icon: Icon;
@@ -2586,6 +2586,8 @@ export interface DevOverlayPlugin {
 	beforeTogglingOff?(canvas: ShadowRoot): boolean | Promise<boolean>;
 }
 
+export type DevOverlayPlugin = DevToolbarApp;
+
 export type DevOverlayMetadata = Window &
 	typeof globalThis & {
 		__astro_dev_overlay__: {

From 8dd7deb7b7cdc9f83b94c5253513a9d8577ae01e Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Mon, 4 Dec 2023 10:03:41 -0800
Subject: [PATCH 11/59] [ci] release (beta) (#9280)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                         |  4 ++
 examples/basics/package.json                |  2 +-
 examples/blog/package.json                  |  2 +-
 examples/component/package.json             |  2 +-
 examples/framework-alpine/package.json      |  2 +-
 examples/framework-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  2 +-
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  2 +-
 examples/framework-svelte/package.json      |  2 +-
 examples/framework-vue/package.json         |  2 +-
 examples/hackernews/package.json            |  2 +-
 examples/integration/package.json           |  2 +-
 examples/middleware/package.json            |  2 +-
 examples/minimal/package.json               |  2 +-
 examples/non-html-pages/package.json        |  2 +-
 examples/portfolio/package.json             |  2 +-
 examples/ssr/package.json                   |  2 +-
 examples/view-transitions/package.json      |  2 +-
 examples/with-markdoc/package.json          |  2 +-
 examples/with-markdown-plugins/package.json |  2 +-
 examples/with-markdown-shiki/package.json   |  2 +-
 examples/with-mdx/package.json              |  2 +-
 examples/with-nanostores/package.json       |  2 +-
 examples/with-tailwindcss/package.json      |  2 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro/CHANGELOG.md                 | 18 +++++++
 packages/astro/package.json                 |  2 +-
 pnpm-lock.yaml                              | 52 ++++++++++-----------
 30 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 6f386be808ce..e497b1a1e9a3 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -51,8 +51,10 @@
     "little-beers-sit",
     "mighty-rats-flow",
     "modern-candles-sip",
+    "nervous-beans-peel",
     "ninety-weeks-juggle",
     "odd-rivers-happen",
+    "orange-candles-sip",
     "plenty-candles-help",
     "rude-hairs-whisper",
     "sharp-starfishes-compete",
@@ -60,6 +62,8 @@
     "short-deers-whisper",
     "slimy-jeans-peel",
     "slow-hornets-try",
+    "smart-cats-camp",
+    "smooth-gifts-train",
     "sour-games-burn",
     "spicy-starfishes-shake",
     "tasty-dryers-bathe",
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 7abdfe6a1293..b5fe674fed7b 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 39563bd0c119..33bf98a67e0e 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/rss": "^4.0.0-beta.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 9b40573f38b1..68496c5ea75c 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 43157492725f..6fee6eb8ecf5 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 9003183a9d76..f218bbdba3f8 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 5cb403a878b3..a8a9d72e35d7 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0-beta.0",
     "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 5d7d53870fd5..43f2060156a7 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 42a380a470b6..4c3c068f797c 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7-beta.0",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index c7b542dd1479..91329d369c7f 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index a7df437f655a..b22038e92546 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 1f1b3c8dfbf2..ecca723cb17a 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index dcc31e68d837..c0e3deaab93b 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 56d3da06015e..d1560aeb3c3a 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 48f890b43136..c74801bf55c1 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 816dcad775cf..34730a1368bf 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 7b0fd18d48cd..2abd40a5c7cd 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index c80d64b0b463..f0406c876554 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index a2e206bf14e1..430cddf21d4f 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
     "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 7408bec60c88..1625901bc8d6 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^6.0.0-beta.0",
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index f2fe1301beb0..a405e11479f9 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^1.0.0-beta.1",
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 5155dee67fcb..379d44bd26c8 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index 23147377488e..aceb6cd29d2c 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.4"
+    "astro": "^4.0.0-beta.5"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index f6a9fed87b0b..52fe9a7f4758 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 46fa70d1499a..d2e40a139bb0 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 9cdd53045903..7160d9c5f10c 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/tailwind": "^6.0.0-beta.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 4936a5894838..ad5db2e8496a 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.4",
+    "astro": "^4.0.0-beta.5",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 4b4c03b9844f..775058e543f6 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,23 @@
 # astro
 
+## 4.0.0-beta.5
+
+### Minor Changes
+
+- [#9279](https://github.com/withastro/astro/pull/9279) [`6a9669b81`](https://github.com/withastro/astro/commit/6a9669b810ddfcae6c537165a438190ea1e7a4bc) Thanks [@martrapp](https://github.com/martrapp)! - Improves consistency between navigations with and without `<ViewTransitions>`. See [#9279](https://github.com/withastro/astro/pull/9279) for more details.
+
+### Patch Changes
+
+- [#9170](https://github.com/withastro/astro/pull/9170) [`8a228fce0`](https://github.com/withastro/astro/commit/8a228fce0114daeea2100e50ddc5cf2ea0a03b5d) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Adds new accessibility audits to the Dev Toolbar's built-in Audits app.
+
+  The audits Astro performs are non-exhaustive and only capable of detecting a handful of common accessibility issues. Please take care to perform a thorough, **manual** audit of your site to ensure compliance with the [Web Content Accessibility Guidelines (WCAG) international standard](https://www.w3.org/WAI/standards-guidelines/wcag/) _before_ publishing your site.
+
+  🧡 Huge thanks to the [Svelte](https://github.com/sveltejs/svelte) team for providing the basis of these accessibility audits!
+
+- [#9274](https://github.com/withastro/astro/pull/9274) [`feaba2c7f`](https://github.com/withastro/astro/commit/feaba2c7fc0a48d3af7dd98e6b750ec1e8274e33) Thanks [@TheOtterlord](https://github.com/TheOtterlord)! - Fix routing prefixes when `prefixDefaultLocale` is `true`
+
+- [#9273](https://github.com/withastro/astro/pull/9273) [`9887f2412`](https://github.com/withastro/astro/commit/9887f241241f800e2907afe7079db070f3bfcfab) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Exports type for Dev Toolbar App under correct name
+
 ## 4.0.0-beta.4
 
 ### Major Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 7641ce2b5c83..f58b2c838cbb 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9634d1de7eeb..0d989cfebf34 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,13 +140,13 @@ importers:
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +197,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +272,7 @@ importers:
         specifier: ^5.0.0-beta.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -284,7 +284,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +296,13 @@ importers:
         specifier: ^7.0.0-beta.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^7.0.0-beta.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^5.0.0-beta.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -359,7 +359,7 @@ importers:
         specifier: ^6.0.0-beta.0
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^1.0.0-beta.1
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -446,7 +446,7 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.4
+        specifier: ^4.0.0-beta.5
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 99c1bcad9ef1f3889a0808edc9ff00a9dd0d2149 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Mon, 4 Dec 2023 11:33:18 -0800
Subject: [PATCH 12/59] remove outdated devoverlay config and defaultstate
 config (#9291)

* remove outdated devoverlay config and defaultstate config

* update tests

* fix the build
---
 packages/astro/e2e/astro-envs.test.js         |  2 +-
 packages/astro/e2e/css.test.js                |  2 +-
 packages/astro/e2e/dev-overlay.test.js        |  4 +-
 .../fixtures/astro-component/astro.config.mjs |  2 +-
 .../e2e/fixtures/astro-envs/astro.config.mjs  |  2 +-
 .../fixtures/lit-component/astro.config.mjs   |  2 +-
 .../e2e/fixtures/prefetch/astro.config.mjs    |  2 +-
 .../e2e/fixtures/tailwindcss/astro.config.mjs |  2 +-
 .../view-transitions/astro.config.mjs         |  2 +-
 packages/astro/e2e/hmr.test.js                |  2 +-
 packages/astro/src/@types/astro.ts            | 39 -------------------
 packages/astro/src/core/compile/compile.ts    |  2 +-
 packages/astro/src/core/config/schema.ts      | 16 --------
 .../src/runtime/client/dev-overlay/overlay.ts |  7 +---
 .../src/vite-plugin-astro-server/route.ts     |  3 +-
 15 files changed, 14 insertions(+), 75 deletions(-)

diff --git a/packages/astro/e2e/astro-envs.test.js b/packages/astro/e2e/astro-envs.test.js
index 6cffc2d828de..cf8a1d304259 100644
--- a/packages/astro/e2e/astro-envs.test.js
+++ b/packages/astro/e2e/astro-envs.test.js
@@ -3,7 +3,7 @@ import { testFactory } from './test-utils.js';
 
 const test = testFactory({
 	root: './fixtures/astro-envs/',
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 });
diff --git a/packages/astro/e2e/css.test.js b/packages/astro/e2e/css.test.js
index df50ee35d064..fff197a39246 100644
--- a/packages/astro/e2e/css.test.js
+++ b/packages/astro/e2e/css.test.js
@@ -3,7 +3,7 @@ import { testFactory } from './test-utils.js';
 
 const test = testFactory({
 	root: './fixtures/css/',
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 });
diff --git a/packages/astro/e2e/dev-overlay.test.js b/packages/astro/e2e/dev-overlay.test.js
index b4188b1e7817..b61a3e10e756 100644
--- a/packages/astro/e2e/dev-overlay.test.js
+++ b/packages/astro/e2e/dev-overlay.test.js
@@ -19,8 +19,8 @@ test.describe('Dev Overlay', () => {
 	test('dev overlay exists in the page', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/'));
 
-		const devOVerlay = page.locator('astro-dev-toolbar');
-		await expect(devOVerlay).toHaveCount(1);
+		const devToolbar = page.locator('astro-dev-toolbar');
+		await expect(devToolbar).toHaveCount(1);
 	});
 
 	test('shows plugin name on hover', async ({ page, astro }) => {
diff --git a/packages/astro/e2e/fixtures/astro-component/astro.config.mjs b/packages/astro/e2e/fixtures/astro-component/astro.config.mjs
index 6ffc82a088f9..58b3ebc4bf9c 100644
--- a/packages/astro/e2e/fixtures/astro-component/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/astro-component/astro.config.mjs
@@ -4,7 +4,7 @@ import preact from '@astrojs/preact'
 // https://astro.build/config
 export default defineConfig({
   integrations: [preact()],
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	}
 });
diff --git a/packages/astro/e2e/fixtures/astro-envs/astro.config.mjs b/packages/astro/e2e/fixtures/astro-envs/astro.config.mjs
index 28bce59c7a47..48d49eccd204 100644
--- a/packages/astro/e2e/fixtures/astro-envs/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/astro-envs/astro.config.mjs
@@ -5,7 +5,7 @@ import vue from '@astrojs/vue';
 export default defineConfig({
 	site: 'http://example.com',
 	base: '/blog',
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 	integrations: [vue()],
diff --git a/packages/astro/e2e/fixtures/lit-component/astro.config.mjs b/packages/astro/e2e/fixtures/lit-component/astro.config.mjs
index 19da6f609088..8df6f42a1165 100644
--- a/packages/astro/e2e/fixtures/lit-component/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/lit-component/astro.config.mjs
@@ -4,7 +4,7 @@ import lit from '@astrojs/lit';
 // https://astro.build/config
 export default defineConfig({
 	integrations: [lit()],
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	}
 });
diff --git a/packages/astro/e2e/fixtures/prefetch/astro.config.mjs b/packages/astro/e2e/fixtures/prefetch/astro.config.mjs
index 745817a28dc5..a29c83f4250c 100644
--- a/packages/astro/e2e/fixtures/prefetch/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/prefetch/astro.config.mjs
@@ -2,7 +2,7 @@ import { defineConfig } from 'astro/config';
 
 // https://astro.build/config
 export default defineConfig({
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 	prefetch: true
diff --git a/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs b/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs
index 4c808ac5db5d..aa1ca234a34b 100644
--- a/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/tailwindcss/astro.config.mjs
@@ -9,7 +9,7 @@ export default defineConfig({
 			configFile: fileURLToPath(new URL('./tailwind.config.js', import.meta.url)),
 		}),
 	],
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 	vite: {
diff --git a/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs b/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs
index 9ca3631ee0f2..4b682d215785 100644
--- a/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs
+++ b/packages/astro/e2e/fixtures/view-transitions/astro.config.mjs
@@ -13,7 +13,7 @@ export default defineConfig({
 		'/redirect-two': '/two',
 		'/redirect-external': 'http://example.com/',
 	},
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 	vite: {
diff --git a/packages/astro/e2e/hmr.test.js b/packages/astro/e2e/hmr.test.js
index 94aa68140c40..5e7e232af96f 100644
--- a/packages/astro/e2e/hmr.test.js
+++ b/packages/astro/e2e/hmr.test.js
@@ -3,7 +3,7 @@ import { testFactory } from './test-utils.js';
 
 const test = testFactory({
 	root: './fixtures/hmr/',
-	devOverlay: {
+	devToolbar: {
 		enabled: false,
 	},
 });
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 773fb4be748b..a34f24ffa696 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1155,35 +1155,6 @@ export interface AstroUserConfig {
 		remotePatterns?: Partial<RemotePattern>[];
 	};
 
-	/**
-	 * @docs
-	 * @kind heading
-	 * @name Dev Overlay Options
-	 * @deprecated Use `devToolbar` instead.
-	 */
-	devOverlay?: {
-		/**
-		 * @docs
-		 * @name devOverlay.enabled
-		 * @type {boolean}
-		 * @default `true`
-		 * @description
-		 * Whether to enable the dev overlay. This overlay allows you to inspect your page islands, see helpful audits on performance and accessibility, and more.
-		 *
-		 * This option is scoped to the entire project, to only disable the overlay for yourself, run `npm run astro preferences disable devOverlay`. To disable the overlay for all your Astro projects, run `npm run astro preferences disable devOverlay --global`.
-		 */
-		enabled: boolean;
-		/**
-		 * @docs
-		 * @name devOverlay.defaultState
-		 * @type {'minimized' | 'expanded'}
-		 * @default `minimized`
-		 * @description
-		 * Whether the dev overlay should be expanded or minimized by default.
-		 */
-		defaultState: 'minimized' | 'expanded';
-	};
-
 	/**
 	 * @docs
 	 * @kind heading
@@ -1201,15 +1172,6 @@ export interface AstroUserConfig {
 		 * This option is scoped to the entire project, to only disable the toolbar for yourself, run `npm run astro preferences disable devToolbar`. To disable the toolbar for all your Astro projects, run `npm run astro preferences disable devToolbar --global`.
 		 */
 		enabled: boolean;
-		/**
-		 * @docs
-		 * @name devToolbar.defaultState
-		 * @type {'minimized' | 'expanded'}
-		 * @default `minimized`
-		 * @description
-		 * Whether the Dev Toolbar should be expanded or minimized by default.
-		 */
-		defaultState: 'minimized' | 'expanded';
 	};
 
 	/**
@@ -2591,7 +2553,6 @@ export type DevOverlayPlugin = DevToolbarApp;
 export type DevOverlayMetadata = Window &
 	typeof globalThis & {
 		__astro_dev_overlay__: {
-			defaultState: AstroConfig['devOverlay']['defaultState'];
 			root: string;
 			version: string;
 			debugInfo: string;
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index ed2369f7f328..8a187e652f85 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -48,7 +48,7 @@ export async function compile({
 			resultScopedSlot: true,
 			transitionsAnimationURL: 'astro/components/viewtransitions.css',
 			annotateSourceFile:
-				!viteConfig.isProduction && astroConfig.devOverlay && astroConfig.devOverlay.enabled,
+				!viteConfig.isProduction && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
 			preprocessStyle: createStylePreprocessor({
 				filename,
 				viteConfig,
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index 833fd63d7faa..08910720a13e 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -41,13 +41,8 @@ const ASTRO_CONFIG_DEFAULTS = {
 	image: {
 		service: { entrypoint: 'astro/assets/services/sharp', config: {} },
 	},
-	devOverlay: {
-		enabled: true,
-		defaultState: 'minimized',
-	},
 	devToolbar: {
 		enabled: true,
-		defaultState: 'minimized',
 	},
 	compressHTML: true,
 	server: {
@@ -232,20 +227,9 @@ export const AstroConfigSchema = z.object({
 				.default([]),
 		})
 		.default(ASTRO_CONFIG_DEFAULTS.image),
-	devOverlay: z
-		.object({
-			enabled: z.boolean().default(ASTRO_CONFIG_DEFAULTS.devOverlay.enabled),
-			defaultState: z
-				.enum(['minimized', 'expanded'])
-				.default(ASTRO_CONFIG_DEFAULTS.devOverlay.defaultState),
-		})
-		.default(ASTRO_CONFIG_DEFAULTS.devOverlay),
 	devToolbar: z
 		.object({
 			enabled: z.boolean().default(ASTRO_CONFIG_DEFAULTS.devToolbar.enabled),
-			defaultState: z
-				.enum(['minimized', 'expanded'])
-				.default(ASTRO_CONFIG_DEFAULTS.devToolbar.defaultState),
 		})
 		.default(ASTRO_CONFIG_DEFAULTS.devToolbar),
 	markdown: z
diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index 98663911434d..a11050e44dad 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -228,12 +228,7 @@ export class AstroDevOverlay extends HTMLElement {
 				width: 1px;
 			}
 		</style>
-		<div id="dev-overlay"${
-			((window as DevOverlayMetadata)?.__astro_dev_overlay__?.defaultState ?? 'minimized') ===
-			'minimized'
-				? ' data-hidden '
-				: ''
-		} ${settings.config.disablePluginNotification ? 'data-no-notification' : ''}>
+		<div id="dev-overlay" data-hidden ${settings.config.disablePluginNotification ? 'data-no-notification' : ''}>
 			<div id="dev-bar-hitbox-above"></div>
 			<div id="dev-bar">
 				<div id="bar-container">
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index 04e33d82797f..92a7a8247a35 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -396,7 +396,7 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
 		});
 
 		if (
-			settings.config.devOverlay.enabled &&
+			settings.config.devToolbar.enabled &&
 			(await settings.preferences.get('devToolbar.enabled'))
 		) {
 			scripts.add({
@@ -408,7 +408,6 @@ async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesPa
 			});
 
 			const additionalMetadata: DevOverlayMetadata['__astro_dev_overlay__'] = {
-				defaultState: settings.config.devOverlay.defaultState,
 				root: fileURLToPath(settings.config.root),
 				version: ASTRO_VERSION,
 				debugInfo: await getInfoOutput({ userConfig: settings.config, print: false }),

From fd9ffe2062dcf2c4d241de67782b15cd69c1c10a Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <FredKSchott@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:34:20 +0000
Subject: [PATCH 13/59] [ci] format

---
 packages/astro/src/runtime/client/dev-overlay/overlay.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index a11050e44dad..b3f2f31f5e0d 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -228,7 +228,9 @@ export class AstroDevOverlay extends HTMLElement {
 				width: 1px;
 			}
 		</style>
-		<div id="dev-overlay" data-hidden ${settings.config.disablePluginNotification ? 'data-no-notification' : ''}>
+		<div id="dev-overlay" data-hidden ${
+			settings.config.disablePluginNotification ? 'data-no-notification' : ''
+		}>
 			<div id="dev-bar-hitbox-above"></div>
 			<div id="dev-bar">
 				<div id="bar-container">

From 5428b3da08493d933981c4646d5d132fb31f0d25 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Mon, 4 Dec 2023 13:56:37 -0600
Subject: [PATCH 14/59] Improves display of `preferences list` command (#9292)

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 .changeset/gorgeous-squids-walk.md          |  5 ++
 packages/astro/src/cli/preferences/index.ts | 66 +++++++++++++++++----
 packages/astro/src/preferences/index.ts     | 28 ++++++---
 3 files changed, 79 insertions(+), 20 deletions(-)
 create mode 100644 .changeset/gorgeous-squids-walk.md

diff --git a/.changeset/gorgeous-squids-walk.md b/.changeset/gorgeous-squids-walk.md
new file mode 100644
index 000000000000..79599013c0a1
--- /dev/null
+++ b/.changeset/gorgeous-squids-walk.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Improves display for `astro preferences list` command
diff --git a/packages/astro/src/cli/preferences/index.ts b/packages/astro/src/cli/preferences/index.ts
index 35de2ce04068..d6e76db2af10 100644
--- a/packages/astro/src/cli/preferences/index.ts
+++ b/packages/astro/src/cli/preferences/index.ts
@@ -2,7 +2,7 @@
 import type yargs from 'yargs-parser';
 import type { AstroSettings } from '../../@types/astro.js';
 
-import { bold } from 'kleur/colors';
+import { bgGreen, black, bold, dim } from 'kleur/colors';
 import { fileURLToPath } from 'node:url';
 
 import dlv from 'dlv';
@@ -10,7 +10,7 @@ import { resolveConfig } from '../../core/config/config.js';
 import { createSettings } from '../../core/config/settings.js';
 import * as msg from '../../core/messages.js';
 import { DEFAULT_PREFERENCES } from '../../preferences/defaults.js';
-import { coerce, isValidKey, type PreferenceKey } from '../../preferences/index.js';
+import { coerce, isValidKey, type PreferenceKey, type PreferenceLocation } from '../../preferences/index.js';
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from '../flags.js';
 // @ts-expect-error flattie types are mispackaged
 import { flattie } from 'flattie';
@@ -211,12 +211,52 @@ async function resetPreference(
 }
 
 async function listPreferences(settings: AstroSettings, { location, json }: SubcommandOptions) {
-	const store = await settings.preferences.getAll({ location });
 	if (json) {
-		console.log(JSON.stringify(store, null, 2));
+		const resolved = await settings.preferences.getAll();
+		console.log(JSON.stringify(resolved, null, 2));
 		return 0;
 	}
-	prettyPrint(store);
+	const { global, project, defaults } = await settings.preferences.list({ location });
+	const flatProject = flattie(project);
+	const flatGlobal = flattie(global);
+	const flatUser = Object.assign({}, flatGlobal, flatProject);
+	for (let key of Object.keys(flatUser)) {
+		if (!isValidKey(key)) {
+			delete flatUser[key];
+			continue;
+		}
+	}
+
+	const flatDefault = flattie(defaults);
+	const userKeys = Object.keys(flatUser);
+
+	if (userKeys.length > 0) {
+		const badge = bgGreen(black(` Your Preferences `));
+		const table = formatTable(flatUser, ['Preference', 'Value']);
+
+		console.log(['', badge, table].join('\n'));
+	} else {
+		const badge = bgGreen(black(` Your Preferences `));
+		const message = dim('No preferences set');
+		console.log(['', badge, '', message].join('\n'));
+	}
+	const flatUnset = Object.assign({}, flatDefault);
+	for (const key of userKeys) {
+		delete flatUnset[key];
+	}
+	const unsetKeys = Object.keys(flatUnset);
+
+	if (unsetKeys.length > 0) {
+		const badge = bgGreen(black(` Default Preferences `));
+		const table = formatTable(flatUnset, ['Preference', 'Value']);
+
+		console.log(['', badge, table].join('\n'));
+	} else {
+		const badge = bgGreen(black(` Default Preferences `));
+		const message = dim('All preferences have been set');
+		console.log(['', badge, '', message].join('\n'));
+	}
+
 	return 0;
 }
 
@@ -256,19 +296,19 @@ function formatTable(
 		b: string | number | boolean,
 		style: (value: string | number | boolean) => string = (v) => v.toString()
 	): string {
-		return `${chars.v} ${style(a)} ${space(colALength - a.length - 2)} ${chars.v} ${style(
+		return `${dim(chars.v)} ${style(a)} ${space(colALength - a.length - 2)} ${dim(chars.v)} ${style(
 			b
-		)} ${space(colBLength - b.toString().length - 3)} ${chars.v}`;
+		)} ${space(colBLength - b.toString().length - 3)} ${dim(chars.v)}`;
 	}
-	const top = `${chars.topLeft}${chars.h.repeat(colALength + 1)}${chars.hBottom}${chars.h.repeat(
+	const top = dim(`${chars.topLeft}${chars.h.repeat(colALength + 1)}${chars.hBottom}${chars.h.repeat(
 		colBLength
-	)}${chars.topRight}`;
-	const bottom = `${chars.bottomLeft}${chars.h.repeat(colALength + 1)}${chars.hTop}${chars.h.repeat(
+	)}${chars.topRight}`);
+	const bottom = dim(`${chars.bottomLeft}${chars.h.repeat(colALength + 1)}${chars.hTop}${chars.h.repeat(
 		colBLength
-	)}${chars.bottomRight}`;
-	const divider = `${chars.vRightThick}${chars.hThick.repeat(colALength + 1)}${
+	)}${chars.bottomRight}`);
+	const divider = dim(`${chars.vRightThick}${chars.hThick.repeat(colALength + 1)}${
 		chars.hThickCross
-	}${chars.hThick.repeat(colBLength)}${chars.vLeftThick}`;
+	}${chars.hThick.repeat(colBLength)}${chars.vLeftThick}`);
 	const rows: string[] = [top, formatRow(-1, colA, colB, bold), divider];
 	let i = 0;
 	for (const [key, value] of Object.entries(object)) {
diff --git a/packages/astro/src/preferences/index.ts b/packages/astro/src/preferences/index.ts
index 00a46c573a91..56249f534418 100644
--- a/packages/astro/src/preferences/index.ts
+++ b/packages/astro/src/preferences/index.ts
@@ -22,11 +22,19 @@ export type GetDotKey<
 	K extends string,
 > = K extends `${infer U}.${infer Rest}` ? GetDotKey<T[U], Rest> : T[K];
 
+export type PreferenceLocation = 'global' | 'project';
 export interface PreferenceOptions {
-	location?: 'global' | 'project';
+	location?: PreferenceLocation;
 }
 
+type DeepPartial<T> = T extends object ? {
+	[P in keyof T]?: DeepPartial<T[P]>;
+} : T;
+
 export type PreferenceKey = DotKeys<Preferences>;
+export interface PreferenceList extends Record<PreferenceLocation, DeepPartial<Preferences>> {
+	defaults: Preferences;
+}
 
 export interface AstroPreferences {
 	get<Key extends PreferenceKey>(
@@ -38,7 +46,8 @@ export interface AstroPreferences {
 		value: GetDotKey<Preferences, Key>,
 		opts?: PreferenceOptions
 	): Promise<void>;
-	getAll(opts?: PreferenceOptions): Promise<Record<string, any>>;
+	getAll(): Promise<Preferences>;
+	list(opts?: PreferenceOptions): Promise<PreferenceList>;
 }
 
 export function isValidKey(key: string): key is PreferenceKey {
@@ -62,7 +71,7 @@ export function coerce(key: string, value: unknown) {
 export default function createPreferences(config: AstroConfig): AstroPreferences {
 	const global = new PreferenceStore(getGlobalPreferenceDir());
 	const project = new PreferenceStore(fileURLToPath(new URL('./.astro/', config.root)));
-	const stores = { global, project };
+	const stores: Record<PreferenceLocation, PreferenceStore> = { global, project };
 
 	return {
 		async get(key, { location } = {}) {
@@ -72,10 +81,15 @@ export default function createPreferences(config: AstroConfig): AstroPreferences
 		async set(key, value, { location = 'project' } = {}) {
 			stores[location].set(key, value);
 		},
-		async getAll({ location } = {}) {
-			if (!location)
-				return Object.assign({}, stores['global'].getAll(), stores['project'].getAll());
-			return stores[location].getAll();
+		async getAll() {
+			return Object.assign({}, DEFAULT_PREFERENCES, stores['global'].getAll(), stores['project'].getAll());
+		},
+		async list() {
+			return {
+				global: stores['global'].getAll(),
+				project: stores['project'].getAll(),
+				defaults: DEFAULT_PREFERENCES,
+			};
 		},
 	};
 }

From 5d566cfeca712f9439abe5fea2c8c838f085dcd9 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:57:38 +0000
Subject: [PATCH 15/59] [ci] format

---
 packages/astro/src/cli/preferences/index.ts | 31 ++++++++++++++-------
 packages/astro/src/preferences/index.ts     | 15 +++++++---
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/packages/astro/src/cli/preferences/index.ts b/packages/astro/src/cli/preferences/index.ts
index d6e76db2af10..4fd29cdfea14 100644
--- a/packages/astro/src/cli/preferences/index.ts
+++ b/packages/astro/src/cli/preferences/index.ts
@@ -10,7 +10,12 @@ import { resolveConfig } from '../../core/config/config.js';
 import { createSettings } from '../../core/config/settings.js';
 import * as msg from '../../core/messages.js';
 import { DEFAULT_PREFERENCES } from '../../preferences/defaults.js';
-import { coerce, isValidKey, type PreferenceKey, type PreferenceLocation } from '../../preferences/index.js';
+import {
+	coerce,
+	isValidKey,
+	type PreferenceKey,
+	type PreferenceLocation,
+} from '../../preferences/index.js';
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from '../flags.js';
 // @ts-expect-error flattie types are mispackaged
 import { flattie } from 'flattie';
@@ -300,15 +305,21 @@ function formatTable(
 			b
 		)} ${space(colBLength - b.toString().length - 3)} ${dim(chars.v)}`;
 	}
-	const top = dim(`${chars.topLeft}${chars.h.repeat(colALength + 1)}${chars.hBottom}${chars.h.repeat(
-		colBLength
-	)}${chars.topRight}`);
-	const bottom = dim(`${chars.bottomLeft}${chars.h.repeat(colALength + 1)}${chars.hTop}${chars.h.repeat(
-		colBLength
-	)}${chars.bottomRight}`);
-	const divider = dim(`${chars.vRightThick}${chars.hThick.repeat(colALength + 1)}${
-		chars.hThickCross
-	}${chars.hThick.repeat(colBLength)}${chars.vLeftThick}`);
+	const top = dim(
+		`${chars.topLeft}${chars.h.repeat(colALength + 1)}${chars.hBottom}${chars.h.repeat(
+			colBLength
+		)}${chars.topRight}`
+	);
+	const bottom = dim(
+		`${chars.bottomLeft}${chars.h.repeat(colALength + 1)}${chars.hTop}${chars.h.repeat(
+			colBLength
+		)}${chars.bottomRight}`
+	);
+	const divider = dim(
+		`${chars.vRightThick}${chars.hThick.repeat(colALength + 1)}${
+			chars.hThickCross
+		}${chars.hThick.repeat(colBLength)}${chars.vLeftThick}`
+	);
 	const rows: string[] = [top, formatRow(-1, colA, colB, bold), divider];
 	let i = 0;
 	for (const [key, value] of Object.entries(object)) {
diff --git a/packages/astro/src/preferences/index.ts b/packages/astro/src/preferences/index.ts
index 56249f534418..ee50261158bc 100644
--- a/packages/astro/src/preferences/index.ts
+++ b/packages/astro/src/preferences/index.ts
@@ -27,9 +27,11 @@ export interface PreferenceOptions {
 	location?: PreferenceLocation;
 }
 
-type DeepPartial<T> = T extends object ? {
-	[P in keyof T]?: DeepPartial<T[P]>;
-} : T;
+type DeepPartial<T> = T extends object
+	? {
+			[P in keyof T]?: DeepPartial<T[P]>;
+	  }
+	: T;
 
 export type PreferenceKey = DotKeys<Preferences>;
 export interface PreferenceList extends Record<PreferenceLocation, DeepPartial<Preferences>> {
@@ -82,7 +84,12 @@ export default function createPreferences(config: AstroConfig): AstroPreferences
 			stores[location].set(key, value);
 		},
 		async getAll() {
-			return Object.assign({}, DEFAULT_PREFERENCES, stores['global'].getAll(), stores['project'].getAll());
+			return Object.assign(
+				{},
+				DEFAULT_PREFERENCES,
+				stores['global'].getAll(),
+				stores['project'].getAll()
+			);
 		},
 		async list() {
 			return {

From 0968cb1a373b1101a649035d2ea2210d3d6412dc Mon Sep 17 00:00:00 2001
From: Arsh <69170106+lilnasy@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:59:35 +0000
Subject: [PATCH 16/59] fix(astro compiler): check vite command to decide on
 "annotateSourceFile" (#9275)

* prevent annotations in build

* add changeset

* Apply suggestions from code review

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>

---------

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
---
 .changeset/chatty-poems-doubt.md           | 5 +++++
 packages/astro/src/core/compile/compile.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/chatty-poems-doubt.md

diff --git a/.changeset/chatty-poems-doubt.md b/.changeset/chatty-poems-doubt.md
new file mode 100644
index 000000000000..32bc05c9d5ea
--- /dev/null
+++ b/.changeset/chatty-poems-doubt.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where html annotations relevant only to the dev server were included in the production build.
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index 8a187e652f85..2877d6a3ebc3 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -48,7 +48,7 @@ export async function compile({
 			resultScopedSlot: true,
 			transitionsAnimationURL: 'astro/components/viewtransitions.css',
 			annotateSourceFile:
-				!viteConfig.isProduction && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
+				viteConfig.command === "serve" && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
 			preprocessStyle: createStylePreprocessor({
 				filename,
 				viteConfig,

From e88f166be828c289edbcf69e40aa136fb50dab79 Mon Sep 17 00:00:00 2001
From: Arsh <lilnasy@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:00:39 +0000
Subject: [PATCH 17/59] [ci] format

---
 packages/astro/src/core/compile/compile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index 2877d6a3ebc3..c2f58fb9f859 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -48,7 +48,7 @@ export async function compile({
 			resultScopedSlot: true,
 			transitionsAnimationURL: 'astro/components/viewtransitions.css',
 			annotateSourceFile:
-				viteConfig.command === "serve" && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
+				viteConfig.command === 'serve' && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
 			preprocessStyle: createStylePreprocessor({
 				filename,
 				viteConfig,

From cf5fa437627ca6978ae3ff33c7894f278dfe75cd Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Mon, 4 Dec 2023 15:16:28 -0500
Subject: [PATCH 18/59] Remove audit role that depends on CJS package (#9293)

* Remove audit role that depends on CJS package

* Adding changeset

---------

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 .changeset/tender-eagles-learn.md             |  7 +++
 packages/astro/package.json                   |  1 -
 .../client/dev-overlay/plugins/audit/a11y.ts  | 59 -------------------
 pnpm-lock.yaml                                |  9 ---
 4 files changed, 7 insertions(+), 69 deletions(-)
 create mode 100644 .changeset/tender-eagles-learn.md

diff --git a/.changeset/tender-eagles-learn.md b/.changeset/tender-eagles-learn.md
new file mode 100644
index 000000000000..b1f98c2f6c58
--- /dev/null
+++ b/.changeset/tender-eagles-learn.md
@@ -0,0 +1,7 @@
+---
+'astro': patch
+---
+
+Removes the 'a11y-role-has-required-aria-props' audit rule
+
+This audit rule depends on a CommonJS module. To prevent blocking the 4.0 release the rule is being removed temporarily.
diff --git a/packages/astro/package.json b/packages/astro/package.json
index f58b2c838cbb..074f50343902 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -125,7 +125,6 @@
     "@types/babel__core": "^7.20.4",
     "acorn": "^8.11.2",
     "aria-query": "^5.3.0",
-    "axobject-query": "^4.0.0",
     "boxen": "^7.1.1",
     "chokidar": "^3.5.3",
     "ci-info": "^4.0.0",
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
index fd3763564bca..5527689e34d5 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
@@ -26,8 +26,6 @@
 import type { ARIARoleDefinitionKey } from 'aria-query';
 import { aria, roles } from 'aria-query';
 import type { AuditRuleWithSelector } from './index.js';
-// @ts-expect-error package does not provide types
-import { AXObjectRoles, elementAXObjects } from 'axobject-query';
 
 const a11y_required_attributes = {
 	a: ['href'],
@@ -437,32 +435,6 @@ export const a11y: AuditRuleWithSelector[] = [
 			'This will move elements out of the expected tab order, creating a confusing experience for keyboard users.',
 		selector: '[tabindex]:not([tabindex="-1"]):not([tabindex="0"])',
 	},
-	{
-		code: 'a11y-role-has-required-aria-props',
-		title: 'Missing attributes required for ARIA role',
-		message: (element) => {
-			const { __astro_role: role, __astro_missing_attributes: required } = element as any;
-			return `${
-				element.localName
-			} element is missing required attributes for its role (${role}): ${required.join(', ')}`;
-		},
-		selector: '*',
-		match(element) {
-			const role = getRole(element);
-			if (!role) return false;
-			if (is_semantic_role_element(role, element.localName, getAttributeObject(element))) {
-				return;
-			}
-			const { requiredProps } = roles.get(role)!;
-			const required_role_props = Object.keys(requiredProps);
-			const missingProps = required_role_props.filter((prop) => !element.hasAttribute(prop));
-			if (missingProps.length > 0) {
-				(element as any).__astro_role = role;
-				(element as any).__astro_missing_attributes = missingProps;
-				return true;
-			}
-		},
-	},
 	{
 		code: 'a11y-role-supports-aria-props',
 		title: 'Unsupported ARIA attribute',
@@ -595,34 +567,3 @@ function getAttributeObject(element: Element): Record<string, string> {
 	}
 	return obj;
 }
-
-/**
- * @param {import('aria-query').ARIARoleDefinitionKey} role
- * @param {string} tag_name
- * @param {Map<string, import('#compiler').Attribute>} attribute_map
- */
-function is_semantic_role_element(
-	role: string,
-	tag_name: string,
-	attributes: Record<string, string>
-) {
-	for (const [schema, ax_object] of elementAXObjects.entries()) {
-		if (
-			schema.name === tag_name &&
-			(!schema.attributes ||
-				schema.attributes.every((attr: any) => attributes[attr.name] === attr.value))
-		) {
-			for (const name of ax_object) {
-				const axRoles = AXObjectRoles.get(name);
-				if (axRoles) {
-					for (const { name: _name } of axRoles) {
-						if (_name === role) {
-							return true;
-						}
-					}
-				}
-			}
-		}
-	}
-	return false;
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d989cfebf34..091179a0d54b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -511,9 +511,6 @@ importers:
       aria-query:
         specifier: ^5.3.0
         version: 5.3.0
-      axobject-query:
-        specifier: ^4.0.0
-        version: 4.0.0
       boxen:
         specifier: ^7.1.1
         version: 7.1.1
@@ -8371,12 +8368,6 @@ packages:
     dependencies:
       dequal: 2.0.3
 
-  /axobject-query@4.0.0:
-    resolution: {integrity: sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==}
-    dependencies:
-      dequal: 2.0.3
-    dev: false
-
   /b4a@1.6.4:
     resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==}
     requiresBuild: true

From b1199c5342deb4d72d03f5f8e9c8a0f401ff07d0 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:19:54 -0800
Subject: [PATCH 19/59] [ci] release (beta) (#9294)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                         |  3 ++
 examples/basics/package.json                |  2 +-
 examples/blog/package.json                  |  2 +-
 examples/component/package.json             |  2 +-
 examples/framework-alpine/package.json      |  2 +-
 examples/framework-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  2 +-
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  2 +-
 examples/framework-svelte/package.json      |  2 +-
 examples/framework-vue/package.json         |  2 +-
 examples/hackernews/package.json            |  2 +-
 examples/integration/package.json           |  2 +-
 examples/middleware/package.json            |  2 +-
 examples/minimal/package.json               |  2 +-
 examples/non-html-pages/package.json        |  2 +-
 examples/portfolio/package.json             |  2 +-
 examples/ssr/package.json                   |  2 +-
 examples/view-transitions/package.json      |  2 +-
 examples/with-markdoc/package.json          |  2 +-
 examples/with-markdown-plugins/package.json |  2 +-
 examples/with-markdown-shiki/package.json   |  2 +-
 examples/with-mdx/package.json              |  2 +-
 examples/with-nanostores/package.json       |  2 +-
 examples/with-tailwindcss/package.json      |  2 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro/CHANGELOG.md                 | 12 +++++
 packages/astro/package.json                 |  2 +-
 pnpm-lock.yaml                              | 52 ++++++++++-----------
 30 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index e497b1a1e9a3..0d2fc4fe65c3 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -34,6 +34,7 @@
     "big-cooks-notice",
     "brown-jars-lick",
     "calm-baboons-watch",
+    "chatty-poems-doubt",
     "clever-beds-notice",
     "curvy-sheep-lick",
     "famous-eels-trade",
@@ -41,6 +42,7 @@
     "gentle-cobras-wash",
     "giant-snails-perform",
     "gold-grapes-jump",
+    "gorgeous-squids-walk",
     "green-impalas-fetch",
     "green-parrots-brake",
     "grumpy-seas-switch",
@@ -68,6 +70,7 @@
     "spicy-starfishes-shake",
     "tasty-dryers-bathe",
     "tasty-parents-own",
+    "tender-eagles-learn",
     "three-chairs-sip",
     "tricky-dragons-explain",
     "weak-wolves-bow",
diff --git a/examples/basics/package.json b/examples/basics/package.json
index b5fe674fed7b..6791c1bc601e 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 33bf98a67e0e..d179aaf838c3 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/rss": "^4.0.0-beta.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 68496c5ea75c..11fe26cdc1c6 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 6fee6eb8ecf5..51f1d65fd041 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index f218bbdba3f8..245afec9d962 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index a8a9d72e35d7..f6b1dd5b6d0d 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0-beta.0",
     "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 43f2060156a7..39600204592b 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 4c3c068f797c..5ce75b722167 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7-beta.0",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 91329d369c7f..ef8d6bd8446d 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index b22038e92546..c816fe1f9cf3 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index ecca723cb17a..1fa157870ec7 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index c0e3deaab93b..1df10b813d5b 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index d1560aeb3c3a..4026d72c4955 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index c74801bf55c1..ab14748c28c6 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 34730a1368bf..940afd221564 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 2abd40a5c7cd..bf5798aa69c4 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index f0406c876554..c0faf3cf18c7 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 430cddf21d4f..2eed42088129 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
     "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 1625901bc8d6..6d098a2ee693 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^6.0.0-beta.0",
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index a405e11479f9..8eb5124cd00d 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^1.0.0-beta.1",
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 379d44bd26c8..c5ee441c0db1 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index aceb6cd29d2c..9043a87a2d48 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.5"
+    "astro": "^4.0.0-beta.6"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 52fe9a7f4758..5c3384365270 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index d2e40a139bb0..26f828501064 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 7160d9c5f10c..87750b92d011 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/tailwind": "^6.0.0-beta.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index ad5db2e8496a..6e5c2e4ece57 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.5",
+    "astro": "^4.0.0-beta.6",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 775058e543f6..62556d4c26dc 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,17 @@
 # astro
 
+## 4.0.0-beta.6
+
+### Patch Changes
+
+- [#9275](https://github.com/withastro/astro/pull/9275) [`0968cb1a3`](https://github.com/withastro/astro/commit/0968cb1a373b1101a649035d2ea2210d3d6412dc) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where html annotations relevant only to the dev server were included in the production build.
+
+- [#9292](https://github.com/withastro/astro/pull/9292) [`5428b3da0`](https://github.com/withastro/astro/commit/5428b3da08493d933981c4646d5d132fb31f0d25) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Improves display for `astro preferences list` command
+
+- [#9293](https://github.com/withastro/astro/pull/9293) [`cf5fa4376`](https://github.com/withastro/astro/commit/cf5fa437627ca6978ae3ff33c7894f278dfe75cd) Thanks [@matthewp](https://github.com/matthewp)! - Removes the 'a11y-role-has-required-aria-props' audit rule
+
+  This audit rule depends on a CommonJS module. To prevent blocking the 4.0 release the rule is being removed temporarily.
+
 ## 4.0.0-beta.5
 
 ### Minor Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 074f50343902..9aa914aac02e 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 091179a0d54b..aab43404f7a7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,13 +140,13 @@ importers:
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +197,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +272,7 @@ importers:
         specifier: ^5.0.0-beta.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -284,7 +284,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +296,13 @@ importers:
         specifier: ^7.0.0-beta.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^7.0.0-beta.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^5.0.0-beta.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -359,7 +359,7 @@ importers:
         specifier: ^6.0.0-beta.0
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^1.0.0-beta.1
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -446,7 +446,7 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.5
+        specifier: ^4.0.0-beta.6
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 3d2dbb0e5d2bf67b38ff8533d4dd938c94433812 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Mon, 4 Dec 2023 15:41:40 -0500
Subject: [PATCH 20/59] Remove aria-query and related rule (#9295)

---
 .changeset/silent-phones-divide.md            |  7 ++
 packages/astro/package.json                   |  2 -
 .../client/dev-overlay/plugins/audit/a11y.ts  | 87 -------------------
 pnpm-lock.yaml                                | 10 ---
 4 files changed, 7 insertions(+), 99 deletions(-)
 create mode 100644 .changeset/silent-phones-divide.md

diff --git a/.changeset/silent-phones-divide.md b/.changeset/silent-phones-divide.md
new file mode 100644
index 000000000000..afd58853a83d
--- /dev/null
+++ b/.changeset/silent-phones-divide.md
@@ -0,0 +1,7 @@
+---
+'astro': patch
+---
+
+Remove aria-query package
+
+This is another CJS-only package that breaks usage.
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 9aa914aac02e..fd026e4b4027 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -124,7 +124,6 @@
     "@babel/types": "^7.23.3",
     "@types/babel__core": "^7.20.4",
     "acorn": "^8.11.2",
-    "aria-query": "^5.3.0",
     "boxen": "^7.1.1",
     "chokidar": "^3.5.3",
     "ci-info": "^4.0.0",
@@ -181,7 +180,6 @@
   "devDependencies": {
     "@astrojs/check": "^0.3.1",
     "@playwright/test": "1.40.0",
-    "@types/aria-query": "^5.0.4",
     "@types/babel__generator": "^7.6.7",
     "@types/babel__traverse": "^7.20.4",
     "@types/chai": "^4.3.10",
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
index 5527689e34d5..46c5f306d101 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
@@ -23,8 +23,6 @@
  * SOFTWARE.
  */
 
-import type { ARIARoleDefinitionKey } from 'aria-query';
-import { aria, roles } from 'aria-query';
 import type { AuditRuleWithSelector } from './index.js';
 
 const a11y_required_attributes = {
@@ -435,34 +433,6 @@ export const a11y: AuditRuleWithSelector[] = [
 			'This will move elements out of the expected tab order, creating a confusing experience for keyboard users.',
 		selector: '[tabindex]:not([tabindex="-1"]):not([tabindex="0"])',
 	},
-	{
-		code: 'a11y-role-supports-aria-props',
-		title: 'Unsupported ARIA attribute',
-		message: (element) => {
-			const { __astro_role: role, __astro_unsupported_attributes: unsupported } = element as any;
-			return `${
-				element.localName
-			} element has ARIA attributes that are not supported by its role (${role}): ${unsupported.join(
-				', '
-			)}`;
-		},
-		selector: '*',
-		match(element) {
-			const role = getRole(element);
-			if (!role) return false;
-			const { props } = roles.get(role)!;
-			const attributes = getAttributeObject(element);
-			const unsupportedAttributes = aria.keys().filter((attribute) => !(attribute in props));
-			const invalidAttributes: string[] = Object.keys(attributes).filter(
-				(key) => key.startsWith('aria-') && unsupportedAttributes.includes(key as any)
-			);
-			if (invalidAttributes.length > 0) {
-				(element as any).__astro_role = role;
-				(element as any).__astro_unsupported_attributes = invalidAttributes;
-				return true;
-			}
-		},
-	},
 	{
 		code: 'a11y-structure',
 		title: 'Invalid DOM structure',
@@ -496,16 +466,6 @@ export const a11y: AuditRuleWithSelector[] = [
 	},
 ];
 
-const a11y_labelable = [
-	'button',
-	'input',
-	'keygen',
-	'meter',
-	'output',
-	'progress',
-	'select',
-	'textarea',
-];
 
 /**
  * Exceptions to the rule which follows common A11y conventions
@@ -520,50 +480,3 @@ const a11y_non_interactive_element_to_interactive_role_exceptions = {
 	td: ['gridcell'],
 	fieldset: ['radiogroup', 'presentation'],
 };
-
-const combobox_if_list = ['email', 'search', 'tel', 'text', 'url'];
-function input_implicit_role(attributes: Record<string, string>) {
-	if (!('type' in attributes)) return;
-	const { type, list } = attributes;
-	if (!type) return;
-	if (list && combobox_if_list.includes(type)) {
-		return 'combobox';
-	}
-	return input_type_to_implicit_role.get(type);
-}
-
-/** @param {Map<string, import('#compiler').Attribute>} attribute_map */
-function menuitem_implicit_role(attributes: Record<string, string>) {
-	if (!('type' in attributes)) return;
-	const { type } = attributes;
-	if (!type) return;
-	return menuitem_type_to_implicit_role.get(type);
-}
-
-function getRole(element: Element): ARIARoleDefinitionKey | undefined {
-	if (element.hasAttribute('role')) {
-		return element.getAttribute('role')! as ARIARoleDefinitionKey;
-	}
-	return getImplicitRole(element) as ARIARoleDefinitionKey;
-}
-
-function getImplicitRole(element: Element) {
-	const name = element.localName;
-	const attrs = getAttributeObject(element);
-	if (name === 'menuitem') {
-		return menuitem_implicit_role(attrs);
-	} else if (name === 'input') {
-		return input_implicit_role(attrs);
-	} else {
-		return a11y_implicit_semantics.get(name);
-	}
-}
-
-function getAttributeObject(element: Element): Record<string, string> {
-	let obj: Record<string, string> = {};
-	for (let i = 0; i < element.attributes.length; i++) {
-		const attribute = element.attributes.item(i)!;
-		obj[attribute.name] = attribute.value;
-	}
-	return obj;
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aab43404f7a7..94be3019f371 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -508,9 +508,6 @@ importers:
       acorn:
         specifier: ^8.11.2
         version: 8.11.2
-      aria-query:
-        specifier: ^5.3.0
-        version: 5.3.0
       boxen:
         specifier: ^7.1.1
         version: 7.1.1
@@ -669,9 +666,6 @@ importers:
       '@playwright/test':
         specifier: 1.40.0
         version: 1.40.0
-      '@types/aria-query':
-        specifier: ^5.0.4
-        version: 5.0.4
       '@types/babel__generator':
         specifier: ^7.6.7
         version: 7.6.7
@@ -7247,10 +7241,6 @@ packages:
     resolution: {integrity: sha512-BSNTroRhmBkNiyd7ELK/5Boja92hnQMST6H4z1BqXKeMVzHjp9o1j5poqd5Tyhjd8oMFwxYC4I00eghfg2xrTA==}
     dev: false
 
-  /@types/aria-query@5.0.4:
-    resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
-    dev: true
-
   /@types/babel__core@7.20.4:
     resolution: {integrity: sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==}
     dependencies:

From 0d194942f91723a5b88f906f408f38d9f6ff1002 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthewp@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:42:51 +0000
Subject: [PATCH 21/59] [ci] format

---
 .../astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
index 46c5f306d101..a5e6e5073ad5 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/a11y.ts
@@ -466,7 +466,6 @@ export const a11y: AuditRuleWithSelector[] = [
 	},
 ];
 
-
 /**
  * Exceptions to the rule which follows common A11y conventions
  * TODO make this configurable by the user

From 4b9d657ff2fe7756848a1d489cbecb51b3b91e5a Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:45:24 -0800
Subject: [PATCH 22/59] [ci] release (beta) (#9296)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/pre.json                         |  1 +
 examples/basics/package.json                |  2 +-
 examples/blog/package.json                  |  2 +-
 examples/component/package.json             |  2 +-
 examples/framework-alpine/package.json      |  2 +-
 examples/framework-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  2 +-
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  2 +-
 examples/framework-svelte/package.json      |  2 +-
 examples/framework-vue/package.json         |  2 +-
 examples/hackernews/package.json            |  2 +-
 examples/integration/package.json           |  2 +-
 examples/middleware/package.json            |  2 +-
 examples/minimal/package.json               |  2 +-
 examples/non-html-pages/package.json        |  2 +-
 examples/portfolio/package.json             |  2 +-
 examples/ssr/package.json                   |  2 +-
 examples/view-transitions/package.json      |  2 +-
 examples/with-markdoc/package.json          |  2 +-
 examples/with-markdown-plugins/package.json |  2 +-
 examples/with-markdown-shiki/package.json   |  2 +-
 examples/with-mdx/package.json              |  2 +-
 examples/with-nanostores/package.json       |  2 +-
 examples/with-tailwindcss/package.json      |  2 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro/CHANGELOG.md                 |  8 ++++
 packages/astro/package.json                 |  2 +-
 pnpm-lock.yaml                              | 52 ++++++++++-----------
 30 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 0d2fc4fe65c3..1cf5ecf7a7c8 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -62,6 +62,7 @@
     "sharp-starfishes-compete",
     "shiny-trees-sip",
     "short-deers-whisper",
+    "silent-phones-divide",
     "slimy-jeans-peel",
     "slow-hornets-try",
     "smart-cats-camp",
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 6791c1bc601e..00e32a079ef9 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index d179aaf838c3..85da22909416 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/rss": "^4.0.0-beta.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 11fe26cdc1c6..7d39c1c71e25 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 51f1d65fd041..0064aee4c326 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 245afec9d962..ae2dac2fd1f3 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index f6b1dd5b6d0d..4d15c33c44a4 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0-beta.0",
     "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 39600204592b..5eee2ff9fd3b 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 5ce75b722167..f81fc7d66175 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7-beta.0",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index ef8d6bd8446d..bdaf0df7f219 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index c816fe1f9cf3..6b03bdf2654a 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 1fa157870ec7..8f78ceb98c1a 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 1df10b813d5b..435ea981a9f3 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 4026d72c4955..4a5718384c9a 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index ab14748c28c6..fccaab4e7d86 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 940afd221564..a17f4fda6d33 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index bf5798aa69c4..37d5be57d2a4 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index c0faf3cf18c7..6a91830972fe 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 2eed42088129..e00f226ae70c 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0-beta.1",
     "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 6d098a2ee693..f6a7ad88973b 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^6.0.0-beta.0",
     "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 8eb5124cd00d..6c6d7bc728ea 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^1.0.0-beta.1",
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index c5ee441c0db1..a8566d078be7 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index 9043a87a2d48..6f4cb2471fa1 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.6"
+    "astro": "^4.0.0-beta.7"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 5c3384365270..6e2de281dbb9 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 26f828501064..58383008869b 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 87750b92d011..abaca5b5a267 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.0.0-beta.0",
     "@astrojs/tailwind": "^6.0.0-beta.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 6e5c2e4ece57..93d1443f7d8b 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.6",
+    "astro": "^4.0.0-beta.7",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 62556d4c26dc..f9d791dfe603 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,13 @@
 # astro
 
+## 4.0.0-beta.7
+
+### Patch Changes
+
+- [#9295](https://github.com/withastro/astro/pull/9295) [`3d2dbb0e5`](https://github.com/withastro/astro/commit/3d2dbb0e5d2bf67b38ff8533d4dd938c94433812) Thanks [@matthewp](https://github.com/matthewp)! - Remove aria-query package
+
+  This is another CJS-only package that breaks usage.
+
 ## 4.0.0-beta.6
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index fd026e4b4027..f624d32f2b08 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-beta.7",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 94be3019f371..9c5784ba3fe1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,13 +140,13 @@ importers:
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +197,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +272,7 @@ importers:
         specifier: ^5.0.0-beta.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -284,7 +284,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +296,13 @@ importers:
         specifier: ^7.0.0-beta.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^7.0.0-beta.1
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^5.0.0-beta.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -359,7 +359,7 @@ importers:
         specifier: ^6.0.0-beta.0
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^1.0.0-beta.1
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^4.0.0-beta.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -446,7 +446,7 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.6
+        specifier: ^4.0.0-beta.7
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 9807582b690acf1570def9a7ca7dfbb059eab6bb Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Tue, 5 Dec 2023 03:02:34 -0800
Subject: [PATCH 23/59] [Toolbar] fix issue where requestIdleCallback would
 take forever (#9302)

---
 packages/astro/src/runtime/client/dev-overlay/overlay.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index b3f2f31f5e0d..33a78ed61b0e 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -281,7 +281,7 @@ export class AstroDevOverlay extends HTMLElement {
 		if ('requestIdleCallback' in window) {
 			window.requestIdleCallback(async () => {
 				this.plugins.map((plugin) => this.initPlugin(plugin));
-			});
+			}, {timeout: 300});
 		} else {
 			setTimeout(async () => {
 				this.plugins.map((plugin) => this.initPlugin(plugin));

From 829a6fadfaa3ed6cd0ef8ecb73406a9f3c622163 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <Princesseuh@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:03:42 +0000
Subject: [PATCH 24/59] [ci] format

---
 packages/astro/src/runtime/client/dev-overlay/overlay.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index 33a78ed61b0e..e1240f8b41f0 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -279,9 +279,12 @@ export class AstroDevOverlay extends HTMLElement {
 		// Init plugin lazily, so that the page can load faster.
 		// Fallback to setTimeout for Safari (sad!)
 		if ('requestIdleCallback' in window) {
-			window.requestIdleCallback(async () => {
-				this.plugins.map((plugin) => this.initPlugin(plugin));
-			}, {timeout: 300});
+			window.requestIdleCallback(
+				async () => {
+					this.plugins.map((plugin) => this.initPlugin(plugin));
+				},
+				{ timeout: 300 }
+			);
 		} else {
 			setTimeout(async () => {
 				this.plugins.map((plugin) => this.initPlugin(plugin));

From 4351f43bb982d3d55311040ceae43286bfc90cbb Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Tue, 5 Dec 2023 03:48:31 -0800
Subject: [PATCH 25/59] fix z-index on dev overlay tooltips and highlights
 (#9301)

---
 .../runtime/client/dev-overlay/entrypoint.ts  |  2 +-
 .../src/runtime/client/dev-overlay/overlay.ts |  2 +-
 .../client/dev-overlay/plugins/audit/index.ts | 13 +++++++++++++
 .../dev-overlay/plugins/utils/highlight.ts    | 19 ++++---------------
 .../client/dev-overlay/plugins/xray.ts        | 17 ++++++++---------
 .../dev-overlay/ui-library/highlight.ts       |  1 +
 .../client/dev-overlay/ui-library/tooltip.ts  |  2 +-
 7 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
index ffd9ea32b57f..fa3020b03c98 100644
--- a/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/entrypoint.ts
@@ -127,7 +127,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 						box-shadow: 0px 0px 0px 0px rgba(19, 21, 26, 0.30), 0px 1px 2px 0px rgba(19, 21, 26, 0.29), 0px 4px 4px 0px rgba(19, 21, 26, 0.26), 0px 10px 6px 0px rgba(19, 21, 26, 0.15), 0px 17px 7px 0px rgba(19, 21, 26, 0.04), 0px 26px 7px 0px rgba(19, 21, 26, 0.01);
 						width: 192px;
 						padding: 8px;
-						z-index: 9999999999;
+						z-index: 2000000010;
 						transform: translate(-50%, 0%);
 						position: fixed;
 						bottom: 72px;
diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index e1240f8b41f0..8a5cda453db5 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -58,7 +58,7 @@ export class AstroDevOverlay extends HTMLElement {
 				bottom: 0px;
 				left: 50%;
 				transform: translate(-50%, 0%);
-				z-index: 9999999999;
+				z-index: 2000000010;
 				display: flex;
 				flex-direction: column;
 				align-items: center;
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
index fc9a1e6d35bc..094640f9bbab 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
@@ -3,6 +3,7 @@ import type { DevOverlayHighlight } from '../../ui-library/highlight.js';
 import {
 	attachTooltipToHighlight,
 	createHighlight,
+	getElementsPositionInDocument,
 	positionHighlight,
 } from '../utils/highlight.js';
 import { createWindowElement } from '../utils/window.js';
@@ -198,6 +199,18 @@ export default {
 			const rect = originalElement.getBoundingClientRect();
 			const highlight = createHighlight(rect, 'warning');
 			const tooltip = buildAuditTooltip(rule, originalElement);
+
+			// Set the highlight/tooltip as being fixed position the highlighted element
+			// is fixed. We do this so that we don't mistakenly take scroll position
+			// into account when setting the tooltip/highlight positioning.
+			// 
+			// We only do this once due to how expensive computed styles are to calculate, 
+			// and are unlikely to change. If that turns out to be wrong, reconsider this.
+			const { isFixed } = getElementsPositionInDocument(originalElement);
+			if (isFixed) {
+				tooltip.style.position = highlight.style.position = 'fixed';
+			}
+			
 			attachTooltipToHighlight(highlight, tooltip, originalElement);
 
 			canvas.append(highlight);
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
index 73d7fe112757..6ad37aad2af2 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/utils/highlight.ts
@@ -15,28 +15,21 @@ export function createHighlight(rect: DOMRect, icon?: Icon) {
 	return highlight;
 }
 
-// Figures out the element's z-index and position, based on it's parents.
+// Figures out the element's position, based on it's parents.
 export function getElementsPositionInDocument(el: Element) {
-	let highestZIndex = 0;
-	let fixed = false;
+	let isFixed = false;
 	let current: Element | ParentNode | null = el;
 	while (current instanceof Element) {
-		// This is the expensive part, we are calling getComputedStyle which triggers layout
 		// all the way up the tree. We are only doing so when the app initializes, so the cost is one-time
 		// If perf becomes an issue we'll want to refactor this somehow so that it reads this info in a rAF
 		let style = getComputedStyle(current);
-		let zIndex = Number(style.zIndex);
-		if (!Number.isNaN(zIndex) && zIndex > highestZIndex) {
-			highestZIndex = zIndex;
-		}
 		if (style.position === 'fixed') {
-			fixed = true;
+			isFixed = true;
 		}
 		current = current.parentNode;
 	}
 	return {
-		zIndex: highestZIndex + 1,
-		fixed,
+		isFixed,
 	};
 }
 
@@ -57,12 +50,9 @@ export function attachTooltipToHighlight(
 	originalElement: Element
 ) {
 	highlight.shadowRoot.append(tooltip);
-	// Track the original z-index so that we can restore it after hover
-	const originalZIndex = highlight.style.zIndex;
 
 	(['mouseover', 'focus'] as const).forEach((event) => {
 		highlight.addEventListener(event, () => {
-			highlight.style.zIndex = '9999999999';
 			tooltip.dataset.show = 'true';
 			const originalRect = originalElement.getBoundingClientRect();
 			const dialogRect = tooltip.getBoundingClientRect();
@@ -80,7 +70,6 @@ export function attachTooltipToHighlight(
 	(['mouseout', 'blur'] as const).forEach((event) => {
 		highlight.addEventListener(event, () => {
 			tooltip.dataset.show = 'false';
-			highlight.style.zIndex = originalZIndex;
 		});
 	});
 }
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index 5b7327029686..714c80c2e8c2 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -108,15 +108,14 @@ export default {
 				const highlight = createHighlight(rect);
 				const tooltip = buildIslandTooltip(island);
 
-				// Set the z-index to be 1 higher than the greatest z-index in the stack.
-				// And also set the highlight/tooltip as being fixed position if they are inside
-				// a fixed container. We do this so that we don't mistakenly take scroll position
-				// into account when setting their position.
-				// We are only doing both of these things once, as they are relatively expensive
-				// to calculate, and are unlikely to change. If that turns out to be wrong, reconsider this.
-				const { zIndex, fixed } = getElementsPositionInDocument(islandElement);
-				tooltip.style.zIndex = highlight.style.zIndex = zIndex + '';
-				if (fixed) {
+				// Set the highlight/tooltip as being fixed position the highlighted element
+				// is fixed. We do this so that we don't mistakenly take scroll position
+				// into account when setting the tooltip/highlight positioning.
+				// 
+				// We only do this once due to how expensive computed styles are to calculate, 
+				// and are unlikely to change. If that turns out to be wrong, reconsider this.
+				const { isFixed } = getElementsPositionInDocument(islandElement);
+				if (isFixed) {
 					tooltip.style.position = highlight.style.position = 'fixed';
 				}
 
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts
index 6a1b914a8b01..16d02df0cc7a 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/highlight.ts
@@ -21,6 +21,7 @@ export class DevOverlayHighlight extends HTMLElement {
 					width: 100%;
 					height: 100%;
 					position: absolute;
+					z-index: 2000000000;
 				}
 
 				.icon {
diff --git a/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts b/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
index 6a8e19b0d973..9f7224ca479f 100644
--- a/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/ui-library/tooltip.ts
@@ -32,7 +32,7 @@ export class DevOverlayTooltip extends HTMLElement {
 				font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 				font-size: 14px;
 				margin: 0;
-				z-index: 9999999;
+				z-index: 2000000001;
 				max-width: 45ch;
 				width: fit-content;
 				min-width: 30ch;

From 7a4e2f41454f9119e8f8b66bfefba53c1a4d4de0 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <matthewp@users.noreply.github.com>
Date: Tue, 5 Dec 2023 11:49:40 +0000
Subject: [PATCH 26/59] [ci] format

---
 .../src/runtime/client/dev-overlay/plugins/audit/index.ts   | 6 +++---
 .../astro/src/runtime/client/dev-overlay/plugins/xray.ts    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
index 094640f9bbab..ac45616b16b5 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
@@ -203,14 +203,14 @@ export default {
 			// Set the highlight/tooltip as being fixed position the highlighted element
 			// is fixed. We do this so that we don't mistakenly take scroll position
 			// into account when setting the tooltip/highlight positioning.
-			// 
-			// We only do this once due to how expensive computed styles are to calculate, 
+			//
+			// We only do this once due to how expensive computed styles are to calculate,
 			// and are unlikely to change. If that turns out to be wrong, reconsider this.
 			const { isFixed } = getElementsPositionInDocument(originalElement);
 			if (isFixed) {
 				tooltip.style.position = highlight.style.position = 'fixed';
 			}
-			
+
 			attachTooltipToHighlight(highlight, tooltip, originalElement);
 
 			canvas.append(highlight);
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index 714c80c2e8c2..1c9a9c404eef 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -111,8 +111,8 @@ export default {
 				// Set the highlight/tooltip as being fixed position the highlighted element
 				// is fixed. We do this so that we don't mistakenly take scroll position
 				// into account when setting the tooltip/highlight positioning.
-				// 
-				// We only do this once due to how expensive computed styles are to calculate, 
+				//
+				// We only do this once due to how expensive computed styles are to calculate,
 				// and are unlikely to change. If that turns out to be wrong, reconsider this.
 				const { isFixed } = getElementsPositionInDocument(islandElement);
 				if (isFixed) {

From 466d1f0ab200a4a89ae1617bb8ebfa4eeabdac23 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Tue, 5 Dec 2023 04:13:54 -0800
Subject: [PATCH 27/59] capture click events inside the toolbar (#9303)

---
 packages/astro/src/runtime/client/dev-overlay/overlay.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/overlay.ts b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
index 8a5cda453db5..48241ded9f77 100644
--- a/packages/astro/src/runtime/client/dev-overlay/overlay.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/overlay.ts
@@ -310,13 +310,14 @@ export class AstroDevOverlay extends HTMLElement {
 	attachEvents() {
 		const items = this.shadowRoot.querySelectorAll<HTMLDivElement>('.item');
 		items.forEach((item) => {
-			item.addEventListener('click', async (e) => {
-				const target = e.currentTarget;
+			item.addEventListener('click', async (event) => {
+				const target = event.currentTarget;
 				if (!target || !(target instanceof HTMLElement)) return;
 				const id = target.dataset.pluginId;
 				if (!id) return;
 				const plugin = this.getPluginById(id);
 				if (!plugin) return;
+				event.stopPropagation();
 				await this.togglePluginStatus(plugin);
 			});
 		});

From 30982078e666f54429fa7b6e0014c505512af024 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Tue, 5 Dec 2023 04:14:04 -0800
Subject: [PATCH 28/59] filter out internal island props (#9304)

---
 .../src/runtime/client/dev-overlay/plugins/xray.ts   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
index 1c9a9c404eef..edc038df7afe 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/xray.ts
@@ -153,14 +153,16 @@ export default {
 				});
 			}
 
-			// Add the props if we have any
-			if (Object.keys(islandProps).length > 0) {
+			// Display the props if we have any
+			// Ignore the "data-astro-cid-XXXXXX" prop (internal)
+			const islandPropsEntries = Object.entries(islandProps).filter(
+				(prop: any) => !prop[0].startsWith('data-astro-cid-')
+			);
+			if (islandPropsEntries.length > 0) {
 				tooltip.sections.push({
 					title: 'Props',
 					content: `<pre><code>${JSON.stringify(
-						Object.fromEntries(
-							Object.entries(islandProps).map((prop: any) => [prop[0], prop[1][1]])
-						),
+						Object.fromEntries(islandPropsEntries.map((prop: any) => [prop[0], prop[1][1]])),
 						undefined,
 						2
 					)}</code></pre>`,

From 7b6ae083482848142edc27b74fbbc318f03149d3 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Tue, 5 Dec 2023 04:14:34 -0800
Subject: [PATCH 29/59] [Toolbar] Remove image decode call (#9305)

* stop waiting for images to decode

* fix: don't add empty audits

---------

Co-authored-by: Princesseuh <3019731+Princesseuh@users.noreply.github.com>
---
 .../src/runtime/client/dev-overlay/plugins/audit/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
index ac45616b16b5..175fe0ab66c1 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/audit/index.ts
@@ -135,7 +135,7 @@ export default {
 							margin: 0;
 							font-size: 22px;
 						}
-	
+
 						astro-dev-toolbar-icon {
 							width: 1em;
 						   height: 1em;
@@ -187,13 +187,13 @@ export default {
 
 			// If the element is hidden, don't do anything
 			if (targetedElement.offsetParent === null || computedStyle.display === 'none') {
-				audits.push();
 				return;
 			}
 
-			// If the element is an image, wait for it to load
+			// If the element is an image but not yet loaded, ignore it
+			// TODO: We shouldn't ignore this, because it is valid for an image to not be loaded at start (e.g. lazy loading)
 			if (originalElement.nodeName === 'IMG' && !(originalElement as HTMLImageElement).complete) {
-				await (originalElement as HTMLImageElement).decode();
+				return;
 			}
 
 			const rect = originalElement.getBoundingClientRect();

From d4290c630bf876aa5e2203d743e2cb6d808e4b45 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Tue, 5 Dec 2023 07:15:56 -0500
Subject: [PATCH 30/59] Exit pre-mode for 4.0 release (#9290)

---
 .changeset/pre.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 1cf5ecf7a7c8..49f4fbbf39c4 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "beta",
   "initialVersions": {
     "astro": "3.5.5",

From b4f3a8722ec27d12dc485f11a2dac6c682001304 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Tue, 5 Dec 2023 20:58:13 +0800
Subject: [PATCH 31/59] Release markdoc integration as v0.x (#9308)

---
 packages/integrations/markdoc/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index eedbb0d9a946..bda1fa5514ae 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "1.0.0-beta.1",
+  "version": "0.7.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -75,7 +75,7 @@
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "astro": "^4.0.0-beta.0"
+    "astro": "^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "workspace:*",

From 2e1d6792abc74e71e6efab65b796a7c85632a255 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Tue, 5 Dec 2023 08:06:52 -0500
Subject: [PATCH 32/59] Downgrade the tailwind integration for Astro 3/4 compat
 (#9309)

---
 packages/integrations/tailwind/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index de681aac0d4f..e372c5e7088f 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/tailwind",
   "description": "Use Tailwind CSS to style your Astro site",
-  "version": "6.0.0-beta.0",
+  "version": "5.0.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -43,7 +43,7 @@
     "vite": "^5.0.0"
   },
   "peerDependencies": {
-    "astro": "^4.0.0-beta.0",
+    "astro": "^3.0.0 || ^4.0.0",
     "tailwindcss": "^3.0.24"
   },
   "publishConfig": {

From 82586f32f467c4ddaf581af97e48bace8da2bb6a Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Tue, 5 Dec 2023 21:09:08 +0800
Subject: [PATCH 33/59] Update `@astrojs/upgrade` to 0.2.0 (#9310)

---
 packages/upgrade/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 596fe71e0f59..69fd31694c70 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.1.0-beta.0",
+  "version": "0.2.0-beta.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",

From 5f13e7e0dcf256fc5c5b0ac7ca10c02e44f728b3 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Tue, 5 Dec 2023 05:39:16 -0800
Subject: [PATCH 34/59] [ci] release (#9307)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 .changeset/angry-swans-fry.md               |   5 -
 .changeset/beige-jokes-report.md            |   9 -
 .changeset/big-cooks-notice.md              |   6 -
 .changeset/brown-jars-lick.md               |   5 -
 .changeset/calm-baboons-watch.md            |   5 -
 .changeset/chatty-poems-doubt.md            |   5 -
 .changeset/clever-beds-notice.md            |   9 -
 .changeset/curvy-sheep-lick.md              |   6 -
 .changeset/famous-eels-trade.md             |   5 -
 .changeset/fluffy-dolls-sleep.md            |  26 ---
 .changeset/gentle-cobras-wash.md            |  17 --
 .changeset/giant-snails-perform.md          |   5 -
 .changeset/gold-grapes-jump.md              |   5 -
 .changeset/gorgeous-squids-walk.md          |   5 -
 .changeset/green-impalas-fetch.md           |   5 -
 .changeset/green-parrots-brake.md           |  10 --
 .changeset/grumpy-seas-switch.md            |   5 -
 .changeset/grumpy-turtles-tickle.md         |   5 -
 .changeset/khaki-fans-sell.md               |   5 -
 .changeset/lemon-crews-juggle.md            |   9 -
 .changeset/light-ties-poke.md               |   8 -
 .changeset/little-beers-sit.md              |   5 -
 .changeset/mighty-rats-flow.md              |   5 -
 .changeset/modern-candles-sip.md            |   5 -
 .changeset/nervous-beans-peel.md            |   6 -
 .changeset/ninety-weeks-juggle.md           |   5 -
 .changeset/odd-rivers-happen.md             |   5 -
 .changeset/orange-candles-sip.md            |   9 -
 .changeset/plenty-candles-help.md           |  21 ---
 .changeset/pre.json                         |  82 ---------
 .changeset/rude-hairs-whisper.md            |   5 -
 .changeset/sharp-starfishes-compete.md      |  20 ---
 .changeset/shiny-trees-sip.md               |   5 -
 .changeset/short-deers-whisper.md           |   5 -
 .changeset/silent-phones-divide.md          |   7 -
 .changeset/slimy-jeans-peel.md              |   5 -
 .changeset/slow-hornets-try.md              |   5 -
 .changeset/smart-cats-camp.md               |   5 -
 .changeset/smooth-gifts-train.md            |   5 -
 .changeset/sour-games-burn.md               |  13 --
 .changeset/spicy-starfishes-shake.md        |   5 -
 .changeset/tasty-dryers-bathe.md            |  27 ---
 .changeset/tasty-parents-own.md             |   5 -
 .changeset/tender-eagles-learn.md           |   7 -
 .changeset/three-chairs-sip.md              |   5 -
 .changeset/tricky-dragons-explain.md        |   5 -
 .changeset/weak-wolves-bow.md               |   5 -
 .changeset/wicked-sloths-develop.md         |  11 --
 .changeset/wild-apricots-rescue.md          |   5 -
 .changeset/wild-boats-wait.md               |   5 -
 examples/basics/package.json                |   2 +-
 examples/blog/package.json                  |   6 +-
 examples/component/package.json             |   2 +-
 examples/framework-alpine/package.json      |   2 +-
 examples/framework-lit/package.json         |   2 +-
 examples/framework-multiple/package.json    |   8 +-
 examples/framework-preact/package.json      |   2 +-
 examples/framework-react/package.json       |   4 +-
 examples/framework-solid/package.json       |   2 +-
 examples/framework-svelte/package.json      |   4 +-
 examples/framework-vue/package.json         |   4 +-
 examples/hackernews/package.json            |   4 +-
 examples/integration/package.json           |   2 +-
 examples/middleware/package.json            |   4 +-
 examples/minimal/package.json               |   2 +-
 examples/non-html-pages/package.json        |   2 +-
 examples/portfolio/package.json             |   2 +-
 examples/ssr/package.json                   |   6 +-
 examples/view-transitions/package.json      |   6 +-
 examples/with-markdoc/package.json          |   4 +-
 examples/with-markdown-plugins/package.json |   4 +-
 examples/with-markdown-shiki/package.json   |   2 +-
 examples/with-mdx/package.json              |   4 +-
 examples/with-nanostores/package.json       |   2 +-
 examples/with-tailwindcss/package.json      |   6 +-
 examples/with-vitest/package.json           |   2 +-
 packages/astro-rss/CHANGELOG.md             |   6 +
 packages/astro-rss/package.json             |   2 +-
 packages/astro/CHANGELOG.md                 | 187 ++++++++++++++++++++
 packages/astro/package.json                 |   2 +-
 packages/create-astro/CHANGELOG.md          |   6 +
 packages/create-astro/package.json          |   2 +-
 packages/integrations/markdoc/CHANGELOG.md  |   6 +
 packages/integrations/markdoc/package.json  |   2 +-
 packages/integrations/mdx/CHANGELOG.md      |  13 ++
 packages/integrations/mdx/package.json      |   2 +-
 packages/integrations/node/CHANGELOG.md     |   6 +
 packages/integrations/node/package.json     |   2 +-
 packages/integrations/react/CHANGELOG.md    |   6 +
 packages/integrations/react/package.json    |   2 +-
 packages/integrations/svelte/CHANGELOG.md   |   8 +
 packages/integrations/svelte/package.json   |   2 +-
 packages/integrations/vercel/CHANGELOG.md   |  10 ++
 packages/integrations/vercel/package.json   |   2 +-
 packages/integrations/vue/CHANGELOG.md      |   6 +
 packages/integrations/vue/package.json      |   2 +-
 packages/markdown/remark/CHANGELOG.md       |  14 ++
 packages/markdown/remark/package.json       |   2 +-
 packages/upgrade/CHANGELOG.md               |  28 +++
 packages/upgrade/package.json               |   2 +-
 pnpm-lock.yaml                              |  90 +++++-----
 101 files changed, 398 insertions(+), 560 deletions(-)
 delete mode 100644 .changeset/angry-swans-fry.md
 delete mode 100644 .changeset/beige-jokes-report.md
 delete mode 100644 .changeset/big-cooks-notice.md
 delete mode 100644 .changeset/brown-jars-lick.md
 delete mode 100644 .changeset/calm-baboons-watch.md
 delete mode 100644 .changeset/chatty-poems-doubt.md
 delete mode 100644 .changeset/clever-beds-notice.md
 delete mode 100644 .changeset/curvy-sheep-lick.md
 delete mode 100644 .changeset/famous-eels-trade.md
 delete mode 100644 .changeset/fluffy-dolls-sleep.md
 delete mode 100644 .changeset/gentle-cobras-wash.md
 delete mode 100644 .changeset/giant-snails-perform.md
 delete mode 100644 .changeset/gold-grapes-jump.md
 delete mode 100644 .changeset/gorgeous-squids-walk.md
 delete mode 100644 .changeset/green-impalas-fetch.md
 delete mode 100644 .changeset/green-parrots-brake.md
 delete mode 100644 .changeset/grumpy-seas-switch.md
 delete mode 100644 .changeset/grumpy-turtles-tickle.md
 delete mode 100644 .changeset/khaki-fans-sell.md
 delete mode 100644 .changeset/lemon-crews-juggle.md
 delete mode 100644 .changeset/light-ties-poke.md
 delete mode 100644 .changeset/little-beers-sit.md
 delete mode 100644 .changeset/mighty-rats-flow.md
 delete mode 100644 .changeset/modern-candles-sip.md
 delete mode 100644 .changeset/nervous-beans-peel.md
 delete mode 100644 .changeset/ninety-weeks-juggle.md
 delete mode 100644 .changeset/odd-rivers-happen.md
 delete mode 100644 .changeset/orange-candles-sip.md
 delete mode 100644 .changeset/plenty-candles-help.md
 delete mode 100644 .changeset/pre.json
 delete mode 100644 .changeset/rude-hairs-whisper.md
 delete mode 100644 .changeset/sharp-starfishes-compete.md
 delete mode 100644 .changeset/shiny-trees-sip.md
 delete mode 100644 .changeset/short-deers-whisper.md
 delete mode 100644 .changeset/silent-phones-divide.md
 delete mode 100644 .changeset/slimy-jeans-peel.md
 delete mode 100644 .changeset/slow-hornets-try.md
 delete mode 100644 .changeset/smart-cats-camp.md
 delete mode 100644 .changeset/smooth-gifts-train.md
 delete mode 100644 .changeset/sour-games-burn.md
 delete mode 100644 .changeset/spicy-starfishes-shake.md
 delete mode 100644 .changeset/tasty-dryers-bathe.md
 delete mode 100644 .changeset/tasty-parents-own.md
 delete mode 100644 .changeset/tender-eagles-learn.md
 delete mode 100644 .changeset/three-chairs-sip.md
 delete mode 100644 .changeset/tricky-dragons-explain.md
 delete mode 100644 .changeset/weak-wolves-bow.md
 delete mode 100644 .changeset/wicked-sloths-develop.md
 delete mode 100644 .changeset/wild-apricots-rescue.md
 delete mode 100644 .changeset/wild-boats-wait.md

diff --git a/.changeset/angry-swans-fry.md b/.changeset/angry-swans-fry.md
deleted file mode 100644
index ce5c513d5fc3..000000000000
--- a/.changeset/angry-swans-fry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Redesign Dev Overlay main screen to show more information, such as the coolest integrations, your current Astro version and more.
diff --git a/.changeset/beige-jokes-report.md b/.changeset/beige-jokes-report.md
deleted file mode 100644
index ecb97328b6c1..000000000000
--- a/.changeset/beige-jokes-report.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'@astrojs/mdx': major
-'@astrojs/markdown-remark': major
-'astro': major
----
-
-Updates the unified, remark, and rehype dependencies to latest. Make sure to update your custom remark and rehype plugins as well to be compatible with the latest versions.
-
-**Potentially breaking change:** The default value of `markdown.remarkRehype.footnoteBackLabel` is changed from `"Back to content"` to `"Back to reference 1"`. See the `mdast-util-to-hast` [commit](https://github.com/syntax-tree/mdast-util-to-hast/commit/56c88e45690be138fad9f0bf367b939d09816863) for more information.
diff --git a/.changeset/big-cooks-notice.md b/.changeset/big-cooks-notice.md
deleted file mode 100644
index 9a0586c73ad4..000000000000
--- a/.changeset/big-cooks-notice.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@astrojs/vercel': major
-'@astrojs/node': major
----
-
-The internals of the integration have been updated to support Astro 4.0. Make sure to upgrade your Astro version as Astro 3.0 is no longer supported.
diff --git a/.changeset/brown-jars-lick.md b/.changeset/brown-jars-lick.md
deleted file mode 100644
index 0d824e445f47..000000000000
--- a/.changeset/brown-jars-lick.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an issue where links with the same pathname as the current page, but different search params, were not prefetched.
diff --git a/.changeset/calm-baboons-watch.md b/.changeset/calm-baboons-watch.md
deleted file mode 100644
index a0e8259e965e..000000000000
--- a/.changeset/calm-baboons-watch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-Update CLI logging experience
diff --git a/.changeset/chatty-poems-doubt.md b/.changeset/chatty-poems-doubt.md
deleted file mode 100644
index 32bc05c9d5ea..000000000000
--- a/.changeset/chatty-poems-doubt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an issue where html annotations relevant only to the dev server were included in the production build.
diff --git a/.changeset/clever-beds-notice.md b/.changeset/clever-beds-notice.md
deleted file mode 100644
index 6be65bde1157..000000000000
--- a/.changeset/clever-beds-notice.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'astro': major
----
-
-Removes support for returning simple objects from endpoints (deprecated since Astro 3.0). You should return a `Response` instead.
-
-`ResponseWithEncoding` is also removed. You can refactor the code to return a response with an array buffer instead, which is encoding agnostic.
-
-The types for middlewares have also been revised. To type a middleware function, you should now use `MiddlewareHandler` instead of `MiddlewareResponseHandler`. If you used `defineMiddleware()` to type the function, no changes are needed.
diff --git a/.changeset/curvy-sheep-lick.md b/.changeset/curvy-sheep-lick.md
deleted file mode 100644
index d369d129d41f..000000000000
--- a/.changeset/curvy-sheep-lick.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'astro': patch
----
-
-Consistently emit fallback routes in the correct folders, and emit routes that
-consider `trailingSlash`
diff --git a/.changeset/famous-eels-trade.md b/.changeset/famous-eels-trade.md
deleted file mode 100644
index 2c3d24898746..000000000000
--- a/.changeset/famous-eels-trade.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Ensure the dev-overlay-window is anchored to the bottom
diff --git a/.changeset/fluffy-dolls-sleep.md b/.changeset/fluffy-dolls-sleep.md
deleted file mode 100644
index 02b698f1e492..000000000000
--- a/.changeset/fluffy-dolls-sleep.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-'astro': minor
----
-
-Adds a new way to configure the `i18n.locales` array.
-
-Developers can now assign a custom URL path prefix that can span multiple language codes:
-
-```js
-// astro.config.mjs
-export default defineConfig({
-  experimental: {
-      i18n: {
-          defaultLocale: "english",
-          locales: [
-            "de",
-            { path: "english", codes: ["en", "en-US"]},
-            "fr",
-          ],
-          routingStrategy: "prefix-always"
-      }
-  }
-})
-```
-
-With the above configuration, the URL prefix of the default locale will be `/english/`. When computing `Astro.preferredLocale`, Astro will use the `codes`.
diff --git a/.changeset/gentle-cobras-wash.md b/.changeset/gentle-cobras-wash.md
deleted file mode 100644
index 1a9245524aae..000000000000
--- a/.changeset/gentle-cobras-wash.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-'astro': minor
----
-
-Adds the `astro preferences` command to manage user preferences. User preferences are specific to individual Astro users, unlike the `astro.config.mjs` file which changes behavior for everyone working on a project.
-
-User preferences are scoped to the current project by default, stored in a local `.astro/settings.json` file. Using the `--global` flag, user preferences can also be applied to every Astro project on the current machine. Global user preferences are stored in an operating system-specific location.
-
-```sh
-# Disable the dev overlay for the current user in the current project
-npm run astro preferences disable devOverlay
-# Disable the dev overlay for the current user in all Astro projects on this machine
-npm run astro preferences --global disable devOverlay
-
-# Check if the dev overlay is enabled for the current user
-npm run astro preferences list devOverlay
-```
diff --git a/.changeset/giant-snails-perform.md b/.changeset/giant-snails-perform.md
deleted file mode 100644
index e44a0b73060b..000000000000
--- a/.changeset/giant-snails-perform.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vercel': major
----
-
-Removes deprecated `analytics` option. Use the `webAnalytics` option instead.
diff --git a/.changeset/gold-grapes-jump.md b/.changeset/gold-grapes-jump.md
deleted file mode 100644
index d3da8b72e9eb..000000000000
--- a/.changeset/gold-grapes-jump.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-Reworks Vite's logger to use Astro's logger to correctly log HMR messages
diff --git a/.changeset/gorgeous-squids-walk.md b/.changeset/gorgeous-squids-walk.md
deleted file mode 100644
index 79599013c0a1..000000000000
--- a/.changeset/gorgeous-squids-walk.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Improves display for `astro preferences list` command
diff --git a/.changeset/green-impalas-fetch.md b/.changeset/green-impalas-fetch.md
deleted file mode 100644
index 02b77375fd40..000000000000
--- a/.changeset/green-impalas-fetch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix SVG icons not showing properly in the extended dropdown menu of the dev overlay
diff --git a/.changeset/green-parrots-brake.md b/.changeset/green-parrots-brake.md
deleted file mode 100644
index f2d9db4be5bc..000000000000
--- a/.changeset/green-parrots-brake.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'astro': major
----
-
-Removes additional deprecated APIs:
-
-- The Astro preview server now returns a 404 status instead of a 301 redirect when requesting assets from the public directory without a base.
-- Removes special handling when referencing the `astro/client-image` type. You should use the `astro/client` type instead.
-- Removes deprecated built-in `rss` support in `getStaticPaths`. You should use `@astrojs/rss` instead.
-- Removes deprecated `Astro.request.params` support. You should use `Astro.params` instead.
diff --git a/.changeset/grumpy-seas-switch.md b/.changeset/grumpy-seas-switch.md
deleted file mode 100644
index 85cf0e22fe56..000000000000
--- a/.changeset/grumpy-seas-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Improve high contrast mode with the Dev Overlay
diff --git a/.changeset/grumpy-turtles-tickle.md b/.changeset/grumpy-turtles-tickle.md
deleted file mode 100644
index 75f8f0eec333..000000000000
--- a/.changeset/grumpy-turtles-tickle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Improve highlight/tooltip positioning when in fixed positions
diff --git a/.changeset/khaki-fans-sell.md b/.changeset/khaki-fans-sell.md
deleted file mode 100644
index f6d84bdaedac..000000000000
--- a/.changeset/khaki-fans-sell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/markdown-remark': patch
----
-
-Fixes `RemarkRehype` type's `handler` and `handlers` properties
diff --git a/.changeset/lemon-crews-juggle.md b/.changeset/lemon-crews-juggle.md
deleted file mode 100644
index d838bdbaadd5..000000000000
--- a/.changeset/lemon-crews-juggle.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'astro': major
----
-
-Renames Dev Overlay to Dev Toolbar
-
-The previously named experimental Dev Overlay is now known as the Astro Dev Toolbar. Plugins have been renamed as Toolbar Apps. This updates our references to reflect.
-
-To not break existing APIs, aliases for the Toolbar-based names have been created. The previous API names will continue to function but will be deprecated in the future. All documentation has been updated to reflect Toolbar-based names.
diff --git a/.changeset/light-ties-poke.md b/.changeset/light-ties-poke.md
deleted file mode 100644
index 97eceace43e9..000000000000
--- a/.changeset/light-ties-poke.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-'@astrojs/svelte': major
-'@astrojs/react': patch
-'@astrojs/vue': patch
-'astro': major
----
-
-Adds Vite 5 support. There are no breaking changes from Astro. Check the [Vite migration guide](https://vitejs.dev/guide/migration.html) for details of the breaking changes from Vite instead.
diff --git a/.changeset/little-beers-sit.md b/.changeset/little-beers-sit.md
deleted file mode 100644
index 97dd63873884..000000000000
--- a/.changeset/little-beers-sit.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/markdoc': minor
----
-
-Removes internal `propagators` handling for Astro 3
diff --git a/.changeset/mighty-rats-flow.md b/.changeset/mighty-rats-flow.md
deleted file mode 100644
index 8fbec88bafc3..000000000000
--- a/.changeset/mighty-rats-flow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Update the look and feel of the dev overlay
diff --git a/.changeset/modern-candles-sip.md b/.changeset/modern-candles-sip.md
deleted file mode 100644
index 31e75c412551..000000000000
--- a/.changeset/modern-candles-sip.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-astro': patch
----
-
-Stop clearing the console on start
diff --git a/.changeset/nervous-beans-peel.md b/.changeset/nervous-beans-peel.md
deleted file mode 100644
index aaf464db0bdb..000000000000
--- a/.changeset/nervous-beans-peel.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'astro': minor
----
-
-Improves consistency between navigations with and without `<ViewTransitions>`. See [#9279](https://github.com/withastro/astro/pull/9279) for more details.
-
diff --git a/.changeset/ninety-weeks-juggle.md b/.changeset/ninety-weeks-juggle.md
deleted file mode 100644
index a78fda8467d1..000000000000
--- a/.changeset/ninety-weeks-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Adds properties of the submit button (name, value) to the form data of a view transition
diff --git a/.changeset/odd-rivers-happen.md b/.changeset/odd-rivers-happen.md
deleted file mode 100644
index 2490084bc234..000000000000
--- a/.changeset/odd-rivers-happen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': major
----
-
-Removes the opt-in `handleForms` property for `<ViewTransitions />`. Form submissions are now handled by default and can be disabled by setting `data-astro-reload` on relevant `<form />` elements.
diff --git a/.changeset/orange-candles-sip.md b/.changeset/orange-candles-sip.md
deleted file mode 100644
index 442e386b7447..000000000000
--- a/.changeset/orange-candles-sip.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'astro': patch
----
-
-Adds new accessibility audits to the Dev Toolbar's built-in Audits app.
-
-The audits Astro performs are non-exhaustive and only capable of detecting a handful of common accessibility issues. Please take care to perform a thorough, **manual** audit of your site to ensure compliance with the [Web Content Accessibility Guidelines (WCAG) international standard](https://www.w3.org/WAI/standards-guidelines/wcag/) _before_ publishing your site.
-
-🧡 Huge thanks to the [Svelte](https://github.com/sveltejs/svelte) team for providing the basis of these accessibility audits!
diff --git a/.changeset/plenty-candles-help.md b/.changeset/plenty-candles-help.md
deleted file mode 100644
index e7ddf8cb4fcb..000000000000
--- a/.changeset/plenty-candles-help.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-'astro': major
----
-
-Removes support for Shiki custom language's `path` property. The language JSON file should be imported and passed to the option instead.
-
-```diff
-// astro.config.js
-+ import customLang from './custom.tmLanguage.json'
-
-export default defineConfig({
-  markdown: {
-    shikiConfig: {
-      langs: [
--       { path: './custom.tmLanguage.json' },
-+       customLang,
-      ],
-    },
-  },
-})
-```
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index 49f4fbbf39c4..000000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "mode": "exit",
-  "tag": "beta",
-  "initialVersions": {
-    "astro": "3.5.5",
-    "@astrojs/prism": "3.0.0",
-    "@astrojs/rss": "3.0.0",
-    "create-astro": "4.5.1",
-    "@astrojs/alpinejs": "0.3.1",
-    "@astrojs/cloudflare": "0.0.0",
-    "@astrojs/lit": "3.0.3",
-    "@astrojs/markdoc": "0.7.2",
-    "@astrojs/mdx": "1.1.5",
-    "@astrojs/netlify": "0.0.0",
-    "@astrojs/node": "6.0.4",
-    "@astrojs/partytown": "2.0.2",
-    "@astrojs/preact": "3.0.1",
-    "@astrojs/react": "3.0.5",
-    "@astrojs/sitemap": "3.0.3",
-    "@astrojs/solid-js": "3.0.2",
-    "@astrojs/svelte": "4.0.4",
-    "@astrojs/tailwind": "5.0.2",
-    "@astrojs/vercel": "5.2.0",
-    "@astrojs/vue": "3.0.4",
-    "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "3.5.0",
-    "@astrojs/telemetry": "3.0.4",
-    "@astrojs/underscore-redirects": "0.3.3",
-    "@astrojs/upgrade": "0.0.1"
-  },
-  "changesets": [
-    "angry-swans-fry",
-    "beige-jokes-report",
-    "big-cooks-notice",
-    "brown-jars-lick",
-    "calm-baboons-watch",
-    "chatty-poems-doubt",
-    "clever-beds-notice",
-    "curvy-sheep-lick",
-    "famous-eels-trade",
-    "fluffy-dolls-sleep",
-    "gentle-cobras-wash",
-    "giant-snails-perform",
-    "gold-grapes-jump",
-    "gorgeous-squids-walk",
-    "green-impalas-fetch",
-    "green-parrots-brake",
-    "grumpy-seas-switch",
-    "grumpy-turtles-tickle",
-    "khaki-fans-sell",
-    "lemon-crews-juggle",
-    "light-ties-poke",
-    "little-beers-sit",
-    "mighty-rats-flow",
-    "modern-candles-sip",
-    "nervous-beans-peel",
-    "ninety-weeks-juggle",
-    "odd-rivers-happen",
-    "orange-candles-sip",
-    "plenty-candles-help",
-    "rude-hairs-whisper",
-    "sharp-starfishes-compete",
-    "shiny-trees-sip",
-    "short-deers-whisper",
-    "silent-phones-divide",
-    "slimy-jeans-peel",
-    "slow-hornets-try",
-    "smart-cats-camp",
-    "smooth-gifts-train",
-    "sour-games-burn",
-    "spicy-starfishes-shake",
-    "tasty-dryers-bathe",
-    "tasty-parents-own",
-    "tender-eagles-learn",
-    "three-chairs-sip",
-    "tricky-dragons-explain",
-    "weak-wolves-bow",
-    "wicked-sloths-develop",
-    "wild-apricots-rescue",
-    "wild-boats-wait"
-  ]
-}
diff --git a/.changeset/rude-hairs-whisper.md b/.changeset/rude-hairs-whisper.md
deleted file mode 100644
index a9d7baa4d445..000000000000
--- a/.changeset/rude-hairs-whisper.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-Renames the `entryPoint` property of the `injectRoute` integrations API to `entrypoint` for consistency. A warning will be shown prompting you to update your code when using the old name.
diff --git a/.changeset/sharp-starfishes-compete.md b/.changeset/sharp-starfishes-compete.md
deleted file mode 100644
index 0eb4f413bcda..000000000000
--- a/.changeset/sharp-starfishes-compete.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-'astro': major
----
-
-This change only affects maintainers of third-party adapters. In the Integration API, the `app.render()` method of the `App` class has been simplified. 
-
-Instead of two optional arguments, it now takes a single optional argument that is an object with two optional properties: `routeData` and `locals`.
-```diff
- app.render(request)
-
-- app.render(request, routeData)
-+ app.render(request, { routeData })
-
-- app.render(request, routeData, locals)
-+ app.render(request, { routeData, locals })
-
-- app.render(request, undefined, locals)
-+ app.render(request, { locals })
-```
-The current signature is deprecated but will continue to function until next major version.
diff --git a/.changeset/shiny-trees-sip.md b/.changeset/shiny-trees-sip.md
deleted file mode 100644
index 991c7aa92825..000000000000
--- a/.changeset/shiny-trees-sip.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/markdown-remark': major
----
-
-Removes deprecated APIs. All Astro packages had been refactored to not use these APIs.
diff --git a/.changeset/short-deers-whisper.md b/.changeset/short-deers-whisper.md
deleted file mode 100644
index 03e0f4480676..000000000000
--- a/.changeset/short-deers-whisper.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Removes vendored Vite's `importMeta.d.ts` file in favour of Vite 5's new `vite/types/import-meta.d.ts` export
diff --git a/.changeset/silent-phones-divide.md b/.changeset/silent-phones-divide.md
deleted file mode 100644
index afd58853a83d..000000000000
--- a/.changeset/silent-phones-divide.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'astro': patch
----
-
-Remove aria-query package
-
-This is another CJS-only package that breaks usage.
diff --git a/.changeset/slimy-jeans-peel.md b/.changeset/slimy-jeans-peel.md
deleted file mode 100644
index c4ba769e3060..000000000000
--- a/.changeset/slimy-jeans-peel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vercel': major
----
-
-Removes the deprecated `@astrojs/vercel/edge` export. You should use `@astrojs/vercel/serverless` instead with the `edgeMiddleware` option.
diff --git a/.changeset/slow-hornets-try.md b/.changeset/slow-hornets-try.md
deleted file mode 100644
index 970e7f49105b..000000000000
--- a/.changeset/slow-hornets-try.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/rss': major
----
-
-Removes the `drafts` option as the feature is deprecated in Astro 3.0
diff --git a/.changeset/smart-cats-camp.md b/.changeset/smart-cats-camp.md
deleted file mode 100644
index 96f290362b79..000000000000
--- a/.changeset/smart-cats-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix routing prefixes when `prefixDefaultLocale` is `true`
diff --git a/.changeset/smooth-gifts-train.md b/.changeset/smooth-gifts-train.md
deleted file mode 100644
index 95ebda97e142..000000000000
--- a/.changeset/smooth-gifts-train.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Exports type for Dev Toolbar App under correct name
diff --git a/.changeset/sour-games-burn.md b/.changeset/sour-games-burn.md
deleted file mode 100644
index f0d596603ddd..000000000000
--- a/.changeset/sour-games-burn.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-"astro": patch
----
-
-Refactors virtual modules exports. This should not break your project unless you import Astro's internal modules, including:
-
-- `astro/middleware/namespace`
-- `astro/transitions`
-- `astro/transitions/router`
-- `astro/transitions/events`
-- `astro/transitions/types`
-- `astro/prefetch`
-- `astro/i18n`
diff --git a/.changeset/spicy-starfishes-shake.md b/.changeset/spicy-starfishes-shake.md
deleted file mode 100644
index a283f4d37911..000000000000
--- a/.changeset/spicy-starfishes-shake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Ensure overlay x-ray z-index is higher than the island
diff --git a/.changeset/tasty-dryers-bathe.md b/.changeset/tasty-dryers-bathe.md
deleted file mode 100644
index 438597e13b04..000000000000
--- a/.changeset/tasty-dryers-bathe.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-'@astrojs/upgrade': minor
----
-
-Initial release! 
-
-`@astrojs/upgrade` is an automated command-line tool for upgrading Astro and your official Astro integrations together.
-
-Inside of your existing `astro` project, run the following command to install the `latest` version of your integrations.
-
-**With NPM:**
-
-```bash
-npx @astrojs/upgrade
-```
-
-**With Yarn:**
-
-```bash
-yarn dlx @astrojs/upgrade
-```
-
-**With PNPM:**
-
-```bash
-pnpm dlx @astrojs/upgrade
-```
diff --git a/.changeset/tasty-parents-own.md b/.changeset/tasty-parents-own.md
deleted file mode 100644
index 3ab6ca510b4e..000000000000
--- a/.changeset/tasty-parents-own.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Adds instructions on how to hide the dev overlay
diff --git a/.changeset/tender-eagles-learn.md b/.changeset/tender-eagles-learn.md
deleted file mode 100644
index b1f98c2f6c58..000000000000
--- a/.changeset/tender-eagles-learn.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'astro': patch
----
-
-Removes the 'a11y-role-has-required-aria-props' audit rule
-
-This audit rule depends on a CommonJS module. To prevent blocking the 4.0 release the rule is being removed temporarily.
diff --git a/.changeset/three-chairs-sip.md b/.changeset/three-chairs-sip.md
deleted file mode 100644
index 68bdc0a61426..000000000000
--- a/.changeset/three-chairs-sip.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-Update error log formatting
diff --git a/.changeset/tricky-dragons-explain.md b/.changeset/tricky-dragons-explain.md
deleted file mode 100644
index 78ecb1e95752..000000000000
--- a/.changeset/tricky-dragons-explain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes a number of small user experience bugs with the dev overlay
diff --git a/.changeset/weak-wolves-bow.md b/.changeset/weak-wolves-bow.md
deleted file mode 100644
index 484544cd12b7..000000000000
--- a/.changeset/weak-wolves-bow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': major
----
-
-Removes deprecated `app.match()` option, `matchNotFound`
diff --git a/.changeset/wicked-sloths-develop.md b/.changeset/wicked-sloths-develop.md
deleted file mode 100644
index 806e0270728f..000000000000
--- a/.changeset/wicked-sloths-develop.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-'astro': major
----
-
-Removes deprecated features from Astro 3.0
-
-- Adapters are now required to pass `supportedAstroFeatures` to specify a list of features they support.
-- The `build.split` and `build.excludeMiddleware` options are removed. Use `functionPerRoute` and `edgeMiddleware` from adapters instead.
-- The `markdown.drafts` option and draft feature is removed. Use content collections instead.
-- Lowercase endpoint names are no longer supported. Use uppercase endpoint names instead.
-- `getHeaders()` exported from markdown files is removed. Use `getHeadings()` instead.
diff --git a/.changeset/wild-apricots-rescue.md b/.changeset/wild-apricots-rescue.md
deleted file mode 100644
index c4a7deea3eb3..000000000000
--- a/.changeset/wild-apricots-rescue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/svelte': major
----
-
-Drops support for Svelte 3 as `@sveltejs/vite-plugin-svelte` is updated to `3.0.0` which does not support Svelte 3
diff --git a/.changeset/wild-boats-wait.md b/.changeset/wild-boats-wait.md
deleted file mode 100644
index 6300e839ea5d..000000000000
--- a/.changeset/wild-boats-wait.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Returns the updated config in the integration `astro:config:setup` hook's `updateConfig()` API
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 00e32a079ef9..8657c37cde25 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 85da22909416..c863ef32a6f7 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.0-beta.0",
-    "@astrojs/rss": "^4.0.0-beta.0",
+    "@astrojs/mdx": "^2.0.0",
+    "@astrojs/rss": "^4.0.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 7d39c1c71e25..471fd8bc7061 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 0064aee4c326..33d3804ac770 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index ae2dac2fd1f3..41ec0b400cca 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 4d15c33c44a4..eb67152b6844 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -12,11 +12,11 @@
   },
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
-    "@astrojs/react": "^3.0.7-beta.0",
+    "@astrojs/react": "^3.0.7",
     "@astrojs/solid-js": "^3.0.2",
-    "@astrojs/svelte": "^5.0.0-beta.0",
-    "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.7",
+    "@astrojs/svelte": "^5.0.0",
+    "@astrojs/vue": "^4.0.0",
+    "astro": "^4.0.0",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 5eee2ff9fd3b..48d15001064d 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index f81fc7d66175..56eec97ccef0 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.7-beta.0",
+    "@astrojs/react": "^3.0.7",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index bdaf0df7f219..4b326cc4d193 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 6b03bdf2654a..a4802e958a28 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.7",
+    "@astrojs/svelte": "^5.0.0",
+    "astro": "^4.0.0",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 8f78ceb98c1a..682965449602 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.7",
+    "@astrojs/vue": "^4.0.0",
+    "astro": "^4.0.0",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 435ea981a9f3..439b426a2a26 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.7"
+    "@astrojs/node": "^7.0.0",
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 4a5718384c9a..e05486f03939 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index fccaab4e7d86..25cde11ff60d 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -12,8 +12,8 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.7",
+    "@astrojs/node": "^7.0.0",
+    "astro": "^4.0.0",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index a17f4fda6d33..45dee04891cf 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 37d5be57d2a4..550cb56ac777 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index 6a91830972fe..26df21048fab 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index e00f226ae70c..67b8d6e291e3 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -12,9 +12,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.0-beta.1",
-    "@astrojs/svelte": "^5.0.0-beta.0",
-    "astro": "^4.0.0-beta.7",
+    "@astrojs/node": "^7.0.0",
+    "@astrojs/svelte": "^5.0.0",
+    "astro": "^4.0.0",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index f6a7ad88973b..71ba7346c635 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "@astrojs/tailwind": "^6.0.0-beta.0",
-    "@astrojs/node": "^7.0.0-beta.1",
-    "astro": "^4.0.0-beta.7"
+    "@astrojs/tailwind": "^5.0.2",
+    "@astrojs/node": "^7.0.0",
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 6c6d7bc728ea..9e2ad69677cf 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^1.0.0-beta.1",
-    "astro": "^4.0.0-beta.7"
+    "@astrojs/markdoc": "^0.8.0",
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index a8566d078be7..17c46630466d 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^4.0.0-beta.0",
-    "astro": "^4.0.0-beta.7",
+    "@astrojs/markdown-remark": "^4.0.0",
+    "astro": "^4.0.0",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index 6f4cb2471fa1..ed520d0c4abf 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.7"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 6e2de281dbb9..ff92218dfe1f 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.0-beta.0",
+    "@astrojs/mdx": "^2.0.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 58383008869b..202b11bbd7db 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index abaca5b5a267..e2dc4e83a627 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.0-beta.0",
-    "@astrojs/tailwind": "^6.0.0-beta.0",
+    "@astrojs/mdx": "^2.0.0",
+    "@astrojs/tailwind": "^5.0.2",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 93d1443f7d8b..3d6c30a47904 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.0-beta.7",
+    "astro": "^4.0.0",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
index 60327a088ea0..89179a9a7026 100644
--- a/packages/astro-rss/CHANGELOG.md
+++ b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 4.0.0
+
+### Major Changes
+
+- [#9168](https://github.com/withastro/astro/pull/9168) [`153a5abb9`](https://github.com/withastro/astro/commit/153a5abb905042ac68b712514dc9ec387d3e6b17) Thanks [@bluwy](https://github.com/bluwy)! - Removes the deprecated (in v3.0) `drafts` option as the feature is deprecated in Astro 3.0
+
 ## 4.0.0-beta.0
 
 ### Major Changes
diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
index 86df612b7707..9c9adb849903 100644
--- a/packages/astro-rss/package.json
+++ b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index f9d791dfe603..52c92e641756 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,192 @@
 # astro
 
+## 4.0.0
+
+### Major Changes
+
+- [#9138](https://github.com/withastro/astro/pull/9138) [`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3) Thanks [@bluwy](https://github.com/bluwy)! - Updates the unified, remark, and rehype dependencies to latest. Make sure to update your custom remark and rehype plugins as well to be compatible with the latest versions.
+
+  **Potentially breaking change:** The default value of `markdown.remarkRehype.footnoteBackLabel` is changed from `"Back to content"` to `"Back to reference 1"`. See the `mdast-util-to-hast` [commit](https://github.com/syntax-tree/mdast-util-to-hast/commit/56c88e45690be138fad9f0bf367b939d09816863) for more information.
+
+- [#9181](https://github.com/withastro/astro/pull/9181) [`cdabf6ef0`](https://github.com/withastro/astro/commit/cdabf6ef02be7220fd2b6bdcef924ceca089381e) Thanks [@bluwy](https://github.com/bluwy)! - Removes support for returning simple objects from endpoints (deprecated since Astro 3.0). You should return a `Response` instead.
+
+  `ResponseWithEncoding` is also removed. You can refactor the code to return a response with an array buffer instead, which is encoding agnostic.
+
+  The types for middlewares have also been revised. To type a middleware function, you should now use `MiddlewareHandler` instead of `MiddlewareResponseHandler`. If you used `defineMiddleware()` to type the function, no changes are needed.
+
+- [#9263](https://github.com/withastro/astro/pull/9263) [`3cbd8ea75`](https://github.com/withastro/astro/commit/3cbd8ea7534910e3beae396dcfa93ce87dcdd91f) Thanks [@bluwy](https://github.com/bluwy)! - Removes additional deprecated APIs:
+
+  - The Astro preview server now returns a 404 status instead of a 301 redirect when requesting assets from the public directory without a base.
+  - Removes special handling when referencing the `astro/client-image` type. You should use the `astro/client` type instead.
+  - Removes deprecated built-in `rss` support in `getStaticPaths`. You should use `@astrojs/rss` instead.
+  - Removes deprecated `Astro.request.params` support. You should use `Astro.params` instead.
+
+- [#9271](https://github.com/withastro/astro/pull/9271) [`47604bd5b`](https://github.com/withastro/astro/commit/47604bd5b5bb2ea63922b657bac104c010575c20) Thanks [@matthewp](https://github.com/matthewp)! - Renames Dev Overlay to Dev Toolbar
+
+  The previously named experimental Dev Overlay is now known as the Astro Dev Toolbar. Overlay plugins have been renamed as Toolbar Apps. All APIs have been updated to reflect this name change.
+
+  To not break existing APIs, aliases for the Toolbar-based names have been created. The previous API names will continue to function but will be deprecated in the future. All documentation has been updated to reflect Toolbar-based names.
+
+- [#9122](https://github.com/withastro/astro/pull/9122) [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721) Thanks [@bluwy](https://github.com/bluwy)! - Adds Vite 5 support. There are no breaking changes from Astro. Check the [Vite migration guide](https://vitejs.dev/guide/migration.html) for details of the breaking changes from Vite instead.
+
+- [#9225](https://github.com/withastro/astro/pull/9225) [`c421a3d17`](https://github.com/withastro/astro/commit/c421a3d17911aeda29b5204f6d568ae87e329eaf) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Removes the opt-in `handleForms` property for `<ViewTransitions />`. Form submissions are now handled by default and this property is no longer necessary. This default behavior can be disabled by setting `data-astro-reload` on relevant `<form />` elements.
+
+- [#9196](https://github.com/withastro/astro/pull/9196) [`37697a2c5`](https://github.com/withastro/astro/commit/37697a2c5511572dc29c0a4ea46f90c2f62be8e6) Thanks [@bluwy](https://github.com/bluwy)! - Removes support for Shiki custom language's `path` property. The language JSON file should be imported and passed to the option instead.
+
+  ```diff
+  // astro.config.js
+  + import customLang from './custom.tmLanguage.json'
+
+  export default defineConfig({
+    markdown: {
+      shikiConfig: {
+        langs: [
+  -       { path: './custom.tmLanguage.json' },
+  +       customLang,
+        ],
+      },
+    },
+  })
+  ```
+
+- [#9199](https://github.com/withastro/astro/pull/9199) [`49aa215a0`](https://github.com/withastro/astro/commit/49aa215a01ee1c4805316c85bb0aea6cfbc25a31) Thanks [@lilnasy](https://github.com/lilnasy)! - This change only affects maintainers of third-party adapters. In the Integration API, the `app.render()` method of the `App` class has been simplified.
+
+  Instead of two optional arguments, it now takes a single optional argument that is an object with two optional properties: `routeData` and `locals`.
+
+  ```diff
+   app.render(request)
+
+  - app.render(request, routeData)
+  + app.render(request, { routeData })
+
+  - app.render(request, routeData, locals)
+  + app.render(request, { routeData, locals })
+
+  - app.render(request, undefined, locals)
+  + app.render(request, { locals })
+  ```
+
+  The current signature is deprecated but will continue to function until next major version.
+
+- [#9212](https://github.com/withastro/astro/pull/9212) [`c0383ea0c`](https://github.com/withastro/astro/commit/c0383ea0c102cb62b7235823c706a090ba08715f) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Removes deprecated `app.match()` option, `matchNotFound`
+
+- [#9168](https://github.com/withastro/astro/pull/9168) [`153a5abb9`](https://github.com/withastro/astro/commit/153a5abb905042ac68b712514dc9ec387d3e6b17) Thanks [@bluwy](https://github.com/bluwy)! - Removes deprecated features from Astro 3.0
+
+  - Adapters are now required to pass `supportedAstroFeatures` to specify a list of features they support.
+  - The `build.split` and `build.excludeMiddleware` options are removed. Use `functionPerRoute` and `edgeMiddleware` from adapters instead.
+  - The `markdown.drafts` option and draft feature is removed. Use content collections instead.
+  - Lowercase endpoint names are no longer supported. Use uppercase endpoint names instead.
+  - `getHeaders()` exported from markdown files is removed. Use `getHeadings()` instead.
+
+### Minor Changes
+
+- [#9105](https://github.com/withastro/astro/pull/9105) [`6201bbe96`](https://github.com/withastro/astro/commit/6201bbe96c2a083fb201e4a43a9bd88499821a3e) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Update CLI logging experience
+
+- [#9200](https://github.com/withastro/astro/pull/9200) [`b4b851f5a`](https://github.com/withastro/astro/commit/b4b851f5a46b32ee531db5dc39ccd2aa7af7bcfd) Thanks [@ematipico](https://github.com/ematipico)! - Adds a new way to configure the `i18n.locales` array.
+
+  Developers can now assign a custom URL path prefix that can span multiple language codes:
+
+  ```js
+  // astro.config.mjs
+  export default defineConfig({
+    experimental: {
+      i18n: {
+        defaultLocale: 'english',
+        locales: ['de', { path: 'english', codes: ['en', 'en-US'] }, 'fr'],
+      },
+    },
+  });
+  ```
+
+  With the above configuration, the URL prefix of the default locale will be `/english/`. When computing `Astro.preferredLocale`, Astro will use the `codes`.
+
+- [#9115](https://github.com/withastro/astro/pull/9115) [`3b77889b4`](https://github.com/withastro/astro/commit/3b77889b47750ed6e17c7858780dc4aae9201b58) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Adds the `astro preferences` command to manage user preferences. User preferences are specific to individual Astro users, unlike the `astro.config.mjs` file which changes behavior for everyone working on a project.
+
+  User preferences are scoped to the current project by default, stored in a local `.astro/settings.json` file. Using the `--global` flag, user preferences can also be applied to every Astro project on the current machine. Global user preferences are stored in an operating system-specific location.
+
+  ```sh
+  # Disable the dev overlay for the current user in the current project
+  npm run astro preferences disable devOverlay
+  # Disable the dev overlay for the current user in all Astro projects on this machine
+  npm run astro preferences --global disable devOverlay
+
+  # Check if the dev overlay is enabled for the current user
+  npm run astro preferences list devOverlay
+  ```
+
+- [#9139](https://github.com/withastro/astro/pull/9139) [`459b26436`](https://github.com/withastro/astro/commit/459b2643666db08dbd29a100ce3d8697b451d3fe) Thanks [@bluwy](https://github.com/bluwy)! - Reworks Vite's logger to use Astro's logger to correctly log HMR messages
+
+- [#9279](https://github.com/withastro/astro/pull/9279) [`6a9669b81`](https://github.com/withastro/astro/commit/6a9669b810ddfcae6c537165a438190ea1e7a4bc) Thanks [@martrapp](https://github.com/martrapp)! - Improves consistency between navigations with and without `<ViewTransitions>`. See [#9279](https://github.com/withastro/astro/pull/9279) for more details.
+
+- [#9161](https://github.com/withastro/astro/pull/9161) [`bd0c2e9ae`](https://github.com/withastro/astro/commit/bd0c2e9ae3389a9d3085050c1e8134ae98dff299) Thanks [@bluwy](https://github.com/bluwy)! - Renames the `entryPoint` property of the `injectRoute` integrations API to `entrypoint` for consistency. A warning will be shown prompting you to update your code when using the old name.
+
+- [#9129](https://github.com/withastro/astro/pull/9129) [`8bfc20511`](https://github.com/withastro/astro/commit/8bfc20511918d675202cdc100d4efab293e5cbac) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Update error log formatting
+
+### Patch Changes
+
+- [#9118](https://github.com/withastro/astro/pull/9118) [`000e8f465`](https://github.com/withastro/astro/commit/000e8f4654cae9982e21e0a858366c4844139db6) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Redesign Dev Overlay main screen to show more information, such as the coolest integrations, your current Astro version and more.
+
+- [#9118](https://github.com/withastro/astro/pull/9118) [`000e8f465`](https://github.com/withastro/astro/commit/000e8f4654cae9982e21e0a858366c4844139db6) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes an issue where links with the same pathname as the current page, but different search params, were not prefetched.
+
+- [#9275](https://github.com/withastro/astro/pull/9275) [`0968cb1a3`](https://github.com/withastro/astro/commit/0968cb1a373b1101a649035d2ea2210d3d6412dc) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where html annotations relevant only to the dev server were included in the production build.
+
+- [#9252](https://github.com/withastro/astro/pull/9252) [`7b74ec4ba`](https://github.com/withastro/astro/commit/7b74ec4ba48e363a19d20e322212d0d264927f1b) Thanks [@ematipico](https://github.com/ematipico)! - Consistently emit fallback routes in the correct folders, and emit routes that consider `trailingSlash`
+
+- [#9222](https://github.com/withastro/astro/pull/9222) [`279e3c1b3`](https://github.com/withastro/astro/commit/279e3c1b3d06e7b48f01c0ef8285c3719ac74ace) Thanks [@matthewp](https://github.com/matthewp)! - Ensure the dev-overlay-window is anchored to the bottom
+
+- [#9292](https://github.com/withastro/astro/pull/9292) [`5428b3da0`](https://github.com/withastro/astro/commit/5428b3da08493d933981c4646d5d132fb31f0d25) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Improves display for `astro preferences list` command
+
+- [#9235](https://github.com/withastro/astro/pull/9235) [`9c2342c32`](https://github.com/withastro/astro/commit/9c2342c327a13d2f7d1eb387b743e81f431b9813) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix SVG icons not showing properly in the extended dropdown menu of the dev overlay
+
+- [#9218](https://github.com/withastro/astro/pull/9218) [`f4401c8c1`](https://github.com/withastro/astro/commit/f4401c8c1fa203431b4e7b2e89381a91b4ef1ac6) Thanks [@matthewp](https://github.com/matthewp)! - Improve high contrast mode with the Dev Overlay
+
+- [#9254](https://github.com/withastro/astro/pull/9254) [`b750a161e`](https://github.com/withastro/astro/commit/b750a161e0e059de9cf814ce271d5891e4e97cbe) Thanks [@matthewp](https://github.com/matthewp)! - Improve highlight/tooltip positioning when in fixed positions
+
+- [#9230](https://github.com/withastro/astro/pull/9230) [`60cfa49e4`](https://github.com/withastro/astro/commit/60cfa49e445c926288612a6b1a30113ab988011c) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Update the look and feel of the dev overlay
+
+- [#9248](https://github.com/withastro/astro/pull/9248) [`43ddb5217`](https://github.com/withastro/astro/commit/43ddb5217691dc4112d8d98ae07511a8be6d4b94) Thanks [@martrapp](https://github.com/martrapp)! - Adds properties of the submit button (name, value) to the form data of a view transition
+
+- [#9170](https://github.com/withastro/astro/pull/9170) [`8a228fce0`](https://github.com/withastro/astro/commit/8a228fce0114daeea2100e50ddc5cf2ea0a03b5d) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Adds new accessibility audits to the Dev Toolbar's built-in Audits app.
+
+  The audits Astro performs are non-exhaustive and only capable of detecting a handful of common accessibility issues. Please take care to perform a thorough, **manual** audit of your site to ensure compliance with the [Web Content Accessibility Guidelines (WCAG) international standard](https://www.w3.org/WAI/standards-guidelines/wcag/) _before_ publishing your site.
+
+  🧡 Huge thanks to the [Svelte](https://github.com/sveltejs/svelte) team for providing the basis of these accessibility audits!
+
+- [#9149](https://github.com/withastro/astro/pull/9149) [`0fe3a7ed5`](https://github.com/withastro/astro/commit/0fe3a7ed5d7bb1a9fce1623e84ba14104b51223c) Thanks [@bluwy](https://github.com/bluwy)! - Removes vendored Vite's `importMeta.d.ts` file in favour of Vite 5's new `vite/types/import-meta.d.ts` export
+
+- [#9295](https://github.com/withastro/astro/pull/9295) [`3d2dbb0e5`](https://github.com/withastro/astro/commit/3d2dbb0e5d2bf67b38ff8533d4dd938c94433812) Thanks [@matthewp](https://github.com/matthewp)! - Remove aria-query package
+
+  This is another CJS-only package that breaks usage.
+
+- [#9274](https://github.com/withastro/astro/pull/9274) [`feaba2c7f`](https://github.com/withastro/astro/commit/feaba2c7fc0a48d3af7dd98e6b750ec1e8274e33) Thanks [@TheOtterlord](https://github.com/TheOtterlord)! - Fix routing prefixes when `prefixDefaultLocale` is `true`
+
+- [#9273](https://github.com/withastro/astro/pull/9273) [`9887f2412`](https://github.com/withastro/astro/commit/9887f241241f800e2907afe7079db070f3bfcfab) Thanks [@alexanderniebuhr](https://github.com/alexanderniebuhr)! - Exports type for Dev Toolbar App under correct name
+
+- [#9150](https://github.com/withastro/astro/pull/9150) [`710be505c`](https://github.com/withastro/astro/commit/710be505c9ddf416e77a75343d8cae9c497d72c6) Thanks [@bluwy](https://github.com/bluwy)! - Refactors virtual modules exports. This should not break your project unless you import Astro's internal modules, including:
+
+  - `astro/middleware/namespace`
+  - `astro/transitions`
+  - `astro/transitions/router`
+  - `astro/transitions/events`
+  - `astro/transitions/types`
+  - `astro/prefetch`
+  - `astro/i18n`
+
+- [#9227](https://github.com/withastro/astro/pull/9227) [`4b8a42406`](https://github.com/withastro/astro/commit/4b8a42406bbdcc68604ea4ecc2a926721fbc4d52) Thanks [@matthewp](https://github.com/matthewp)! - Ensure overlay x-ray z-index is higher than the island
+
+- [#9255](https://github.com/withastro/astro/pull/9255) [`9ea3e0b94`](https://github.com/withastro/astro/commit/9ea3e0b94f7c4813c52bffd78043f90fd87dffda) Thanks [@matthewp](https://github.com/matthewp)! - Adds instructions on how to hide the dev overlay
+
+- [#9293](https://github.com/withastro/astro/pull/9293) [`cf5fa4376`](https://github.com/withastro/astro/commit/cf5fa437627ca6978ae3ff33c7894f278dfe75cd) Thanks [@matthewp](https://github.com/matthewp)! - Removes the 'a11y-role-has-required-aria-props' audit rule
+
+  This audit rule depends on a CommonJS module. To prevent blocking the 4.0 release the rule is being removed temporarily.
+
+- [#9214](https://github.com/withastro/astro/pull/9214) [`4fe523b00`](https://github.com/withastro/astro/commit/4fe523b0064b323ee46b2574339d96ea8bdb7b2d) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fixes a number of small user experience bugs with the dev overlay
+
+- [#9013](https://github.com/withastro/astro/pull/9013) [`ff8eadb95`](https://github.com/withastro/astro/commit/ff8eadb95d34833baaf3ec7575bf4f293eae97da) Thanks [@bayssmekanique](https://github.com/bayssmekanique)! - Returns the updated config in the integration `astro:config:setup` hook's `updateConfig()` API
+
+- Updated dependencies [[`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3), [`addb57c8e`](https://github.com/withastro/astro/commit/addb57c8e80b7b67ec61224666f3a1db5c44410c), [`c7953645e`](https://github.com/withastro/astro/commit/c7953645eeaaf9e87c6db4494b0023d2c1878ff0)]:
+  - @astrojs/markdown-remark@4.0.0
+
 ## 4.0.0-beta.7
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index f624d32f2b08..916bf237de58 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md
index 76b53508976e..f1c16fdc21e9 100644
--- a/packages/create-astro/CHANGELOG.md
+++ b/packages/create-astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-astro
 
+## 4.5.2
+
+### Patch Changes
+
+- [#9105](https://github.com/withastro/astro/pull/9105) [`6201bbe96`](https://github.com/withastro/astro/commit/6201bbe96c2a083fb201e4a43a9bd88499821a3e) Thanks [@FredKSchott](https://github.com/FredKSchott)! - Stop clearing the console on start
+
 ## 4.5.2-beta.0
 
 ### Patch Changes
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index 2699b11948a0..8f1ed83da991 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "4.5.2-beta.0",
+  "version": "4.5.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index 7fed651df026..67a9d249e5c8 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/markdoc
 
+## 0.8.0
+
+### Minor Changes
+
+- [#9263](https://github.com/withastro/astro/pull/9263) [`3cbd8ea75`](https://github.com/withastro/astro/commit/3cbd8ea7534910e3beae396dcfa93ce87dcdd91f) Thanks [@bluwy](https://github.com/bluwy)! - Removes internal `propagators` handling for Astro 3
+
 ## 1.0.0-beta.1
 
 ### Minor Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index bda1fa5514ae..f75a56466cca 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc in your Astro site",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index 11632d110a1e..374496a496d9 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @astrojs/mdx
 
+## 2.0.0
+
+### Major Changes
+
+- [#9138](https://github.com/withastro/astro/pull/9138) [`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3) Thanks [@bluwy](https://github.com/bluwy)! - Updates the unified, remark, and rehype dependencies to latest. Make sure to update your custom remark and rehype plugins as well to be compatible with the latest versions.
+
+  **Potentially breaking change:** The default value of `markdown.remarkRehype.footnoteBackLabel` is changed from `"Back to content"` to `"Back to reference 1"`. See the `mdast-util-to-hast` [commit](https://github.com/syntax-tree/mdast-util-to-hast/commit/56c88e45690be138fad9f0bf367b939d09816863) for more information.
+
+### Patch Changes
+
+- Updated dependencies [[`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3), [`addb57c8e`](https://github.com/withastro/astro/commit/addb57c8e80b7b67ec61224666f3a1db5c44410c), [`c7953645e`](https://github.com/withastro/astro/commit/c7953645eeaaf9e87c6db4494b0023d2c1878ff0)]:
+  - @astrojs/markdown-remark@4.0.0
+
 ## 2.0.0-beta.0
 
 ### Major Changes
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index 3f5b6d559a6c..45a47ae6cafe 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md
index e4cf76b85f4b..71a1b2f2f69d 100644
--- a/packages/integrations/node/CHANGELOG.md
+++ b/packages/integrations/node/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/node
 
+## 7.0.0
+
+### Major Changes
+
+- [#9199](https://github.com/withastro/astro/pull/9199) [`49aa215a0`](https://github.com/withastro/astro/commit/49aa215a01ee1c4805316c85bb0aea6cfbc25a31) Thanks [@lilnasy](https://github.com/lilnasy)! - The internals of the integration have been updated to support Astro 4.0. Make sure to upgrade your Astro version as Astro 3.0 is no longer supported.
+
 ## 7.0.0-beta.1
 
 ### Major Changes
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 9981db3c5b7d..c75b7a622273 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/node",
   "description": "Deploy your site to a Node.js server",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index 7dcf8dc2a027..1ba942a77295 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/react
 
+## 3.0.7
+
+### Patch Changes
+
+- [#9122](https://github.com/withastro/astro/pull/9122) [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721) Thanks [@bluwy](https://github.com/bluwy)! - Adds Vite 5 support. There are no breaking changes from Astro. Check the [Vite migration guide](https://vitejs.dev/guide/migration.html) for details of the breaking changes from Vite instead.
+
 ## 3.0.7-beta.0
 
 ### Patch Changes
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 0721d37f3208..4ab958bcc453 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/react",
   "description": "Use React components within Astro",
-  "version": "3.0.7-beta.0",
+  "version": "3.0.7",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/svelte/CHANGELOG.md b/packages/integrations/svelte/CHANGELOG.md
index e9ce0c2ed8ec..19939d2f15d0 100644
--- a/packages/integrations/svelte/CHANGELOG.md
+++ b/packages/integrations/svelte/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @astrojs/svelte
 
+## 5.0.0
+
+### Major Changes
+
+- [#9122](https://github.com/withastro/astro/pull/9122) [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721) Thanks [@bluwy](https://github.com/bluwy)! - Adds Vite 5 support. There are no breaking changes from Astro. Check the [Vite migration guide](https://vitejs.dev/guide/migration.html) for details of the breaking changes from Vite instead.
+
+- [#9122](https://github.com/withastro/astro/pull/9122) [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721) Thanks [@bluwy](https://github.com/bluwy)! - Drops support for Svelte 3 as `@sveltejs/vite-plugin-svelte` is updated to `3.0.0` which does not support Svelte 3
+
 ## 5.0.0-beta.0
 
 ### Major Changes
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 9694acab64fe..1dfec1977f83 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/svelte",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0",
   "description": "Use Svelte components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 5e025048e974..aaec3b144866 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @astrojs/vercel
 
+## 6.0.0
+
+### Major Changes
+
+- [#9199](https://github.com/withastro/astro/pull/9199) [`49aa215a0`](https://github.com/withastro/astro/commit/49aa215a01ee1c4805316c85bb0aea6cfbc25a31) Thanks [@lilnasy](https://github.com/lilnasy)! - The internals of the integration have been updated to support Astro 4.0. Make sure to upgrade your Astro version as Astro 3.0 is no longer supported.
+
+- [#9184](https://github.com/withastro/astro/pull/9184) [`a145ac07e`](https://github.com/withastro/astro/commit/a145ac07e75927e13af62e28d13bc8217a362b8e) Thanks [@bluwy](https://github.com/bluwy)! - Removes deprecated `analytics` option. Use the `webAnalytics` option instead.
+
+- [#9263](https://github.com/withastro/astro/pull/9263) [`3cbd8ea75`](https://github.com/withastro/astro/commit/3cbd8ea7534910e3beae396dcfa93ce87dcdd91f) Thanks [@bluwy](https://github.com/bluwy)! - Removes the deprecated `@astrojs/vercel/edge` export. You should use `@astrojs/vercel/serverless` instead with the `edgeMiddleware` option.
+
 ## 6.0.0-beta.2
 
 ### Major Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 067163c50ed5..730020c04762 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/vercel",
   "description": "Deploy your site to Vercel",
-  "version": "6.0.0-beta.2",
+  "version": "6.0.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md
index 3199fdccb16e..dcb0c91e8d3c 100644
--- a/packages/integrations/vue/CHANGELOG.md
+++ b/packages/integrations/vue/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/vue
 
+## 4.0.0
+
+### Patch Changes
+
+- [#9122](https://github.com/withastro/astro/pull/9122) [`1c48ed286`](https://github.com/withastro/astro/commit/1c48ed286538ab9e354eca4e4dcd7c6385c96721) Thanks [@bluwy](https://github.com/bluwy)! - Adds Vite 5 support. There are no breaking changes from Astro. Check the [Vite migration guide](https://vitejs.dev/guide/migration.html) for details of the breaking changes from Vite instead.
+
 ## 4.0.0-beta.0
 
 ### Patch Changes
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index f220d5bf90f6..463b98958bbf 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/vue",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0",
   "description": "Use Vue components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index b720f5b5f2c5..93e1d5870010 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @astrojs/markdown-remark
 
+## 4.0.0
+
+### Major Changes
+
+- [#9138](https://github.com/withastro/astro/pull/9138) [`abf601233`](https://github.com/withastro/astro/commit/abf601233f8188d118a8cb063c777478d8d9f1a3) Thanks [@bluwy](https://github.com/bluwy)! - Updates the unified, remark, and rehype dependencies to latest. Make sure to update your custom remark and rehype plugins as well to be compatible with the latest versions.
+
+  **Potentially breaking change:** The default value of `markdown.remarkRehype.footnoteBackLabel` is changed from `"Back to content"` to `"Back to reference 1"`. See the `mdast-util-to-hast` [commit](https://github.com/syntax-tree/mdast-util-to-hast/commit/56c88e45690be138fad9f0bf367b939d09816863) for more information.
+
+- [#9182](https://github.com/withastro/astro/pull/9182) [`c7953645e`](https://github.com/withastro/astro/commit/c7953645eeaaf9e87c6db4494b0023d2c1878ff0) Thanks [@bluwy](https://github.com/bluwy)! - Removes deprecated APIs. All Astro packages had been refactored to not use these APIs.
+
+### Patch Changes
+
+- [#9147](https://github.com/withastro/astro/pull/9147) [`addb57c8e`](https://github.com/withastro/astro/commit/addb57c8e80b7b67ec61224666f3a1db5c44410c) Thanks [@bluwy](https://github.com/bluwy)! - Fixes `RemarkRehype` type's `handler` and `handlers` properties
+
 ## 4.0.0-beta.0
 
 ### Major Changes
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index 15777e10be3a..05d55e0dbfe2 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/upgrade/CHANGELOG.md b/packages/upgrade/CHANGELOG.md
index 969c359b6633..8ea9a0f3962b 100644
--- a/packages/upgrade/CHANGELOG.md
+++ b/packages/upgrade/CHANGELOG.md
@@ -1,5 +1,33 @@
 # @astrojs/upgrade
 
+## 0.2.0
+
+### Minor Changes
+
+- [#9118](https://github.com/withastro/astro/pull/9118) [`000e8f465`](https://github.com/withastro/astro/commit/000e8f4654cae9982e21e0a858366c4844139db6) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Initial release!
+
+  `@astrojs/upgrade` is an automated command-line tool for upgrading Astro and your official Astro integrations together.
+
+  Inside of your existing `astro` project, run the following command to install the `latest` version of your integrations.
+
+  **With NPM:**
+
+  ```bash
+  npx @astrojs/upgrade
+  ```
+
+  **With Yarn:**
+
+  ```bash
+  yarn dlx @astrojs/upgrade
+  ```
+
+  **With PNPM:**
+
+  ```bash
+  pnpm dlx @astrojs/upgrade
+  ```
+
 ## 0.1.0-beta.0
 
 ### Minor Changes
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 69fd31694c70..1f5eb5f86d67 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.2.0-beta.0",
+  "version": "0.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c5784ba3fe1..a685a9fa5814 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,28 +125,28 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/blog:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^2.0.0-beta.0
+        specifier: ^2.0.0
         version: link:../../packages/integrations/mdx
       '@astrojs/rss':
-        specifier: ^4.0.0-beta.0
+        specifier: ^4.0.0
         version: link:../../packages/astro-rss
       '@astrojs/sitemap':
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -185,19 +185,19 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       '@astrojs/react':
-        specifier: ^3.0.7-beta.0
+        specifier: ^3.0.7
         version: link:../../packages/integrations/react
       '@astrojs/solid-js':
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       '@astrojs/svelte':
-        specifier: ^5.0.0-beta.0
+        specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       '@astrojs/vue':
-        specifier: ^4.0.0-beta.0
+        specifier: ^4.0.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -236,7 +236,7 @@ importers:
   examples/framework-react:
     dependencies:
       '@astrojs/react':
-        specifier: ^3.0.7-beta.0
+        specifier: ^3.0.7
         version: link:../../packages/integrations/react
       '@types/react':
         specifier: ^18.2.37
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -269,10 +269,10 @@ importers:
   examples/framework-svelte:
     dependencies:
       '@astrojs/svelte':
-        specifier: ^5.0.0-beta.0
+        specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -281,10 +281,10 @@ importers:
   examples/framework-vue:
     dependencies:
       '@astrojs/vue':
-        specifier: ^4.0.0-beta.0
+        specifier: ^4.0.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -293,25 +293,25 @@ importers:
   examples/hackernews:
     dependencies:
       '@astrojs/node':
-        specifier: ^7.0.0-beta.1
+        specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/middleware:
     dependencies:
       '@astrojs/node':
-        specifier: ^7.0.0-beta.1
+        specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,31 +320,31 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/ssr:
     dependencies:
       '@astrojs/node':
-        specifier: ^7.0.0-beta.1
+        specifier: ^7.0.0
         version: link:../../packages/integrations/node
       '@astrojs/svelte':
-        specifier: ^5.0.0-beta.0
+        specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -353,31 +353,31 @@ importers:
   examples/view-transitions:
     devDependencies:
       '@astrojs/node':
-        specifier: ^7.0.0-beta.1
+        specifier: ^7.0.0
         version: link:../../packages/integrations/node
       '@astrojs/tailwind':
-        specifier: ^6.0.0-beta.0
+        specifier: ^5.0.2
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/with-markdoc:
     dependencies:
       '@astrojs/markdoc':
-        specifier: ^1.0.0-beta.1
+        specifier: ^0.8.0
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
     dependencies:
       '@astrojs/markdown-remark':
-        specifier: ^4.0.0-beta.0
+        specifier: ^4.0.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,19 +398,19 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
 
   examples/with-mdx:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^2.0.0-beta.0
+        specifier: ^2.0.0
         version: link:../../packages/integrations/mdx
       '@astrojs/preact':
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -437,16 +437,16 @@ importers:
   examples/with-tailwindcss:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^2.0.0-beta.0
+        specifier: ^2.0.0
         version: link:../../packages/integrations/mdx
       '@astrojs/tailwind':
-        specifier: ^6.0.0-beta.0
+        specifier: ^5.0.2
         version: link:../../packages/integrations/tailwind
       '@types/canvas-confetti':
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.0-beta.7
+        specifier: ^4.0.0
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 2f110a501664d9fa8b03814d3fe818956031cfc4 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Tue, 5 Dec 2023 09:02:53 -0500
Subject: [PATCH 35/59] Add changeset for Tailiwind (#9313)

---
 .changeset/nice-panthers-tell.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/nice-panthers-tell.md

diff --git a/.changeset/nice-panthers-tell.md b/.changeset/nice-panthers-tell.md
new file mode 100644
index 000000000000..5793ae3c04b0
--- /dev/null
+++ b/.changeset/nice-panthers-tell.md
@@ -0,0 +1,7 @@
+---
+'@astrojs/tailwind': patch
+---
+
+Upgrade for compatibility with Astro 4
+
+The Tailwind now supports both Astro 3 and Astro 4.

From 631e5d01b00efee6970466c38201cb0e67ec74cf Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 5 Dec 2023 14:31:51 +0000
Subject: [PATCH 36/59] fix: logging build trace of pages (#9315)

---
 .changeset/angry-cows-hug.md              |  5 +++++
 packages/astro/src/core/build/generate.ts | 21 +++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/angry-cows-hug.md

diff --git a/.changeset/angry-cows-hug.md b/.changeset/angry-cows-hug.md
new file mode 100644
index 000000000000..4a381311737b
--- /dev/null
+++ b/.changeset/angry-cows-hug.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an issue where logs that weren't grouped together by route when building the app.
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 99a7ad121b79..99912ba27b66 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -249,13 +249,11 @@ async function generatePage(
 	// prepare information we need
 	const logger = pipeline.getLogger();
 	const config = pipeline.getConfig();
-	const manifest = pipeline.getManifest();
 	const pageModulePromise = ssrEntry.page;
 	const onRequest = ssrEntry.onRequest;
 	const pageInfo = getPageDataByComponent(pipeline.getInternals(), pageData.route.component);
 
 	// Calculate information of the page, like scripts, links and styles
-	const hoistedScripts = pageInfo?.hoistedScript ?? null;
 	const styles = pageData.styles
 		.sort(cssOrder)
 		.map(({ sheet }) => sheet)
@@ -294,6 +292,15 @@ async function generatePage(
 	};
 	// Now we explode the routes. A route render itself, and it can render its fallbacks (i18n routing)
 	for (const route of eachRouteInRouteData(pageData)) {
+		const icon =
+			route.type === 'page' || route.type === 'redirect' || route.type === 'fallback'
+				? green('▶')
+				: magenta('λ');
+		if (isRelativePath(route.component)) {
+			logger.info(null, `${icon} ${route.route}`);
+		} else {
+			logger.info(null, `${icon} ${route.component}`);
+		}
 		// Get paths for the route, calling getStaticPaths if needed.
 		const paths = await getPathsForRoute(route, pageModule, pipeline, builtPaths);
 		let timeStart = performance.now();
@@ -515,16 +522,6 @@ async function generatePath(
 		}
 	}
 
-	const icon =
-		route.type === 'page' || route.type === 'redirect' || route.type === 'fallback'
-			? green('▶')
-			: magenta('λ');
-	if (isRelativePath(route.component)) {
-		logger.info(null, `${icon} ${route.route}`);
-	} else {
-		logger.info(null, `${icon} ${route.component}`);
-	}
-
 	// This adds the page name to the array so it can be shown as part of stats.
 	if (route.type === 'page') {
 		addPageName(pathname, pipeline.getStaticBuildOptions());

From 79e191ae4274ba07a26941dab78bd87453263c8d Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Tue, 5 Dec 2023 06:44:51 -0800
Subject: [PATCH 37/59] [ci] release (#9314)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/angry-cows-hug.md                |  5 --
 .changeset/nice-panthers-tell.md            |  7 ---
 examples/basics/package.json                |  2 +-
 examples/blog/package.json                  |  2 +-
 examples/component/package.json             |  2 +-
 examples/framework-alpine/package.json      |  2 +-
 examples/framework-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  2 +-
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  2 +-
 examples/framework-svelte/package.json      |  2 +-
 examples/framework-vue/package.json         |  2 +-
 examples/hackernews/package.json            |  2 +-
 examples/integration/package.json           |  2 +-
 examples/middleware/package.json            |  2 +-
 examples/minimal/package.json               |  2 +-
 examples/non-html-pages/package.json        |  2 +-
 examples/portfolio/package.json             |  2 +-
 examples/ssr/package.json                   |  2 +-
 examples/view-transitions/package.json      |  4 +-
 examples/with-markdoc/package.json          |  2 +-
 examples/with-markdown-plugins/package.json |  2 +-
 examples/with-markdown-shiki/package.json   |  2 +-
 examples/with-mdx/package.json              |  2 +-
 examples/with-nanostores/package.json       |  2 +-
 examples/with-tailwindcss/package.json      |  4 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro/CHANGELOG.md                 |  6 +++
 packages/astro/package.json                 |  2 +-
 packages/integrations/tailwind/CHANGELOG.md |  8 +++
 packages/integrations/tailwind/package.json |  2 +-
 pnpm-lock.yaml                              | 56 ++++++++++-----------
 33 files changed, 72 insertions(+), 70 deletions(-)
 delete mode 100644 .changeset/angry-cows-hug.md
 delete mode 100644 .changeset/nice-panthers-tell.md

diff --git a/.changeset/angry-cows-hug.md b/.changeset/angry-cows-hug.md
deleted file mode 100644
index 4a381311737b..000000000000
--- a/.changeset/angry-cows-hug.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an issue where logs that weren't grouped together by route when building the app.
diff --git a/.changeset/nice-panthers-tell.md b/.changeset/nice-panthers-tell.md
deleted file mode 100644
index 5793ae3c04b0..000000000000
--- a/.changeset/nice-panthers-tell.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@astrojs/tailwind': patch
----
-
-Upgrade for compatibility with Astro 4
-
-The Tailwind now supports both Astro 3 and Astro 4.
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 8657c37cde25..e4ed24314fe7 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index c863ef32a6f7..8e4c5ac223bf 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/rss": "^4.0.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 471fd8bc7061..0d916d3b713c 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 33d3804ac770..28debb4f53fd 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 41ec0b400cca..3a4fec7fc22d 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index eb67152b6844..f70d030e5cd5 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0",
     "@astrojs/vue": "^4.0.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 48d15001064d..56adb34e6ca3 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 56eec97ccef0..1e0eeed2893c 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 4b326cc4d193..e9872b4efaa2 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index a4802e958a28..e7e370518810 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 682965449602..c84f18a4ab11 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 439b426a2a26..0a354dacf866 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index e05486f03939..3fe356bea0c8 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 25cde11ff60d..432bb09544b1 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 45dee04891cf..62f864b52ace 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 550cb56ac777..6695eda42e63 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index 26df21048fab..ad232172e8f4 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 67b8d6e291e3..7665692b15ac 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0",
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 71ba7346c635..81e1799d1d17 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -10,8 +10,8 @@
     "astro": "astro"
   },
   "devDependencies": {
-    "@astrojs/tailwind": "^5.0.2",
+    "@astrojs/tailwind": "^5.0.3",
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 9e2ad69677cf..6ffcb62c947c 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.0",
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 17c46630466d..99273393dc55 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index ed520d0c4abf..cba6affce62a 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.0"
+    "astro": "^4.0.1"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index ff92218dfe1f..64444a5f4028 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 202b11bbd7db..9938024775d3 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index e2dc4e83a627..b549791fcb86 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -12,9 +12,9 @@
   },
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
-    "@astrojs/tailwind": "^5.0.2",
+    "@astrojs/tailwind": "^5.0.3",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 3d6c30a47904..c2532051195e 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.0",
+    "astro": "^4.0.1",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 52c92e641756..3925e15e40ab 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # astro
 
+## 4.0.1
+
+### Patch Changes
+
+- [#9315](https://github.com/withastro/astro/pull/9315) [`631e5d01b`](https://github.com/withastro/astro/commit/631e5d01b00efee6970466c38201cb0e67ec74cf) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where logs that weren't grouped together by route when building the app.
+
 ## 4.0.0
 
 ### Major Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 916bf237de58..2557fe50b3b7 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/integrations/tailwind/CHANGELOG.md b/packages/integrations/tailwind/CHANGELOG.md
index 10b062b35057..50e3b0786139 100644
--- a/packages/integrations/tailwind/CHANGELOG.md
+++ b/packages/integrations/tailwind/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @astrojs/tailwind
 
+## 5.0.3
+
+### Patch Changes
+
+- [#9313](https://github.com/withastro/astro/pull/9313) [`2f110a501`](https://github.com/withastro/astro/commit/2f110a501664d9fa8b03814d3fe818956031cfc4) Thanks [@matthewp](https://github.com/matthewp)! - Upgrade for compatibility with Astro 4
+
+  The Tailwind now supports both Astro 3 and Astro 4.
+
 ## 6.0.0-beta.0
 
 ### Patch Changes
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index e372c5e7088f..dd3fcd79af49 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/tailwind",
   "description": "Use Tailwind CSS to style your Astro site",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a685a9fa5814..2e9dce56f88b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,13 +140,13 @@ importers:
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +197,7 @@ importers:
         specifier: ^4.0.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +272,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -284,7 +284,7 @@ importers:
         specifier: ^4.0.0
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +296,13 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -356,10 +356,10 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       '@astrojs/tailwind':
-        specifier: ^5.0.2
+        specifier: ^5.0.3
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^0.8.0
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^4.0.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -440,13 +440,13 @@ importers:
         specifier: ^2.0.0
         version: link:../../packages/integrations/mdx
       '@astrojs/tailwind':
-        specifier: ^5.0.2
+        specifier: ^5.0.3
         version: link:../../packages/integrations/tailwind
       '@types/canvas-confetti':
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 933f9f274dbfa5cb627d2d887cf95ef585b4325b Mon Sep 17 00:00:00 2001
From: Emanuele Stoppa <my.burning@gmail.com>
Date: Tue, 5 Dec 2023 15:09:13 +0000
Subject: [PATCH 38/59] fix: docs placement and wording (#9316)

* fix: docs placement and wording

* more changes

* Update packages/astro/src/@types/astro.ts

Co-authored-by:  Matthew Phillips <matthew@skypack.dev>

* apply Sarah's suggestion

* Remove  tag

---------

Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: = <otterlord.dev@gmail.com>
---
 packages/astro/src/@types/astro.ts | 42 +++++++++++++-----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index a34f24ffa696..fb623d8c20f7 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1368,15 +1368,6 @@ export interface AstroUserConfig {
 	 */
 	legacy?: object;
 
-	/**
-	 * @docs
-	 * @kind heading
-	 * @name Experimental Flags
-	 * @description
-	 * Astro offers experimental flags to give users early access to new features.
-	 * These flags are not guaranteed to be stable.
-	 */
-
 	/**
 	 * @docs
 	 * @name i18n
@@ -1385,14 +1376,13 @@ export interface AstroUserConfig {
 	 * @type {object}
 	 * @description
 	 *
-	 * Configures experimental i18n routing and allows you to specify some customization options.
+	 * Configures i18n routing and allows you to specify some customization options.
 	 *
 	 * See our guide for more information on [internationalization in Astro](/en/guides/internationalization/)
 	 */
 	i18n?: {
 		/**
 		 * @docs
-		 * @kind h4
 		 * @name i18n.defaultLocale
 		 * @type {string}
 		 * @version 3.5.0
@@ -1405,7 +1395,6 @@ export interface AstroUserConfig {
 		defaultLocale: string;
 		/**
 		 * @docs
-		 * @kind h4
 		 * @name i18n.locales
 		 * @type {Locales}
 		 * @version 3.5.0
@@ -1421,7 +1410,6 @@ export interface AstroUserConfig {
 
 		/**
 		 * @docs
-		 * @kind h4
 		 * @name i18n.fallback
 		 * @type {Record<string, string>}
 		 * @version 3.5.0
@@ -1437,14 +1425,12 @@ export interface AstroUserConfig {
 		 *
 		 * ```js
 		 * export default defineConfig({
-		 * 	experimental: {
-		 * 		i18n: {
-		 * 			defaultLocale: "en",
-		 * 			locales: ["en", "fr", "pt-br", "es"],
-		 * 			fallback: {
-		 * 				pt: "es",
-		 * 			  fr: "en"
-		 * 			}
+		 * 	i18n: {
+		 * 		defaultLocale: "en",
+		 * 		locales: ["en", "fr", "pt-br", "es"],
+		 * 		fallback: {
+		 * 			pt: "es",
+		 * 		  fr: "en"
 		 * 		}
 		 * 	}
 		 * })
@@ -1454,7 +1440,6 @@ export interface AstroUserConfig {
 
 		/**
 		 * @docs
-		 * @kind h4
 		 * @name i18n.routing
 		 * @type {Routing}
 		 * @version 3.7.0
@@ -1466,6 +1451,7 @@ export interface AstroUserConfig {
 			/**
 			 * @docs
 			 * @name i18n.routing.prefixDefaultLocale
+			 * @kind h4
 			 * @type {boolean}
 			 * @default `false`
 			 * @version 3.7.0
@@ -1494,6 +1480,14 @@ export interface AstroUserConfig {
 		};
 	};
 
+	/**
+	 * @docs
+	 * @kind heading
+	 * @name Experimental Flags
+	 * @description
+	 * Astro offers experimental flags to give users early access to new features.
+	 * These flags are not guaranteed to be stable.
+	 */
 	experimental?: {
 		/**
 		 * @docs
@@ -2192,7 +2186,7 @@ export interface APIContext<
 	locals: App.Locals;
 
 	/**
-	 * Available only when `experimental.i18n` enabled and in SSR.
+	 * Available only when `i18n` configured and in SSR.
 	 *
 	 * It represents the preferred locale of the user. It's computed by checking the supported locales in `i18n.locales`
 	 * and locales supported by the users's browser via the header `Accept-Language`
@@ -2205,7 +2199,7 @@ export interface APIContext<
 	preferredLocale: string | undefined;
 
 	/**
-	 * Available only when `experimental.i18n` enabled and in SSR.
+	 * Available only when `i18n` configured and in SSR.
 	 *
 	 * It represents the list of the preferred locales that are supported by the application. The list is sorted via [quality value].
 	 *

From eb584de1f5796aff6d487ec0c165bfb8a1a978b6 Mon Sep 17 00:00:00 2001
From: Reuben Tier <64310361+TheOtterlord@users.noreply.github.com>
Date: Tue, 5 Dec 2023 15:52:52 +0000
Subject: [PATCH 39/59] Move i18n config above legacy (#9318)

---
 packages/astro/src/@types/astro.ts | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index fb623d8c20f7..9961d7a71032 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1359,17 +1359,7 @@ export interface AstroUserConfig {
 
 	/**
 	 * @docs
-	 * @kind heading
-	 * @name Legacy Flags
-	 * @description
-	 * To help some users migrate between versions of Astro, we occasionally introduce `legacy` flags.
-	 * These flags allow you to opt in to some deprecated or otherwise outdated behavior of Astro
-	 * in the latest version, so that you can continue to upgrade and take advantage of new Astro releases.
-	 */
-	legacy?: object;
-
-	/**
-	 * @docs
+   * @kind heading
 	 * @name i18n
 	 * @type {object}
 	 * @version 3.5.0
@@ -1480,6 +1470,17 @@ export interface AstroUserConfig {
 		};
 	};
 
+  /**
+	 * @docs
+	 * @kind heading
+	 * @name Legacy Flags
+	 * @description
+	 * To help some users migrate between versions of Astro, we occasionally introduce `legacy` flags.
+	 * These flags allow you to opt in to some deprecated or otherwise outdated behavior of Astro
+	 * in the latest version, so that you can continue to upgrade and take advantage of new Astro releases.
+	 */
+	legacy?: object;
+
 	/**
 	 * @docs
 	 * @kind heading

From aa2e76d54f8169682b818f3e8066baa7c913962f Mon Sep 17 00:00:00 2001
From: Reuben Tier <sarah11918@users.noreply.github.com>
Date: Tue, 5 Dec 2023 15:53:57 +0000
Subject: [PATCH 40/59] [ci] format

---
 packages/astro/src/@types/astro.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 9961d7a71032..bbea8202523e 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1359,7 +1359,7 @@ export interface AstroUserConfig {
 
 	/**
 	 * @docs
-   * @kind heading
+	 * @kind heading
 	 * @name i18n
 	 * @type {object}
 	 * @version 3.5.0
@@ -1470,7 +1470,7 @@ export interface AstroUserConfig {
 		};
 	};
 
-  /**
+	/**
 	 * @docs
 	 * @kind heading
 	 * @name Legacy Flags

From d1c91add074c2e08056f01df5a6043c9716b7e1f Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Tue, 5 Dec 2023 10:22:13 -0600
Subject: [PATCH 41/59] Improves `@astrojs/upgrade` dependency handling (#9317)

---
 .changeset/poor-otters-doubt.md        |  5 ++
 packages/upgrade/src/actions/verify.ts | 27 ++++++++---
 packages/upgrade/src/index.ts          |  4 +-
 packages/upgrade/test/verify.test.js   | 66 ++++++++++++++++++++++++++
 4 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/poor-otters-doubt.md
 create mode 100644 packages/upgrade/test/verify.test.js

diff --git a/.changeset/poor-otters-doubt.md b/.changeset/poor-otters-doubt.md
new file mode 100644
index 000000000000..55be4b145386
--- /dev/null
+++ b/.changeset/poor-otters-doubt.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/upgrade': patch
+---
+
+Improves dependency handling by ignoring packages that don't use a semver version
diff --git a/packages/upgrade/src/actions/verify.ts b/packages/upgrade/src/actions/verify.ts
index 82daa9a06b14..8233a5caf157 100644
--- a/packages/upgrade/src/actions/verify.ts
+++ b/packages/upgrade/src/actions/verify.ts
@@ -66,17 +66,32 @@ async function verifyAstroProject(ctx: Pick<Context, 'cwd' | 'version' | 'packag
 	return true;
 }
 
-function isAstroPackage(name: string) {
+function isAstroPackage(name: string, _version: string) {
 	return name === 'astro' || name.startsWith('@astrojs/');
 }
 
-function collectPackageInfo(
+function isAllowedPackage(name: string, _version: string) {
+	return name !== '@astrojs/upgrade';
+}
+
+function isValidVersion(_name: string, version: string) {
+	return semverCoerce(version, { loose: true }) !== null;
+}
+
+function isSupportedPackage(name: string, version: string): boolean {
+	for (const validator of [isAstroPackage, isAllowedPackage, isValidVersion]) {
+		if (!validator(name, version)) return false;
+	}
+	return true;
+}
+
+export function collectPackageInfo(
 	ctx: Pick<Context, 'version' | 'packages'>,
-	dependencies: Record<string, string>,
-	devDependencies: Record<string, string>
+	dependencies: Record<string, string> = {},
+	devDependencies: Record<string, string> = {}
 ) {
 	for (const [name, currentVersion] of Object.entries(dependencies)) {
-		if (!isAstroPackage(name)) continue;
+		if (!isSupportedPackage(name, currentVersion)) continue;
 		ctx.packages.push({
 			name,
 			currentVersion,
@@ -84,7 +99,7 @@ function collectPackageInfo(
 		});
 	}
 	for (const [name, currentVersion] of Object.entries(devDependencies)) {
-		if (!isAstroPackage(name)) continue;
+		if (!isSupportedPackage(name, currentVersion)) continue;
 		ctx.packages.push({
 			name,
 			currentVersion,
diff --git a/packages/upgrade/src/index.ts b/packages/upgrade/src/index.ts
index 8131e6eb3d8d..8dac82c1c854 100644
--- a/packages/upgrade/src/index.ts
+++ b/packages/upgrade/src/index.ts
@@ -2,7 +2,7 @@ import { getContext } from './actions/context.js';
 
 import { help } from './actions/help.js';
 import { install } from './actions/install.js';
-import { verify } from './actions/verify.js';
+import { verify, collectPackageInfo } from './actions/verify.js';
 import { setStdout } from './messages.js';
 
 const exit = () => process.exit(0);
@@ -29,4 +29,4 @@ export async function main() {
 	process.exit(0);
 }
 
-export { getContext, install, setStdout, verify };
+export { getContext, install, setStdout, verify, collectPackageInfo };
diff --git a/packages/upgrade/test/verify.test.js b/packages/upgrade/test/verify.test.js
new file mode 100644
index 000000000000..ec9d2de58a36
--- /dev/null
+++ b/packages/upgrade/test/verify.test.js
@@ -0,0 +1,66 @@
+import { expect } from 'chai';
+import { collectPackageInfo } from '../dist/index.js';
+
+describe('collectPackageInfo', () => {
+	const context = {
+		cwd: '',
+		version: 'latest',
+		packageManager: 'npm',
+		dryRun: true,
+		packages: []
+	};
+
+	beforeEach(() => {
+		context.packages = [];
+	})
+
+	it('detects astro', async () => {
+		collectPackageInfo(context, { "astro": "1.0.0" }, {});
+		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '1.0.0', targetVersion: 'latest' }]);
+	});
+
+	it('detects @astrojs', async () => {
+		collectPackageInfo(context, { "@astrojs/preact": "1.0.0" }, {});
+		expect(context.packages).deep.equal([{ name: '@astrojs/preact', currentVersion: '1.0.0', targetVersion: 'latest' }]);
+	});
+
+	it('supports ^ prefixes', async () => {
+		collectPackageInfo(context, { "astro": "^1.0.0" }, {});
+		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '^1.0.0', targetVersion: 'latest' }]);
+	});
+
+	it('supports ~ prefixes', async () => {
+		collectPackageInfo(context, { "astro": "~1.0.0" }, {});
+		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '~1.0.0', targetVersion: 'latest' }]);
+	});
+
+	it('supports prereleases', async () => {
+		collectPackageInfo(context, { "astro": "1.0.0-beta.0" }, {});
+		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '1.0.0-beta.0', targetVersion: 'latest' }]);
+	});
+
+	it('ignores self', async () => {
+		collectPackageInfo(context, { "@astrojs/upgrade": "0.0.1" }, {});
+		expect(context.packages).deep.equal([]);
+	});
+
+	it('ignores linked packages', async () => {
+		collectPackageInfo(context, { "@astrojs/preact": "link:../packages/preact" }, {});
+		expect(context.packages).deep.equal([]);
+	});
+
+	it('ignores workspace packages', async () => {
+		collectPackageInfo(context, { "@astrojs/preact": "workspace:*" }, {});
+		expect(context.packages).deep.equal([]);
+	});
+
+	it('ignores github packages', async () => {
+		collectPackageInfo(context, { "@astrojs/preact": "github:withastro/astro" }, {});
+		expect(context.packages).deep.equal([]);
+	});
+
+	it('ignores tag', async () => {
+		collectPackageInfo(context, { "@astrojs/preact": "beta" }, {});
+		expect(context.packages).deep.equal([]);
+	});
+});

From 874f68c67f588f37b5ad4a698d5c32e1667292dd Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:23:18 +0000
Subject: [PATCH 42/59] [ci] format

---
 packages/upgrade/test/verify.test.js | 44 +++++++++++++++++-----------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/packages/upgrade/test/verify.test.js b/packages/upgrade/test/verify.test.js
index ec9d2de58a36..a54cb6bb5085 100644
--- a/packages/upgrade/test/verify.test.js
+++ b/packages/upgrade/test/verify.test.js
@@ -7,60 +7,70 @@ describe('collectPackageInfo', () => {
 		version: 'latest',
 		packageManager: 'npm',
 		dryRun: true,
-		packages: []
+		packages: [],
 	};
 
 	beforeEach(() => {
 		context.packages = [];
-	})
+	});
 
 	it('detects astro', async () => {
-		collectPackageInfo(context, { "astro": "1.0.0" }, {});
-		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '1.0.0', targetVersion: 'latest' }]);
+		collectPackageInfo(context, { astro: '1.0.0' }, {});
+		expect(context.packages).deep.equal([
+			{ name: 'astro', currentVersion: '1.0.0', targetVersion: 'latest' },
+		]);
 	});
 
 	it('detects @astrojs', async () => {
-		collectPackageInfo(context, { "@astrojs/preact": "1.0.0" }, {});
-		expect(context.packages).deep.equal([{ name: '@astrojs/preact', currentVersion: '1.0.0', targetVersion: 'latest' }]);
+		collectPackageInfo(context, { '@astrojs/preact': '1.0.0' }, {});
+		expect(context.packages).deep.equal([
+			{ name: '@astrojs/preact', currentVersion: '1.0.0', targetVersion: 'latest' },
+		]);
 	});
 
 	it('supports ^ prefixes', async () => {
-		collectPackageInfo(context, { "astro": "^1.0.0" }, {});
-		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '^1.0.0', targetVersion: 'latest' }]);
+		collectPackageInfo(context, { astro: '^1.0.0' }, {});
+		expect(context.packages).deep.equal([
+			{ name: 'astro', currentVersion: '^1.0.0', targetVersion: 'latest' },
+		]);
 	});
 
 	it('supports ~ prefixes', async () => {
-		collectPackageInfo(context, { "astro": "~1.0.0" }, {});
-		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '~1.0.0', targetVersion: 'latest' }]);
+		collectPackageInfo(context, { astro: '~1.0.0' }, {});
+		expect(context.packages).deep.equal([
+			{ name: 'astro', currentVersion: '~1.0.0', targetVersion: 'latest' },
+		]);
 	});
 
 	it('supports prereleases', async () => {
-		collectPackageInfo(context, { "astro": "1.0.0-beta.0" }, {});
-		expect(context.packages).deep.equal([{ name: 'astro', currentVersion: '1.0.0-beta.0', targetVersion: 'latest' }]);
+		collectPackageInfo(context, { astro: '1.0.0-beta.0' }, {});
+		expect(context.packages).deep.equal([
+			{ name: 'astro', currentVersion: '1.0.0-beta.0', targetVersion: 'latest' },
+		]);
 	});
 
 	it('ignores self', async () => {
-		collectPackageInfo(context, { "@astrojs/upgrade": "0.0.1" }, {});
+		collectPackageInfo(context, { '@astrojs/upgrade': '0.0.1' }, {});
 		expect(context.packages).deep.equal([]);
 	});
 
 	it('ignores linked packages', async () => {
-		collectPackageInfo(context, { "@astrojs/preact": "link:../packages/preact" }, {});
+		collectPackageInfo(context, { '@astrojs/preact': 'link:../packages/preact' }, {});
 		expect(context.packages).deep.equal([]);
 	});
 
 	it('ignores workspace packages', async () => {
-		collectPackageInfo(context, { "@astrojs/preact": "workspace:*" }, {});
+		collectPackageInfo(context, { '@astrojs/preact': 'workspace:*' }, {});
 		expect(context.packages).deep.equal([]);
 	});
 
 	it('ignores github packages', async () => {
-		collectPackageInfo(context, { "@astrojs/preact": "github:withastro/astro" }, {});
+		collectPackageInfo(context, { '@astrojs/preact': 'github:withastro/astro' }, {});
 		expect(context.packages).deep.equal([]);
 	});
 
 	it('ignores tag', async () => {
-		collectPackageInfo(context, { "@astrojs/preact": "beta" }, {});
+		collectPackageInfo(context, { '@astrojs/preact': 'beta' }, {});
 		expect(context.packages).deep.equal([]);
 	});
 });

From 4d4e34d451e351f8a52e04124027850a575ba752 Mon Sep 17 00:00:00 2001
From: Amumu <yoyo837@hotmail.com>
Date: Wed, 6 Dec 2023 04:07:28 +0800
Subject: [PATCH 43/59] Improve Vue `appEntrypoint` handling (#8794)

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
Co-authored-by: Arsh <69170106+lilnasy@users.noreply.github.com>
Co-authored-by: Florian LEFEBVRE <contact@florian-lefebvre.dev>
Co-authored-by: Nate Moore <nate@astro.build>
---
 .changeset/smart-cameras-kneel.md             |  5 ++
 packages/integrations/vue/src/index.ts        | 57 +++++++++++----
 .../vue/test/app-entrypoint.test.js           | 70 +++++++++++++++++++
 .../astro.config.mjs                          | 14 ++++
 .../package.json                              | 13 ++++
 .../src/components/Bar.vue                    |  3 +
 .../src/components/Circle.svg                 |  1 +
 .../src/components/Foo.vue                    | 11 +++
 .../src/pages/_app.ts                         |  3 +
 .../src/pages/index.astro                     | 12 ++++
 .../app-entrypoint-relative/astro.config.mjs  |  8 +++
 .../app-entrypoint-relative/package.json      | 12 ++++
 .../src/components/Bar.vue                    |  3 +
 .../src/components/Circle.svg                 |  1 +
 .../src/components/Foo.vue                    | 11 +++
 .../src/pages/index.astro                     | 12 ++++
 .../app-entrypoint-relative/src/vue.ts        |  1 +
 pnpm-lock.yaml                                | 33 +++++++++
 18 files changed, 257 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/smart-cameras-kneel.md
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/astro.config.mjs
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Bar.vue
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Circle.svg
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Foo.vue
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/index.astro
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/astro.config.mjs
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/package.json
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Bar.vue
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Circle.svg
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Foo.vue
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/pages/index.astro
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/vue.ts

diff --git a/.changeset/smart-cameras-kneel.md b/.changeset/smart-cameras-kneel.md
new file mode 100644
index 000000000000..d5cb0264fbe8
--- /dev/null
+++ b/.changeset/smart-cameras-kneel.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vue': patch
+---
+
+Prevents Astro from crashing when no default function is exported from the `appEntrypoint`. Now, the entrypoint will be ignored with a warning instead.
diff --git a/packages/integrations/vue/src/index.ts b/packages/integrations/vue/src/index.ts
index 2c234952b693..c0fda26606c4 100644
--- a/packages/integrations/vue/src/index.ts
+++ b/packages/integrations/vue/src/index.ts
@@ -1,14 +1,21 @@
 import type { Options as VueOptions } from '@vitejs/plugin-vue';
-import vue from '@vitejs/plugin-vue';
 import type { Options as VueJsxOptions } from '@vitejs/plugin-vue-jsx';
-import type { AstroIntegration, AstroRenderer } from 'astro';
-import type { UserConfig } from 'vite';
+import type { AstroIntegration, AstroIntegrationLogger, AstroRenderer } from 'astro';
+import type { UserConfig, Rollup } from 'vite';
+
+import { fileURLToPath } from 'node:url';
+import vue from '@vitejs/plugin-vue';
 
 interface Options extends VueOptions {
 	jsx?: boolean | VueJsxOptions;
 	appEntrypoint?: string;
 }
 
+interface ViteOptions extends Options {
+	root: URL;
+	logger: AstroIntegrationLogger;
+}
+
 function getRenderer(): AstroRenderer {
 	return {
 		name: '@astrojs/vue',
@@ -32,7 +39,7 @@ function getJsxRenderer(): AstroRenderer {
 	};
 }
 
-function virtualAppEntrypoint(options?: Options) {
+function virtualAppEntrypoint(options: ViteOptions) {
 	const virtualModuleId = 'virtual:@astrojs/vue/app';
 	const resolvedVirtualModuleId = '\0' + virtualModuleId;
 	return {
@@ -42,18 +49,40 @@ function virtualAppEntrypoint(options?: Options) {
 				return resolvedVirtualModuleId;
 			}
 		},
-		load(id: string) {
+		async load(id: string) {
+			const noop = `export const setup = () => {}`;
 			if (id === resolvedVirtualModuleId) {
-				if (options?.appEntrypoint) {
-					return `export { default as setup } from "${options.appEntrypoint}";`;
+				if (options.appEntrypoint) {
+					try {
+						let resolved;
+						if (options.appEntrypoint.startsWith('.')) {
+							resolved = await this.resolve(fileURLToPath(new URL(options.appEntrypoint, options.root)));
+						} else {
+							resolved = await this.resolve(options.appEntrypoint, fileURLToPath(options.root));
+						}
+						if (!resolved) {
+							// This error is handled below, the message isn't shown to the user
+							throw new Error('Unable to resolve appEntrypoint');
+						}
+						const loaded = await this.load(resolved);
+						if (!loaded.hasDefaultExport) {
+							options.logger.warn(
+								`appEntrypoint \`${options.appEntrypoint}\` does not export a default function. Check out https://docs.astro.build/en/guides/integrations-guide/vue/#appentrypoint.`
+							);
+							return noop;
+						}
+						return `export { default as setup } from "${resolved.id}";`;
+					} catch {
+						options.logger.warn(`Unable to resolve appEntrypoint \`${options.appEntrypoint}\`. Does the file exist?`);
+					}
 				}
-				return `export const setup = () => {};`;
+				return noop;
 			}
-		},
-	};
+		}
+	} satisfies Rollup.Plugin;
 }
 
-async function getViteConfiguration(options?: Options): Promise<UserConfig> {
+async function getViteConfiguration(options: ViteOptions): Promise<UserConfig> {
 	const config: UserConfig = {
 		optimizeDeps: {
 			include: ['@astrojs/vue/client.js', 'vue'],
@@ -79,12 +108,14 @@ export default function (options?: Options): AstroIntegration {
 	return {
 		name: '@astrojs/vue',
 		hooks: {
-			'astro:config:setup': async ({ addRenderer, updateConfig }) => {
+			'astro:config:setup': async ({ addRenderer, updateConfig, config, logger }) => {
 				addRenderer(getRenderer());
 				if (options?.jsx) {
 					addRenderer(getJsxRenderer());
 				}
-				updateConfig({ vite: await getViteConfiguration(options) });
+				updateConfig({
+					vite: await getViteConfiguration({ ...options, root: config.root, logger }),
+				});
 			},
 		},
 	};
diff --git a/packages/integrations/vue/test/app-entrypoint.test.js b/packages/integrations/vue/test/app-entrypoint.test.js
index b20e7be7e33c..308f10149fc1 100644
--- a/packages/integrations/vue/test/app-entrypoint.test.js
+++ b/packages/integrations/vue/test/app-entrypoint.test.js
@@ -51,3 +51,73 @@ describe('App Entrypoint', () => {
 		expect(client).not.to.be.undefined;
 	});
 });
+
+describe('App Entrypoint no export default', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/app-entrypoint-no-export-default/',
+		});
+		await fixture.build();
+	});
+
+	it('loads during SSR', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const bar = document.querySelector('#foo > #bar');
+		expect(bar).not.to.be.undefined;
+		expect(bar.textContent).to.eq('works');
+	});
+
+	it('component not included in renderer bundle', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const island = document.querySelector('astro-island');
+		const client = island.getAttribute('renderer-url');
+		expect(client).not.to.be.undefined;
+
+		const js = await fixture.readFile(client);
+		expect(js).not.to.match(/\w+\.component\(\"Bar\"/gm);
+	});
+
+	it('loads svg components without transforming them to assets', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const client = document.querySelector('astro-island svg');
+
+		expect(client).not.to.be.undefined;
+	});
+});
+
+describe('App Entrypoint relative', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/app-entrypoint-relative/',
+		});
+		await fixture.build();
+	});
+
+	it('loads during SSR', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const bar = document.querySelector('#foo > #bar');
+		expect(bar).not.to.be.undefined;
+		expect(bar.textContent).to.eq('works');
+	});
+
+	it('component not included in renderer bundle', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const island = document.querySelector('astro-island');
+		const client = island.getAttribute('renderer-url');
+		expect(client).not.to.be.undefined;
+
+		const js = await fixture.readFile(client);
+		expect(js).not.to.match(/\w+\.component\(\"Bar\"/gm);
+	});
+});
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/astro.config.mjs b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/astro.config.mjs
new file mode 100644
index 000000000000..fa04f9c8b592
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/astro.config.mjs
@@ -0,0 +1,14 @@
+import { defineConfig } from 'astro/config';
+import vue from '@astrojs/vue';
+import ViteSvgLoader from 'vite-svg-loader'
+
+export default defineConfig({
+  integrations: [vue({
+		appEntrypoint: '/src/pages/_app'
+	})],
+	vite: {
+    plugins: [
+      ViteSvgLoader(),
+    ],
+	},
+})
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json
new file mode 100644
index 000000000000..29ab3c34264c
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@test/vue-app-entrypoint-no-export-default",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "astro": "astro"
+  },
+  "dependencies": {
+    "@astrojs/vue": "workspace:*",
+    "astro": "workspace:*",
+    "vite-svg-loader": "4.0.0"
+  }
+}
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Bar.vue b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Bar.vue
new file mode 100644
index 000000000000..9e690ea06adc
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Bar.vue
@@ -0,0 +1,3 @@
+<template>
+	<div id="bar">works</div>
+</template>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Circle.svg b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Circle.svg
new file mode 100644
index 000000000000..cf2bd92fc135
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Circle.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" fill="#ff0" r="40" stroke="#008000" stroke-width="4"/></svg>
\ No newline at end of file
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Foo.vue b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Foo.vue
new file mode 100644
index 000000000000..7f6808477f18
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/components/Foo.vue
@@ -0,0 +1,11 @@
+<script setup>
+import Bar from './Bar.vue'
+import Circle from './Circle.svg?component'
+</script>
+
+<template>
+	<div id="foo">
+		<Bar />
+		<Circle/>
+	</div>
+</template>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts
new file mode 100644
index 000000000000..808620814b9b
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts
@@ -0,0 +1,3 @@
+console.log(123);
+
+// no default export
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/index.astro b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/index.astro
new file mode 100644
index 000000000000..3240cbe0fd73
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+import Foo from '../components/Foo.vue';
+---
+
+<html>
+	<head>
+		<title>Vue App Entrypoint</title>
+	</head>
+	<body>
+		<Foo client:load />
+	</body>
+</html>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/astro.config.mjs b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/astro.config.mjs
new file mode 100644
index 000000000000..acafc8270a9d
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import vue from '@astrojs/vue';
+
+export default defineConfig({
+  integrations: [vue({
+		appEntrypoint: './src/vue.ts'
+	})]
+})
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/package.json
new file mode 100644
index 000000000000..80483c7c6ce8
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@test/vue-app-entrypoint-relative",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "astro": "astro"
+  },
+  "dependencies": {
+    "@astrojs/vue": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Bar.vue b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Bar.vue
new file mode 100644
index 000000000000..9e690ea06adc
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Bar.vue
@@ -0,0 +1,3 @@
+<template>
+	<div id="bar">works</div>
+</template>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Circle.svg b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Circle.svg
new file mode 100644
index 000000000000..cf2bd92fc135
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Circle.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" fill="#ff0" r="40" stroke="#008000" stroke-width="4"/></svg>
\ No newline at end of file
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Foo.vue b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Foo.vue
new file mode 100644
index 000000000000..7f6808477f18
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/components/Foo.vue
@@ -0,0 +1,11 @@
+<script setup>
+import Bar from './Bar.vue'
+import Circle from './Circle.svg?component'
+</script>
+
+<template>
+	<div id="foo">
+		<Bar />
+		<Circle/>
+	</div>
+</template>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/pages/index.astro b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/pages/index.astro
new file mode 100644
index 000000000000..3240cbe0fd73
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+import Foo from '../components/Foo.vue';
+---
+
+<html>
+	<head>
+		<title>Vue App Entrypoint</title>
+	</head>
+	<body>
+		<Foo client:load />
+	</body>
+</html>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/vue.ts b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/vue.ts
new file mode 100644
index 000000000000..ead516c976e9
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-relative/src/vue.ts
@@ -0,0 +1 @@
+export default () => {}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2e9dce56f88b..be1d4f9153ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4839,6 +4839,27 @@ importers:
         specifier: 5.0.1
         version: 5.0.1
 
+  packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default:
+    dependencies:
+      '@astrojs/vue':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+      vite-svg-loader:
+        specifier: 4.0.0
+        version: 4.0.0
+
+  packages/integrations/vue/test/fixtures/app-entrypoint-relative:
+    dependencies:
+      '@astrojs/vue':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/vue/test/fixtures/basics:
     dependencies:
       '@astrojs/vue':
@@ -15793,6 +15814,18 @@ packages:
       - supports-color
     dev: false
 
+  /vite-svg-loader@4.0.0:
+    resolution: {integrity: sha512-0MMf1yzzSYlV4MGePsLVAOqXsbF5IVxbn4EEzqRnWxTQl8BJg/cfwIzfQNmNQxZp5XXwd4kyRKF1LytuHZTnqA==}
+    peerDependencies:
+      vue: '*'
+    peerDependenciesMeta:
+      vue:
+        optional: true
+    dependencies:
+      '@vue/compiler-sfc': 3.3.8
+      svgo: 3.0.4
+    dev: false
+
   /vite-svg-loader@5.0.1:
     resolution: {integrity: sha512-EUfcuqk1NomuacwiuL3mvCfinkm4XN0AHN8BXG737eDlhC0jnp5jxdCxakV+juP/YhhjV5tq/c/bLcm3waWv4Q==}
     peerDependencies:

From e83b2feecaf576d99939bdbff22ebb22ee4ed8f7 Mon Sep 17 00:00:00 2001
From: Amumu <natemoo-re@users.noreply.github.com>
Date: Tue, 5 Dec 2023 20:08:47 +0000
Subject: [PATCH 44/59] [ci] format

---
 packages/integrations/vue/src/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/integrations/vue/src/index.ts b/packages/integrations/vue/src/index.ts
index c0fda26606c4..109ca58ef4fc 100644
--- a/packages/integrations/vue/src/index.ts
+++ b/packages/integrations/vue/src/index.ts
@@ -56,7 +56,9 @@ function virtualAppEntrypoint(options: ViteOptions) {
 					try {
 						let resolved;
 						if (options.appEntrypoint.startsWith('.')) {
-							resolved = await this.resolve(fileURLToPath(new URL(options.appEntrypoint, options.root)));
+							resolved = await this.resolve(
+								fileURLToPath(new URL(options.appEntrypoint, options.root))
+							);
 						} else {
 							resolved = await this.resolve(options.appEntrypoint, fileURLToPath(options.root));
 						}
@@ -73,12 +75,14 @@ function virtualAppEntrypoint(options: ViteOptions) {
 						}
 						return `export { default as setup } from "${resolved.id}";`;
 					} catch {
-						options.logger.warn(`Unable to resolve appEntrypoint \`${options.appEntrypoint}\`. Does the file exist?`);
+						options.logger.warn(
+							`Unable to resolve appEntrypoint \`${options.appEntrypoint}\`. Does the file exist?`
+						);
 					}
 				}
 				return noop;
 			}
-		}
+		},
 	} satisfies Rollup.Plugin;
 }
 

From 339be4dbff5a29e7bc33b28f0b37c3f2cefaeafa Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Tue, 5 Dec 2023 12:55:54 -0800
Subject: [PATCH 45/59] [ci] release (#9319)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/poor-otters-doubt.md          | 5 -----
 .changeset/smart-cameras-kneel.md        | 5 -----
 examples/framework-multiple/package.json | 2 +-
 examples/framework-vue/package.json      | 2 +-
 packages/integrations/vue/CHANGELOG.md   | 6 ++++++
 packages/integrations/vue/package.json   | 2 +-
 packages/upgrade/CHANGELOG.md            | 6 ++++++
 packages/upgrade/package.json            | 2 +-
 pnpm-lock.yaml                           | 4 ++--
 9 files changed, 18 insertions(+), 16 deletions(-)
 delete mode 100644 .changeset/poor-otters-doubt.md
 delete mode 100644 .changeset/smart-cameras-kneel.md

diff --git a/.changeset/poor-otters-doubt.md b/.changeset/poor-otters-doubt.md
deleted file mode 100644
index 55be4b145386..000000000000
--- a/.changeset/poor-otters-doubt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/upgrade': patch
----
-
-Improves dependency handling by ignoring packages that don't use a semver version
diff --git a/.changeset/smart-cameras-kneel.md b/.changeset/smart-cameras-kneel.md
deleted file mode 100644
index d5cb0264fbe8..000000000000
--- a/.changeset/smart-cameras-kneel.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vue': patch
----
-
-Prevents Astro from crashing when no default function is exported from the `appEntrypoint`. Now, the entrypoint will be ignored with a warning instead.
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index f70d030e5cd5..cc2d1fc1e4ac 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -15,7 +15,7 @@
     "@astrojs/react": "^3.0.7",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0",
-    "@astrojs/vue": "^4.0.0",
+    "@astrojs/vue": "^4.0.1",
     "astro": "^4.0.1",
     "preact": "^10.19.2",
     "react": "^18.2.0",
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index c84f18a4ab11..81a02293828e 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.0.0",
+    "@astrojs/vue": "^4.0.1",
     "astro": "^4.0.1",
     "vue": "^3.3.8"
   }
diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md
index dcb0c91e8d3c..1cc63f36e626 100644
--- a/packages/integrations/vue/CHANGELOG.md
+++ b/packages/integrations/vue/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/vue
 
+## 4.0.1
+
+### Patch Changes
+
+- [#8794](https://github.com/withastro/astro/pull/8794) [`4d4e34d45`](https://github.com/withastro/astro/commit/4d4e34d451e351f8a52e04124027850a575ba752) Thanks [@yoyo837](https://github.com/yoyo837)! - Prevents Astro from crashing when no default function is exported from the `appEntrypoint`. Now, the entrypoint will be ignored with a warning instead.
+
 ## 4.0.0
 
 ### Patch Changes
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 463b98958bbf..79dd727ad201 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/vue",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Use Vue components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/packages/upgrade/CHANGELOG.md b/packages/upgrade/CHANGELOG.md
index 8ea9a0f3962b..e39000145f31 100644
--- a/packages/upgrade/CHANGELOG.md
+++ b/packages/upgrade/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/upgrade
 
+## 0.2.1
+
+### Patch Changes
+
+- [#9317](https://github.com/withastro/astro/pull/9317) [`d1c91add0`](https://github.com/withastro/astro/commit/d1c91add074c2e08056f01df5a6043c9716b7e1f) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Improves dependency handling by ignoring packages that don't use a semver version
+
 ## 0.2.0
 
 ### Minor Changes
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 1f5eb5f86d67..fb765e47b37f 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/upgrade",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be1d4f9153ca..85cfe724fdec 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -194,7 +194,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       '@astrojs/vue':
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/integrations/vue
       astro:
         specifier: ^4.0.1
@@ -281,7 +281,7 @@ importers:
   examples/framework-vue:
     dependencies:
       '@astrojs/vue':
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/integrations/vue
       astro:
         specifier: ^4.0.1

From cfb20550d346a33e76e23453d5dcd084e5065c4d Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Tue, 5 Dec 2023 17:41:12 -0600
Subject: [PATCH 46/59] Update `vitefu` version (#9331)

---
 .changeset/beige-gorillas-camp.md | 5 +++++
 packages/astro/package.json       | 2 +-
 pnpm-lock.yaml                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/beige-gorillas-camp.md

diff --git a/.changeset/beige-gorillas-camp.md b/.changeset/beige-gorillas-camp.md
new file mode 100644
index 000000000000..4edafccb44ea
--- /dev/null
+++ b/.changeset/beige-gorillas-camp.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Updates an internal dependency ([`vitefu`](https://github.com/svitejs/vitefu)) to avoid a common `peerDependency` warning
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 2557fe50b3b7..a5bff393aa36 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -169,7 +169,7 @@
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
     "vite": "^5.0.0",
-    "vitefu": "^0.2.4",
+    "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 85cfe724fdec..5b63728e06c6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -644,7 +644,7 @@ importers:
         specifier: ^5.0.0
         version: 5.0.0(@types/node@18.18.6)(sass@1.69.5)
       vitefu:
-        specifier: ^0.2.4
+        specifier: ^0.2.5
         version: 0.2.5(vite@5.0.0)
       which-pm:
         specifier: ^2.1.1

From b832cd190199d4269d25d5d6e6b7efb399a69070 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Tue, 5 Dec 2023 18:38:29 -0600
Subject: [PATCH 47/59] Vue: Remove `hasDefaultExport` check from
 `appEntrypoint` logic (#9333)

---
 .changeset/selfish-lamps-build.md             |  5 ++
 packages/integrations/vue/src/index.ts        | 27 ++++++--
 .../vue/test/app-entrypoint.test.js           | 64 +++++++++++++++++++
 .../src/pages/_app.ts                         |  2 +-
 .../astro.config.mjs                          |  8 +++
 .../app-entrypoint-src-absolute/package.json  | 12 ++++
 .../src/components/Bar.vue                    |  3 +
 .../src/components/Circle.svg                 |  1 +
 .../src/components/Foo.vue                    | 11 ++++
 .../src/pages/index.astro                     | 12 ++++
 .../app-entrypoint-src-absolute/src/vue.ts    |  1 +
 pnpm-lock.yaml                                |  9 +++
 12 files changed, 149 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/selfish-lamps-build.md
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/astro.config.mjs
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/package.json
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Bar.vue
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Circle.svg
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Foo.vue
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/pages/index.astro
 create mode 100644 packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/vue.ts

diff --git a/.changeset/selfish-lamps-build.md b/.changeset/selfish-lamps-build.md
new file mode 100644
index 000000000000..155c326270f5
--- /dev/null
+++ b/.changeset/selfish-lamps-build.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vue': patch
+---
+
+Fixes issue with `appEntrypoint` when running `astro dev`
diff --git a/packages/integrations/vue/src/index.ts b/packages/integrations/vue/src/index.ts
index 109ca58ef4fc..636dfba6a7d8 100644
--- a/packages/integrations/vue/src/index.ts
+++ b/packages/integrations/vue/src/index.ts
@@ -1,7 +1,7 @@
 import type { Options as VueOptions } from '@vitejs/plugin-vue';
 import type { Options as VueJsxOptions } from '@vitejs/plugin-vue-jsx';
 import type { AstroIntegration, AstroIntegrationLogger, AstroRenderer } from 'astro';
-import type { UserConfig, Rollup } from 'vite';
+import type { UserConfig, Plugin } from 'vite';
 
 import { fileURLToPath } from 'node:url';
 import vue from '@vitejs/plugin-vue';
@@ -42,15 +42,32 @@ function getJsxRenderer(): AstroRenderer {
 function virtualAppEntrypoint(options: ViteOptions) {
 	const virtualModuleId = 'virtual:@astrojs/vue/app';
 	const resolvedVirtualModuleId = '\0' + virtualModuleId;
+	let getExports: (id: string) => Promise<string[]>;
 	return {
 		name: '@astrojs/vue/virtual-app',
+		buildStart() {
+			if (!getExports) {
+				getExports = async (id: string) => {
+					const info = await this.load.call(this, { id });
+					return info.exports ?? [];
+				}
+			}
+		},
+		configureServer(server) {
+			if (!getExports) {
+				getExports = async (id: string) => {
+					const mod = await server.ssrLoadModule(id);
+					return Object.keys(mod) ?? [];
+				}
+			}
+		},
 		resolveId(id: string) {
 			if (id == virtualModuleId) {
 				return resolvedVirtualModuleId;
 			}
 		},
 		async load(id: string) {
-			const noop = `export const setup = () => {}`;
+			const noop = `export const setup = (app) => app;`;
 			if (id === resolvedVirtualModuleId) {
 				if (options.appEntrypoint) {
 					try {
@@ -66,8 +83,8 @@ function virtualAppEntrypoint(options: ViteOptions) {
 							// This error is handled below, the message isn't shown to the user
 							throw new Error('Unable to resolve appEntrypoint');
 						}
-						const loaded = await this.load(resolved);
-						if (!loaded.hasDefaultExport) {
+						const exports = await getExports(resolved.id);
+						if (!exports.includes('default')) {
 							options.logger.warn(
 								`appEntrypoint \`${options.appEntrypoint}\` does not export a default function. Check out https://docs.astro.build/en/guides/integrations-guide/vue/#appentrypoint.`
 							);
@@ -83,7 +100,7 @@ function virtualAppEntrypoint(options: ViteOptions) {
 				return noop;
 			}
 		},
-	} satisfies Rollup.Plugin;
+	} satisfies Plugin;
 }
 
 async function getViteConfiguration(options: ViteOptions): Promise<UserConfig> {
diff --git a/packages/integrations/vue/test/app-entrypoint.test.js b/packages/integrations/vue/test/app-entrypoint.test.js
index 308f10149fc1..7a40613544bd 100644
--- a/packages/integrations/vue/test/app-entrypoint.test.js
+++ b/packages/integrations/vue/test/app-entrypoint.test.js
@@ -52,6 +52,39 @@ describe('App Entrypoint', () => {
 	});
 });
 
+describe('App Entrypoint no export default (dev)', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+	let devServer;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/app-entrypoint-no-export-default/',
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	after(async () => {
+		await devServer.stop();
+	});
+
+	it('loads during SSR', async () => {
+		const html = await fixture.fetch('/').then(res => res.text());
+		const { document } = parseHTML(html);
+		const bar = document.querySelector('#foo > #bar');
+		expect(bar).not.to.be.undefined;
+		expect(bar.textContent).to.eq('works');
+	});
+
+	it('loads svg components without transforming them to assets', async () => {
+		const html = await fixture.fetch('/').then(res => res.text());
+		const { document } = parseHTML(html);
+		const client = document.querySelector('astro-island svg');
+
+		expect(client).not.to.be.undefined;
+	});
+});
+
 describe('App Entrypoint no export default', () => {
 	/** @type {import('./test-utils').Fixture} */
 	let fixture;
@@ -121,3 +154,34 @@ describe('App Entrypoint relative', () => {
 		expect(js).not.to.match(/\w+\.component\(\"Bar\"/gm);
 	});
 });
+
+describe('App Entrypoint /src/absolute', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/app-entrypoint-src-absolute/',
+		});
+		await fixture.build();
+	});
+
+	it('loads during SSR', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const bar = document.querySelector('#foo > #bar');
+		expect(bar).not.to.be.undefined;
+		expect(bar.textContent).to.eq('works');
+	});
+
+	it('component not included in renderer bundle', async () => {
+		const data = await fixture.readFile('/index.html');
+		const { document } = parseHTML(data);
+		const island = document.querySelector('astro-island');
+		const client = island.getAttribute('renderer-url');
+		expect(client).not.to.be.undefined;
+
+		const js = await fixture.readFile(client);
+		expect(js).not.to.match(/\w+\.component\(\"Bar\"/gm);
+	});
+});
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts
index 808620814b9b..2fc8bde52d68 100644
--- a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/src/pages/_app.ts
@@ -1,3 +1,3 @@
-console.log(123);
+export const setup = () => {}
 
 // no default export
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/astro.config.mjs b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/astro.config.mjs
new file mode 100644
index 000000000000..6eae67892051
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import vue from '@astrojs/vue';
+
+export default defineConfig({
+  integrations: [vue({
+		appEntrypoint: '/src/vue.ts'
+	})]
+})
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/package.json
new file mode 100644
index 000000000000..244f9120c825
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@test/vue-app-entrypoint-src-absolute",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "astro": "astro"
+  },
+  "dependencies": {
+    "@astrojs/vue": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Bar.vue b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Bar.vue
new file mode 100644
index 000000000000..9e690ea06adc
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Bar.vue
@@ -0,0 +1,3 @@
+<template>
+	<div id="bar">works</div>
+</template>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Circle.svg b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Circle.svg
new file mode 100644
index 000000000000..cf2bd92fc135
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Circle.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" fill="#ff0" r="40" stroke="#008000" stroke-width="4"/></svg>
\ No newline at end of file
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Foo.vue b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Foo.vue
new file mode 100644
index 000000000000..7f6808477f18
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/components/Foo.vue
@@ -0,0 +1,11 @@
+<script setup>
+import Bar from './Bar.vue'
+import Circle from './Circle.svg?component'
+</script>
+
+<template>
+	<div id="foo">
+		<Bar />
+		<Circle/>
+	</div>
+</template>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/pages/index.astro b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/pages/index.astro
new file mode 100644
index 000000000000..3240cbe0fd73
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/pages/index.astro
@@ -0,0 +1,12 @@
+---
+import Foo from '../components/Foo.vue';
+---
+
+<html>
+	<head>
+		<title>Vue App Entrypoint</title>
+	</head>
+	<body>
+		<Foo client:load />
+	</body>
+</html>
diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/vue.ts b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/vue.ts
new file mode 100644
index 000000000000..ead516c976e9
--- /dev/null
+++ b/packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute/src/vue.ts
@@ -0,0 +1 @@
+export default () => {}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5b63728e06c6..d8f8ff2ad6ea 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4860,6 +4860,15 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
 
+  packages/integrations/vue/test/fixtures/app-entrypoint-src-absolute:
+    dependencies:
+      '@astrojs/vue':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/vue/test/fixtures/basics:
     dependencies:
       '@astrojs/vue':

From dd24379f496dcc99aea3004d3d5236955d6705f9 Mon Sep 17 00:00:00 2001
From: Nate Moore <natemoo-re@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:39:39 +0000
Subject: [PATCH 48/59] [ci] format

---
 packages/integrations/vue/src/index.ts                | 4 ++--
 packages/integrations/vue/test/app-entrypoint.test.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/integrations/vue/src/index.ts b/packages/integrations/vue/src/index.ts
index 636dfba6a7d8..ef35055877d7 100644
--- a/packages/integrations/vue/src/index.ts
+++ b/packages/integrations/vue/src/index.ts
@@ -50,7 +50,7 @@ function virtualAppEntrypoint(options: ViteOptions) {
 				getExports = async (id: string) => {
 					const info = await this.load.call(this, { id });
 					return info.exports ?? [];
-				}
+				};
 			}
 		},
 		configureServer(server) {
@@ -58,7 +58,7 @@ function virtualAppEntrypoint(options: ViteOptions) {
 				getExports = async (id: string) => {
 					const mod = await server.ssrLoadModule(id);
 					return Object.keys(mod) ?? [];
-				}
+				};
 			}
 		},
 		resolveId(id: string) {
diff --git a/packages/integrations/vue/test/app-entrypoint.test.js b/packages/integrations/vue/test/app-entrypoint.test.js
index 7a40613544bd..3a374be1c287 100644
--- a/packages/integrations/vue/test/app-entrypoint.test.js
+++ b/packages/integrations/vue/test/app-entrypoint.test.js
@@ -69,7 +69,7 @@ describe('App Entrypoint no export default (dev)', () => {
 	});
 
 	it('loads during SSR', async () => {
-		const html = await fixture.fetch('/').then(res => res.text());
+		const html = await fixture.fetch('/').then((res) => res.text());
 		const { document } = parseHTML(html);
 		const bar = document.querySelector('#foo > #bar');
 		expect(bar).not.to.be.undefined;
@@ -77,7 +77,7 @@ describe('App Entrypoint no export default (dev)', () => {
 	});
 
 	it('loads svg components without transforming them to assets', async () => {
-		const html = await fixture.fetch('/').then(res => res.text());
+		const html = await fixture.fetch('/').then((res) => res.text());
 		const { document } = parseHTML(html);
 		const client = document.querySelector('astro-island svg');
 

From 3878a91be4879988c7235f433e50a6dc82e32288 Mon Sep 17 00:00:00 2001
From: Ted Klingenberg <ted@doseofted.com>
Date: Tue, 5 Dec 2023 19:42:53 -0500
Subject: [PATCH 49/59] Prevent client-side navigation for method="dialog"
 (#9327)

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 .changeset/rich-keys-rescue.md                   |  5 +++++
 packages/astro/components/ViewTransitions.astro  |  7 +++++++
 .../view-transitions/src/pages/dialog.astro      | 16 ++++++++++++++++
 packages/astro/e2e/view-transitions.test.js      | 14 ++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 .changeset/rich-keys-rescue.md
 create mode 100644 packages/astro/e2e/fixtures/view-transitions/src/pages/dialog.astro

diff --git a/.changeset/rich-keys-rescue.md b/.changeset/rich-keys-rescue.md
new file mode 100644
index 000000000000..1107f35b17cc
--- /dev/null
+++ b/.changeset/rich-keys-rescue.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes an edge case for `<form method="dialog">` when using View Transitions. Forms with `method="dialog"` no longer require an additional `data-astro-reload` attribute.
diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro
index 6ce08cec9556..d9786ac6ac32 100644
--- a/packages/astro/components/ViewTransitions.astro
+++ b/packages/astro/components/ViewTransitions.astro
@@ -104,6 +104,12 @@ const { fallback = 'animate' } = Astro.props;
 			let action = submitter?.getAttribute('formaction') ?? form.action ?? location.pathname;
 			const method = submitter?.getAttribute('formmethod') ?? form.method;
 
+			// the "dialog" method is a special keyword used within <dialog> elements
+			// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-method
+			if (method === "dialog") {
+				return
+			}
+
 			const options: Options = { sourceElement: submitter ?? form };
 			if (method === 'get') {
 				const params = new URLSearchParams(formData as any);
@@ -113,6 +119,7 @@ const { fallback = 'animate' } = Astro.props;
 			} else {
 				options.formData = formData;
 			}
+			
 			ev.preventDefault();
 			navigate(action, options);
 		});
diff --git a/packages/astro/e2e/fixtures/view-transitions/src/pages/dialog.astro b/packages/astro/e2e/fixtures/view-transitions/src/pages/dialog.astro
new file mode 100644
index 000000000000..07d4b0f00b39
--- /dev/null
+++ b/packages/astro/e2e/fixtures/view-transitions/src/pages/dialog.astro
@@ -0,0 +1,16 @@
+---
+import { ViewTransitions } from "astro:transitions";
+---
+<html>
+	<head>
+    <ViewTransitions />
+	</head>
+	<body>
+    <button id="open" onclick="modal.showModal()">Open Modal</button>
+    <dialog id="modal">
+      <form method="dialog">
+        <button id="close">Close</button>
+      </form>
+    </dialog>
+	</body>
+</html>
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index bfc5d7d4a92d..27b7ea6d6a76 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -1074,4 +1074,18 @@ test.describe('View Transitions', () => {
 		await page.click('#three');
 		await expect(page).toHaveURL(expected);
 	});
+
+	test('Dialog using form with method of "dialog" should not trigger navigation', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/dialog'));
+
+		let requests = [];
+		page.on('request', request => requests.push(`${request.method()} ${request.url()}`));
+
+		await page.click('#open');
+		await expect(page.locator("dialog")).toHaveAttribute("open")
+		await page.click('#close');
+		await expect(page.locator("dialog")).not.toHaveAttribute("open")
+
+		expect(requests).toHaveLength(0)
+	});
 });

From 6404d26a22417587cac272bc473ee1c8eb8c69a3 Mon Sep 17 00:00:00 2001
From: Ted Klingenberg <natemoo-re@users.noreply.github.com>
Date: Wed, 6 Dec 2023 00:43:56 +0000
Subject: [PATCH 50/59] [ci] format

---
 packages/astro/components/ViewTransitions.astro |  6 +++---
 packages/astro/e2e/view-transitions.test.js     | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro
index d9786ac6ac32..310f1865a92c 100644
--- a/packages/astro/components/ViewTransitions.astro
+++ b/packages/astro/components/ViewTransitions.astro
@@ -106,8 +106,8 @@ const { fallback = 'animate' } = Astro.props;
 
 			// the "dialog" method is a special keyword used within <dialog> elements
 			// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-method
-			if (method === "dialog") {
-				return
+			if (method === 'dialog') {
+				return;
 			}
 
 			const options: Options = { sourceElement: submitter ?? form };
@@ -119,7 +119,7 @@ const { fallback = 'animate' } = Astro.props;
 			} else {
 				options.formData = formData;
 			}
-			
+
 			ev.preventDefault();
 			navigate(action, options);
 		});
diff --git a/packages/astro/e2e/view-transitions.test.js b/packages/astro/e2e/view-transitions.test.js
index 27b7ea6d6a76..222c9dfdf2aa 100644
--- a/packages/astro/e2e/view-transitions.test.js
+++ b/packages/astro/e2e/view-transitions.test.js
@@ -1075,17 +1075,20 @@ test.describe('View Transitions', () => {
 		await expect(page).toHaveURL(expected);
 	});
 
-	test('Dialog using form with method of "dialog" should not trigger navigation', async ({ page, astro }) => {
+	test('Dialog using form with method of "dialog" should not trigger navigation', async ({
+		page,
+		astro,
+	}) => {
 		await page.goto(astro.resolveUrl('/dialog'));
 
 		let requests = [];
-		page.on('request', request => requests.push(`${request.method()} ${request.url()}`));
+		page.on('request', (request) => requests.push(`${request.method()} ${request.url()}`));
 
 		await page.click('#open');
-		await expect(page.locator("dialog")).toHaveAttribute("open")
+		await expect(page.locator('dialog')).toHaveAttribute('open');
 		await page.click('#close');
-		await expect(page.locator("dialog")).not.toHaveAttribute("open")
+		await expect(page.locator('dialog')).not.toHaveAttribute('open');
 
-		expect(requests).toHaveLength(0)
+		expect(requests).toHaveLength(0);
 	});
 });

From 895ebcb5bfeb2fe08ae939eaceeb0405cff91ca5 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Tue, 5 Dec 2023 16:47:22 -0800
Subject: [PATCH 51/59] [ci] release (#9332)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/beige-gorillas-camp.md           |  5 --
 .changeset/rich-keys-rescue.md              |  5 --
 .changeset/selfish-lamps-build.md           |  5 --
 examples/basics/package.json                |  2 +-
 examples/blog/package.json                  |  2 +-
 examples/component/package.json             |  2 +-
 examples/framework-alpine/package.json      |  2 +-
 examples/framework-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  4 +-
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  2 +-
 examples/framework-svelte/package.json      |  2 +-
 examples/framework-vue/package.json         |  4 +-
 examples/hackernews/package.json            |  2 +-
 examples/integration/package.json           |  2 +-
 examples/middleware/package.json            |  2 +-
 examples/minimal/package.json               |  2 +-
 examples/non-html-pages/package.json        |  2 +-
 examples/portfolio/package.json             |  2 +-
 examples/ssr/package.json                   |  2 +-
 examples/view-transitions/package.json      |  2 +-
 examples/with-markdoc/package.json          |  2 +-
 examples/with-markdown-plugins/package.json |  2 +-
 examples/with-markdown-shiki/package.json   |  2 +-
 examples/with-mdx/package.json              |  2 +-
 examples/with-nanostores/package.json       |  2 +-
 examples/with-tailwindcss/package.json      |  2 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro/CHANGELOG.md                 |  8 +++
 packages/astro/package.json                 |  2 +-
 packages/integrations/vue/CHANGELOG.md      |  6 +++
 packages/integrations/vue/package.json      |  2 +-
 pnpm-lock.yaml                              | 56 ++++++++++-----------
 34 files changed, 72 insertions(+), 73 deletions(-)
 delete mode 100644 .changeset/beige-gorillas-camp.md
 delete mode 100644 .changeset/rich-keys-rescue.md
 delete mode 100644 .changeset/selfish-lamps-build.md

diff --git a/.changeset/beige-gorillas-camp.md b/.changeset/beige-gorillas-camp.md
deleted file mode 100644
index 4edafccb44ea..000000000000
--- a/.changeset/beige-gorillas-camp.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Updates an internal dependency ([`vitefu`](https://github.com/svitejs/vitefu)) to avoid a common `peerDependency` warning
diff --git a/.changeset/rich-keys-rescue.md b/.changeset/rich-keys-rescue.md
deleted file mode 100644
index 1107f35b17cc..000000000000
--- a/.changeset/rich-keys-rescue.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an edge case for `<form method="dialog">` when using View Transitions. Forms with `method="dialog"` no longer require an additional `data-astro-reload` attribute.
diff --git a/.changeset/selfish-lamps-build.md b/.changeset/selfish-lamps-build.md
deleted file mode 100644
index 155c326270f5..000000000000
--- a/.changeset/selfish-lamps-build.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vue': patch
----
-
-Fixes issue with `appEntrypoint` when running `astro dev`
diff --git a/examples/basics/package.json b/examples/basics/package.json
index e4ed24314fe7..462235462498 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 8e4c5ac223bf..3ece054ce403 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/rss": "^4.0.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 0d916d3b713c..9cac9645df69 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 28debb4f53fd..f9fc290954ba 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 3a4fec7fc22d..72a5bd0c45aa 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index cc2d1fc1e4ac..d83833e59bec 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -15,8 +15,8 @@
     "@astrojs/react": "^3.0.7",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0",
-    "@astrojs/vue": "^4.0.1",
-    "astro": "^4.0.1",
+    "@astrojs/vue": "^4.0.2",
+    "astro": "^4.0.2",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 56adb34e6ca3..08c3d7d875e1 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 1e0eeed2893c..6256dcb6b779 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index e9872b4efaa2..34d8bc50f6ba 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index e7e370518810..a9406838c3cf 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 81a02293828e..f7a42cd42bf5 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.0.1",
-    "astro": "^4.0.1",
+    "@astrojs/vue": "^4.0.2",
+    "astro": "^4.0.2",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 0a354dacf866..ca4ab4ef6030 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 3fe356bea0c8..3708dfac7306 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 432bb09544b1..9f6393538781 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 62f864b52ace..7f37079799a5 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 6695eda42e63..e7c51ad9cdbf 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index ad232172e8f4..c8b9e51946f3 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 7665692b15ac..f7af576ce892 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0",
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 81e1799d1d17..4e2839596e52 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.3",
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 6ffcb62c947c..58f640c801e6 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.0",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 99273393dc55..1dbbd8eda8bc 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index cba6affce62a..b7c646508f27 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 64444a5f4028..67b1428e4e12 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 9938024775d3..586b36bd8b6a 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index b549791fcb86..f76fccaacb19 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/tailwind": "^5.0.3",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index c2532051195e..838d13d2e65a 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 3925e15e40ab..5076fc126336 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,13 @@
 # astro
 
+## 4.0.2
+
+### Patch Changes
+
+- [#9331](https://github.com/withastro/astro/pull/9331) [`cfb20550d`](https://github.com/withastro/astro/commit/cfb20550d346a33e76e23453d5dcd084e5065c4d) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Updates an internal dependency ([`vitefu`](https://github.com/svitejs/vitefu)) to avoid a common `peerDependency` warning
+
+- [#9327](https://github.com/withastro/astro/pull/9327) [`3878a91be`](https://github.com/withastro/astro/commit/3878a91be4879988c7235f433e50a6dc82e32288) Thanks [@doseofted](https://github.com/doseofted)! - Fixes an edge case for `<form method="dialog">` when using View Transitions. Forms with `method="dialog"` no longer require an additional `data-astro-reload` attribute.
+
 ## 4.0.1
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index a5bff393aa36..bfa7c54fdf04 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/integrations/vue/CHANGELOG.md b/packages/integrations/vue/CHANGELOG.md
index 1cc63f36e626..16b28bec63fd 100644
--- a/packages/integrations/vue/CHANGELOG.md
+++ b/packages/integrations/vue/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/vue
 
+## 4.0.2
+
+### Patch Changes
+
+- [#9333](https://github.com/withastro/astro/pull/9333) [`b832cd190`](https://github.com/withastro/astro/commit/b832cd190199d4269d25d5d6e6b7efb399a69070) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fixes issue with `appEntrypoint` when running `astro dev`
+
 ## 4.0.1
 
 ### Patch Changes
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 79dd727ad201..9ed3417f64e8 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/vue",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Use Vue components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d8f8ff2ad6ea..1dfa0f263c7d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/blog:
@@ -140,13 +140,13 @@ importers:
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -194,10 +194,10 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       '@astrojs/vue':
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +272,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -281,10 +281,10 @@ importers:
   examples/framework-vue:
     dependencies:
       '@astrojs/vue':
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +296,13 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -359,7 +359,7 @@ importers:
         specifier: ^5.0.3
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^0.8.0
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^4.0.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -446,7 +446,7 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.1
+        specifier: ^4.0.2
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2

From 0bb3d532219fb90fc08bfb472fc981fab6543d16 Mon Sep 17 00:00:00 2001
From: Shinya Fujino <shf0811@gmail.com>
Date: Wed, 6 Dec 2023 19:44:07 +0900
Subject: [PATCH 52/59] Fix log message for `Disable notifications` (#9339)

* Fix log message for `Disable notifications`

* Add changeset
---
 .changeset/strange-parrots-promise.md                        | 5 +++++
 .../astro/src/runtime/client/dev-overlay/plugins/settings.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/strange-parrots-promise.md

diff --git a/.changeset/strange-parrots-promise.md b/.changeset/strange-parrots-promise.md
new file mode 100644
index 000000000000..584d911eea0b
--- /dev/null
+++ b/.changeset/strange-parrots-promise.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixed the log message to correctly display 'enabled' and 'disabled' when toggling 'Disable notifications' in the Toolbar.
diff --git a/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts b/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
index 672b7bbda36a..dc5fe4ae3637 100644
--- a/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
+++ b/packages/astro/src/runtime/client/dev-overlay/plugins/settings.ts
@@ -25,7 +25,7 @@ const settingsRows = [
 				}
 
 				settings.updateSetting('disablePluginNotification', evt.currentTarget.checked);
-				const action = evt.currentTarget.checked ? 'enabled' : 'disabled';
+				const action = evt.currentTarget.checked ? 'disabled' : 'enabled';
 				settings.log(`Plugin notification badges ${action}`);
 			}
 		},

From c76901065545f6a8d3de3e44d1c8ee5456a8a77a Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Wed, 6 Dec 2023 04:07:52 -0800
Subject: [PATCH 53/59] Fix issue where 404/500 status codes were logged as
 "[200]" (#9336)

---
 .changeset/modern-mice-shout.md               |  5 +++
 packages/astro/src/core/messages.ts           |  2 +-
 .../src/vite-plugin-astro-server/route.ts     | 33 +++++++++----------
 3 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 .changeset/modern-mice-shout.md

diff --git a/.changeset/modern-mice-shout.md b/.changeset/modern-mice-shout.md
new file mode 100644
index 000000000000..cc483b1937f6
--- /dev/null
+++ b/.changeset/modern-mice-shout.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+dev: fix issue where 404 and 500 responses were logged as 200
diff --git a/packages/astro/src/core/messages.ts b/packages/astro/src/core/messages.ts
index ebac2c51d611..b105e985cb05 100644
--- a/packages/astro/src/core/messages.ts
+++ b/packages/astro/src/core/messages.ts
@@ -37,7 +37,7 @@ export function req({
 	method?: string;
 	reqTime?: number;
 }): string {
-	const color = statusCode >= 400 ? red : statusCode >= 300 ? yellow : blue;
+	const color = statusCode >= 500 ? red : statusCode >= 300 ? yellow : blue;
 	return (
 		color(`[${statusCode}]`) +
 		` ` +
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index 92a7a8247a35..3196b951a796 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -332,7 +332,7 @@ export async function handleRoute({
 			req({
 				url: pathname,
 				method: incomingRequest.method,
-				statusCode: response.status,
+				statusCode: status ?? response.status,
 				reqTime: timeEnd - timeStart,
 			})
 		);
@@ -356,24 +356,23 @@ export async function handleRoute({
 	}
 	if (route.type === 'endpoint') {
 		await writeWebResponse(incomingResponse, response);
-	} else {
-		if (
-			// We are in a recursion, and it's possible that this function is called itself with a status code
-			// By default, the status code passed via parameters is computed by the matched route.
-			//
-			// By default, we should give priority to the status code passed, although it's possible that
-			// the `Response` emitted by the user is a redirect. If so, then return the returned response.
-			response.status < 400 &&
-			response.status >= 300
-		) {
-			await writeSSRResult(request, response, incomingResponse);
-			return;
-		} else if (status && response.status !== status && (status === 404 || status === 500)) {
-			// Response.status is read-only, so a clone is required to override
-			response = new Response(response.body, { ...response, status });
-		}
+		return;
+	}
+	// We are in a recursion, and it's possible that this function is called itself with a status code
+	// By default, the status code passed via parameters is computed by the matched route.
+	//
+	// By default, we should give priority to the status code passed, although it's possible that
+	// the `Response` emitted by the user is a redirect. If so, then return the returned response.
+	if (response.status < 400 && response.status >= 300) {
 		await writeSSRResult(request, response, incomingResponse);
+		return;
+	}
+	// Apply the `status` override to the response object before responding.
+	// Response.status is read-only, so a clone is required to override.
+	if (status && response.status !== status && (status === 404 || status === 500)) {
+		response = new Response(response.body, { ...response, status });
 	}
+	await writeSSRResult(request, response, incomingResponse);
 }
 
 interface GetScriptsAndStylesParams {

From eb942942d67508c07d7efaa859a7840f7c0223da Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Wed, 6 Dec 2023 13:09:30 +0100
Subject: [PATCH 54/59] fix: add types for `is:inline` on slots (#9342)

---
 .changeset/cold-toys-greet.md      | 5 +++++
 packages/astro/astro-jsx.d.ts      | 3 ++-
 packages/astro/src/@types/astro.ts | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/cold-toys-greet.md

diff --git a/.changeset/cold-toys-greet.md b/.changeset/cold-toys-greet.md
new file mode 100644
index 000000000000..7923c5567aea
--- /dev/null
+++ b/.changeset/cold-toys-greet.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix missing `is:inline` type for the `<slot />` element
diff --git a/packages/astro/astro-jsx.d.ts b/packages/astro/astro-jsx.d.ts
index 3e8a86889282..3f73bcc613ee 100644
--- a/packages/astro/astro-jsx.d.ts
+++ b/packages/astro/astro-jsx.d.ts
@@ -36,6 +36,7 @@ declare namespace astroHTML.JSX {
 		AstroDefineVarsAttribute;
 	type AstroStyleAttributes = import('./dist/@types/astro.js').AstroStyleAttributes &
 		AstroDefineVarsAttribute;
+	type AstroSlotAttributes = import('./dist/@types/astro.js').AstroSlotAttributes;
 
 	// This is an unfortunate use of `any`, but unfortunately we can't make a type that works for every framework
 	// without importing every single framework's types (which comes with its own set of problems).
@@ -1415,7 +1416,7 @@ declare namespace astroHTML.JSX {
 		ruby: HTMLAttributes;
 		s: HTMLAttributes;
 		samp: HTMLAttributes;
-		slot: SlotHTMLAttributes;
+		slot: SlotHTMLAttributes & AstroSlotAttributes;
 		script: ScriptHTMLAttributes & AstroScriptAttributes;
 		section: HTMLAttributes;
 		select: SelectHTMLAttributes;
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index bbea8202523e..fa8c33920ac0 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -132,6 +132,10 @@ export interface AstroScriptAttributes {
 	'is:inline'?: boolean;
 }
 
+export interface AstroSlotAttributes {
+	'is:inline'?: boolean;
+}
+
 export interface AstroComponentMetadata {
 	displayName: string;
 	hydrate?: 'load' | 'idle' | 'visible' | 'media' | 'only';

From edfae50e6ea494f49c6d4fbf4bd4481870f994b1 Mon Sep 17 00:00:00 2001
From: Charles Villard <c.d.villard@gmail.com>
Date: Wed, 6 Dec 2023 07:13:15 -0500
Subject: [PATCH 55/59] [@astrojs/rss] Quality-of-Life Improvement to `items`
 property-related error (#9299)

* This commit addresses a quality-of-life concern when setting up a RSS feed
when using collections. Specifically, it provides more context to the error
message thrown when the object passed to the `items` property is missing any
of the three required keys or if one of those keys is mistyped.

* Add changeset

* Update .changeset with properly formatted update structure

@sarah11918 suggested a change to the verbiage that properly formatted the update detail in question. Accepting the suggestion.

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>

---------

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 .changeset/thirty-hairs-pump.md |  5 +++++
 packages/astro-rss/src/index.ts | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/thirty-hairs-pump.md

diff --git a/.changeset/thirty-hairs-pump.md b/.changeset/thirty-hairs-pump.md
new file mode 100644
index 000000000000..acb4d1da23ee
--- /dev/null
+++ b/.changeset/thirty-hairs-pump.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/rss': patch
+---
+
+Improves the `@astrojs/rss` error message thrown when the object passed to the `items` property is missing any of the three required keys or if one of those keys is mistyped.
diff --git a/packages/astro-rss/src/index.ts b/packages/astro-rss/src/index.ts
index 48c5defe855c..738e696f39b6 100644
--- a/packages/astro-rss/src/index.ts
+++ b/packages/astro-rss/src/index.ts
@@ -110,8 +110,21 @@ async function validateRssOptions(rssOptions: RSSOptions) {
 		[
 			`[RSS] Invalid or missing options:`,
 			...parsedResult.error.errors.map(
-				(zodError) => `${zodError.message} (${zodError.path.join('.')})`
-			),
+				(zodError) => {
+					const path = zodError.path.join('.');
+					const message = `${zodError.message} (${path})`;
+					const code = zodError.code;
+
+					if (path === 'items' && code === 'invalid_union') {
+						return [
+							message,
+						`The \`items\` property requires properly typed \`title\`, \`pubDate\`, and \`link\` keys.`,
+						`Check your collection's schema, and visit https://docs.astro.build/en/guides/rss/#generating-items for more info.`
+						].join('\n')
+					}
+
+					return message;
+				}),
 		].join('\n')
 	);
 	throw formattedError;

From 58d643bcd8e7ecbef5352d28054669a63b9cfa9e Mon Sep 17 00:00:00 2001
From: Charles Villard <ematipico@users.noreply.github.com>
Date: Wed, 6 Dec 2023 12:14:25 +0000
Subject: [PATCH 56/59] [ci] format

---
 packages/astro-rss/src/index.ts | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/astro-rss/src/index.ts b/packages/astro-rss/src/index.ts
index 738e696f39b6..c8cf19d6022e 100644
--- a/packages/astro-rss/src/index.ts
+++ b/packages/astro-rss/src/index.ts
@@ -109,22 +109,21 @@ async function validateRssOptions(rssOptions: RSSOptions) {
 	const formattedError = new Error(
 		[
 			`[RSS] Invalid or missing options:`,
-			...parsedResult.error.errors.map(
-				(zodError) => {
-					const path = zodError.path.join('.');
-					const message = `${zodError.message} (${path})`;
-					const code = zodError.code;
+			...parsedResult.error.errors.map((zodError) => {
+				const path = zodError.path.join('.');
+				const message = `${zodError.message} (${path})`;
+				const code = zodError.code;
 
-					if (path === 'items' && code === 'invalid_union') {
-						return [
-							message,
+				if (path === 'items' && code === 'invalid_union') {
+					return [
+						message,
 						`The \`items\` property requires properly typed \`title\`, \`pubDate\`, and \`link\` keys.`,
-						`Check your collection's schema, and visit https://docs.astro.build/en/guides/rss/#generating-items for more info.`
-						].join('\n')
-					}
+						`Check your collection's schema, and visit https://docs.astro.build/en/guides/rss/#generating-items for more info.`,
+					].join('\n');
+				}
 
-					return message;
-				}),
+				return message;
+			}),
 		].join('\n')
 	);
 	throw formattedError;

From ab0281aee419e58c6079ca393987fe1ff0541dd5 Mon Sep 17 00:00:00 2001
From: Martin Trapp <94928215+martrapp@users.noreply.github.com>
Date: Wed, 6 Dec 2023 16:20:08 +0100
Subject: [PATCH 57/59] Adds source file properties to HTML elements only if
 devToolbar is enabled (#9343)

---
 .changeset/famous-bobcats-vanish.md           | 5 +++++
 packages/astro/src/core/compile/compile.ts    | 8 +++++++-
 packages/astro/src/vite-plugin-astro/index.ts | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/famous-bobcats-vanish.md

diff --git a/.changeset/famous-bobcats-vanish.md b/.changeset/famous-bobcats-vanish.md
new file mode 100644
index 000000000000..873cea592eb8
--- /dev/null
+++ b/.changeset/famous-bobcats-vanish.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Adds source file properties to HTML elements only if devToolbar is enabled
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index c2f58fb9f859..97625f021a55 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -10,10 +10,12 @@ import { AggregateError, CompilerError } from '../errors/errors.js';
 import { AstroErrorData } from '../errors/index.js';
 import { resolvePath } from '../util.js';
 import { createStylePreprocessor } from './style.js';
+import type { AstroPreferences } from '../../preferences/index.js';
 
 export interface CompileProps {
 	astroConfig: AstroConfig;
 	viteConfig: ResolvedConfig;
+	preferences: AstroPreferences;
 	filename: string;
 	source: string;
 }
@@ -26,6 +28,7 @@ export interface CompileResult extends TransformResult {
 export async function compile({
 	astroConfig,
 	viteConfig,
+	preferences,
 	filename,
 	source,
 }: CompileProps): Promise<CompileResult> {
@@ -48,7 +51,10 @@ export async function compile({
 			resultScopedSlot: true,
 			transitionsAnimationURL: 'astro/components/viewtransitions.css',
 			annotateSourceFile:
-				viteConfig.command === 'serve' && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
+				viteConfig.command === 'serve' &&
+				astroConfig.devToolbar &&
+				astroConfig.devToolbar.enabled &&
+				(await preferences.get('devToolbar.enabled')),
 			preprocessStyle: createStylePreprocessor({
 				filename,
 				viteConfig,
diff --git a/packages/astro/src/vite-plugin-astro/index.ts b/packages/astro/src/vite-plugin-astro/index.ts
index 2aa6236ffe95..d02d78d6ae6a 100644
--- a/packages/astro/src/vite-plugin-astro/index.ts
+++ b/packages/astro/src/vite-plugin-astro/index.ts
@@ -139,6 +139,7 @@ export default function astro({ settings, logger }: AstroPluginOptions): vite.Pl
 			const compileProps: CompileProps = {
 				astroConfig: config,
 				viteConfig: resolvedConfig,
+				preferences: settings.preferences,
 				filename: normalizePath(parsedId.filename),
 				source,
 			};
@@ -179,6 +180,7 @@ export default function astro({ settings, logger }: AstroPluginOptions): vite.Pl
 				cachedCompilation({
 					astroConfig: config,
 					viteConfig: resolvedConfig,
+					preferences: settings.preferences,
 					filename,
 					source,
 				});

From 1685cc42b51603eb98b5ba3e072cf2d3953339f2 Mon Sep 17 00:00:00 2001
From: Matthew Phillips <matthew@skypack.dev>
Date: Wed, 6 Dec 2023 14:58:35 -0500
Subject: [PATCH 58/59] Define the Vercel adapter's peerDependency (#9348)

* Define the Vercel adapter's peerDependency

* Update .changeset/nasty-carrots-study.md

Co-authored-by: Alexander Niebuhr <alexander@nbhr.io>

---------

Co-authored-by: Alexander Niebuhr <alexander@nbhr.io>
---
 .changeset/nasty-carrots-study.md         | 5 +++++
 packages/integrations/vercel/package.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/nasty-carrots-study.md

diff --git a/.changeset/nasty-carrots-study.md b/.changeset/nasty-carrots-study.md
new file mode 100644
index 000000000000..13ee46022a59
--- /dev/null
+++ b/.changeset/nasty-carrots-study.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Uses the latest astro as the peerDependency
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 730020c04762..935baee36f4d 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -59,7 +59,7 @@
     "web-vitals": "^3.4.0"
   },
   "peerDependencies": {
-    "astro": "^4.0.0-beta.0"
+    "astro": "^4.0.2"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.6",

From 3e4109b08f7cf79492724f145c44e0c561d21954 Mon Sep 17 00:00:00 2001
From: "Houston (Bot)" <108291165+astrobot-houston@users.noreply.github.com>
Date: Wed, 6 Dec 2023 12:09:30 -0800
Subject: [PATCH 59/59] [ci] release (#9340)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/cold-toys-greet.md               |  5 --
 .changeset/famous-bobcats-vanish.md         |  5 --
 .changeset/modern-mice-shout.md             |  5 --
 .changeset/nasty-carrots-study.md           |  5 --
 .changeset/strange-parrots-promise.md       |  5 --
 .changeset/thirty-hairs-pump.md             |  5 --
 examples/basics/package.json                |  2 +-
 examples/blog/package.json                  |  4 +-
 examples/component/package.json             |  2 +-
 examples/framework-alpine/package.json      |  2 +-
 examples/framework-lit/package.json         |  2 +-
 examples/framework-multiple/package.json    |  2 +-
 examples/framework-preact/package.json      |  2 +-
 examples/framework-react/package.json       |  2 +-
 examples/framework-solid/package.json       |  2 +-
 examples/framework-svelte/package.json      |  2 +-
 examples/framework-vue/package.json         |  2 +-
 examples/hackernews/package.json            |  2 +-
 examples/integration/package.json           |  2 +-
 examples/middleware/package.json            |  2 +-
 examples/minimal/package.json               |  2 +-
 examples/non-html-pages/package.json        |  2 +-
 examples/portfolio/package.json             |  2 +-
 examples/ssr/package.json                   |  2 +-
 examples/view-transitions/package.json      |  2 +-
 examples/with-markdoc/package.json          |  2 +-
 examples/with-markdown-plugins/package.json |  2 +-
 examples/with-markdown-shiki/package.json   |  2 +-
 examples/with-mdx/package.json              |  2 +-
 examples/with-nanostores/package.json       |  2 +-
 examples/with-tailwindcss/package.json      |  2 +-
 examples/with-vitest/package.json           |  2 +-
 packages/astro-rss/CHANGELOG.md             |  6 +++
 packages/astro-rss/package.json             |  2 +-
 packages/astro/CHANGELOG.md                 | 12 +++++
 packages/astro/package.json                 |  2 +-
 packages/integrations/vercel/CHANGELOG.md   |  6 +++
 packages/integrations/vercel/package.json   |  2 +-
 pnpm-lock.yaml                              | 54 ++++++++++-----------
 39 files changed, 81 insertions(+), 87 deletions(-)
 delete mode 100644 .changeset/cold-toys-greet.md
 delete mode 100644 .changeset/famous-bobcats-vanish.md
 delete mode 100644 .changeset/modern-mice-shout.md
 delete mode 100644 .changeset/nasty-carrots-study.md
 delete mode 100644 .changeset/strange-parrots-promise.md
 delete mode 100644 .changeset/thirty-hairs-pump.md

diff --git a/.changeset/cold-toys-greet.md b/.changeset/cold-toys-greet.md
deleted file mode 100644
index 7923c5567aea..000000000000
--- a/.changeset/cold-toys-greet.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix missing `is:inline` type for the `<slot />` element
diff --git a/.changeset/famous-bobcats-vanish.md b/.changeset/famous-bobcats-vanish.md
deleted file mode 100644
index 873cea592eb8..000000000000
--- a/.changeset/famous-bobcats-vanish.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Adds source file properties to HTML elements only if devToolbar is enabled
diff --git a/.changeset/modern-mice-shout.md b/.changeset/modern-mice-shout.md
deleted file mode 100644
index cc483b1937f6..000000000000
--- a/.changeset/modern-mice-shout.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-dev: fix issue where 404 and 500 responses were logged as 200
diff --git a/.changeset/nasty-carrots-study.md b/.changeset/nasty-carrots-study.md
deleted file mode 100644
index 13ee46022a59..000000000000
--- a/.changeset/nasty-carrots-study.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vercel': patch
----
-
-Uses the latest astro as the peerDependency
diff --git a/.changeset/strange-parrots-promise.md b/.changeset/strange-parrots-promise.md
deleted file mode 100644
index 584d911eea0b..000000000000
--- a/.changeset/strange-parrots-promise.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixed the log message to correctly display 'enabled' and 'disabled' when toggling 'Disable notifications' in the Toolbar.
diff --git a/.changeset/thirty-hairs-pump.md b/.changeset/thirty-hairs-pump.md
deleted file mode 100644
index acb4d1da23ee..000000000000
--- a/.changeset/thirty-hairs-pump.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/rss': patch
----
-
-Improves the `@astrojs/rss` error message thrown when the object passed to the `items` property is missing any of the three required keys or if one of those keys is mistyped.
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 462235462498..d33671b1fb9f 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 3ece054ce403..0c42df70d5fb 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
-    "@astrojs/rss": "^4.0.0",
+    "@astrojs/rss": "^4.0.1",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 9cac9645df69..3a72bb72e0bb 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index f9fc290954ba..d37a79bc0e55 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 72a5bd0c45aa..96593eb37f47 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index d83833e59bec..498b56f78207 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0",
     "@astrojs/vue": "^4.0.2",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 08c3d7d875e1..5ed6833731ec 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 6256dcb6b779..1732ec7906c4 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 34d8bc50f6ba..709d10f81572 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index a9406838c3cf..c99ea913456f 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index f7a42cd42bf5..3a4480862d1b 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.2",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index ca4ab4ef6030..28a3310acbcf 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 3708dfac7306..a92a888b46e6 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   },
   "peerDependencies": {
     "astro": "^3.0.0"
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 9f6393538781..9af03a263845 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 7f37079799a5..4e4fb33d36ea 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index e7c51ad9cdbf..52b4c9fc71e2 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index c8b9e51946f3..01d5effb6220 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index f7af576ce892..5c6c5c20f62d 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0",
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 4e2839596e52..bb19a4f032a8 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.3",
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index 58f640c801e6..4d63d789ce6b 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.0",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 1dbbd8eda8bc..bd86abdde00d 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index b7c646508f27..56de8c8716ef 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 67b1428e4e12..b0e08746819f 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 586b36bd8b6a..66bd31e66dff 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index f76fccaacb19..c62ad3343514 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/tailwind": "^5.0.3",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 838d13d2e65a..54f7fdf99720 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
index 89179a9a7026..df205874890d 100644
--- a/packages/astro-rss/CHANGELOG.md
+++ b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 4.0.1
+
+### Patch Changes
+
+- [#9299](https://github.com/withastro/astro/pull/9299) [`edfae50e6`](https://github.com/withastro/astro/commit/edfae50e6ea494f49c6d4fbf4bd4481870f994b1) Thanks [@cdvillard](https://github.com/cdvillard)! - Improves the `@astrojs/rss` error message thrown when the object passed to the `items` property is missing any of the three required keys or if one of those keys is mistyped.
+
 ## 4.0.0
 
 ### Major Changes
diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
index 9c9adb849903..c262452daf0b 100644
--- a/packages/astro-rss/package.json
+++ b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 5076fc126336..da96a03cb6be 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,17 @@
 # astro
 
+## 4.0.3
+
+### Patch Changes
+
+- [#9342](https://github.com/withastro/astro/pull/9342) [`eb942942d`](https://github.com/withastro/astro/commit/eb942942d67508c07d7efaa859a7840f7c0223da) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix missing `is:inline` type for the `<slot />` element
+
+- [#9343](https://github.com/withastro/astro/pull/9343) [`ab0281aee`](https://github.com/withastro/astro/commit/ab0281aee419e58c6079ca393987fe1ff0541dd5) Thanks [@martrapp](https://github.com/martrapp)! - Adds source file properties to HTML elements only if devToolbar is enabled
+
+- [#9336](https://github.com/withastro/astro/pull/9336) [`c76901065`](https://github.com/withastro/astro/commit/c76901065545f6a8d3de3e44d1c8ee5456a8a77a) Thanks [@FredKSchott](https://github.com/FredKSchott)! - dev: fix issue where 404 and 500 responses were logged as 200
+
+- [#9339](https://github.com/withastro/astro/pull/9339) [`0bb3d5322`](https://github.com/withastro/astro/commit/0bb3d532219fb90fc08bfb472fc981fab6543d16) Thanks [@morinokami](https://github.com/morinokami)! - Fixed the log message to correctly display 'enabled' and 'disabled' when toggling 'Disable notifications' in the Toolbar.
+
 ## 4.0.2
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index bfa7c54fdf04..c7dd43ae3d1f 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index aaec3b144866..abb304360da0 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/vercel
 
+## 6.0.1
+
+### Patch Changes
+
+- [#9348](https://github.com/withastro/astro/pull/9348) [`1685cc42b`](https://github.com/withastro/astro/commit/1685cc42b51603eb98b5ba3e072cf2d3953339f2) Thanks [@matthewp](https://github.com/matthewp)! - Uses the latest astro as the peerDependency
+
 ## 6.0.0
 
 ### Major Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 935baee36f4d..db1b63a900e2 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/vercel",
   "description": "Deploy your site to Vercel",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1dfa0f263c7d..9b42c6504f62 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -125,7 +125,7 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/blog:
@@ -134,19 +134,19 @@ importers:
         specifier: ^2.0.0
         version: link:../../packages/integrations/mdx
       '@astrojs/rss':
-        specifier: ^4.0.0
+        specifier: ^4.0.1
         version: link:../../packages/astro-rss
       '@astrojs/sitemap':
         specifier: ^3.0.3
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +161,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +173,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +197,7 @@ importers:
         specifier: ^4.0.2
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +227,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.2)
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +245,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.15
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +260,7 @@ importers:
         specifier: ^3.0.2
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +272,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -284,7 +284,7 @@ importers:
         specifier: ^4.0.2
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +296,13 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +311,7 @@ importers:
         specifier: ^7.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -320,19 +320,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/ssr:
@@ -344,7 +344,7 @@ importers:
         specifier: ^5.0.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -359,7 +359,7 @@ importers:
         specifier: ^5.0.3
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -368,7 +368,7 @@ importers:
         specifier: ^0.8.0
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
@@ -377,7 +377,7 @@ importers:
         specifier: ^4.0.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -398,7 +398,7 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
 
   examples/with-mdx:
@@ -410,7 +410,7 @@ importers:
         specifier: ^3.0.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -425,7 +425,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.2)
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -446,7 +446,7 @@ importers:
         specifier: ^1.6.3
         version: 1.6.3
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -464,7 +464,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro
       vitest:
         specifier: ^0.34.2