From 0665caadb667e140f7b7c518c45cc18510ade880 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 15 Sep 2025 16:27:25 +0200
Subject: [PATCH 01/36] chore: changeset

---
 .changeset/spotty-toes-know.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/spotty-toes-know.md

diff --git a/.changeset/spotty-toes-know.md b/.changeset/spotty-toes-know.md
new file mode 100644
index 000000000000..c2e96e46a35f
--- /dev/null
+++ b/.changeset/spotty-toes-know.md
@@ -0,0 +1,5 @@
+---
+'astro': major
+---
+
+TODO:

From 845172faabb093a0dd01728181760a0729a9e8cd Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 15 Sep 2025 17:10:04 +0200
Subject: [PATCH 02/36] feat: enable prerelease mode (#14384)

---
 .changeset/config.json |  2 +-
 .changeset/pre.json    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/config.json b/.changeset/config.json
index be86265817aa..902828cfe8b7 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -4,7 +4,7 @@
   "commit": false,
   "linked": [],
   "access": "public",
-  "baseBranch": "origin/main",
+  "baseBranch": "origin/next",
   "updateInternalDependencies": "patch",
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 000000000000..f67a865e0787
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,31 @@
+{
+  "mode": "pre",
+  "tag": "next",
+  "initialVersions": {
+    "astro": "5.13.7",
+    "@astrojs/prism": "3.3.0",
+    "@astrojs/rss": "4.0.12",
+    "create-astro": "4.13.1",
+    "@astrojs/db": "0.17.2",
+    "@astrojs/alpinejs": "0.4.9",
+    "@astrojs/cloudflare": "12.6.8",
+    "@astrojs/markdoc": "0.15.6",
+    "@astrojs/mdx": "4.3.5",
+    "@astrojs/netlify": "6.5.10",
+    "@astrojs/node": "9.4.3",
+    "@astrojs/partytown": "2.1.4",
+    "@astrojs/preact": "4.1.1",
+    "@astrojs/react": "4.3.1",
+    "@astrojs/sitemap": "3.5.1",
+    "@astrojs/solid-js": "5.1.1",
+    "@astrojs/svelte": "7.1.1",
+    "@astrojs/vercel": "8.2.7",
+    "@astrojs/vue": "5.1.1",
+    "@astrojs/internal-helpers": "0.7.2",
+    "@astrojs/markdown-remark": "6.3.6",
+    "@astrojs/telemetry": "3.3.0",
+    "@astrojs/underscore-redirects": "1.0.0",
+    "@astrojs/upgrade": "0.6.2"
+  },
+  "changesets": []
+}

From 0758881b7798649386fd0c95a85f9bd30af26a1e Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Fri, 19 Sep 2025 14:41:06 +0200
Subject: [PATCH 03/36] Delete .changeset/spotty-toes-know.md

---
 .changeset/spotty-toes-know.md | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .changeset/spotty-toes-know.md

diff --git a/.changeset/spotty-toes-know.md b/.changeset/spotty-toes-know.md
deleted file mode 100644
index c2e96e46a35f..000000000000
--- a/.changeset/spotty-toes-know.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': major
----
-
-TODO:

From c69c7de1ffeff29f919d97c262f245927556f875 Mon Sep 17 00:00:00 2001
From: ellielok <ellielo2021@gmail.com>
Date: Fri, 19 Sep 2025 23:11:36 +1000
Subject: [PATCH 04/36] Remove deprecated ViewTransitions component (#14400)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/rich-horses-begin.md               | 26 +++++++++++++++++++
 packages/astro/client.d.ts                    |  4 ---
 .../transitions/vite-plugin-transitions.ts    |  5 +---
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/rich-horses-begin.md

diff --git a/.changeset/rich-horses-begin.md b/.changeset/rich-horses-begin.md
new file mode 100644
index 000000000000..580a90ef933a
--- /dev/null
+++ b/.changeset/rich-horses-begin.md
@@ -0,0 +1,26 @@
+---
+'astro': major
+---
+
+Removes the deprecated `<ViewTransitions />` component
+
+In Astro 5.0, the `<ViewTransitions />` component was renamed to `<ClientRouter />` to clarify the role of the component. The new name makes it more clear that the features you get from Astro's `<ClientRouter />` routing component are slightly different from the native CSS-based MPA router. However, a deprecated version of the `<ViewTransitions />` component still existed and may have functioned in Astro 5.x.
+	
+Astro 6.0 removes the `<ViewTransitions />` component entirely and it can no longer be used in your project. Update to the `<ClientRouter />` component to continue to use these features.
+
+#### What should I do?
+
+Replace all occurrences of the `ViewTransitions` import and component with `ClientRouter`:
+
+```diff
+// src/layouts/MyLayout.astro"
+- import { ViewTransitions } from 'astro:transitions';
++ import { ClientRouter } from 'astro:transitions';
+<html>
+  <head>
+    ...
+-    <ViewTransitions />
++    <ClientRouter />
+  </head>
+</html>
+```
diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts
index 24a8585de51f..ca9078d6a675 100644
--- a/packages/astro/client.d.ts
+++ b/packages/astro/client.d.ts
@@ -122,10 +122,6 @@ declare module 'astro:transitions' {
 	export const createAnimationScope: TransitionModule['createAnimationScope'];
 
 	type ClientRouterModule = typeof import('./components/ClientRouter.astro');
-	/**
-	 * @deprecated The ViewTransitions component has been renamed to ClientRouter
-	 */
-	export const ViewTransitions: ClientRouterModule['default'];
 	export const ClientRouter: ClientRouterModule['default'];
 }
 
diff --git a/packages/astro/src/transitions/vite-plugin-transitions.ts b/packages/astro/src/transitions/vite-plugin-transitions.ts
index d72eb0dc9417..c2ec27e77ba4 100644
--- a/packages/astro/src/transitions/vite-plugin-transitions.ts
+++ b/packages/astro/src/transitions/vite-plugin-transitions.ts
@@ -30,10 +30,7 @@ export default function astroTransitions({ settings }: { settings: AstroSettings
 				return {
 					code: `
 						export * from "astro/virtual-modules/transitions.js";
-						export {
-							default as ViewTransitions,
-							default as ClientRouter
-						} from "astro/components/ClientRouter.astro";
+						export { default as ClientRouter } from "astro/components/ClientRouter.astro";
 					`,
 				};
 			}

From 2570c4bc26896f28e7e320f3da62ff9ba1b2d49d Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Tue, 23 Sep 2025 12:06:32 +0200
Subject: [PATCH 05/36] feat!: clean up internal symbols usage (#14420)

---
 packages/astro/src/core/middleware/index.ts       | 15 +++++----------
 packages/astro/src/core/render-context.ts         | 10 +---------
 .../deps/test-adapter/server.js                   | 12 +++++-------
 packages/astro/test/test-adapter.js               |  9 +++++++--
 .../integrations/cloudflare/src/utils/handler.ts  |  3 +--
 packages/integrations/netlify/src/index.ts        |  7 ++++---
 packages/integrations/netlify/src/ssr-function.ts |  9 +++++----
 7 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/packages/astro/src/core/middleware/index.ts b/packages/astro/src/core/middleware/index.ts
index 19a89828fe2d..904774e5552b 100644
--- a/packages/astro/src/core/middleware/index.ts
+++ b/packages/astro/src/core/middleware/index.ts
@@ -6,7 +6,7 @@ import {
 } from '../../i18n/utils.js';
 import type { MiddlewareHandler, Params, RewritePayload } from '../../types/public/common.js';
 import type { APIContext, AstroSharedContextCsp } from '../../types/public/context.js';
-import { ASTRO_VERSION, clientLocalsSymbol } from '../constants.js';
+import { ASTRO_VERSION } from '../constants.js';
 import { AstroCookies } from '../cookies/index.js';
 import { AstroError, AstroErrorData } from '../errors/index.js';
 import { getClientIpAddress } from '../routing/request.js';
@@ -43,7 +43,7 @@ export type CreateContext = {
 	/**
 	 * Initial value of the locals
 	 */
-	locals: App.Locals;
+	locals?: App.Locals;
 };
 
 /**
@@ -54,7 +54,7 @@ function createContext({
 	params = {},
 	userDefinedLocales = [],
 	defaultLocale = '',
-	locals,
+	locals = {},
 }: CreateContext): APIContext {
 	let preferredLocale: string | undefined = undefined;
 	let preferredLocaleList: string[] | undefined = undefined;
@@ -110,15 +110,10 @@ function createContext({
 			return clientIpAddress;
 		},
 		get locals() {
-			// TODO: deprecate this usage. This is used only by the edge middleware for now, so its usage should be basically none.
-			let _locals = locals ?? Reflect.get(request, clientLocalsSymbol);
-			if (locals === undefined) {
-				_locals = {};
-			}
-			if (typeof _locals !== 'object') {
+			if (typeof locals !== 'object') {
 				throw new AstroError(AstroErrorData.LocalsNotAnObject);
 			}
-			return _locals;
+			return locals;
 		},
 		set locals(_) {
 			throw new AstroError(AstroErrorData.LocalsReassigned);
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index b42c0fdbdf2b..3fc04db5803a 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -22,7 +22,6 @@ import type { RouteData, SSRResult } from '../types/public/internal.js';
 import type { SSRActions } from './app/types.js';
 import {
 	ASTRO_VERSION,
-	clientAddressSymbol,
 	REROUTE_DIRECTIVE_HEADER,
 	REWRITE_DIRECTIVE_HEADER_KEY,
 	REWRITE_DIRECTIVE_HEADER_VALUE,
@@ -751,7 +750,7 @@ export class RenderContext {
 	}
 
 	getClientAddress() {
-		const { pipeline, request, routeData, clientAddress } = this;
+		const { pipeline, routeData, clientAddress } = this;
 
 		if (routeData.prerender) {
 			throw new AstroError({
@@ -764,13 +763,6 @@ export class RenderContext {
 			return clientAddress;
 		}
 
-		// TODO: Legacy, should not need to get here.
-		// Some adapters set this symbol so we can't remove support yet.
-		// Adapters should be updated to provide it via RenderOptions instead.
-		if (clientAddressSymbol in request) {
-			return Reflect.get(request, clientAddressSymbol) as string;
-		}
-
 		if (pipeline.adapterName) {
 			throw new AstroError({
 				...AstroErrorData.ClientAddressNotAvailable,
diff --git a/packages/astro/test/fixtures/ssr-prerender-chunks/deps/test-adapter/server.js b/packages/astro/test/fixtures/ssr-prerender-chunks/deps/test-adapter/server.js
index 0515aaaa1657..0aba9ad5610f 100644
--- a/packages/astro/test/fixtures/ssr-prerender-chunks/deps/test-adapter/server.js
+++ b/packages/astro/test/fixtures/ssr-prerender-chunks/deps/test-adapter/server.js
@@ -26,12 +26,6 @@ import { App } from 'astro/app';
  			}
  		}
 
- 		Reflect.set(
- 			request,
- 			Symbol.for('astro.clientAddress'),
- 			request.headers.get('cf-connecting-ip')
- 		);
-
  		const locals = {
  			runtime: {
  				env: env,
@@ -44,7 +38,11 @@ import { App } from 'astro/app';
  			},
  		};
 
- 		const response = await app.render(request, { routeData, locals });
+ 		const response = await app.render(request, {
+			routeData,
+			locals,
+			clientAddress: request.headers.get('cf-connecting-ip'),
+		});
 
  		if (app.setCookieHeaders) {
  			for (const setCookieHeader of app.setCookieHeaders(response)) {
diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js
index c5f48d17646b..6189b3623971 100644
--- a/packages/astro/test/test-adapter.js
+++ b/packages/astro/test/test-adapter.js
@@ -81,12 +81,17 @@ export default function ({
 														return new Response(data);
 													}
 
+													return super.render(request, {
+														routeData,
+														locals,
+														addCookieHeader,
+														prerenderedErrorPageFetch,
 													${
 														provideAddress
-															? `request[Symbol.for('astro.clientAddress')] = clientAddress ?? '0.0.0.0';`
+															? `clientAddress: clientAddress ?? '0.0.0.0',`
 															: ''
 													}
-													return super.render(request, { routeData, locals, addCookieHeader, prerenderedErrorPageFetch });
+													});
 												}
 											}
 
diff --git a/packages/integrations/cloudflare/src/utils/handler.ts b/packages/integrations/cloudflare/src/utils/handler.ts
index 90e2d020745f..d1c40df542f2 100644
--- a/packages/integrations/cloudflare/src/utils/handler.ts
+++ b/packages/integrations/cloudflare/src/utils/handler.ts
@@ -64,8 +64,6 @@ export async function handle(
 		}
 	}
 
-	Reflect.set(request, Symbol.for('astro.clientAddress'), request.headers.get('cf-connecting-ip'));
-
 	const locals: Runtime = {
 		runtime: {
 			env: env,
@@ -92,6 +90,7 @@ export async function handle(
 			prerenderedErrorPageFetch: async (url) => {
 				return env.ASSETS.fetch(url.replace(/\.html$/, ''));
 			},
+			clientAddress: request.headers.get('cf-connecting-ip') ?? undefined,
 		},
 	);
 
diff --git a/packages/integrations/netlify/src/index.ts b/packages/integrations/netlify/src/index.ts
index 77d24f6edcfb..8105361055e7 100644
--- a/packages/integrations/netlify/src/index.ts
+++ b/packages/integrations/netlify/src/index.ts
@@ -698,10 +698,11 @@ export default function netlifyIntegration(
 				if (existingSessionModule) {
 					server.moduleGraph.invalidateModule(existingSessionModule);
 				}
+
+				const clientLocalsSymbol = Symbol.for('astro.locals');
+
 				server.middlewares.use((req, _res, next) => {
-					const locals = Symbol.for('astro.locals');
-					Reflect.set(req, locals, {
-						...Reflect.get(req, locals),
+					Reflect.set(req, clientLocalsSymbol, {
 						netlify: { context: getLocalDevNetlifyContext(req) },
 					});
 					next();
diff --git a/packages/integrations/netlify/src/ssr-function.ts b/packages/integrations/netlify/src/ssr-function.ts
index 5ea2e97f1142..bc7d712f5ad1 100644
--- a/packages/integrations/netlify/src/ssr-function.ts
+++ b/packages/integrations/netlify/src/ssr-function.ts
@@ -12,8 +12,6 @@ export interface Args {
 	middlewareSecret: string;
 }
 
-const clientAddressSymbol = Symbol.for('astro.clientAddress');
-
 export const createExports = (manifest: SSRManifest, { middlewareSecret }: Args) => {
 	const app = new App(manifest);
 
@@ -30,7 +28,6 @@ export const createExports = (manifest: SSRManifest, { middlewareSecret }: Args)
 				});
 			}
 
-			Reflect.set(request, clientAddressSymbol, context.ip);
 			let locals: Record<string, unknown> = {};
 
 			const astroLocalsHeader = request.headers.get('x-astro-locals');
@@ -46,7 +43,11 @@ export const createExports = (manifest: SSRManifest, { middlewareSecret }: Args)
 
 			locals.netlify = { context };
 
-			const response = await app.render(request, { routeData, locals });
+			const response = await app.render(request, {
+				routeData,
+				locals,
+				clientAddress: context.ip
+			});
 
 			if (app.setCookieHeaders) {
 				for (const setCookieHeader of app.setCookieHeaders(response)) {

From 3bda3ce4edcb1bd1349890c6ed8110f05954c791 Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Tue, 23 Sep 2025 15:33:34 +0100
Subject: [PATCH 06/36] fix: remove legacy content collections (#14407)

* wip

* wip: remove legacy content collection support

* Fix types

* Update tests in integrations

* Format

* Legacy type

* Fix default

* Update examples

* Better errors for collections without loaders

* Sooo many fixture updates

* Test fixes

* Formatting and tests

* Fix vitest test

* Update image data tests

* Update more tests

* More test fixes

* Test fixes

* Changeset

* Update errors
---
 .changeset/young-banks-camp.md                |  18 +
 benchmark/make-project/markdown-cc1.js        |  24 +-
 benchmark/make-project/markdown-cc2.js        |   2 +-
 benchmark/make-project/mdx-cc1.js             |  24 +-
 benchmark/make-project/mdx-cc2.js             |   2 +-
 benchmark/make-project/memory-default.js      |  24 +-
 examples/with-markdoc/src/content.config.ts   |   5 +-
 examples/with-markdoc/src/pages/index.astro   |   4 +-
 .../{content/config.ts => content.config.ts}  |   3 +-
 .../{content/config.ts => content.config.ts}  |   3 +-
 .../content-collections/src/content.config.ts |   9 +
 .../content-collections/src/content/config.ts |   6 -
 .../content-collections/src/pages/index.astro |   6 +-
 .../fixtures/md/src/ContentRenderer.astro     |   3 +-
 .../fixtures/mdoc/src/ContentRenderer.astro   |   3 +-
 .../fixtures/mdx/src/ContentRenderer.astro    |   3 +-
 packages/astro/src/config/index.ts            |  13 +-
 .../src/config/vite-plugin-content-listen.ts  |  41 --
 packages/astro/src/content/config.ts          |  40 +-
 packages/astro/src/content/loaders/glob.ts    |  41 +-
 packages/astro/src/content/runtime.ts         | 333 +++----------
 .../astro/src/content/server-listeners.ts     | 125 +----
 packages/astro/src/content/types-generator.ts | 121 +----
 packages/astro/src/content/utils.ts           | 216 ++-------
 .../vite-plugin-content-virtual-mod.ts        | 170 +------
 .../astro/src/core/config/schemas/base.ts     |  10 +-
 packages/astro/src/core/errors/errors-data.ts |  61 ++-
 packages/astro/src/core/sync/index.ts         |  17 +-
 packages/astro/src/types/public/config.ts     |  43 +-
 .../astro/src/virtual-modules/live-config.ts  |   2 -
 packages/astro/templates/content/module.mjs   |  71 +--
 packages/astro/templates/content/types.d.ts   |  79 +--
 packages/astro/test/astro-sync.test.js        |  11 +-
 packages/astro/test/config-vite.test.js       |  12 +-
 .../content-collection-references.test.js     |   8 +-
 .../test/content-collections-render.test.js   |  23 +-
 .../astro/test/content-collections.test.js    |  89 +---
 packages/astro/test/core-image.test.js        |  15 +-
 .../astro/test/css-inline-stylesheets.test.js |   5 +-
 .../astro-assets-dir/src/content.config.ts    |   2 +
 .../astro-assets-prefix/src/content.config.ts |   2 +
 .../fixtures/astro-mode/src/content.config.ts |  50 ++
 .../src/content.config.ts                     |   4 +
 .../src/content.config.ts                     |   6 +-
 .../src/pages/welcome-data.json.js            |   3 +-
 .../src/pages/welcome.astro                   |   2 +-
 .../src/content.config.ts                     |   2 +
 .../src/pages/docs.astro                      |   6 +-
 .../src/content.config.ts                     |   3 +-
 .../src/content.config.ts                     |   4 +-
 .../{content/config.ts => content.config.ts}  |   2 +
 .../src/pages/index.astro                     |   4 +-
 .../src/content.config.ts                     |   3 +-
 .../src/content.config.ts                     |   2 +
 .../src/pages/docs.astro                      |   6 +-
 .../src/content/config.mjs                    |   2 +
 .../src/pages/index.astro                     |   4 +-
 .../package.json                              |   8 -
 .../src/content/blog/introduction.md          |   5 -
 .../src/content/config.mts                    |  11 -
 .../src/pages/index.astro                     |   5 -
 .../content-collections/src/content.config.ts |  29 +-
 .../src/content/without-config/columbia.md    |  15 -
 .../src/content/without-config/enterprise.md  |  14 -
 .../promo/_launch-week-styles.css             |   3 -
 .../without-config/promo/launch week.mdx      |  14 -
 .../src/pages/collections.json.js             |  14 +-
 .../src/pages/entries.json.js                 |  13 +-
 .../src/pages/with-scripts/[...slug].astro    |   6 +-
 .../fixtures/content-collections/src/utils.js |   8 -
 .../src/content.config.ts                     |   2 +-
 .../content-intellisense/src/utils.js         |   8 -
 .../{content/config.ts => content.config.ts}  |   4 +-
 .../pages/deprecated-getdataentrybyid.astro   |  18 +
 .../src/pages/deprecated-getentrybyslug.astro |  18 +
 .../src/pages/posts/[...slug].astro           |  11 +-
 .../src/content.config.ts                     |   2 +
 .../src/pages/posts/[...slug].astro           |   6 +-
 .../test/fixtures/content/astro.config.mjs    |   4 -
 .../src/content.config.ts}                    |   4 +-
 .../src/content/blog/with-layout-prop.md      |   9 -
 .../pages/launch-week-component-scripts.astro |   6 +-
 .../pages/launch-week-components-export.astro |   6 +-
 .../content/src/pages/launch-week.astro       |   7 +-
 .../content/src/pages/with-layout-prop.astro  |   9 -
 .../core-image-base/src/content.config.ts     |   2 +
 .../src/pages/blog/[...slug].astro            |   6 +-
 .../core-image-deletion/src/content.config.ts |   3 +-
 .../src/pages/blog/[slug].astro               |   6 +-
 .../core-image-errors/astro.config.mjs        |   4 -
 .../{content/config.ts => content.config.ts}  |   7 +-
 .../src/pages/blog/[...slug].astro            |   6 +-
 .../core-image-ssg/src/content.config.ts      |   2 +
 .../src/pages/blog/[...slug].astro            |   6 +-
 .../src/content.config.ts}                    |   4 +-
 .../src/pages/blog/[...slug].astro            |   6 +-
 .../test/fixtures/core-image/astro.config.mjs |   4 -
 .../{content/config.ts => content.config.ts}  |   5 +-
 .../core-image/src/content/blog/one.md        |   3 +-
 .../core-image/src/pages/blog/[...slug].astro |  10 +-
 .../css-inline-stylesheets-2/astro.config.mjs |   5 +-
 .../src/content.config.ts                     |  13 +
 .../src/content/en/endeavour.md               |   1 -
 .../src/pages}/endeavour.md                   |   1 +
 .../src/pages/index.astro                     |   9 +-
 .../css-inline-stylesheets-3/astro.config.mjs |   5 +-
 .../src/content/en/endeavour.md               |   3 +-
 .../src/pages/index.astro                     |   6 +-
 .../css-inline-stylesheets/astro.config.mjs   |   4 -
 .../src/content.config.ts                     |  13 +
 .../src/content/en/endeavour.md               |   1 -
 .../src/pages}/endeavour.md                   |   1 +
 .../src/pages/index.astro                     |   9 +-
 .../src/content.config.ts                     |  11 +-
 .../src/pages/translations/by-id.json.js      |   4 +-
 .../data-collections/src/content.config.ts    |  16 +-
 .../src/pages/translations/by-id.json.js      |   4 +-
 .../astro.config.mjs                          |  13 -
 .../legacy-content-collections/package.json   |   9 -
 .../src/assets/the-future.jpg                 | Bin 22792 -> 0 bytes
 .../src/components/ScriptCompA.astro          |   1 -
 .../src/components/ScriptCompB.astro          |   1 -
 .../src/content/config.ts                     |  62 ---
 .../src/content/with-custom-slugs/one.md      |   5 -
 .../src/content/with-custom-slugs/three.md    |   5 -
 .../src/content/with-custom-slugs/two.md      |   5 -
 .../src/content/with-data/one.json            |   3 -
 .../src/content/with-data/three.json          |   3 -
 .../src/content/with-data/two.json            |   3 -
 .../src/content/with-schema-config/_ignore.md |   0
 .../with-schema-config/_ignore/file.md        |   0
 .../with-schema-config/_ignore/ignore/file.md |   0
 .../src/content/with-schema-config/four%.md   |   8 -
 .../src/content/with-schema-config/one.md     |   8 -
 .../src/content/with-schema-config/three.md   |   8 -
 .../src/content/with-schema-config/two.md     |   8 -
 .../src/content/with-scripts/one.mdx          |   7 -
 .../src/content/with-symlinked-content        |   1 -
 .../src/content/with-symlinked-data           |   1 -
 .../content/with-union-schema/newsletter.md   |   6 -
 .../src/content/with-union-schema/post.md     |   7 -
 .../src/content/without-config/columbia.md    |  15 -
 .../src/content/without-config/enterprise.md  |  14 -
 .../promo/_launch-week-styles.css             |   3 -
 .../without-config/promo/launch week.mdx      |  14 -
 .../src/pages/collections.json.js             |  25 -
 .../src/pages/entries.json.js                 |  21 -
 .../src/pages/index.astro                     |  24 -
 .../src/pages/propagation.astro               |  22 -
 .../src/pages/with-scripts/[...slug].astro    |  21 -
 .../legacy-content-collections/src/utils.js   |   8 -
 .../content-collection/first.md               |   6 -
 .../content-collection/second.md              |   6 -
 .../content-collection/third.md               |   6 -
 .../data-collection/welcome.json              |   4 -
 .../legacy-data-collections/astro.config.mjs  |   9 -
 .../legacy-data-collections/package.json      |  15 -
 .../authors-without-config/Ben Holmes.yml     |   2 -
 .../authors-without-config/Fred K Schott.yml  |   2 -
 .../authors-without-config/Nate Moore.yml     |   2 -
 .../src/content/config.ts                     |  20 -
 .../src/content/docs/example.md               |   3 -
 .../src/content/i18n/en.json                  |   6 -
 .../src/content/i18n/es.json                  |   6 -
 .../src/content/i18n/fr.yaml                  |   3 -
 .../src/pages/authors/[id].json.js            |  18 -
 .../src/pages/authors/all.json.js             |   6 -
 .../src/pages/translations/[lang].json.js     |  18 -
 .../src/pages/translations/all.json.js        |   6 -
 .../src/pages/translations/by-id.json.js      |   6 -
 .../test/legacy-content-collections.test.js   | 456 ------------------
 .../test/legacy-data-collections.test.js      | 159 ------
 .../content-collections/frontmatter.test.js   |   2 +
 .../get-entry-type.test.js                    |   2 +-
 .../collections-mixed-content-errors.test.js  | 147 ------
 .../units/dev/collections-renderentry.test.js | 298 ------------
 packages/astro/test/vitest.test.js            |  17 +-
 .../{content/config.ts => content.config.ts}  |   2 +
 .../src/pages/blog/[...slug].astro            |   4 +-
 .../markdoc/test/content-collections.test.js  |   9 +-
 .../{content/config.ts => content.config.ts}  |   2 +
 .../src/pages/collection.json.js              |   3 +-
 .../src/pages/entry.json.js                   |   7 +-
 .../fixtures/content-collections/utils.js     |   8 -
 .../headings-custom/src/content.config.ts     |  10 +
 .../headings-custom/src/content/config.ts     |   7 -
 .../headings-custom/src/pages/[slug].astro    |   6 +-
 .../fixtures/headings/src/content.config.ts   |  10 +
 .../fixtures/headings/src/content/config.ts   |   7 -
 .../fixtures/headings/src/pages/[slug].astro  |   6 +-
 .../image-assets-custom/src/content.config.ts |  10 +
 .../image-assets-custom/src/content/config.ts |   7 -
 .../image-assets-custom/src/pages/index.astro |   6 +-
 .../image-assets/src/content.config.ts        |  10 +
 .../image-assets/src/content/config.ts        |   7 -
 .../image-assets/src/pages/index.astro        |   6 +-
 .../propagated-assets/src/content.config.ts   |   8 +
 .../propagated-assets/src/pages/[slug].astro  |   6 +-
 .../render with-space/src/content.config.ts   |  10 +
 .../render with-space/src/content/config.ts   |   7 -
 .../render with-space/src/pages/index.astro   |   6 +-
 .../render-html/src/content.config.ts         |  10 +
 .../render-html/src/content/config.ts         |   7 -
 .../render-html/src/pages/[slug].astro        |   8 +-
 .../render-null/src/content.config.ts         |  10 +
 .../render-null/src/content/config.ts         |   7 -
 .../render-null/src/pages/index.astro         |   6 +-
 .../render-partials/src/content.config.ts     |  10 +
 .../render-partials/src/content/config.ts     |   7 -
 .../render-partials/src/pages/index.astro     |   6 +-
 .../render-simple/src/content.config.ts       |  10 +
 .../render-simple/src/content/config.ts       |   7 -
 .../render-simple/src/pages/index.astro       |   6 +-
 .../render-typographer/src/content.config.ts  |  10 +
 .../render-typographer/src/content/config.ts  |   7 -
 .../render-typographer/src/pages/index.astro  |   6 +-
 .../src/content.config.ts                     |  10 +
 .../src/content/config.ts                     |   7 -
 .../src/pages/index.astro                     |   6 +-
 .../render-with-config/src/content.config.ts  |  10 +
 .../render-with-config/src/content/config.ts  |   7 -
 .../render-with-config/src/pages/index.astro  |   6 +-
 .../src/content.config.ts                     |  10 +
 .../src/content/config.ts                     |   7 -
 .../src/pages/index.astro                     |   6 +-
 .../src/content.config.ts                     |  10 +
 .../src/content/config.ts                     |   7 -
 .../src/pages/index.astro                     |   6 +-
 .../{content/config.ts => content.config.ts}  |   2 +
 .../variables/src/content/blog/entry.mdoc     |   1 -
 .../fixtures/variables/src/pages/index.astro  |   6 +-
 .../markdoc/test/variables.test.js            |   6 +-
 .../{content/config.ts => content.config.ts}  |   0
 .../fixtures/mdx-images/src/content.config.ts |   8 +
 .../fixtures/mdx-images/src/content/config.ts |   5 -
 .../{content/config.js => content.config.js}  |   3 +-
 .../src/pages/broken.astro                    |   4 +-
 pnpm-lock.yaml                                |  21 -
 238 files changed, 936 insertions(+), 3280 deletions(-)
 create mode 100644 .changeset/young-banks-camp.md
 rename packages/astro/e2e/fixtures/actions-blog/src/{content/config.ts => content.config.ts} (77%)
 rename packages/astro/e2e/fixtures/actions-react-19/src/{content/config.ts => content.config.ts} (77%)
 create mode 100644 packages/astro/e2e/fixtures/content-collections/src/content.config.ts
 delete mode 100644 packages/astro/e2e/fixtures/content-collections/src/content/config.ts
 delete mode 100644 packages/astro/src/config/vite-plugin-content-listen.ts
 create mode 100644 packages/astro/test/fixtures/astro-mode/src/content.config.ts
 rename packages/astro/test/fixtures/content-collections-empty-md-file/src/{content/config.ts => content.config.ts} (61%)
 delete mode 100644 packages/astro/test/fixtures/content-collections-with-config-mts/package.json
 delete mode 100644 packages/astro/test/fixtures/content-collections-with-config-mts/src/content/blog/introduction.md
 delete mode 100644 packages/astro/test/fixtures/content-collections-with-config-mts/src/content/config.mts
 delete mode 100644 packages/astro/test/fixtures/content-collections-with-config-mts/src/pages/index.astro
 delete mode 100644 packages/astro/test/fixtures/content-collections/src/content/without-config/columbia.md
 delete mode 100644 packages/astro/test/fixtures/content-collections/src/content/without-config/enterprise.md
 delete mode 100644 packages/astro/test/fixtures/content-collections/src/content/without-config/promo/_launch-week-styles.css
 delete mode 100644 packages/astro/test/fixtures/content-collections/src/content/without-config/promo/launch week.mdx
 delete mode 100644 packages/astro/test/fixtures/content-collections/src/utils.js
 delete mode 100644 packages/astro/test/fixtures/content-intellisense/src/utils.js
 rename packages/astro/test/fixtures/content-ssr-integration/src/{content/config.ts => content.config.ts} (64%)
 create mode 100644 packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getdataentrybyid.astro
 create mode 100644 packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getentrybyslug.astro
 rename packages/astro/test/fixtures/{core-image-svg/src/content/config.ts => content/src/content.config.ts} (59%)
 delete mode 100644 packages/astro/test/fixtures/content/src/content/blog/with-layout-prop.md
 delete mode 100644 packages/astro/test/fixtures/content/src/pages/with-layout-prop.astro
 rename packages/astro/test/fixtures/core-image-errors/src/{content/config.ts => content.config.ts} (66%)
 rename packages/astro/test/fixtures/{content/src/content/config.ts => core-image-svg/src/content.config.ts} (59%)
 rename packages/astro/test/fixtures/core-image/src/{content/config.ts => content.config.ts} (73%)
 create mode 100644 packages/astro/test/fixtures/css-inline-stylesheets-2/src/content.config.ts
 rename packages/astro/test/fixtures/{content-collections/src/content/without-config => css-inline-stylesheets-2/src/pages}/endeavour.md (97%)
 create mode 100644 packages/astro/test/fixtures/css-inline-stylesheets/src/content.config.ts
 rename packages/astro/test/fixtures/{legacy-content-collections/src/content/without-config => css-inline-stylesheets/src/pages}/endeavour.md (97%)
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/astro.config.mjs
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/package.json
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/assets/the-future.jpg
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompA.astro
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompB.astro
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/config.ts
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/one.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/three.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/two.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/one.json
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/three.json
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/two.json
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore/file.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore/ignore/file.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/four%.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/one.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/three.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/two.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-scripts/one.mdx
 delete mode 120000 packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-content
 delete mode 120000 packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-data
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/newsletter.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/post.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/columbia.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/enterprise.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/_launch-week-styles.css
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/launch week.mdx
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/pages/collections.json.js
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/pages/entries.json.js
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/pages/index.astro
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/pages/propagation.astro
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/pages/with-scripts/[...slug].astro
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/src/utils.js
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/first.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/second.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/third.md
 delete mode 100644 packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/data-collection/welcome.json
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/astro.config.mjs
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/package.json
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Ben Holmes.yml
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Fred K Schott.yml
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Nate Moore.yml
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/config.ts
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/docs/example.md
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/en.json
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/es.json
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/fr.yaml
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/[id].json.js
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/all.json.js
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/[lang].json.js
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/all.json.js
 delete mode 100644 packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/by-id.json.js
 delete mode 100644 packages/astro/test/legacy-content-collections.test.js
 delete mode 100644 packages/astro/test/legacy-data-collections.test.js
 delete mode 100644 packages/astro/test/units/dev/collections-mixed-content-errors.test.js
 delete mode 100644 packages/astro/test/units/dev/collections-renderentry.test.js
 rename packages/integrations/cloudflare/test/fixtures/compile-image-service/src/{content/config.ts => content.config.ts} (79%)
 rename packages/integrations/markdoc/test/fixtures/content-collections/src/{content/config.ts => content.config.ts} (68%)
 delete mode 100644 packages/integrations/markdoc/test/fixtures/content-collections/utils.js
 create mode 100644 packages/integrations/markdoc/test/fixtures/headings-custom/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/headings-custom/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/headings/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/headings/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/image-assets/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/image-assets/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/propagated-assets/src/content.config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render with-space/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render with-space/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-html/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-html/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-null/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-null/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-partials/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-partials/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-simple/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-simple/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-typographer/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-typographer/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-with-components/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-with-components/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-with-config/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-with-config/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content/config.ts
 create mode 100644 packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content.config.ts
 delete mode 100644 packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content/config.ts
 rename packages/integrations/markdoc/test/fixtures/variables/src/{content/config.ts => content.config.ts} (66%)
 rename packages/integrations/mdx/test/fixtures/css-head-mdx/src/{content/config.ts => content.config.ts} (100%)
 create mode 100644 packages/integrations/mdx/test/fixtures/mdx-images/src/content.config.ts
 delete mode 100644 packages/integrations/mdx/test/fixtures/mdx-images/src/content/config.ts
 rename packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/{content/config.js => content.config.js} (67%)

diff --git a/.changeset/young-banks-camp.md b/.changeset/young-banks-camp.md
new file mode 100644
index 000000000000..7a7f95f4de06
--- /dev/null
+++ b/.changeset/young-banks-camp.md
@@ -0,0 +1,18 @@
+---
+'astro': major
+---
+
+Removes legacy content collection support.
+
+This PR removes a number of APIs and options related to legacy content collections that were deprecated in Astro 5, including:
+
+- The `legacy.collections` option, which was added in Astro 5 and caused the old content collections system to be used instead of the new one.
+- Deprecated functions from `astro:content`: `getEntryBySlug` and `getDataEntryById` are both replaced by `getEntry()`, which is a drop-in replacement for both.
+- Support for the old `src/content/config.*` file location. You must now use `src/content.config.*`.
+- Automatically generating collections when a `src/content/` directory is present and no content config file exists. You must now explicitly define collections in `src/content.config.*`.
+- Support for collections without a loader. You must now use the `glob()` loader to create collections from filesystem content. This will also mean that generated entries use the new entry format:
+  - The `id` field is now a slug, not a filename. You can access the filename via `entry.filePath`, which is the path relative to the site root.
+  - There is no longer a `slug` field – use `id` instead.
+  - You can no longer call `entry.render()` on content entries. Use `render(entry)` instead, imported from `astro:content`.
+
+For full details, see [the Astro 6 upgrade guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections).
diff --git a/benchmark/make-project/markdown-cc1.js b/benchmark/make-project/markdown-cc1.js
index 1e3aaa51779b..97cd7f1712ab 100644
--- a/benchmark/make-project/markdown-cc1.js
+++ b/benchmark/make-project/markdown-cc1.js
@@ -34,15 +34,15 @@ ${loremIpsumMd}
 		new URL(`./src/pages/blog/[...slug].astro`, projectDir),
 		`\
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 export async function getStaticPaths() {
   const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <h1>{entry.data.title}</h1>
 <Content />
@@ -52,6 +52,24 @@ const { Content } = await entry.render();
 
 	await Promise.all(promises);
 
+	await fs.writeFile(
+		new URL(`./src/content.config.ts`, projectDir),
+		`\
+import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
+	schema: z.object({
+		title: z.string(),
+	}),
+});
+
+export const collections = { blog };
+`,
+		'utf-8',
+	);
+
 	await fs.writeFile(
 		new URL('./astro.config.js', projectDir),
 		`\
diff --git a/benchmark/make-project/markdown-cc2.js b/benchmark/make-project/markdown-cc2.js
index ba60813c0d4a..ed0312397b3c 100644
--- a/benchmark/make-project/markdown-cc2.js
+++ b/benchmark/make-project/markdown-cc2.js
@@ -28,7 +28,7 @@ ${loremIpsumMd}
 	}
 
 	await fs.writeFile(
-		new URL(`./src/content/config.ts`, projectDir),
+		new URL(`./src/content.config.ts`, projectDir),
 		/*ts */ `
 		import { defineCollection, z } from 'astro:content';
 		import { glob } from 'astro/loaders';
diff --git a/benchmark/make-project/mdx-cc1.js b/benchmark/make-project/mdx-cc1.js
index a948ce194008..4d381d921908 100644
--- a/benchmark/make-project/mdx-cc1.js
+++ b/benchmark/make-project/mdx-cc1.js
@@ -34,15 +34,15 @@ ${loremIpsumMd}
 		new URL(`./src/pages/blog/[...slug].astro`, projectDir),
 		`\
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 export async function getStaticPaths() {
   const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <h1>{entry.data.title}</h1>
 <Content />
@@ -52,6 +52,24 @@ const { Content } = await entry.render();
 
 	await Promise.all(promises);
 
+	await fs.writeFile(
+		new URL(`./src/content.config.ts`, projectDir),
+		`\
+import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
+	schema: z.object({
+		title: z.string(),
+	}),
+});
+
+export const collections = { blog };
+`,
+		'utf-8',
+	);
+
 	await fs.writeFile(
 		new URL('./astro.config.js', projectDir),
 		`\
diff --git a/benchmark/make-project/mdx-cc2.js b/benchmark/make-project/mdx-cc2.js
index f50b63c9ee38..666971050d27 100644
--- a/benchmark/make-project/mdx-cc2.js
+++ b/benchmark/make-project/mdx-cc2.js
@@ -28,7 +28,7 @@ ${loremIpsumMd}
 	}
 
 	await fs.writeFile(
-		new URL(`./src/content/config.ts`, projectDir),
+		new URL(`./src/content.config.ts`, projectDir),
 		/*ts */ `
 		import { defineCollection, z } from 'astro:content';
 		import { glob } from 'astro/loaders';
diff --git a/benchmark/make-project/memory-default.js b/benchmark/make-project/memory-default.js
index 1087c3d4aa84..a4f09f8d49af 100644
--- a/benchmark/make-project/memory-default.js
+++ b/benchmark/make-project/memory-default.js
@@ -50,15 +50,15 @@ ${loremIpsum}
 		new URL(`./src/pages/blog/[...slug].astro`, projectDir),
 		`\
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 export async function getStaticPaths() {
   const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <h1>{entry.data.title}</h1>
 <Content />
@@ -68,6 +68,24 @@ const { Content } = await entry.render();
 
 	await Promise.all(promises);
 
+	await fs.writeFile(
+		new URL(`./src/content.config.ts`, projectDir),
+		`\
+import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
+	schema: z.object({
+		title: z.string(),
+	}),
+});
+
+export const collections = { blog };
+`,
+		'utf-8',
+	);
+
 	await fs.writeFile(
 		new URL('./astro.config.js', projectDir),
 		`\
diff --git a/examples/with-markdoc/src/content.config.ts b/examples/with-markdoc/src/content.config.ts
index a991e1ea1038..490697000a14 100644
--- a/examples/with-markdoc/src/content.config.ts
+++ b/examples/with-markdoc/src/content.config.ts
@@ -1,5 +1,8 @@
 import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 export const collections = {
-	docs: defineCollection({}),
+	docs: defineCollection({
+		loader: glob({ pattern: '**/*.mdoc', base: './src/content/docs' }),
+	}),
 };
diff --git a/examples/with-markdoc/src/pages/index.astro b/examples/with-markdoc/src/pages/index.astro
index 891b344de8cb..b9ddcc83cc23 100644
--- a/examples/with-markdoc/src/pages/index.astro
+++ b/examples/with-markdoc/src/pages/index.astro
@@ -1,12 +1,12 @@
 ---
-import { getEntry } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import Layout from '../layouts/Layout.astro';
 
 const intro = await getEntry('docs', 'intro');
 if (!intro) {
 	return Astro.redirect('/404');
 }
-const { Content } = await intro.render();
+const { Content } = await render(intro);
 ---
 
 <Layout title={intro.data.title}>
diff --git a/packages/astro/e2e/fixtures/actions-blog/src/content/config.ts b/packages/astro/e2e/fixtures/actions-blog/src/content.config.ts
similarity index 77%
rename from packages/astro/e2e/fixtures/actions-blog/src/content/config.ts
rename to packages/astro/e2e/fixtures/actions-blog/src/content.config.ts
index 667a31cc7391..355d5f45e912 100644
--- a/packages/astro/e2e/fixtures/actions-blog/src/content/config.ts
+++ b/packages/astro/e2e/fixtures/actions-blog/src/content.config.ts
@@ -1,7 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
-	type: 'content',
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	// Type-check frontmatter using a schema
 	schema: z.object({
 		title: z.string(),
diff --git a/packages/astro/e2e/fixtures/actions-react-19/src/content/config.ts b/packages/astro/e2e/fixtures/actions-react-19/src/content.config.ts
similarity index 77%
rename from packages/astro/e2e/fixtures/actions-react-19/src/content/config.ts
rename to packages/astro/e2e/fixtures/actions-react-19/src/content.config.ts
index 667a31cc7391..355d5f45e912 100644
--- a/packages/astro/e2e/fixtures/actions-react-19/src/content/config.ts
+++ b/packages/astro/e2e/fixtures/actions-react-19/src/content.config.ts
@@ -1,7 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
-	type: 'content',
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	// Type-check frontmatter using a schema
 	schema: z.object({
 		title: z.string(),
diff --git a/packages/astro/e2e/fixtures/content-collections/src/content.config.ts b/packages/astro/e2e/fixtures/content-collections/src/content.config.ts
new file mode 100644
index 000000000000..db61e3da15aa
--- /dev/null
+++ b/packages/astro/e2e/fixtures/content-collections/src/content.config.ts
@@ -0,0 +1,9 @@
+import { defineCollection } from "astro:content";
+import { glob } from "astro/loaders";
+
+
+const posts = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/posts' }),
+});
+
+export const collections = { posts };
diff --git a/packages/astro/e2e/fixtures/content-collections/src/content/config.ts b/packages/astro/e2e/fixtures/content-collections/src/content/config.ts
deleted file mode 100644
index 81f62c975b82..000000000000
--- a/packages/astro/e2e/fixtures/content-collections/src/content/config.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { defineCollection } from "astro:content";
-
-
-const posts = defineCollection({});
-
-export const collections = { posts };
diff --git a/packages/astro/e2e/fixtures/content-collections/src/pages/index.astro b/packages/astro/e2e/fixtures/content-collections/src/pages/index.astro
index 4d6f17501943..0eed75d679f2 100644
--- a/packages/astro/e2e/fixtures/content-collections/src/pages/index.astro
+++ b/packages/astro/e2e/fixtures/content-collections/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content'
+import { getEntry, render } from 'astro:content'
 
-const post = await getEntryBySlug('posts', 'post-1')
-const { Content } = await post.render();
+const post = await getEntry('posts', 'post-1')
+const { Content } = await render(post);
 ---
 
 <Content/>
diff --git a/packages/astro/performance/fixtures/md/src/ContentRenderer.astro b/packages/astro/performance/fixtures/md/src/ContentRenderer.astro
index 307541fcfd59..5034ff5b2272 100644
--- a/packages/astro/performance/fixtures/md/src/ContentRenderer.astro
+++ b/packages/astro/performance/fixtures/md/src/ContentRenderer.astro
@@ -1,12 +1,13 @@
 ---
 import type { CollectionEntry } from 'astro:content';
+import { render } from 'astro:content';
 
 type Props = {
 	entry: CollectionEntry<'generated'>;
 }
 
 const { entry }  = Astro.props as Props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 
 <Content />
diff --git a/packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro b/packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro
index fbe086bc27fb..47f8ede04fa0 100644
--- a/packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro
+++ b/packages/astro/performance/fixtures/mdoc/src/ContentRenderer.astro
@@ -1,5 +1,6 @@
 ---
 import type { CollectionEntry } from 'astro:content';
+import { render } from 'astro:content';
 import { Aside, Heading, HydratedLikeButton, LikeButton } from '@performance/utils';
 
 type Props = {
@@ -7,7 +8,7 @@ type Props = {
 }
 
 const { entry }  = Astro.props as Props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 
 {entry.data.type === 'with-astro-components'
diff --git a/packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro b/packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro
index 6c40fe40e6a8..b05b0f8c3acc 100644
--- a/packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro
+++ b/packages/astro/performance/fixtures/mdx/src/ContentRenderer.astro
@@ -1,5 +1,6 @@
 ---
 import type { CollectionEntry } from 'astro:content';
+import { render } from 'astro:content';
 import Title from './Title.astro';
 
 type Props = {
@@ -7,7 +8,7 @@ type Props = {
 }
 
 const { entry }  = Astro.props as Props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 
 {entry.data.type === 'with-astro-components'
diff --git a/packages/astro/src/config/index.ts b/packages/astro/src/config/index.ts
index 53c513f3973e..13751611f479 100644
--- a/packages/astro/src/config/index.ts
+++ b/packages/astro/src/config/index.ts
@@ -35,21 +35,17 @@ export function getViteConfig(
 
 		// Use dynamic import to avoid pulling in deps unless used
 		const [
-			fs,
 			{ mergeConfig },
 			{ createNodeLogger },
 			{ resolveConfig, createSettings },
 			{ createVite },
 			{ runHookConfigSetup, runHookConfigDone },
-			{ astroContentListenPlugin },
 		] = await Promise.all([
-			import('node:fs'),
 			import('vite'),
 			import('../core/config/logging.js'),
 			import('../core/config/index.js'),
 			import('../core/create-vite.js'),
 			import('../integrations/hooks.js'),
-			import('./vite-plugin-content-listen.js'),
 		]);
 		const logger = createNodeLogger(inlineAstroConfig);
 		const { astroConfig: config } = await resolveConfig(inlineAstroConfig, cmd);
@@ -58,14 +54,7 @@ export function getViteConfig(
 		const routesList = await createRoutesList({ settings }, logger);
 		const manifest = createDevelopmentManifest(settings);
 		const viteConfig = await createVite(
-			{
-				plugins: config.legacy.collections
-					? [
-							// Initialize the content listener
-							astroContentListenPlugin({ settings, logger, fs }),
-						]
-					: [],
-			},
+			{},
 			{ settings, command: cmd, logger, mode, sync: false, manifest, routesList },
 		);
 		await runHookConfigDone({ settings, logger });
diff --git a/packages/astro/src/config/vite-plugin-content-listen.ts b/packages/astro/src/config/vite-plugin-content-listen.ts
deleted file mode 100644
index 6c0408001954..000000000000
--- a/packages/astro/src/config/vite-plugin-content-listen.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type fsMod from 'node:fs';
-import type { Plugin, ViteDevServer } from 'vite';
-import { attachContentServerListeners } from '../content/server-listeners.js';
-import type { Logger } from '../core/logger/core.js';
-import type { AstroSettings } from '../types/astro.js';
-
-/**
- * Listen for Astro content directory changes and generate types.
- *
- * This is a separate plugin for `getViteConfig` as the `attachContentServerListeners` API
- * needs to be called at different times in `astro dev` and `getViteConfig`. For `astro dev`,
- * it needs to be called after the Astro server is started (packages/astro/src/core/dev/dev.ts).
- * For `getViteConfig`, it needs to be called after the Vite server is started.
- */
-export function astroContentListenPlugin({
-	settings,
-	logger,
-	fs,
-}: {
-	settings: AstroSettings;
-	logger: Logger;
-	fs: typeof fsMod;
-}): Plugin {
-	let server: ViteDevServer;
-
-	return {
-		name: 'astro:content-listen',
-		apply: 'serve',
-		configureServer(_server) {
-			server = _server;
-		},
-		async buildStart() {
-			await attachContentServerListeners({
-				fs: fs,
-				settings,
-				logger,
-				viteServer: server,
-			});
-		},
-	};
-}
diff --git a/packages/astro/src/content/config.ts b/packages/astro/src/content/config.ts
index 4ef7bdb4c1fc..e6424b5b7b10 100644
--- a/packages/astro/src/content/config.ts
+++ b/packages/astro/src/content/config.ts
@@ -182,23 +182,29 @@ export function defineCollection<S extends BaseSchema>(
 		});
 	}
 
-	if ('loader' in config) {
-		if (config.type && config.type !== CONTENT_LAYER_TYPE) {
-			throw new AstroUserError(
-				`Collections that use the Content Layer API must have a \`loader\` defined and no \`type\` set. Check your collection definitions in ${importerFilename ?? 'your content config file'}.`,
-			);
-		}
-		if (
-			typeof config.loader === 'object' &&
-			typeof config.loader.load !== 'function' &&
-			('loadEntry' in config.loader || 'loadCollection' in config.loader)
-		) {
-			throw new AstroUserError(
-				`Live content collections must be defined in "src/live.config.ts" file. Check your collection definitions in "${importerFilename ?? 'your content config file'}" to ensure you are not using a live loader.`,
-			);
-		}
-		config.type = CONTENT_LAYER_TYPE;
+	if (!('loader' in config)) {
+		throw new AstroError({
+			...AstroErrorData.ContentCollectionMissingLoader,
+			message: AstroErrorData.ContentCollectionMissingLoader.message(importerFilename),
+		});
+	}
+
+	if (config.type && config.type !== CONTENT_LAYER_TYPE) {
+		throw new AstroError({
+			...AstroErrorData.ContentCollectionInvalidType,
+			message: AstroErrorData.ContentCollectionInvalidType.message(config.type, importerFilename),
+		});
+	}
+
+	if (
+		typeof config.loader === 'object' &&
+		typeof config.loader.load !== 'function' &&
+		('loadEntry' in config.loader || 'loadCollection' in config.loader)
+	) {
+		throw new AstroUserError(
+			`Live content collections must be defined in "src/live.config.ts" file. Check your collection definitions in "${importerFilename ?? 'your content config file'}" to ensure you are not using a live loader.`,
+		);
 	}
-	if (!config.type) config.type = 'content';
+	config.type = CONTENT_LAYER_TYPE;
 	return config;
 }
diff --git a/packages/astro/src/content/loaders/glob.ts b/packages/astro/src/content/loaders/glob.ts
index ab78f2a76425..a75458f095c2 100644
--- a/packages/astro/src/content/loaders/glob.ts
+++ b/packages/astro/src/content/loaders/glob.ts
@@ -56,14 +56,6 @@ function checkPrefix(pattern: string | Array<string>, prefix: string) {
  * Loads multiple entries, using a glob pattern to match files.
  * @param pattern A glob pattern to match files, relative to the content directory.
  */
-export function glob(globOptions: GlobOptions): Loader;
-/** @private */
-export function glob(
-	globOptions: GlobOptions & {
-		/** @deprecated */
-		_legacy?: true;
-	},
-): Loader;
 
 export function glob(globOptions: GlobOptions): Loader {
 	if (checkPrefix(globOptions.pattern, '../')) {
@@ -90,9 +82,6 @@ export function glob(globOptions: GlobOptions): Loader {
 			>();
 
 			const untouchedEntries = new Set(store.keys());
-			const isLegacy = (globOptions as any)._legacy;
-			// If global legacy collection handling flag is *not* enabled then this loader is used to emulate them instead
-			const emulateLegacyCollections = !config.legacy.collections;
 			async function syncData(
 				entry: string,
 				base: URL,
@@ -125,17 +114,6 @@ export function glob(globOptions: GlobOptions): Loader {
 					store.delete(oldId);
 				}
 
-				let legacyId: string | undefined;
-
-				if (isLegacy) {
-					const entryURL = new URL(encodeURI(entry), base);
-					const legacyOptions = getContentEntryIdAndSlug({
-						entry: entryURL,
-						contentDir: base,
-						collection: '',
-					});
-					legacyId = legacyOptions.id;
-				}
 				untouchedEntries.delete(id);
 
 				const existingEntry = store.get(id);
@@ -165,12 +143,6 @@ export function glob(globOptions: GlobOptions): Loader {
 					filePath,
 				});
 				if (entryType.getRenderFunction) {
-					if (isLegacy && data.layout) {
-						logger.error(
-							`The Markdown "layout" field is not supported in content collections in Astro 5. Ignoring layout for ${JSON.stringify(entry)}. Enable "legacy.collections" if you need to use the layout field.`,
-						);
-					}
-
 					let render = renderFunctionByContentType.get(entryType);
 					if (!render) {
 						render = await entryType.getRenderFunction(config);
@@ -199,7 +171,6 @@ export function glob(globOptions: GlobOptions): Loader {
 						digest,
 						rendered,
 						assetImports: rendered?.metadata?.imagePaths,
-						legacyId,
 					});
 
 					// todo: add an explicit way to opt in to deferred rendering
@@ -211,10 +182,9 @@ export function glob(globOptions: GlobOptions): Loader {
 						filePath: relativePath,
 						digest,
 						deferredRender: true,
-						legacyId,
 					});
 				} else {
-					store.set({ id, data: parsedData, body, filePath: relativePath, digest, legacyId });
+					store.set({ id, data: parsedData, body, filePath: relativePath, digest });
 				}
 
 				fileToIdMap.set(filePath, id);
@@ -262,11 +232,6 @@ export function glob(globOptions: GlobOptions): Loader {
 
 			const contentDir = new URL('content/', config.srcDir);
 
-			function isInContentDir(file: string) {
-				const fileUrl = new URL(file, baseDir);
-				return fileUrl.href.startsWith(contentDir.href);
-			}
-
 			const configFiles = new Set(
 				['config.js', 'config.ts', 'config.mjs'].map((file) => new URL(file, contentDir).href),
 			);
@@ -281,10 +246,6 @@ export function glob(globOptions: GlobOptions): Loader {
 					if (isConfigFile(entry)) {
 						return;
 					}
-					if (!emulateLegacyCollections && isInContentDir(entry)) {
-						skippedFiles.push(entry);
-						return;
-					}
 					return limit(async () => {
 						const entryType = configForFile(entry);
 						await syncData(entry, baseDir, entryType);
diff --git a/packages/astro/src/content/runtime.ts b/packages/astro/src/content/runtime.ts
index 484642fe81a4..a9cec7f6cd59 100644
--- a/packages/astro/src/content/runtime.ts
+++ b/packages/astro/src/content/runtime.ts
@@ -1,7 +1,6 @@
 import type { MarkdownHeading } from '@astrojs/markdown-remark';
 import { escape } from 'html-escaper';
 import { Traverse } from 'neotraverse/modern';
-import pLimit from 'p-limit';
 import { ZodIssueCode, z } from 'zod';
 import type { GetImageResult, ImageMetadata } from '../assets/types.js';
 import { imageSrcToImportId } from '../assets/utils/resolveImports.js';
@@ -34,7 +33,6 @@ import {
 	LiveEntryNotFoundError,
 } from './loaders/errors.js';
 import type { LiveLoader } from './loaders/types.js';
-import type { ContentLookupMap } from './utils.js';
 export {
 	LiveCollectionError,
 	LiveCollectionCacheHintError,
@@ -42,33 +40,11 @@ export {
 	LiveCollectionValidationError,
 };
 type LazyImport = () => Promise<any>;
-type GlobResult = Record<string, LazyImport>;
-type CollectionToEntryMap = Record<string, GlobResult>;
-type GetEntryImport = (collection: string, lookupId: string) => Promise<LazyImport>;
 type LiveCollectionConfigMap = Record<
 	string,
 	{ loader: LiveLoader; type: typeof LIVE_CONTENT_TYPE; schema?: z.ZodType }
 >;
 
-export function createCollectionToGlobResultMap({
-	globResult,
-	contentDir,
-}: {
-	globResult: GlobResult;
-	contentDir: string;
-}) {
-	const collectionToGlobResultMap: CollectionToEntryMap = {};
-	for (const key in globResult) {
-		const keyRelativeToContentDir = key.replace(new RegExp(`^${contentDir}`), '');
-		const segments = keyRelativeToContentDir.split('/');
-		if (segments.length <= 1) continue;
-		const collection = segments[0];
-		collectionToGlobResultMap[collection] ??= {};
-		collectionToGlobResultMap[collection][key] = globResult[key];
-	}
-	return collectionToGlobResultMap;
-}
-
 const cacheHintSchema = z.object({
 	tags: z.array(z.string()).optional(),
 	maxAge: z.number().optional(),
@@ -115,16 +91,8 @@ async function parseLiveEntry(
 }
 
 export function createGetCollection({
-	contentCollectionToEntryMap,
-	dataCollectionToEntryMap,
-	getRenderEntryImport,
-	cacheEntriesByCollection,
 	liveCollections,
 }: {
-	contentCollectionToEntryMap: CollectionToEntryMap;
-	dataCollectionToEntryMap: CollectionToEntryMap;
-	getRenderEntryImport: GetEntryImport;
-	cacheEntriesByCollection: Map<string, any[]>;
 	liveCollections: LiveCollectionConfigMap;
 }) {
 	return async function getCollection(
@@ -140,12 +108,7 @@ export function createGetCollection({
 
 		const hasFilter = typeof filter === 'function';
 		const store = await globalDataStore.get();
-		let type: 'content' | 'data';
-		if (collection in contentCollectionToEntryMap) {
-			type = 'content';
-		} else if (collection in dataCollectionToEntryMap) {
-			type = 'data';
-		} else if (store.hasCollection(collection)) {
+		if (store.hasCollection(collection)) {
 			// @ts-expect-error	virtual module
 			const { default: imageAssetMap } = await import('astro:asset-imports');
 
@@ -159,10 +122,6 @@ export function createGetCollection({
 					collection,
 				};
 
-				if (entry.legacyId) {
-					entry = emulateLegacyEntry(entry);
-				}
-
 				if (hasFilter && !filter(entry)) {
 					continue;
 				}
@@ -177,143 +136,6 @@ export function createGetCollection({
 			);
 			return [];
 		}
-
-		const lazyImports = Object.values(
-			type === 'content'
-				? contentCollectionToEntryMap[collection]
-				: dataCollectionToEntryMap[collection],
-		);
-		let entries: any[] = [];
-		// Cache `getCollection()` calls in production only
-		// prevents stale cache in development
-		if (!import.meta.env?.DEV && cacheEntriesByCollection.has(collection)) {
-			entries = cacheEntriesByCollection.get(collection)!;
-		} else {
-			const limit = pLimit(10);
-			entries = await Promise.all(
-				lazyImports.map((lazyImport) =>
-					limit(async () => {
-						const entry = await lazyImport();
-						return type === 'content'
-							? {
-									id: entry.id,
-									slug: entry.slug,
-									body: entry.body,
-									collection: entry.collection,
-									data: entry.data,
-									async render() {
-										return render({
-											collection: entry.collection,
-											id: entry.id,
-											renderEntryImport: await getRenderEntryImport(collection, entry.slug),
-										});
-									},
-								}
-							: {
-									id: entry.id,
-									collection: entry.collection,
-									data: entry.data,
-								};
-					}),
-				),
-			);
-			cacheEntriesByCollection.set(collection, entries);
-		}
-		if (hasFilter) {
-			return entries.filter(filter);
-		} else {
-			// Clone the array so users can safely mutate it.
-			// slice() is faster than ...spread for large arrays.
-			return entries.slice();
-		}
-	};
-}
-
-export function createGetEntryBySlug({
-	getEntryImport,
-	getRenderEntryImport,
-	collectionNames,
-	getEntry,
-}: {
-	getEntryImport: GetEntryImport;
-	getRenderEntryImport: GetEntryImport;
-	collectionNames: Set<string>;
-	getEntry: ReturnType<typeof createGetEntry>;
-}) {
-	return async function getEntryBySlug(collection: string, slug: string) {
-		const store = await globalDataStore.get();
-
-		if (!collectionNames.has(collection)) {
-			if (store.hasCollection(collection)) {
-				const entry = await getEntry(collection, slug);
-				if (entry && 'slug' in entry) {
-					return entry;
-				}
-				throw new AstroError({
-					...AstroErrorData.GetEntryDeprecationError,
-					message: AstroErrorData.GetEntryDeprecationError.message(collection, 'getEntryBySlug'),
-				});
-			}
-			console.warn(
-				`The collection ${JSON.stringify(collection)} does not exist. Please ensure it is defined in your content config.`,
-			);
-			return undefined;
-		}
-
-		const entryImport = await getEntryImport(collection, slug);
-		if (typeof entryImport !== 'function') return undefined;
-
-		const entry = await entryImport();
-
-		return {
-			id: entry.id,
-			slug: entry.slug,
-			body: entry.body,
-			collection: entry.collection,
-			data: entry.data,
-			async render() {
-				return render({
-					collection: entry.collection,
-					id: entry.id,
-					renderEntryImport: await getRenderEntryImport(collection, slug),
-				});
-			},
-		};
-	};
-}
-
-export function createGetDataEntryById({
-	getEntryImport,
-	collectionNames,
-	getEntry,
-}: {
-	getEntryImport: GetEntryImport;
-	collectionNames: Set<string>;
-	getEntry: ReturnType<typeof createGetEntry>;
-}) {
-	return async function getDataEntryById(collection: string, id: string) {
-		const store = await globalDataStore.get();
-
-		if (!collectionNames.has(collection)) {
-			if (store.hasCollection(collection)) {
-				return getEntry(collection, id);
-			}
-			console.warn(
-				`The collection ${JSON.stringify(collection)} does not exist. Please ensure it is defined in your content config.`,
-			);
-			return undefined;
-		}
-
-		const lazyImport = await getEntryImport(collection, id);
-
-		if (!lazyImport) throw new Error(`Entry ${collection} → ${id} was not found.`);
-		const entry = await lazyImport();
-
-		return {
-			id: entry.id,
-			collection: entry.collection,
-			data: entry.data,
-		};
 	};
 }
 
@@ -334,31 +156,7 @@ type DataEntryResult = {
 
 type EntryLookupObject = { collection: string; id: string } | { collection: string; slug: string };
 
-function emulateLegacyEntry({ legacyId, ...entry }: DataEntry & { collection: string }) {
-	// Define this first so it's in scope for the render function
-	const legacyEntry = {
-		...entry,
-		id: legacyId!,
-		slug: entry.id,
-	};
-	return {
-		...legacyEntry,
-		// Define separately so the render function isn't included in the object passed to `renderEntry()`
-		render: () => renderEntry(legacyEntry),
-	} as ContentEntryResult;
-}
-
-export function createGetEntry({
-	getEntryImport,
-	getRenderEntryImport,
-	collectionNames,
-	liveCollections,
-}: {
-	getEntryImport: GetEntryImport;
-	getRenderEntryImport: GetEntryImport;
-	collectionNames: Set<string>;
-	liveCollections: LiveCollectionConfigMap;
-}) {
+export function createGetEntry({ liveCollections }: { liveCollections: LiveCollectionConfigMap }) {
 	return async function getEntry(
 		// Can either pass collection and identifier as 2 positional args,
 		// Or pass a single object with the collection and identifier as properties.
@@ -408,53 +206,49 @@ export function createGetEntry({
 			// @ts-expect-error	virtual module
 			const { default: imageAssetMap } = await import('astro:asset-imports');
 			entry.data = updateImageReferencesInData(entry.data, entry.filePath, imageAssetMap);
-			if (entry.legacyId) {
-				return emulateLegacyEntry({ ...entry, collection });
-			}
-			return {
+			const result = {
 				...entry,
 				collection,
 			} as DataEntryResult | ContentEntryResult;
-		}
-
-		if (!collectionNames.has(collection)) {
-			console.warn(
-				`The collection ${JSON.stringify(collection)} does not exist. Please ensure it is defined in your content config.`,
+			// TODO: remove in Astro 7
+			warnForPropertyAccess(
+				result.data,
+				'slug',
+				`[content] Attempted to access deprecated property on "${collection}" entry.\nThe "slug" property is no longer automatically added to entries. Please use the "id" property instead.`,
+			);
+			// TODO: remove in Astro 7
+			warnForPropertyAccess(
+				result,
+				'render',
+				`[content] Invalid attempt to access "render()" method on "${collection}" entry.\nTo render an entry, use "render(entry)" from "astro:content".`,
 			);
-			return undefined;
+			return result;
 		}
 
-		const entryImport = await getEntryImport(collection, lookupId);
-		if (typeof entryImport !== 'function') return undefined;
-
-		const entry = await entryImport();
-
-		if (entry._internal.type === 'content') {
-			return {
-				id: entry.id,
-				slug: entry.slug,
-				body: entry.body,
-				collection: entry.collection,
-				data: entry.data,
-				async render() {
-					return render({
-						collection: entry.collection,
-						id: entry.id,
-						renderEntryImport: await getRenderEntryImport(collection, lookupId),
-					});
-				},
-			};
-		} else if (entry._internal.type === 'data') {
-			return {
-				id: entry.id,
-				collection: entry.collection,
-				data: entry.data,
-			};
-		}
 		return undefined;
 	};
 }
 
+function warnForPropertyAccess(entry: object, prop: string, message: string) {
+	// Skip if the property is already defined (it may be legitimately defined on the entry)
+	if (!(prop in entry)) {
+		let _value: any = undefined;
+		Object.defineProperty(entry, prop, {
+			get() {
+				// If the user sets value themselves, don't warn
+				if (_value === undefined) {
+					console.error(message);
+				}
+				return _value;
+			},
+			set(v) {
+				_value = v;
+			},
+			enumerable: false,
+		});
+	}
+}
+
 export function createGetEntries(getEntry: ReturnType<typeof createGetEntry>) {
 	return async function getEntries(
 		entries: { collection: string; id: string }[] | { collection: string; slug: string }[],
@@ -745,21 +539,11 @@ function updateImageReferencesInData<T extends Record<string, unknown>>(
 	});
 }
 
-export async function renderEntry(
-	entry:
-		| DataEntry
-		| { render: () => Promise<{ Content: AstroComponentFactory }> }
-		| (DataEntry & { render: () => Promise<{ Content: AstroComponentFactory }> }),
-) {
+export async function renderEntry(entry: DataEntry) {
 	if (!entry) {
 		throw new AstroError(AstroErrorData.RenderUndefinedEntryError);
 	}
 
-	if ('render' in entry && !('legacyId' in entry)) {
-		// This is an old content collection entry, so we use its render method
-		return entry.render();
-	}
-
 	if (entry.deferredRender) {
 		try {
 			// @ts-expect-error	virtual module
@@ -882,7 +666,7 @@ async function render({
 	}
 }
 
-export function createReference({ lookupMap }: { lookupMap: ContentLookupMap }) {
+export function createReference() {
 	return function reference(collection: string) {
 		return z
 			.union([
@@ -915,36 +699,10 @@ export function createReference({ lookupMap }: { lookupMap: ContentLookupMap })
 							});
 							return;
 						}
-						// We won't throw if the collection is missing, because it may be a content layer collection and the store may not yet be populated.
 						// If it is an object then we're validating later in the build, so we can check the collection at that point.
-
 						return lookup;
 					}
 
-					// If the collection is not in the lookup map it may be a content layer collection and the store may not yet be populated.
-					if (!lookupMap[collection]) {
-						// For now, we can't validate this reference, so we'll optimistically convert it to a reference object which we'll validate
-						// later in the pipeline when we do have access to the store.
-						return { id: lookup, collection };
-					}
-					const { type, entries } = lookupMap[collection];
-					const entry = entries[lookup];
-
-					if (!entry) {
-						ctx.addIssue({
-							code: ZodIssueCode.custom,
-							message: `**${flattenedErrorPath}**: Reference to ${collection} invalid. Expected ${Object.keys(
-								entries,
-							)
-								.map((c) => JSON.stringify(c))
-								.join(' | ')}. Received ${JSON.stringify(lookup)}.`,
-						});
-						return;
-					}
-					// Content is still identified by slugs, so map to a `slug` key for consistency.
-					if (type === 'content') {
-						return { slug: lookup, collection };
-					}
 					return { id: lookup, collection };
 				},
 			);
@@ -983,3 +741,20 @@ export function defineLiveCollection() {
 		),
 	});
 }
+
+export function createDeprecatedFunction(functionName: string) {
+	return (collection: string) => {
+		const error = new AstroError({
+			...AstroErrorData.GetEntryDeprecationError,
+			message: AstroErrorData.GetEntryDeprecationError.message(collection, functionName),
+		});
+
+		// Remove the runtime module from the stack trace
+		const stackLines = error.stack?.split('\n');
+		if (stackLines && stackLines.length > 1) {
+			stackLines.splice(1, 1);
+			error.stack = stackLines.join('\n');
+		}
+		throw error;
+	};
+}
diff --git a/packages/astro/src/content/server-listeners.ts b/packages/astro/src/content/server-listeners.ts
index 492a5a5160cf..8bae846dddd1 100644
--- a/packages/astro/src/content/server-listeners.ts
+++ b/packages/astro/src/content/server-listeners.ts
@@ -1,14 +1,9 @@
 import type fsMod from 'node:fs';
-import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { bold, cyan, underline } from 'kleur/colors';
 import type { ViteDevServer } from 'vite';
-import { loadTSConfig } from '../core/config/tsconfig.js';
 import type { Logger } from '../core/logger/core.js';
-import { appendForwardSlash } from '../core/path.js';
 import type { AstroSettings } from '../types/astro.js';
 import { createContentTypesGenerator } from './types-generator.js';
-import { type ContentPaths, getContentPaths, globalContentConfigObserver } from './utils.js';
+import { globalContentConfigObserver } from './utils.js';
 
 interface ContentServerListenerParams {
 	fs: typeof fsMod;
@@ -23,101 +18,29 @@ export async function attachContentServerListeners({
 	logger,
 	settings,
 }: ContentServerListenerParams) {
-	const contentPaths = getContentPaths(settings.config, fs);
-	if (!settings.config.legacy?.collections) {
-		await attachListeners();
-	} else if (fs.existsSync(contentPaths.contentDir)) {
-		logger.debug(
-			'content',
-			`Watching ${cyan(
-				contentPaths.contentDir.href.replace(settings.config.root.href, ''),
-			)} for changes`,
-		);
-		const maybeTsConfigStats = await getTSConfigStatsWhenAllowJsFalse({ contentPaths, settings });
-		if (maybeTsConfigStats) warnAllowJsIsFalse({ ...maybeTsConfigStats, logger });
-		await attachListeners();
-	} else {
-		viteServer.watcher.on('addDir', contentDirListener);
-		async function contentDirListener(dir: string) {
-			if (appendForwardSlash(pathToFileURL(dir).href) === contentPaths.contentDir.href) {
-				logger.debug('content', `Content directory found. Watching for changes`);
-				await attachListeners();
-				viteServer.watcher.removeListener('addDir', contentDirListener);
-			}
-		}
-	}
-
-	async function attachListeners() {
-		const contentGenerator = await createContentTypesGenerator({
-			fs,
-			settings,
-			logger,
-			viteServer,
-			contentConfigObserver: globalContentConfigObserver,
-		});
-		await contentGenerator.init();
-		logger.debug('content', 'Types generated');
-
-		viteServer.watcher.on('add', (entry) => {
-			contentGenerator.queueEvent({ name: 'add', entry });
-		});
-		viteServer.watcher.on('addDir', (entry) =>
-			contentGenerator.queueEvent({ name: 'addDir', entry }),
-		);
-		viteServer.watcher.on('change', (entry) => {
-			contentGenerator.queueEvent({ name: 'change', entry });
-		});
-		viteServer.watcher.on('unlink', (entry) => {
-			contentGenerator.queueEvent({ name: 'unlink', entry });
-		});
-		viteServer.watcher.on('unlinkDir', (entry) =>
-			contentGenerator.queueEvent({ name: 'unlinkDir', entry }),
-		);
-	}
-}
-
-function warnAllowJsIsFalse({
-	logger,
-	tsConfigFileName,
-	contentConfigFileName,
-}: {
-	logger: Logger;
-	tsConfigFileName: string;
-	contentConfigFileName: string;
-}) {
-	logger.warn(
-		'content',
-		`Make sure you have the ${bold('allowJs')} compiler option set to ${bold(
-			'true',
-		)} in your ${bold(tsConfigFileName)} file to have autocompletion in your ${bold(
-			contentConfigFileName,
-		)} file. See ${underline(
-			cyan('https://www.typescriptlang.org/tsconfig#allowJs'),
-		)} for more information.`,
+	const contentGenerator = await createContentTypesGenerator({
+		fs,
+		settings,
+		logger,
+		viteServer,
+		contentConfigObserver: globalContentConfigObserver,
+	});
+	await contentGenerator.init();
+	logger.debug('content', 'Types generated');
+
+	viteServer.watcher.on('add', (entry) => {
+		contentGenerator.queueEvent({ name: 'add', entry });
+	});
+	viteServer.watcher.on('addDir', (entry) =>
+		contentGenerator.queueEvent({ name: 'addDir', entry }),
 	);
-}
-
-async function getTSConfigStatsWhenAllowJsFalse({
-	contentPaths,
-	settings,
-}: {
-	contentPaths: ContentPaths;
-	settings: AstroSettings;
-}) {
-	const isContentConfigJsFile = ['.js', '.mjs'].some((ext) =>
-		contentPaths.config.url.pathname.endsWith(ext),
+	viteServer.watcher.on('change', (entry) => {
+		contentGenerator.queueEvent({ name: 'change', entry });
+	});
+	viteServer.watcher.on('unlink', (entry) => {
+		contentGenerator.queueEvent({ name: 'unlink', entry });
+	});
+	viteServer.watcher.on('unlinkDir', (entry) =>
+		contentGenerator.queueEvent({ name: 'unlinkDir', entry }),
 	);
-	if (!isContentConfigJsFile) return;
-
-	const inputConfig = await loadTSConfig(fileURLToPath(settings.config.root));
-	if (typeof inputConfig === 'string') return;
-
-	const tsConfigFileName = inputConfig.tsconfigFile.split(path.sep).pop();
-	if (!tsConfigFileName) return;
-
-	const contentConfigFileName = contentPaths.config.url.pathname.split(path.sep).pop()!;
-	const allowJSOption = inputConfig.tsconfig.compilerOptions?.allowJs;
-	if (allowJSOption) return;
-
-	return { tsConfigFileName, contentConfigFileName };
 }
diff --git a/packages/astro/src/content/types-generator.ts b/packages/astro/src/content/types-generator.ts
index ac6d1c51e64d..0c26a0ee8484 100644
--- a/packages/astro/src/content/types-generator.ts
+++ b/packages/astro/src/content/types-generator.ts
@@ -2,12 +2,11 @@ import type fsMod from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { bold, cyan } from 'kleur/colors';
-import { glob } from 'tinyglobby';
 import { normalizePath, type ViteDevServer } from 'vite';
 import { type ZodSchema, z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
 import { AstroError } from '../core/errors/errors.js';
-import { AstroErrorData, AstroUserError } from '../core/errors/index.js';
+import { AstroErrorData } from '../core/errors/index.js';
 import type { Logger } from '../core/logger/core.js';
 import { isRelativePath } from '../core/path.js';
 import type { AstroSettings } from '../types/astro.js';
@@ -16,7 +15,7 @@ import {
 	COLLECTIONS_DIR,
 	CONTENT_LAYER_TYPE,
 	CONTENT_TYPES_FILE,
-	LIVE_CONTENT_TYPE,
+	type LIVE_CONTENT_TYPE,
 	VIRTUAL_MODULE_ID,
 } from './consts.js';
 import {
@@ -88,33 +87,9 @@ export async function createContentTypesGenerator({
 
 	const typeTemplateContent = await fs.promises.readFile(contentPaths.typesTemplate, 'utf-8');
 
-	async function init(): Promise<
-		{ typesGenerated: true } | { typesGenerated: false; reason: 'no-content-dir' }
-	> {
+	async function init(): Promise<void> {
 		events.push({ name: 'add', entry: contentPaths.config.url });
-
-		if (settings.config.legacy.collections) {
-			if (!fs.existsSync(contentPaths.contentDir)) {
-				return { typesGenerated: false, reason: 'no-content-dir' };
-			}
-			const globResult = await glob('**', {
-				cwd: fileURLToPath(contentPaths.contentDir),
-				absolute: true,
-			});
-
-			for (const fullPath of globResult) {
-				const entryURL = pathToFileURL(fullPath);
-				if (entryURL.href.startsWith(contentPaths.config.url.href)) continue;
-				const stat = fs.statSync(fullPath);
-				if (stat.isFile()) {
-					events.push({ name: 'add', entry: entryURL });
-				} else if (stat.isDirectory()) {
-					events.push({ name: 'addDir', entry: entryURL });
-				}
-			}
-		}
 		await runEvents();
-		return { typesGenerated: true };
 	}
 
 	async function handleEvent(event: ContentEvent): Promise<{ shouldGenerateTypes: boolean }> {
@@ -293,11 +268,7 @@ export async function createContentTypesGenerator({
 			name: rawEvent.name,
 		};
 
-		if (settings.config.legacy.collections) {
-			if (!event.entry.pathname.startsWith(contentPaths.contentDir.pathname)) {
-				return;
-			}
-		} else if (contentPaths.config.url.pathname !== event.entry.pathname) {
+		if (contentPaths.config.url.pathname !== event.entry.pathname) {
 			return;
 		}
 
@@ -405,24 +376,24 @@ async function typeForCollection<T extends keyof ContentConfig['collections']>(
 	if (collection?.schema) {
 		return `InferEntrySchema<${collectionKey}>`;
 	}
-
-	if (collection?.type === CONTENT_LAYER_TYPE) {
-		const schema = await getContentLayerSchema(collection, collectionKey);
-		if (schema) {
-			try {
-				const zodToTs = await import('zod-to-ts');
-				const ast = zodToTs.zodToTs(schema);
-				return zodToTs.printNode(ast.node);
-			} catch (err: any) {
-				// zod-to-ts is sad if we don't have TypeScript installed, but that's fine as we won't be needing types in that case
-				if (err.message.includes("Cannot find package 'typescript'")) {
-					return 'any';
-				}
-				throw err;
-			}
+	if (!collection?.type) {
+		return 'any';
+	}
+	const schema = await getContentLayerSchema(collection, collectionKey);
+	if (!schema) {
+		return 'any';
+	}
+	try {
+		const zodToTs = await import('zod-to-ts');
+		const ast = zodToTs.zodToTs(schema);
+		return zodToTs.printNode(ast.node);
+	} catch (err: any) {
+		// zod-to-ts is sad if we don't have TypeScript installed, but that's fine as we won't be needing types in that case
+		if (err.message.includes("Cannot find package 'typescript'")) {
+			return 'any';
 		}
+		throw err;
 	}
-	return 'any';
 }
 
 async function writeContentFiles({
@@ -446,7 +417,6 @@ async function writeContentFiles({
 	logger: Logger;
 	settings: AstroSettings;
 }) {
-	let contentTypesStr = '';
 	let dataTypesStr = '';
 
 	const collectionSchemasDir = new URL(COLLECTIONS_DIR, settings.dotAstroDir);
@@ -489,56 +459,10 @@ async function writeContentFiles({
 			});
 			return;
 		}
-		const resolvedType =
-			collection.type === 'unknown'
-				? // Add empty / unknown collections to the data type map by default
-					// This ensures `getCollection('empty-collection')` doesn't raise a type error
-					(collectionConfig?.type ?? 'data')
-				: collection.type;
-		const collectionEntryKeys = Object.keys(collection.entries).sort();
+
 		const dataType = await typeForCollection(collectionConfig, collectionKey);
-		switch (resolvedType) {
-			case LIVE_CONTENT_TYPE:
-				// This error should never be thrown, as it should have been caught earlier in the process
-				throw new AstroUserError(
-					`Invalid definition for collection ${collectionKey}: Live content collections must be defined in "src/live.config.ts"`,
-				);
-			case 'content':
-				if (collectionEntryKeys.length === 0) {
-					contentTypesStr += `${collectionKey}: Record<string, {\n  id: string;\n  slug: string;\n  body: string;\n  collection: ${collectionKey};\n  data: ${dataType};\n  render(): Render[".md"];\n}>;\n`;
-					break;
-				}
-				contentTypesStr += `${collectionKey}: {\n`;
-				for (const entryKey of collectionEntryKeys) {
-					const entryMetadata = collection.entries[entryKey];
-					const renderType = `{ render(): Render[${JSON.stringify(
-						path.extname(JSON.parse(entryKey)),
-					)}] }`;
-
-					const slugType = JSON.stringify(entryMetadata.slug);
-					contentTypesStr += `${entryKey}: {\n	id: ${entryKey};\n  slug: ${slugType};\n  body: string;\n  collection: ${collectionKey};\n  data: ${dataType}\n} & ${renderType};\n`;
-				}
-				contentTypesStr += `};\n`;
-				break;
-			case CONTENT_LAYER_TYPE:
-				const legacyTypes = (collectionConfig as any)?._legacy
-					? 'render(): Render[".md"];\n  slug: string;\n  body: string;\n'
-					: 'body?: string;\n';
-				dataTypesStr += `${collectionKey}: Record<string, {\n  id: string;\n  ${legacyTypes}  collection: ${collectionKey};\n  data: ${dataType};\n  rendered?: RenderedContent;\n  filePath?: string;\n}>;\n`;
-				break;
-			case 'data':
-				if (collectionEntryKeys.length === 0) {
-					dataTypesStr += `${collectionKey}: Record<string, {\n  id: string;\n  collection: ${collectionKey};\n  data: ${dataType};\n}>;\n`;
-				} else {
-					dataTypesStr += `${collectionKey}: {\n`;
-					for (const entryKey of collectionEntryKeys) {
-						dataTypesStr += `${entryKey}: {\n	id: ${entryKey};\n  collection: ${collectionKey};\n  data: ${dataType}\n};\n`;
-					}
-					dataTypesStr += `};\n`;
-				}
 
-				break;
-		}
+		dataTypesStr += `${collectionKey}: Record<string, {\n  id: string;\n  body?: string;\n  collection: ${collectionKey};\n  data: ${dataType};\n  rendered?: RenderedContent;\n  filePath?: string;\n}>;\n`;
 
 		if (
 			collectionConfig &&
@@ -599,7 +523,6 @@ async function writeContentFiles({
 		}
 	}
 	typeTemplateContent = typeTemplateContent
-		.replace('// @@CONTENT_ENTRY_MAP@@', contentTypesStr)
 		.replace('// @@DATA_ENTRY_MAP@@', dataTypesStr)
 		.replace(
 			"'@@CONTENT_CONFIG_TYPE@@'",
diff --git a/packages/astro/src/content/utils.ts b/packages/astro/src/content/utils.ts
index 851907d4c3f4..766d27eb93c4 100644
--- a/packages/astro/src/content/utils.ts
+++ b/packages/astro/src/content/utils.ts
@@ -11,7 +11,6 @@ import { z } from 'zod';
 import { AstroError, AstroErrorData, errorMap, MarkdownError } from '../core/errors/index.js';
 import { isYAMLException } from '../core/errors/utils.js';
 import type { Logger } from '../core/logger/core.js';
-import { appendForwardSlash } from '../core/path.js';
 import { normalizePath } from '../core/viteUtils.js';
 import type { AstroSettings } from '../types/astro.js';
 import type { AstroConfig } from '../types/public/config.js';
@@ -25,18 +24,8 @@ import {
 	LIVE_CONTENT_TYPE,
 	PROPAGATED_ASSET_FLAG,
 } from './consts.js';
-import { glob } from './loaders/glob.js';
 import { createImage } from './runtime-assets.js';
 
-/**
- * A map from a collection + slug to the local file path.
- * This is used internally to resolve entry imports when using `getEntry()`.
- * @see `templates/content/module.mjs`
- */
-export type ContentLookupMap = {
-	[collectionName: string]: { type: 'content' | 'data'; entries: { [lookupId: string]: string } };
-};
-
 const entryTypeSchema = z
 	.object({
 		id: z.string({
@@ -63,14 +52,6 @@ export const loaderReturnSchema = z.union([
 ]);
 
 const collectionConfigParser = z.union([
-	z.object({
-		type: z.literal('content').optional().default('content'),
-		schema: z.any().optional(),
-	}),
-	z.object({
-		type: z.literal('data'),
-		schema: z.any().optional(),
-	}),
 	z.object({
 		type: z.literal(CONTENT_LAYER_TYPE),
 		schema: z.any().optional(),
@@ -102,8 +83,6 @@ const collectionConfigParser = z.union([
 				render: z.function(z.tuple([z.any()], z.unknown())).optional(),
 			}),
 		]),
-		/** deprecated */
-		_legacy: z.boolean().optional(),
 	}),
 	z.object({
 		type: z.literal(LIVE_CONTENT_TYPE).optional().default(LIVE_CONTENT_TYPE),
@@ -157,14 +136,7 @@ export async function getEntryDataAndImages<
 	experimentalSvgEnabled: boolean,
 	pluginContext?: PluginContext,
 ): Promise<{ data: TOutputData; imageImports: Array<string> }> {
-	let data: TOutputData;
-	// Legacy content collections have 'slug' removed
-	if (collectionConfig.type === 'content' || (collectionConfig as any)._legacy) {
-		const { slug, ...unvalidatedData } = entry.unvalidatedData;
-		data = unvalidatedData as TOutputData;
-	} else {
-		data = entry.unvalidatedData as TOutputData;
-	}
+	let data = entry.unvalidatedData as TOutputData;
 
 	let schema = collectionConfig.schema;
 
@@ -192,20 +164,6 @@ export async function getEntryDataAndImages<
 	}
 
 	if (schema) {
-		// Catch reserved `slug` field inside content schemas
-		// Note: will not warn for `z.union` or `z.intersection` schemas
-		if (
-			collectionConfig.type === 'content' &&
-			typeof schema === 'object' &&
-			'shape' in schema &&
-			schema.shape.slug
-		) {
-			throw new AstroError({
-				...AstroErrorData.ContentSchemaContainsSlugError,
-				message: AstroErrorData.ContentSchemaContainsSlugError.message(entry.collection),
-			});
-		}
-
 		// Use `safeParseAsync` to allow async transforms
 		let formattedError;
 		const parsed = await (schema as z.ZodSchema).safeParseAsync(data, {
@@ -220,13 +178,13 @@ export async function getEntryDataAndImages<
 			data = parsed.data as TOutputData;
 		} else {
 			if (!formattedError) {
-				const errorType =
-					collectionConfig.type === 'content'
-						? AstroErrorData.InvalidContentEntryFrontmatterError
-						: AstroErrorData.InvalidContentEntryDataError;
 				formattedError = new AstroError({
-					...errorType,
-					message: errorType.message(entry.collection, entry.id, parsed.error),
+					...AstroErrorData.InvalidContentEntryDataError,
+					message: AstroErrorData.InvalidContentEntryDataError.message(
+						entry.collection,
+						entry.id,
+						parsed.error,
+					),
 					location: {
 						file: entry._internal?.filePath,
 						line: getYAMLErrorLine(
@@ -560,100 +518,6 @@ async function loadContentConfig({
 	}
 }
 
-async function autogenerateCollections({
-	config,
-	settings,
-	fs,
-}: {
-	config?: ContentConfig;
-	settings: AstroSettings;
-	fs: typeof fsMod;
-}): Promise<ContentConfig | undefined> {
-	if (settings.config.legacy.collections) {
-		return config;
-	}
-	const contentDir = new URL('./content/', settings.config.srcDir);
-
-	const collections: Record<string, CollectionConfig> = config?.collections ?? {};
-
-	const contentExts = getContentEntryExts(settings);
-	const dataExts = getDataEntryExts(settings);
-
-	const contentPattern = globWithUnderscoresIgnored('', contentExts);
-	const dataPattern = globWithUnderscoresIgnored('', dataExts);
-	let usesContentLayer = false;
-	for (const collectionName of Object.keys(collections)) {
-		if (
-			collections[collectionName]?.type === 'content_layer' ||
-			collections[collectionName]?.type === 'live'
-		) {
-			usesContentLayer = true;
-			// This is already a content layer, skip
-			continue;
-		}
-
-		const isDataCollection = collections[collectionName]?.type === 'data';
-		const base = new URL(`${collectionName}/`, contentDir);
-		// Only "content" collections need special legacy handling
-		const _legacy = !isDataCollection || undefined;
-		collections[collectionName] = {
-			...collections[collectionName],
-			type: 'content_layer',
-			_legacy,
-			loader: glob({
-				base,
-				pattern: isDataCollection ? dataPattern : contentPattern,
-				_legacy,
-				// Legacy data collections IDs aren't slugified
-				generateId: isDataCollection
-					? ({ entry }) =>
-							getDataEntryId({
-								entry: new URL(entry, base),
-								collection: collectionName,
-								contentDir,
-							})
-					: undefined,
-
-				// Zod weirdness has trouble with typing the args to the load function
-			}) as any,
-		};
-	}
-	if (!usesContentLayer && fs.existsSync(contentDir)) {
-		// If the user hasn't defined any collections using the content layer, we'll try and help out by checking for
-		// any orphaned folders in the content directory and creating collections for them.
-		const orphanedCollections = [];
-		for (const entry of await fs.promises.readdir(contentDir, { withFileTypes: true })) {
-			const collectionName = entry.name;
-			if (['_', '.'].includes(collectionName.at(0) ?? '')) {
-				continue;
-			}
-			if (entry.isDirectory() && !(collectionName in collections)) {
-				orphanedCollections.push(collectionName);
-				const base = new URL(`${collectionName}/`, contentDir);
-				collections[collectionName] = {
-					type: 'content_layer',
-					loader: glob({
-						base,
-						pattern: contentPattern,
-						_legacy: true,
-					}) as any,
-				};
-			}
-		}
-		if (orphanedCollections.length > 0) {
-			console.warn(
-				`
-Auto-generating collections for folders in "src/content/" that are not defined as collections.
-This is deprecated, so you should define these collections yourself in "src/content.config.ts".
-The following collections have been auto-generated: ${orphanedCollections
-					.map((name) => green(name))
-					.join(', ')}\n`,
-			);
-		}
-	}
-	return { ...config, collections };
-}
-
 export async function reloadContentConfigObserver({
 	observer = globalContentConfigObserver,
 	...loadContentConfigOpts
@@ -667,11 +531,6 @@ export async function reloadContentConfigObserver({
 	try {
 		let config = await loadContentConfig(loadContentConfigOpts);
 
-		config = await autogenerateCollections({
-			config,
-			...loadContentConfigOpts,
-		});
-
 		if (config) {
 			observer.set({ status: 'loaded', config });
 		} else {
@@ -741,15 +600,22 @@ export type ContentPaths = {
 };
 
 export function getContentPaths(
-	{
-		srcDir,
-		legacy,
-		root,
-		experimental,
-	}: Pick<AstroConfig, 'root' | 'srcDir' | 'legacy' | 'experimental'>,
+	{ srcDir, root, experimental }: Pick<AstroConfig, 'root' | 'srcDir' | 'experimental'>,
 	fs: typeof fsMod = fsMod,
 ): ContentPaths {
-	const configStats = searchConfig(fs, srcDir, legacy?.collections);
+	const configStats = searchConfig(fs, srcDir);
+
+	if (!configStats.exists) {
+		const legacyConfigStats = searchLegacyConfig(fs, srcDir);
+		if (legacyConfigStats.exists) {
+			const relativePath = path.relative(fileURLToPath(root), fileURLToPath(legacyConfigStats.url));
+			throw new AstroError({
+				...AstroErrorData.LegacyContentConfigError,
+				message: AstroErrorData.LegacyContentConfigError.message(relativePath),
+			});
+		}
+	}
+
 	const liveConfigStats = experimental?.liveContentCollections
 		? searchLiveConfig(fs, srcDir)
 		: { exists: false, url: new URL('./', srcDir) };
@@ -765,19 +631,22 @@ export function getContentPaths(
 	};
 }
 
-function searchConfig(
-	fs: typeof fsMod,
-	srcDir: URL,
-	legacy?: boolean,
-): { exists: boolean; url: URL } {
+function searchConfig(fs: typeof fsMod, srcDir: URL): { exists: boolean; url: URL } {
 	const paths = [
-		...(legacy
-			? []
-			: ['content.config.mjs', 'content.config.js', 'content.config.mts', 'content.config.ts']),
-		'content/config.mjs',
+		'content.config.mjs',
+		'content.config.js',
+		'content.config.mts',
+		'content.config.ts',
+	];
+	return search(fs, srcDir, paths);
+}
+
+function searchLegacyConfig(fs: typeof fsMod, srcDir: URL): { exists: boolean; url: URL } {
+	const paths = [
+		'content/config.ts',
 		'content/config.js',
+		'content/config.mjs',
 		'content/config.mts',
-		'content/config.ts',
 	];
 	return search(fs, srcDir, paths);
 }
@@ -830,13 +699,6 @@ export async function getEntrySlug({
 	return parseEntrySlug({ generatedSlug, frontmatterSlug, id, collection });
 }
 
-export function getExtGlob(exts: string[]) {
-	return exts.length === 1
-		? // Wrapping {...} breaks when there is only one extension
-			exts[0]
-		: `{${exts.join(',')}}`;
-}
-
 export function hasAssetPropagationFlag(id: string): boolean {
 	try {
 		return new URL(id, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG);
@@ -845,16 +707,6 @@ export function hasAssetPropagationFlag(id: string): boolean {
 	}
 }
 
-export function globWithUnderscoresIgnored(relContentDir: string, exts: string[]): string[] {
-	const extGlob = getExtGlob(exts);
-	const contentDir = relContentDir.length > 0 ? appendForwardSlash(relContentDir) : relContentDir;
-	return [
-		`${contentDir}**/*${extGlob}`,
-		`!${contentDir}**/_*/**/*${extGlob}`,
-		`!${contentDir}**/_*${extGlob}`,
-	];
-}
-
 /**
  * Convert a platform path to a posix path.
  */
diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
index e244b6697ada..5c18488694f9 100644
--- a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
+++ b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
@@ -1,9 +1,6 @@
 import nodeFs from 'node:fs';
-import { extname } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { fileURLToPath } from 'node:url';
 import { dataToEsm } from '@rollup/pluginutils';
-import pLimit from 'p-limit';
-import { glob } from 'tinyglobby';
 import { normalizePath, type Plugin, type ViteDevServer } from 'vite';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
 import { rootRelativePath } from '../core/viteUtils.js';
@@ -14,9 +11,7 @@ import {
 	ASSET_IMPORTS_FILE,
 	ASSET_IMPORTS_RESOLVED_STUB_ID,
 	ASSET_IMPORTS_VIRTUAL_ID,
-	CONTENT_FLAG,
 	CONTENT_RENDER_FLAG,
-	DATA_FLAG,
 	DATA_STORE_VIRTUAL_ID,
 	MODULES_IMPORTS_FILE,
 	MODULES_MJS_ID,
@@ -26,20 +21,7 @@ import {
 	VIRTUAL_MODULE_ID,
 } from './consts.js';
 import { getDataStoreFile } from './content-layer.js';
-import {
-	type ContentLookupMap,
-	getContentEntryIdAndSlug,
-	getContentPaths,
-	getDataEntryExts,
-	getDataEntryId,
-	getEntryCollectionName,
-	getEntryConfigByExtMap,
-	getEntrySlug,
-	getEntryType,
-	getExtGlob,
-	globWithUnderscoresIgnored,
-	isDeferredModule,
-} from './utils.js';
+import { getContentPaths, isDeferredModule } from './utils.js';
 
 interface AstroContentVirtualModPluginParams {
 	settings: AstroSettings;
@@ -129,17 +111,10 @@ export function astroContentVirtualModPlugin({
 		},
 		async load(id, args) {
 			if (id === RESOLVED_VIRTUAL_MODULE_ID) {
-				const lookupMap = settings.config.legacy.collections
-					? await generateLookupMap({
-							settings,
-							fs,
-						})
-					: {};
 				const isClient = !args?.ssr;
 				const code = await generateContentEntryFile({
 					settings,
 					fs,
-					lookupMap,
 					isClient,
 				});
 
@@ -213,40 +188,15 @@ export function astroContentVirtualModPlugin({
 
 async function generateContentEntryFile({
 	settings,
-	lookupMap,
 	isClient,
 }: {
 	settings: AstroSettings;
 	fs: typeof nodeFs;
-	lookupMap: ContentLookupMap;
 	isClient: boolean;
 }) {
 	const contentPaths = getContentPaths(settings.config);
 	const relContentDir = rootRelativePath(settings.config.root, contentPaths.contentDir);
 
-	let contentEntryGlobResult = '""';
-	let dataEntryGlobResult = '""';
-	let renderEntryGlobResult = '""';
-	if (settings.config.legacy.collections) {
-		const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
-		const contentEntryExts = [...contentEntryConfigByExt.keys()];
-		const dataEntryExts = getDataEntryExts(settings);
-		const createGlob = (value: string[], flag: string) =>
-			`import.meta.glob(${JSON.stringify(value)}, { query: { ${flag}: true } })`;
-		contentEntryGlobResult = createGlob(
-			globWithUnderscoresIgnored(relContentDir, contentEntryExts),
-			CONTENT_FLAG,
-		);
-		dataEntryGlobResult = createGlob(
-			globWithUnderscoresIgnored(relContentDir, dataEntryExts),
-			DATA_FLAG,
-		);
-		renderEntryGlobResult = createGlob(
-			globWithUnderscoresIgnored(relContentDir, contentEntryExts),
-			CONTENT_RENDER_FLAG,
-		);
-	}
-
 	let virtualModContents: string;
 	if (isClient) {
 		throw new AstroError({
@@ -257,10 +207,6 @@ async function generateContentEntryFile({
 		virtualModContents = nodeFs
 			.readFileSync(contentPaths.virtualModTemplate, 'utf-8')
 			.replace('@@CONTENT_DIR@@', relContentDir)
-			.replace("'@@CONTENT_ENTRY_GLOB_PATH@@'", contentEntryGlobResult)
-			.replace("'@@DATA_ENTRY_GLOB_PATH@@'", dataEntryGlobResult)
-			.replace("'@@RENDER_ENTRY_GLOB_PATH@@'", renderEntryGlobResult)
-			.replace('/* @@LOOKUP_MAP_ASSIGNMENT@@ */', `lookupMap = ${JSON.stringify(lookupMap)};`)
 			.replace(
 				'/* @@LIVE_CONTENT_CONFIG@@ */',
 				contentPaths.liveConfig.exists
@@ -272,115 +218,3 @@ async function generateContentEntryFile({
 
 	return virtualModContents;
 }
-
-/**
- * Generate a map from a collection + slug to the local file path.
- * This is used internally to resolve entry imports when using `getEntry()`.
- * @see `templates/content/module.mjs`
- */
-async function generateLookupMap({ settings, fs }: { settings: AstroSettings; fs: typeof nodeFs }) {
-	const { root } = settings.config;
-	const contentPaths = getContentPaths(settings.config);
-	const relContentDir = rootRelativePath(root, contentPaths.contentDir, false);
-
-	const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
-	const dataEntryExts = getDataEntryExts(settings);
-
-	const { contentDir } = contentPaths;
-
-	const contentEntryExts = [...contentEntryConfigByExt.keys()];
-
-	let lookupMap: ContentLookupMap = {};
-	const contentGlob = await glob(
-		`${relContentDir}**/*${getExtGlob([...dataEntryExts, ...contentEntryExts])}`,
-		{
-			absolute: true,
-			cwd: fileURLToPath(root),
-			expandDirectories: false,
-		},
-	);
-
-	// Run 10 at a time to prevent `await getEntrySlug` from accessing the filesystem all at once.
-	// Each await shouldn't take too long for the work to be noticeably slow too.
-	const limit = pLimit(10);
-	const promises: Promise<void>[] = [];
-
-	for (const filePath of contentGlob) {
-		promises.push(
-			limit(async () => {
-				const entryType = getEntryType(filePath, contentPaths, contentEntryExts, dataEntryExts);
-				// Globbed ignored or unsupported entry.
-				// Logs warning during type generation, should ignore in lookup map.
-				if (entryType !== 'content' && entryType !== 'data') return;
-
-				const collection = getEntryCollectionName({ contentDir, entry: pathToFileURL(filePath) });
-				if (!collection) throw UnexpectedLookupMapError;
-
-				if (lookupMap[collection]?.type && lookupMap[collection].type !== entryType) {
-					throw new AstroError({
-						...AstroErrorData.MixedContentDataCollectionError,
-						message: AstroErrorData.MixedContentDataCollectionError.message(collection),
-					});
-				}
-
-				if (entryType === 'content') {
-					const contentEntryType = contentEntryConfigByExt.get(extname(filePath));
-					if (!contentEntryType) throw UnexpectedLookupMapError;
-
-					const { id, slug: generatedSlug } = getContentEntryIdAndSlug({
-						entry: pathToFileURL(filePath),
-						contentDir,
-						collection,
-					});
-					const slug = await getEntrySlug({
-						id,
-						collection,
-						generatedSlug,
-						fs,
-						fileUrl: pathToFileURL(filePath),
-						contentEntryType,
-					});
-					if (lookupMap[collection]?.entries?.[slug]) {
-						throw new AstroError({
-							...AstroErrorData.DuplicateContentEntrySlugError,
-							message: AstroErrorData.DuplicateContentEntrySlugError.message(
-								collection,
-								slug,
-								lookupMap[collection].entries[slug],
-								rootRelativePath(root, filePath),
-							),
-							hint:
-								slug !== generatedSlug
-									? `Check the \`slug\` frontmatter property in **${id}**.`
-									: undefined,
-						});
-					}
-					lookupMap[collection] = {
-						type: 'content',
-						entries: {
-							...lookupMap[collection]?.entries,
-							[slug]: rootRelativePath(root, filePath),
-						},
-					};
-				} else {
-					const id = getDataEntryId({ entry: pathToFileURL(filePath), contentDir, collection });
-					lookupMap[collection] = {
-						type: 'data',
-						entries: {
-							...lookupMap[collection]?.entries,
-							[id]: rootRelativePath(root, filePath),
-						},
-					};
-				}
-			}),
-		);
-	}
-
-	await Promise.all(promises);
-	return lookupMap;
-}
-
-const UnexpectedLookupMapError = new AstroError({
-	...AstroErrorData.UnknownContentCollectionError,
-	message: `Unexpected error while parsing content entry IDs and slugs.`,
-});
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index 3b6d12f0d278..fa3c7dde5f4e 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -83,9 +83,7 @@ export const ASTRO_CONFIG_DEFAULTS = {
 	integrations: [],
 	markdown: markdownConfigDefaults,
 	vite: {},
-	legacy: {
-		collections: false,
-	},
+	legacy: {},
 	redirects: {},
 	security: {
 		checkOrigin: true,
@@ -515,11 +513,7 @@ export const AstroConfigSchema = z.object({
 			`Invalid or outdated experimental feature.\nCheck for incorrect spelling or outdated Astro version.\nSee https://docs.astro.build/en/reference/experimental-flags/ for a list of all current experiments.`,
 		)
 		.default({}),
-	legacy: z
-		.object({
-			collections: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.legacy.collections),
-		})
-		.default({}),
+	legacy: z.object({}).default({}),
 });
 
 export type AstroConfigType = z.infer<typeof AstroConfigSchema>;
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index e8348355da46..386b19443426 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -1588,14 +1588,14 @@ export const RenderUndefinedEntryError = {
 /**
  * @docs
  * @description
- * The `getDataEntryById` and `getEntryBySlug` functions are deprecated and cannot be used with content layer collections. Use the `getEntry` function instead.
+ * The `getDataEntryById` and `getEntryBySlug` functions are deprecated and cannot be used with content collections. Use the `getEntry` function instead.
  */
 export const GetEntryDeprecationError = {
 	name: 'GetEntryDeprecationError',
 	title: 'Invalid use of `getDataEntryById` or `getEntryBySlug` function.',
 	message: (collection: string, method: string) =>
 		`The \`${method}\` function is deprecated and cannot be used to query the "${collection}" collection. Use \`getEntry\` instead.`,
-	hint: 'Use the `getEntry` or `getCollection` functions to query content layer collections.',
+	hint: 'See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information.',
 } satisfies ErrorData;
 
 /**
@@ -1610,6 +1610,7 @@ export const GetEntryDeprecationError = {
  * Make sure that all required fields are present, and that all fields are of the correct type.
  * You can check against the collection schema in your `src/content.config.*` file.
  * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
+ * @deprecated This error only applies to legacy content collections which were removed in Astro 6.
  */
 export const InvalidContentEntryFrontmatterError = {
 	name: 'InvalidContentEntryFrontmatterError',
@@ -1629,7 +1630,7 @@ export const InvalidContentEntryFrontmatterError = {
  * @docs
  * @message
  * **Example error message:**<br/>
- * **blog** → **post** frontmatter does not match collection schema.<br/>
+ * **blog** → **post** data does not match collection schema.<br/>
  * "title" is required.<br/>
  * "date" must be a valid date.
  * @description
@@ -1651,6 +1652,60 @@ export const InvalidContentEntryDataError = {
 	hint: 'See https://docs.astro.build/en/guides/content-collections/ for more information on content schemas.',
 } satisfies ErrorData;
 
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Found legacy content config file in "src/content/config.ts". Please move this file to "src/content.config.ts" and ensure each collection has a loader defined.<br/>
+ * @description
+ * A legacy content config file was found. Move the file to `src/content.config.ts` and update any collection definitions if needed.
+ * See the [Astro 6 migration guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections) for more information.
+ */
+
+export const LegacyContentConfigError = {
+	name: 'LegacyContentConfigError',
+	title: 'Legacy content config file found.',
+	message: (filename: string) =>
+		`Found legacy content config file in "${filename}". Please move this file to "src/content.config.${filename.split('.').at(-1)}" and ensure each collection has a loader defined.`,
+	hint: 'See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on updating collections.',
+} satisfies ErrorData;
+
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Collections must have a `loader` defined. Check your collection definitions in your content config file.<br/>
+ * @description
+ * A content collection is missing a `loader` definition. Make sure that each collection in your content config file has a `loader`.
+ * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
+ */
+
+export const ContentCollectionMissingLoader = {
+	name: 'ContentCollectionMissingLoader',
+	title: 'Content collection is missing a `loader` definition.',
+	message: (file = 'your content config file') =>
+		`Collections must have a \`loader\` defined. Check your collection definitions in ${file}.`,
+	hint: 'See https://docs.astro.build/en/guides/content-collections/ for more information on content loaders and https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on migrating from legacy collections.',
+} satisfies ErrorData;
+
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Invalid collection type "data". Remove the type from your collection definition in your content config file.
+ * @description
+ * Content collections should no longer have a `type` field. Remove this field from your content config file.
+ * See the [Astro 6 migration guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections) for more information.
+ */
+
+export const ContentCollectionInvalidType = {
+	name: 'ContentCollectionInvalidType',
+	title: 'Content collection has an invalid `type` field.',
+	message: (type: string, file = 'your content config file') =>
+		`Invalid collection type "${type}". Remove the type from your collection definition in ${file}.`,
+	hint: 'See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on migrating from legacy collections.',
+} satisfies ErrorData;
+
 /**
  * @docs
  * @message
diff --git a/packages/astro/src/core/sync/index.ts b/packages/astro/src/core/sync/index.ts
index deab6e6e3db6..d5a71016c637 100644
--- a/packages/astro/src/core/sync/index.ts
+++ b/packages/astro/src/core/sync/index.ts
@@ -169,12 +169,7 @@ export async function syncInternal({
 		settings.timer.end('Sync content layer');
 	} else {
 		const paths = getContentPaths(settings.config, fs);
-		if (
-			paths.config.exists ||
-			paths.liveConfig.exists ||
-			// Legacy collections don't require a config file
-			(settings.config.legacy?.collections && fs.existsSync(paths.contentDir))
-		) {
+		if (paths.config.exists || paths.liveConfig.exists) {
 			// We only create the reference, without a stub to avoid overriding the
 			// already generated types
 			settings.injectedTypes.push({
@@ -273,20 +268,12 @@ async function syncContentCollections(
 			settings,
 			viteServer: tempViteServer,
 		});
-		const typesResult = await contentTypesGenerator.init();
+		await contentTypesGenerator.init();
 
 		const contentConfig = globalContentConfigObserver.get();
 		if (contentConfig.status === 'error') {
 			throw contentConfig.error;
 		}
-
-		if (typesResult.typesGenerated === false) {
-			switch (typesResult.reason) {
-				case 'no-content-dir':
-				default:
-					logger.debug('types', 'No content directory found. Skipping type generation.');
-			}
-		}
 	} catch (e) {
 		const safeError = createSafeError(e) as ErrorWithMetadata;
 		if (isAstroError(e)) {
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 59bfe4b1729e..9efc3504195a 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -1995,48 +1995,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
 	 * 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?: {
-		/**
-		 *
-		 * @name legacy.collections
-		 * @type {boolean}
-		 * @default `false`
-		 * @version 5.0.0
-		 * @description
-		 * Enable legacy behavior for content collections.
-		 *
-		 * ```js
-		 * // astro.config.mjs
-		 * import { defineConfig } from 'astro/config';
-		 * export default defineConfig({
-		 *   legacy: {
-		 *     collections: true
-		 *   }
-		 * });
-		 * ```
-		 *
-		 * If enabled, `data` and `content` collections (only) are handled using the legacy content collections implementation. Collections with a `loader` (only) will continue to use the Content Layer API instead. Both kinds of collections may exist in the same project, each using their respective implementations.
-		 *
-		 *  The following limitations continue to exist:
-		 *
-		 * - Any legacy (`type: 'content'` or `type: 'data'`) collections must continue to be located in the `src/content/` directory.
-		 * - These legacy collections will not be transformed to implicitly use the `glob()` loader, and will instead be handled by legacy code.
-		 * - Collections using the Content Layer API (with a `loader` defined) are forbidden in `src/content/`, but may exist anywhere else in your project.
-		 *
-		 * When you are ready to remove this flag and migrate to the new Content Layer API for your legacy collections, you must define a collection for any directories in `src/content/` that you want to continue to use as a collection. It is sufficient to declare an empty collection, and Astro will implicitly generate an appropriate definition for your legacy collections:
-		 *
-		 * ```js
-		 * // src/content.config.ts
-		 * import { defineCollection, z } from 'astro:content';
-		 *
-		 * const blog = defineCollection({ })
-		 *
-		 * export const collections = { blog };
-		 * ```
-		 *
-		 */
-		collections?: boolean;
-	};
+	legacy?: Record<string, never>; // Currently no legacy flags are available.
 
 	/**
 	 *
diff --git a/packages/astro/src/virtual-modules/live-config.ts b/packages/astro/src/virtual-modules/live-config.ts
index 989761b8e98c..687aab2d6c01 100644
--- a/packages/astro/src/virtual-modules/live-config.ts
+++ b/packages/astro/src/virtual-modules/live-config.ts
@@ -17,8 +17,6 @@ function createErrorFunction(message: string) {
 export const getCollection = createErrorFunction('getCollection');
 export const render = createErrorFunction('render');
 export const getEntry = createErrorFunction('getEntry');
-export const getEntryBySlug = createErrorFunction('getEntryBySlug');
-export const getDataEntryById = createErrorFunction('getDataEntryById');
 export const getEntries = createErrorFunction('getEntries');
 export const reference = createErrorFunction('reference');
 export const getLiveCollection = createErrorFunction('getLiveCollection');
diff --git a/packages/astro/templates/content/module.mjs b/packages/astro/templates/content/module.mjs
index 327c4a144376..00e4496c8d9c 100644
--- a/packages/astro/templates/content/module.mjs
+++ b/packages/astro/templates/content/module.mjs
@@ -1,11 +1,9 @@
 // astro-head-inject
 import {
-	createCollectionToGlobResultMap,
+	createDeprecatedFunction,
 	createGetCollection,
-	createGetDataEntryById,
 	createGetEntries,
 	createGetEntry,
-	createGetEntryBySlug,
 	createGetLiveCollection,
 	createGetLiveEntry,
 	createReference,
@@ -20,76 +18,17 @@ export { z } from 'astro/zod';
 
 /* @@LIVE_CONTENT_CONFIG@@ */
 
-const contentDir = '@@CONTENT_DIR@@';
-
-const contentEntryGlob = '@@CONTENT_ENTRY_GLOB_PATH@@';
-const contentCollectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: contentEntryGlob,
-	contentDir,
-});
-
-const dataEntryGlob = '@@DATA_ENTRY_GLOB_PATH@@';
-const dataCollectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: dataEntryGlob,
-	contentDir,
-});
-const collectionToEntryMap = createCollectionToGlobResultMap({
-	globResult: { ...contentEntryGlob, ...dataEntryGlob },
-	contentDir,
-});
-
-let lookupMap = {};
-/* @@LOOKUP_MAP_ASSIGNMENT@@ */
-
-const collectionNames = new Set(Object.keys(lookupMap));
-
-function createGlobLookup(glob) {
-	return async (collection, lookupId) => {
-		const filePath = lookupMap[collection]?.entries[lookupId];
-
-		if (!filePath) return undefined;
-		return glob[collection][filePath];
-	};
-}
-
-const renderEntryGlob = '@@RENDER_ENTRY_GLOB_PATH@@';
-const collectionToRenderEntryMap = createCollectionToGlobResultMap({
-	globResult: renderEntryGlob,
-	contentDir,
-});
-
-const cacheEntriesByCollection = new Map();
 export const getCollection = createGetCollection({
-	contentCollectionToEntryMap,
-	dataCollectionToEntryMap,
-	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
-	cacheEntriesByCollection,
 	liveCollections,
 });
 
 export const getEntry = createGetEntry({
-	getEntryImport: createGlobLookup(collectionToEntryMap),
-	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
-	collectionNames,
 	liveCollections,
 });
 
-export const getEntryBySlug = createGetEntryBySlug({
-	getEntryImport: createGlobLookup(contentCollectionToEntryMap),
-	getRenderEntryImport: createGlobLookup(collectionToRenderEntryMap),
-	collectionNames,
-	getEntry,
-});
-
-export const getDataEntryById = createGetDataEntryById({
-	getEntryImport: createGlobLookup(dataCollectionToEntryMap),
-	collectionNames,
-	getEntry,
-});
-
 export const getEntries = createGetEntries(getEntry);
 
-export const reference = createReference({ lookupMap });
+export const reference = createReference();
 
 export const getLiveCollection = createGetLiveCollection({
 	liveCollections,
@@ -98,3 +37,9 @@ export const getLiveCollection = createGetLiveCollection({
 export const getLiveEntry = createGetLiveEntry({
 	liveCollections,
 });
+
+// TODO: remove in Astro 7
+export const getEntryBySlug = createDeprecatedFunction('getEntryBySlug');
+
+// TODO: remove in Astro 7
+export const getDataEntryById = createDeprecatedFunction('getDataEntryById');
diff --git a/packages/astro/templates/content/types.d.ts b/packages/astro/templates/content/types.d.ts
index 291d49a54e16..12d008e3d6e3 100644
--- a/packages/astro/templates/content/types.d.ts
+++ b/packages/astro/templates/content/types.d.ts
@@ -20,16 +20,10 @@ declare module 'astro:content' {
 declare module 'astro:content' {
 	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
 
-	export type CollectionKey = keyof AnyEntryMap;
-	export type CollectionEntry<C extends CollectionKey> = Flatten<AnyEntryMap[C]>;
-
-	export type ContentCollectionKey = keyof ContentEntryMap;
-	export type DataCollectionKey = keyof DataEntryMap;
+	export type CollectionKey = keyof DataEntryMap;
+	export type CollectionEntry<C extends CollectionKey> = Flatten<DataEntryMap[C]>;
 
 	type AllValuesOf<T> = T extends any ? T[keyof T] : never;
-	type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
-		ContentEntryMap[C]
-	>['slug'];
 
 	export type ReferenceDataEntry<
 		C extends CollectionKey,
@@ -38,41 +32,17 @@ declare module 'astro:content' {
 		collection: C;
 		id: E;
 	};
-	export type ReferenceContentEntry<
-		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {}) = string,
-	> = {
-		collection: C;
-		slug: E;
-	};
+
 	export type ReferenceLiveEntry<C extends keyof LiveContentConfig['collections']> = {
 		collection: C;
 		id: string;
 	};
 
-	/** @deprecated Use `getEntry` instead. */
-	export function getEntryBySlug<
-		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {}),
-	>(
-		collection: C,
-		// Note that this has to accept a regular string too, for SSR
-		entrySlug: E,
-	): E extends ValidContentEntrySlug<C>
-		? Promise<CollectionEntry<C>>
-		: Promise<CollectionEntry<C> | undefined>;
-
-	/** @deprecated Use `getEntry` instead. */
-	export function getDataEntryById<C extends keyof DataEntryMap, E extends keyof DataEntryMap[C]>(
-		collection: C,
-		entryId: E,
-	): Promise<CollectionEntry<C>>;
-
-	export function getCollection<C extends keyof AnyEntryMap, E extends CollectionEntry<C>>(
+	export function getCollection<C extends keyof DataEntryMap, E extends CollectionEntry<C>>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => entry is E,
 	): Promise<E[]>;
-	export function getCollection<C extends keyof AnyEntryMap>(
+	export function getCollection<C extends keyof DataEntryMap>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => unknown,
 	): Promise<CollectionEntry<C>[]>;
@@ -84,14 +54,6 @@ declare module 'astro:content' {
 		import('astro').LiveDataCollectionResult<LiveLoaderDataType<C>, LiveLoaderErrorType<C>>
 	>;
 
-	export function getEntry<
-		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {}),
-	>(
-		entry: ReferenceContentEntry<C, E>,
-	): E extends ValidContentEntrySlug<C>
-		? Promise<CollectionEntry<C>>
-		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
 		E extends keyof DataEntryMap[C] | (string & {}),
@@ -100,15 +62,6 @@ declare module 'astro:content' {
 	): E extends keyof DataEntryMap[C]
 		? Promise<DataEntryMap[C][E]>
 		: Promise<CollectionEntry<C> | undefined>;
-	export function getEntry<
-		C extends keyof ContentEntryMap,
-		E extends ValidContentEntrySlug<C> | (string & {}),
-	>(
-		collection: C,
-		slug: E,
-	): E extends ValidContentEntrySlug<C>
-		? Promise<CollectionEntry<C>>
-		: Promise<CollectionEntry<C> | undefined>;
 	export function getEntry<
 		C extends keyof DataEntryMap,
 		E extends keyof DataEntryMap[C] | (string & {}),
@@ -126,24 +79,19 @@ declare module 'astro:content' {
 	): Promise<import('astro').LiveDataEntryResult<LiveLoaderDataType<C>, LiveLoaderErrorType<C>>>;
 
 	/** Resolve an array of entry references from the same collection */
-	export function getEntries<C extends keyof ContentEntryMap>(
-		entries: ReferenceContentEntry<C, ValidContentEntrySlug<C>>[],
-	): Promise<CollectionEntry<C>[]>;
 	export function getEntries<C extends keyof DataEntryMap>(
 		entries: ReferenceDataEntry<C, keyof DataEntryMap[C]>[],
 	): Promise<CollectionEntry<C>[]>;
 
-	export function render<C extends keyof AnyEntryMap>(
-		entry: AnyEntryMap[C][string],
+	export function render<C extends keyof DataEntryMap>(
+		entry: DataEntryMap[C][string],
 	): Promise<RenderResult>;
 
-	export function reference<C extends keyof AnyEntryMap>(
+	export function reference<C extends keyof DataEntryMap>(
 		collection: C,
 	): import('astro/zod').ZodEffects<
 		import('astro/zod').ZodString,
-		C extends keyof ContentEntryMap
-			? ReferenceContentEntry<C, ValidContentEntrySlug<C>>
-			: ReferenceDataEntry<C, keyof DataEntryMap[C]>
+		ReferenceDataEntry<C, keyof DataEntryMap[C]>
 	>;
 	// Allow generic `string` to avoid excessive type errors in the config
 	// if `dev` is not running to update as you edit.
@@ -153,20 +101,14 @@ declare module 'astro:content' {
 	): import('astro/zod').ZodEffects<import('astro/zod').ZodString, never>;
 
 	type ReturnTypeOrOriginal<T> = T extends (...args: any[]) => infer R ? R : T;
-	type InferEntrySchema<C extends keyof AnyEntryMap> = import('astro/zod').infer<
+	type InferEntrySchema<C extends keyof DataEntryMap> = import('astro/zod').infer<
 		ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']>
 	>;
 
-	type ContentEntryMap = {
-		// @@CONTENT_ENTRY_MAP@@
-	};
-
 	type DataEntryMap = {
 		// @@DATA_ENTRY_MAP@@
 	};
 
-	type AnyEntryMap = ContentEntryMap & DataEntryMap;
-
 	type ExtractLoaderTypes<T> = T extends import('astro/loaders').LiveLoader<
 		infer TData,
 		infer TEntryFilter,
@@ -175,7 +117,6 @@ declare module 'astro:content' {
 	>
 		? { data: TData; entryFilter: TEntryFilter; collectionFilter: TCollectionFilter; error: TError }
 		: { data: never; entryFilter: never; collectionFilter: never; error: never };
-	type ExtractDataType<T> = ExtractLoaderTypes<T>['data'];
 	type ExtractEntryFilterType<T> = ExtractLoaderTypes<T>['entryFilter'];
 	type ExtractCollectionFilterType<T> = ExtractLoaderTypes<T>['collectionFilter'];
 	type ExtractErrorType<T> = ExtractLoaderTypes<T>['error'];
diff --git a/packages/astro/test/astro-sync.test.js b/packages/astro/test/astro-sync.test.js
index 3e5a9bcbf330..43a00b355fa2 100644
--- a/packages/astro/test/astro-sync.test.js
+++ b/packages/astro/test/astro-sync.test.js
@@ -150,9 +150,7 @@ describe('astro sync', () => {
 				'.astro/content.d.ts',
 				`"blog": Record<string, {
   id: string;
-  render(): Render[".md"];
-  slug: string;
-  body: string;
+  body?: string;
   collection: "blog";
   data: InferEntrySchema<"blog">;
   rendered?: RenderedContent;
@@ -172,13 +170,6 @@ describe('astro sync', () => {
 				'Types file does not include empty collection type',
 			);
 		});
-
-		it('does not write individual types for entries when emulating legacy collections', async () => {
-			await fixture.load('./fixtures/content-collections/');
-			fixture.clean();
-			await fixture.whenSyncing();
-			fixture.thenFileContentShouldNotInclude('.astro/content.d.ts', 'id: "one.md"');
-		});
 	});
 
 	describe('astro:env', () => {
diff --git a/packages/astro/test/config-vite.test.js b/packages/astro/test/config-vite.test.js
index 90d3487f9f1b..f14712b2d724 100644
--- a/packages/astro/test/config-vite.test.js
+++ b/packages/astro/test/config-vite.test.js
@@ -1,5 +1,6 @@
 import assert from 'node:assert/strict';
-import { before, describe, it } from 'node:test';
+import { after, before, describe, it } from 'node:test';
+import { fileURLToPath } from 'node:url';
 import * as cheerio from 'cheerio';
 import { defaultClientConditions, resolveConfig } from 'vite';
 import { getViteConfig } from '../dist/config/index.js';
@@ -25,6 +26,12 @@ describe('Vite Config', async () => {
 });
 
 describe('getViteConfig', () => {
+	let originalCwd;
+	before(() => {
+		originalCwd = process.cwd();
+		// We chdir because otherwise it sets the wrong root in the site config
+		process.chdir(fileURLToPath(new URL('./fixtures/config-vite/', import.meta.url)));
+	});
 	it('Does not change the default config.', async () => {
 		const command = 'serve';
 		const mode = 'test';
@@ -36,4 +43,7 @@ describe('getViteConfig', () => {
 			'astro',
 		]);
 	});
+	after(() => {
+		process.chdir(originalCwd);
+	});
 });
diff --git a/packages/astro/test/content-collection-references.test.js b/packages/astro/test/content-collection-references.test.js
index 8e5510cebf03..58fd163ac31e 100644
--- a/packages/astro/test/content-collection-references.test.js
+++ b/packages/astro/test/content-collection-references.test.js
@@ -82,17 +82,15 @@ describe('Content Collections - references', () => {
 						body: fixLineEndings(body).trim(),
 					}));
 					assert.deepEqual(
-						topLevelInfo.map(({ id, slug, body, collection }) => ({ id, slug, body, collection })),
+						topLevelInfo.map(({ id, body, collection }) => ({ id, body, collection })),
 						[
 							{
-								id: 'related-1.md',
-								slug: 'related-1',
+								id: 'related-1',
 								body: '# Related post 1\n\nThis is related to the welcome post.',
 								collection: 'blog',
 							},
 							{
-								id: 'related-2.md',
-								slug: 'related-2',
+								id: 'related-2',
 								body: '# Related post 2\n\nThis is related to the welcome post.',
 								collection: 'blog',
 							},
diff --git a/packages/astro/test/content-collections-render.test.js b/packages/astro/test/content-collections-render.test.js
index 31ed04a15ae5..259034218721 100644
--- a/packages/astro/test/content-collections-render.test.js
+++ b/packages/astro/test/content-collections-render.test.js
@@ -37,25 +37,6 @@ describe('Content Collections - render()', () => {
 			assert.equal($('link[rel=stylesheet]').length, 0);
 		});
 
-		it('De-duplicates CSS used both in layout and directly in target page', async () => {
-			const html = await fixture.readFile('/with-layout-prop/index.html');
-			const $ = cheerio.load(html);
-
-			const set = new Set();
-
-			$('link[rel=stylesheet]').each((_, linkEl) => {
-				const href = linkEl.attribs.href;
-				assert.equal(set.has(href), false);
-				set.add(href);
-			});
-
-			$('style').each((_, styleEl) => {
-				const textContent = styleEl.children[0].data;
-				assert.equal(set.has(textContent), false);
-				set.add(textContent);
-			});
-		});
-
 		it('Includes component scripts for rendered entry', async () => {
 			const html = await fixture.readFile('/launch-week-component-scripts/index.html');
 			const $ = cheerio.load(html);
@@ -165,7 +146,7 @@ describe('Content Collections - render()', () => {
 			let response = await app.render(request);
 			let html = await response.text();
 			let $ = cheerio.load(html);
-			assert.equal($('li').first().text(), 'With Layout Prop');
+			assert.equal($('li').first().text(), 'Launch week!');
 
 			request = new Request('http://example.com/');
 			response = await app.render(request);
@@ -232,7 +213,7 @@ describe('Content Collections - render()', () => {
 			assert.equal(h2.attr('data-components-export-applied'), 'true');
 		});
 
-		it('Supports layout prop with recursive getCollection() call', async () => {
+		it.skip('Supports layout prop with recursive getCollection() call - DEPRECATED: layout props removed in Astro 5', async () => {
 			const response = await fixture.fetch('/with-layout-prop', { method: 'GET' });
 			assert.equal(response.status, 200);
 
diff --git a/packages/astro/test/content-collections.test.js b/packages/astro/test/content-collections.test.js
index 70383e728ccb..d01f9f05ec6b 100644
--- a/packages/astro/test/content-collections.test.js
+++ b/packages/astro/test/content-collections.test.js
@@ -21,47 +21,13 @@ describe('Content Collections', () => {
 				json = devalue.parse(rawJson);
 			});
 
-			it('Returns `without config` collection', async () => {
-				assert.ok(json.hasOwnProperty('withoutConfig'));
-				assert.equal(Array.isArray(json.withoutConfig), true);
-
-				const ids = json.withoutConfig.map((item) => item.id);
-				assert.deepEqual(
-					ids.sort(),
-					[
-						'columbia.md',
-						'endeavour.md',
-						'enterprise.md',
-						// Spaces allowed in IDs
-						'promo/launch week.mdx',
-					].sort(),
-				);
-			});
-
-			it('Handles spaces in `without config` slugs', async () => {
-				assert.ok(json.hasOwnProperty('withoutConfig'));
-				assert.equal(Array.isArray(json.withoutConfig), true);
-
-				const slugs = json.withoutConfig.map((item) => item.slug);
-				assert.deepEqual(
-					slugs.sort(),
-					[
-						'columbia',
-						'endeavour',
-						'enterprise',
-						// "launch week.mdx" is converted to "launch-week.mdx"
-						'promo/launch-week',
-					].sort(),
-				);
-			});
-
 			it('Returns `with schema` collection', async () => {
 				assert.ok(json.hasOwnProperty('withSchemaConfig'));
 				assert.equal(Array.isArray(json.withSchemaConfig), true);
 
 				const ids = json.withSchemaConfig.map((item) => item.id);
 				const publishedDates = json.withSchemaConfig.map((item) => item.data.publishedAt);
-				assert.deepEqual(ids.sort(), ['four%.md', 'one.md', 'three.md', 'two.md'].sort());
+				assert.deepEqual(ids.sort(), ['four%', 'one', 'three', 'two'].sort());
 				assert.equal(
 					publishedDates.every((date) => date instanceof Date),
 					true,
@@ -79,10 +45,10 @@ describe('Content Collections', () => {
 			});
 
 			it('Returns `with custom slugs` collection', async () => {
-				assert.ok(json.hasOwnProperty('withSlugConfig'));
-				assert.equal(Array.isArray(json.withSlugConfig), true);
+				assert.ok(json.hasOwnProperty('withCustomSlugs'));
+				assert.equal(Array.isArray(json.withCustomSlugs), true);
 
-				const slugs = json.withSlugConfig.map((item) => item.slug);
+				const slugs = json.withCustomSlugs.map((item) => item.id);
 				assert.deepEqual(slugs.sort(), ['fancy-one', 'excellent-three', 'interesting-two'].sort());
 			});
 
@@ -90,14 +56,14 @@ describe('Content Collections', () => {
 				assert.ok(json.hasOwnProperty('withUnionSchema'));
 				assert.equal(Array.isArray(json.withUnionSchema), true);
 
-				const post = json.withUnionSchema.find((item) => item.id === 'post.md');
+				const post = json.withUnionSchema.find((item) => item.id === 'post');
 				assert.notEqual(post, undefined);
 				assert.deepEqual(post.data, {
 					type: 'post',
 					title: 'My Post',
 					description: 'This is my post',
 				});
-				const newsletter = json.withUnionSchema.find((item) => item.id === 'newsletter.md');
+				const newsletter = json.withUnionSchema.find((item) => item.id === 'newsletter');
 				assert.notEqual(newsletter, undefined);
 				assert.deepEqual(newsletter.data, {
 					type: 'newsletter',
@@ -109,9 +75,9 @@ describe('Content Collections', () => {
 				assert.ok(json.hasOwnProperty('withSymlinkedContent'));
 				assert.equal(Array.isArray(json.withSymlinkedContent), true);
 				const ids = json.withSymlinkedContent.map((item) => item.id);
-				assert.deepEqual(ids.sort(), ['first.md', 'second.md', 'third.md'].sort());
+				assert.deepEqual(ids.sort(), ['first', 'second', 'third'].sort());
 				assert.equal(
-					json.withSymlinkedContent.find(({ id }) => id === 'first.md').data.title,
+					json.withSymlinkedContent.find(({ id }) => id === 'first').data.title,
 					'First Blog',
 				);
 			});
@@ -147,7 +113,7 @@ describe('Content Collections', () => {
 
 			it('Returns `with schema` collection entry', async () => {
 				assert.ok(json.hasOwnProperty('oneWithSchemaConfig'));
-				assert.equal(json.oneWithSchemaConfig.id, 'one.md');
+				assert.equal(json.oneWithSchemaConfig.id, 'one');
 				assert.equal(json.oneWithSchemaConfig.data.publishedAt instanceof Date, true);
 				assert.equal(
 					json.oneWithSchemaConfig.data.publishedAt.toISOString(),
@@ -156,13 +122,13 @@ describe('Content Collections', () => {
 			});
 
 			it('Returns `with custom slugs` collection entry', async () => {
-				assert.ok(json.hasOwnProperty('twoWithSlugConfig'));
-				assert.equal(json.twoWithSlugConfig.slug, 'interesting-two');
+				assert.ok(json.hasOwnProperty('twoWithCustomSlugs'));
+				assert.equal(json.twoWithCustomSlugs.id, 'interesting-two');
 			});
 
 			it('Returns `with union schema` collection entry', async () => {
 				assert.ok(json.hasOwnProperty('postWithUnionSchema'));
-				assert.equal(json.postWithUnionSchema.id, 'post.md');
+				assert.equal(json.postWithUnionSchema.id, 'post');
 				assert.deepEqual(json.postWithUnionSchema.data, {
 					type: 'post',
 					title: 'My Post',
@@ -256,8 +222,8 @@ describe('Content Collections', () => {
 			assert.equal(error, null);
 		});
 	});
-	describe('With config.mjs', () => {
-		it("Errors when frontmatter doesn't match schema", async () => {
+	describe('With legacy config', () => {
+		it('Throws if legacy config file is found', async () => {
 			const fixture = await loadFixture({
 				root: './fixtures/content-collections-with-config-mjs/',
 			});
@@ -267,21 +233,10 @@ describe('Content Collections', () => {
 			} catch (e) {
 				error = e.message;
 			}
-			assert.match(error, /\*\*title\*\*: Expected type `"string"`, received `"number"`/);
-		});
-	});
-	describe('With config.mts', () => {
-		it("Errors when frontmatter doesn't match schema", async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content-collections-with-config-mts/',
-			});
-			let error;
-			try {
-				await fixture.build({ force: true });
-			} catch (e) {
-				error = e.message;
-			}
-			assert.match(error, /\*\*title\*\*: Expected type `"string"`, received `"number"`/);
+			assert.equal(
+				error,
+				'Found legacy content config file in "src/content/config.mjs". Please move this file to "src/content.config.mjs" and ensure each collection has a loader defined.',
+			);
 		});
 	});
 
@@ -382,6 +337,14 @@ describe('Content Collections', () => {
 				);
 			}
 		});
+
+		it('Throws deprecation error when using getEntryBySlug', async () => {
+			const request = new Request('http://example.com/deprecated-getentrybyslug');
+			const response = await app.render(request);
+
+			// Should return 500 status when getEntryBySlug is used with new content collections
+			assert.equal(response.status, 500);
+		});
 	});
 
 	describe('Base configuration', () => {
diff --git a/packages/astro/test/core-image.test.js b/packages/astro/test/core-image.test.js
index 9be37c7bef6a..e88533fffcc3 100644
--- a/packages/astro/test/core-image.test.js
+++ b/packages/astro/test/core-image.test.js
@@ -600,12 +600,12 @@ describe('astro:image', () => {
 
 			it('Adds the <img> tags', () => {
 				let $img = $('img');
-				assert.equal($img.length, 8);
+				assert.equal($img.length, 7);
 			});
 
 			it('image in cc folder is processed', () => {
 				let $imgs = $('img');
-				let $blogfolderimg = $($imgs[7]);
+				let $blogfolderimg = $($imgs[6]);
 				assert.equal($blogfolderimg.attr('src').includes('blogfolder.jpg'), true);
 				assert.equal($blogfolderimg.attr('src').endsWith('f=webp'), true);
 			});
@@ -615,11 +615,6 @@ describe('astro:image', () => {
 				assert.equal($img.attr('src').startsWith('/'), true);
 			});
 
-			it('has proper source for refined image', () => {
-				let $img = $('#refined-image img');
-				assert.equal($img.attr('src').startsWith('/'), true);
-			});
-
 			it('has proper sources for array of images', () => {
 				let $img = $('#array-of-images img');
 				const imgsSrcs = [];
@@ -806,7 +801,11 @@ describe('astro:image', () => {
 			await res.text();
 
 			assert.equal(logs.length, 1);
-			assert.equal(logs[0].message.includes('does not exist. Is the path correct?'), true);
+			assert.ok(
+				logs[0].message.includes(
+					'Could not find requested image `./does-not-exist.jpg`. Does it exist\?',
+				),
+			);
 		});
 
 		it('properly error image in Markdown content is not found', async () => {
diff --git a/packages/astro/test/css-inline-stylesheets.test.js b/packages/astro/test/css-inline-stylesheets.test.js
index 7bae334e14cc..a4dd33c5adba 100644
--- a/packages/astro/test/css-inline-stylesheets.test.js
+++ b/packages/astro/test/css-inline-stylesheets.test.js
@@ -110,11 +110,10 @@ describe('Setting inlineStylesheets to auto in static output', () => {
 	it('Renders some <style> and some <link> tags', async () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerio.load(html);
-
 		// the count of style/link tags depends on our css chunking logic
 		// this test should be updated if it changes
-		assert.equal($('style').length, 3);
 		assert.equal($('link[rel=stylesheet]').length, 1);
+		assert.equal($('style').length, 1);
 	});
 
 	describe('Inspect linked and inlined stylesheets', () => {
@@ -162,7 +161,7 @@ describe('Setting inlineStylesheets to auto in server output', () => {
 
 		// the count of style/link tags depends on our css chunking logic
 		// this test should be updated if it changes
-		assert.equal($('style').length, 3);
+		assert.equal($('style').length, 1);
 		assert.equal($('link[rel=stylesheet]').length, 1);
 	});
 
diff --git a/packages/astro/test/fixtures/astro-assets-dir/src/content.config.ts b/packages/astro/test/fixtures/astro-assets-dir/src/content.config.ts
index 185048665589..bbff615cf6e8 100644
--- a/packages/astro/test/fixtures/astro-assets-dir/src/content.config.ts
+++ b/packages/astro/test/fixtures/astro-assets-dir/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: ({image}) => z.object({
     title: z.string(),
     cover: image(),
diff --git a/packages/astro/test/fixtures/astro-assets-prefix/src/content.config.ts b/packages/astro/test/fixtures/astro-assets-prefix/src/content.config.ts
index 185048665589..bbff615cf6e8 100644
--- a/packages/astro/test/fixtures/astro-assets-prefix/src/content.config.ts
+++ b/packages/astro/test/fixtures/astro-assets-prefix/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: ({image}) => z.object({
     title: z.string(),
     cover: image(),
diff --git a/packages/astro/test/fixtures/astro-mode/src/content.config.ts b/packages/astro/test/fixtures/astro-mode/src/content.config.ts
new file mode 100644
index 000000000000..3a89171ad8bf
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-mode/src/content.config.ts
@@ -0,0 +1,50 @@
+import { defineCollection } from "astro:content";
+
+const rodents = defineCollection({
+	loader: () => ({
+		capybara: {
+			name: 'Capybara',
+			scientificName: 'Hydrochoerus hydrochaeris',
+			lifespan: 10,
+			weight: 50000,
+			diet: ['grass', 'aquatic plants', 'bark', 'fruits'],
+			nocturnal: false,
+		},
+		hamster: {
+			name: 'Golden Hamster',
+			scientificName: 'Mesocricetus auratus',
+			lifespan: 2,
+			weight: 120,
+			diet: ['seeds', 'nuts', 'insects'],
+			nocturnal: true,
+		},
+		rat: {
+			name: 'Brown Rat',
+			scientificName: 'Rattus norvegicus',
+			lifespan: 2,
+			weight: 350,
+			diet: ['grains', 'fruits', 'vegetables', 'meat'],
+			nocturnal: true,
+		},
+		mouse: {
+			name: 'House Mouse',
+			scientificName: 'Mus musculus',
+			lifespan: 1,
+			weight: 20,
+			diet: ['seeds', 'grains', 'fruits'],
+			nocturnal: true,
+		},
+		guineaPig: {
+			name: 'Guinea Pig',
+			scientificName: 'Cavia porcellus',
+			lifespan: 5,
+			weight: 1000,
+			diet: ['hay', 'vegetables', 'fruits'],
+			nocturnal: false,
+		},
+	})
+});
+
+export const collections = {
+	rodents
+};
diff --git a/packages/astro/test/fixtures/content with spaces in folder name/src/content.config.ts b/packages/astro/test/fixtures/content with spaces in folder name/src/content.config.ts
index 60a5803592ab..a246646a0e7d 100644
--- a/packages/astro/test/fixtures/content with spaces in folder name/src/content.config.ts	
+++ b/packages/astro/test/fixtures/content with spaces in folder name/src/content.config.ts	
@@ -1,10 +1,13 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const withCustomSlugs = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-custom-slugs' }),
 	schema: z.object({}),
 });
 
 const withSchemaConfig = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-schema-config' }),
 	schema: z.object({
 		title: z.string(),
 		isDraft: z.boolean().default(false),
@@ -14,6 +17,7 @@ const withSchemaConfig = defineCollection({
 });
 
 const withUnionSchema = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-union-schema' }),
 	schema: z.discriminatedUnion('type', [
 		z.object({
 			type: z.literal('post'),
diff --git a/packages/astro/test/fixtures/content-collection-references/src/content.config.ts b/packages/astro/test/fixtures/content-collection-references/src/content.config.ts
index 7d707b8b7dc5..d383dd6401e0 100644
--- a/packages/astro/test/fixtures/content-collection-references/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collection-references/src/content.config.ts
@@ -1,7 +1,8 @@
 import { defineCollection, reference, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const banners = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/banners' }),
 	schema: ({ image }) =>
 		z.object({
 			alt: z.string(),
@@ -10,7 +11,7 @@ const banners = defineCollection({
 });
 
 const authors = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/authors' }),
 	schema: z.object({
 		name: z.string(),
 		twitter: z.string().url(),
@@ -18,6 +19,7 @@ const authors = defineCollection({
 });
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 		banner: reference('banners'),
diff --git a/packages/astro/test/fixtures/content-collection-references/src/pages/welcome-data.json.js b/packages/astro/test/fixtures/content-collection-references/src/pages/welcome-data.json.js
index 67e220b6c138..b744039c355b 100644
--- a/packages/astro/test/fixtures/content-collection-references/src/pages/welcome-data.json.js
+++ b/packages/astro/test/fixtures/content-collection-references/src/pages/welcome-data.json.js
@@ -9,8 +9,7 @@ export async function GET() {
 
 	const banner = await getEntry(welcomePost.data.banner);
 	const author = await getEntry(welcomePost.data.author);
-	const rawRelatedPosts = await getEntries(welcomePost.data.relatedPosts ?? []);
-	const relatedPosts = rawRelatedPosts.map(({ render /** filter out render() function */, ...p }) => p);
+	const relatedPosts = await getEntries(welcomePost.data.relatedPosts ?? []);
 
 	return Response.json({
 		welcomePost,
diff --git a/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro b/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro
index e372f5a64ae4..efa7e81c385f 100644
--- a/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro
+++ b/packages/astro/test/fixtures/content-collection-references/src/pages/welcome.astro
@@ -30,7 +30,7 @@ const relatedPosts = await getEntries(welcomePost.data.relatedPosts ?? []);
 			{
 				relatedPosts.map((post) => (
 					<li>
-						<a href={`/blog/${post.slug}`}>{post.data.title}</a>
+						<a href={`/blog/${post.id}`}>{post.data.title}</a>
 					</li>
 				))
 			}
diff --git a/packages/astro/test/fixtures/content-collections-base/src/content.config.ts b/packages/astro/test/fixtures/content-collections-base/src/content.config.ts
index 0f52c4ca3624..ec081aeb4893 100644
--- a/packages/astro/test/fixtures/content-collections-base/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collections-base/src/content.config.ts
@@ -1,7 +1,9 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 
 const docs = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/docs' }),
 	schema: z.object({
 		title: z.string(),
 	}),
diff --git a/packages/astro/test/fixtures/content-collections-base/src/pages/docs.astro b/packages/astro/test/fixtures/content-collections-base/src/pages/docs.astro
index 6b352ce371a8..a57364f8633c 100644
--- a/packages/astro/test/fixtures/content-collections-base/src/pages/docs.astro
+++ b/packages/astro/test/fixtures/content-collections-base/src/pages/docs.astro
@@ -1,7 +1,7 @@
 ---
-import { getEntryBySlug } from 'astro:content';
-const entry = await getEntryBySlug('docs', 'one');
-const { Content } = await entry.render();
+import { getEntry, render } from 'astro:content';
+const entry = await getEntry('docs', 'one');
+const { Content } = await render(entry);
 ---
 <html lang="en">
   <head>
diff --git a/packages/astro/test/fixtures/content-collections-cache-invalidation/src/content.config.ts b/packages/astro/test/fixtures/content-collections-cache-invalidation/src/content.config.ts
index db96db2eaa95..5a097a7cb67c 100644
--- a/packages/astro/test/fixtures/content-collections-cache-invalidation/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collections-cache-invalidation/src/content.config.ts
@@ -1,7 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
-	type: 'collection',
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string()
 	})
diff --git a/packages/astro/test/fixtures/content-collections-empty-dir/src/content.config.ts b/packages/astro/test/fixtures/content-collections-empty-dir/src/content.config.ts
index fc21917920fa..9ea94b911608 100644
--- a/packages/astro/test/fixtures/content-collections-empty-dir/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collections-empty-dir/src/content.config.ts
@@ -1,13 +1,15 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 	}),
 });
 
 const blogMeta = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml}', base: './src/content/blogMeta' }),
 	schema: z.object({
 		title: z.string(),
 	}),
diff --git a/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts b/packages/astro/test/fixtures/content-collections-empty-md-file/src/content.config.ts
similarity index 61%
rename from packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts
rename to packages/astro/test/fixtures/content-collections-empty-md-file/src/content.config.ts
index 502bd5170c95..17183a82621b 100644
--- a/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts
+++ b/packages/astro/test/fixtures/content-collections-empty-md-file/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 	}),
diff --git a/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro b/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro
index 134d3cffa419..43c5b4b5b441 100644
--- a/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro
+++ b/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro
@@ -1,6 +1,6 @@
 ---
-import { getEntryBySlug } from 'astro:content';
-const blogEntry = await getEntryBySlug('blog', 'empty');
+import { getEntry } from 'astro:content';
+const blogEntry = await getEntry('blog', 'empty');
 ---
 
 {blogEntry.data.title}
diff --git a/packages/astro/test/fixtures/content-collections-mutation/src/content.config.ts b/packages/astro/test/fixtures/content-collections-mutation/src/content.config.ts
index 601b05ccaa79..29738d550bfb 100644
--- a/packages/astro/test/fixtures/content-collections-mutation/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collections-mutation/src/content.config.ts
@@ -1,9 +1,10 @@
 // 1. Import utilities from `astro:content`
 import { z, defineCollection } from "astro:content";
+import { glob } from "astro/loaders";
 
 // 2. Define a `type` and `schema` for each collection
 const blogCollection = defineCollection({
-  type: "content", // v2.5.0 and later
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: z.object({
     title: z.string(),
     date: z.date(),
diff --git a/packages/astro/test/fixtures/content-collections-same-contents/src/content.config.ts b/packages/astro/test/fixtures/content-collections-same-contents/src/content.config.ts
index 0f52c4ca3624..ec081aeb4893 100644
--- a/packages/astro/test/fixtures/content-collections-same-contents/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collections-same-contents/src/content.config.ts
@@ -1,7 +1,9 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 
 const docs = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/docs' }),
 	schema: z.object({
 		title: z.string(),
 	}),
diff --git a/packages/astro/test/fixtures/content-collections-same-contents/src/pages/docs.astro b/packages/astro/test/fixtures/content-collections-same-contents/src/pages/docs.astro
index 6b352ce371a8..a57364f8633c 100644
--- a/packages/astro/test/fixtures/content-collections-same-contents/src/pages/docs.astro
+++ b/packages/astro/test/fixtures/content-collections-same-contents/src/pages/docs.astro
@@ -1,7 +1,7 @@
 ---
-import { getEntryBySlug } from 'astro:content';
-const entry = await getEntryBySlug('docs', 'one');
-const { Content } = await entry.render();
+import { getEntry, render } from 'astro:content';
+const entry = await getEntry('docs', 'one');
+const { Content } = await render(entry);
 ---
 <html lang="en">
   <head>
diff --git a/packages/astro/test/fixtures/content-collections-with-config-mjs/src/content/config.mjs b/packages/astro/test/fixtures/content-collections-with-config-mjs/src/content/config.mjs
index 5cec07a9a2c5..8e9d2ee24e32 100644
--- a/packages/astro/test/fixtures/content-collections-with-config-mjs/src/content/config.mjs
+++ b/packages/astro/test/fixtures/content-collections-with-config-mjs/src/content/config.mjs
@@ -1,6 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 	}),
diff --git a/packages/astro/test/fixtures/content-collections-with-config-mjs/src/pages/index.astro b/packages/astro/test/fixtures/content-collections-with-config-mjs/src/pages/index.astro
index 4152c0734663..39bfb7ed6ca4 100644
--- a/packages/astro/test/fixtures/content-collections-with-config-mjs/src/pages/index.astro
+++ b/packages/astro/test/fixtures/content-collections-with-config-mjs/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import {getEntryBySlug} from "astro:content"
-const blogEntry = await getEntryBySlug("blog", "introduction");
+import {getEntry} from "astro:content"
+const blogEntry = await getEntry("blog", "introduction");
 ---
 {blogEntry.data.title}
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content-collections-with-config-mts/package.json b/packages/astro/test/fixtures/content-collections-with-config-mts/package.json
deleted file mode 100644
index cba237161e1c..000000000000
--- a/packages/astro/test/fixtures/content-collections-with-config-mts/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "@test/content-collections-with-config-mts",
-  "version": "0.0.0",
-  "private": true,
-  "dependencies": {
-    "astro": "workspace:*"
-  }
-}
diff --git a/packages/astro/test/fixtures/content-collections-with-config-mts/src/content/blog/introduction.md b/packages/astro/test/fixtures/content-collections-with-config-mts/src/content/blog/introduction.md
deleted file mode 100644
index c85be69f6ce2..000000000000
--- a/packages/astro/test/fixtures/content-collections-with-config-mts/src/content/blog/introduction.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 10000
----
-
-# Hi there!
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content-collections-with-config-mts/src/content/config.mts b/packages/astro/test/fixtures/content-collections-with-config-mts/src/content/config.mts
deleted file mode 100644
index 5cec07a9a2c5..000000000000
--- a/packages/astro/test/fixtures/content-collections-with-config-mts/src/content/config.mts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { defineCollection, z } from 'astro:content';
-
-const blog = defineCollection({
-	schema: z.object({
-		title: z.string(),
-	}),
-});
-
-export const collections = {
-	blog
-}
diff --git a/packages/astro/test/fixtures/content-collections-with-config-mts/src/pages/index.astro b/packages/astro/test/fixtures/content-collections-with-config-mts/src/pages/index.astro
deleted file mode 100644
index 4152c0734663..000000000000
--- a/packages/astro/test/fixtures/content-collections-with-config-mts/src/pages/index.astro
+++ /dev/null
@@ -1,5 +0,0 @@
----
-import {getEntryBySlug} from "astro:content"
-const blogEntry = await getEntryBySlug("blog", "introduction");
----
-{blogEntry.data.title}
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content-collections/src/content.config.ts b/packages/astro/test/fixtures/content-collections/src/content.config.ts
index 0c846d2a71ec..07b5b3992ec8 100644
--- a/packages/astro/test/fixtures/content-collections/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-collections/src/content.config.ts
@@ -1,18 +1,34 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const withData = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/with-data' }),
 	schema: z.object({
 		title: z.string(),
 	}),
 });
 
 const withCustomSlugs = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-custom-slugs' }),
 	// Ensure schema passes even when `slug` is present
-	schema: z.object({}).strict(),
+	schema: z
+		.object({
+			slug: z.string().optional(),
+		})
+		.strict(),
 });
 
 const withSchemaConfig = defineCollection({
+	loader: glob({
+		pattern: [
+			'**/*.{md,mdx}', 	// Include all markdown files
+			'!**/_*/**', 			// Exclude anything in directories starting with _
+			'!**/_*.{md,mdx}',// Exclude files starting with _
+		],
+		base: './src/content/with-schema-config',
+		// Preserve special characters like % in filenames
+		generateId: ({ entry }) => entry.replace(/\.(md|mdx)$/, ''),
+	}),
 	schema: z.object({
 		title: z.string(),
 		isDraft: z.boolean().default(false),
@@ -22,6 +38,7 @@ const withSchemaConfig = defineCollection({
 });
 
 const withUnionSchema = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-union-schema' }),
 	schema: z.discriminatedUnion('type', [
 		z.object({
 			type: z.literal('post'),
@@ -36,7 +53,7 @@ const withUnionSchema = defineCollection({
 });
 
 const withSymlinkedData = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/with-symlinked-data' }),
 	schema: ({ image }) =>
 		z.object({
 			alt: z.string(),
@@ -45,14 +62,16 @@ const withSymlinkedData = defineCollection({
 });
 
 const withSymlinkedContent = defineCollection({
-	type: 'content',
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-symlinked-content' }),
 	schema: z.object({
 		title: z.string(),
 		date: z.date(),
 	}),
 });
 
-const withScripts = defineCollection({});
+const withScripts = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/with-scripts' }),
+});
 
 export const collections = {
 	'with-data': withData,
diff --git a/packages/astro/test/fixtures/content-collections/src/content/without-config/columbia.md b/packages/astro/test/fixtures/content-collections/src/content/without-config/columbia.md
deleted file mode 100644
index 4971108e36ed..000000000000
--- a/packages/astro/test/fixtures/content-collections/src/content/without-config/columbia.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Columbia
-description: 'Learn about the Columbia NASA space shuttle.'
-publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: [space, 90s]
----
-
-**Source:** [Wikipedia](https://en.wikipedia.org/wiki/Space_Shuttle_Endeavour)
-
-Space Shuttle Endeavour (Orbiter Vehicle Designation: OV-105) is a retired orbiter from NASA's Space Shuttle program and the fifth and final operational Shuttle built. It embarked on its first mission, STS-49, in May 1992 and its 25th and final mission, STS-134, in May 2011. STS-134 was expected to be the final mission of the Space Shuttle program, but with the authorization of STS-135, Atlantis became the last shuttle to fly.
-
-The United States Congress approved the construction of Endeavour in 1987 to replace the Space Shuttle Challenger, which was destroyed in 1986.
-
-NASA chose, on cost grounds, to build much of Endeavour from spare parts rather than refitting the Space Shuttle Enterprise, and used structural spares built during the construction of Discovery and Atlantis in its assembly.
-Space Shuttle Endeavour (Orbiter Vehicle Designation: OV-105) is a retired orbiter from NASA's Space Shuttle program and the fifth and final operational Shuttle built. It embarked on its first mission, STS-49, in May 1992 and its 25th and final mission, STS-134, in May 2011. STS-134 was expected to be the final mission of the Space Shuttle program, but with the authorization of STS-135, Atlantis became the last shuttle to fly.
diff --git a/packages/astro/test/fixtures/content-collections/src/content/without-config/enterprise.md b/packages/astro/test/fixtures/content-collections/src/content/without-config/enterprise.md
deleted file mode 100644
index 3131e6d5df3a..000000000000
--- a/packages/astro/test/fixtures/content-collections/src/content/without-config/enterprise.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: 'Enterprise'
-description: 'Learn about the Enterprise NASA space shuttle.'
-publishedDate: 'Tue Jun 08 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: [space, 70s]
----
-
-**Source:** [Wikipedia](https://en.wikipedia.org/wiki/Space_Shuttle_Enterprise)
-
-Space Shuttle Enterprise (Orbiter Vehicle Designation: OV-101) was the first orbiter of the Space Shuttle system. Rolled out on September 17, 1976, it was built for NASA as part of the Space Shuttle program to perform atmospheric test flights after being launched from a modified Boeing 747. It was constructed without engines or a functional heat shield. As a result, it was not capable of spaceflight.
-
-Originally, Enterprise had been intended to be refitted for orbital flight to become the second space-rated orbiter in service. However, during the construction of Space Shuttle Columbia, details of the final design changed, making it simpler and less costly to build Challenger around a body frame that had been built as a test article. Similarly, Enterprise was considered for refit to replace Challenger after the latter was destroyed, but Endeavour was built from structural spares instead.
-
-Enterprise was restored and placed on display in 2003 at the Smithsonian's new Steven F. Udvar-Hazy Center in Virginia. Following the retirement of the Space Shuttle fleet, Discovery replaced Enterprise at the Udvar-Hazy Center, and Enterprise was transferred to the Intrepid Sea, Air & Space Museum in New York City, where it has been on display since July 2012.
diff --git a/packages/astro/test/fixtures/content-collections/src/content/without-config/promo/_launch-week-styles.css b/packages/astro/test/fixtures/content-collections/src/content/without-config/promo/_launch-week-styles.css
deleted file mode 100644
index cce2effe20c1..000000000000
--- a/packages/astro/test/fixtures/content-collections/src/content/without-config/promo/_launch-week-styles.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-family: 'Comic Sans MS', sans-serif;
-}
diff --git a/packages/astro/test/fixtures/content-collections/src/content/without-config/promo/launch week.mdx b/packages/astro/test/fixtures/content-collections/src/content/without-config/promo/launch week.mdx
deleted file mode 100644
index 22ed07c43f0c..000000000000
--- a/packages/astro/test/fixtures/content-collections/src/content/without-config/promo/launch week.mdx	
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: 'Launch week!'
-description: 'Join us for the exciting launch of SPACE BLOG'
-publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: ['announcement']
----
-
-import './_launch-week-styles.css';
-
-Join us for the space blog launch!
-
-- THIS THURSDAY
-- Houston, TX
-- Dress code: **interstellar casual** ✨
diff --git a/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js b/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js
index 0694cfaeca99..01cc8302b370 100644
--- a/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js
+++ b/packages/astro/test/fixtures/content-collections/src/pages/collections.json.js
@@ -1,16 +1,14 @@
 import { getCollection } from 'astro:content';
 import * as devalue from 'devalue';
-import { stripAllRenderFn } from '../utils.js';
 
 export async function GET() {
-	const withSchemaConfig = stripAllRenderFn(await getCollection('with-schema-config'));
-	const withSlugConfig = stripAllRenderFn(await getCollection('with-custom-slugs'));
-	const withUnionSchema = stripAllRenderFn(await getCollection('with-union-schema'));
-	const withSymlinkedContent = stripAllRenderFn(await getCollection('with-symlinked-content'));
-	const withSymlinkedData = stripAllRenderFn(await getCollection('with-symlinked-data'));
-	const withoutConfig = stripAllRenderFn(await getCollection('without-config'));
+	const withSchemaConfig = await getCollection('with-schema-config');
+	const withCustomSlugs = await getCollection('with-custom-slugs');
+	const withUnionSchema = await getCollection('with-union-schema');
+	const withSymlinkedContent = await getCollection('with-symlinked-content');
+	const withSymlinkedData = await getCollection('with-symlinked-data');
 
 	return new Response(
-		devalue.stringify({ withSchemaConfig, withSlugConfig, withUnionSchema, withSymlinkedContent, withSymlinkedData, withoutConfig }),
+		devalue.stringify({ withSchemaConfig, withCustomSlugs, withUnionSchema, withSymlinkedContent, withSymlinkedData }),
 	);
 }
diff --git a/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js b/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js
index 06484bcb25ed..015cbf4e6f1a 100644
--- a/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js
+++ b/packages/astro/test/fixtures/content-collections/src/pages/entries.json.js
@@ -1,18 +1,15 @@
-import { getEntryBySlug } from 'astro:content';
+import { getEntry } from 'astro:content';
 import * as devalue from 'devalue';
-import { stripRenderFn } from '../utils.js';
 
 export async function GET() {
-	const oneWithSchemaConfig = stripRenderFn(await getEntryBySlug('with-schema-config', 'one'));
-	const twoWithSlugConfig = stripRenderFn(
-		await getEntryBySlug('with-custom-slugs', 'interesting-two')
-	);
-	const postWithUnionSchema = stripRenderFn(await getEntryBySlug('with-union-schema', 'post'));
+	const oneWithSchemaConfig = await getEntry('with-schema-config', 'one');
+	const twoWithCustomSlugs = await getEntry('with-custom-slugs', 'interesting-two');
+	const postWithUnionSchema = await getEntry('with-union-schema', 'post');
 
 	return new Response(
 		devalue.stringify({
 			oneWithSchemaConfig,
-			twoWithSlugConfig,
+			twoWithCustomSlugs,
 			postWithUnionSchema,
 		})
 	);
diff --git a/packages/astro/test/fixtures/content-collections/src/pages/with-scripts/[...slug].astro b/packages/astro/test/fixtures/content-collections/src/pages/with-scripts/[...slug].astro
index 893cbb9c61ff..e5605b867e62 100644
--- a/packages/astro/test/fixtures/content-collections/src/pages/with-scripts/[...slug].astro
+++ b/packages/astro/test/fixtures/content-collections/src/pages/with-scripts/[...slug].astro
@@ -1,16 +1,16 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
   const blogEntries = await getCollection('with-scripts');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
 const { entry } = Astro.props;
 
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 const { title } = entry.data;
 ---
 
diff --git a/packages/astro/test/fixtures/content-collections/src/utils.js b/packages/astro/test/fixtures/content-collections/src/utils.js
deleted file mode 100644
index 3a6244327862..000000000000
--- a/packages/astro/test/fixtures/content-collections/src/utils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function stripRenderFn(entryWithRender) {
-	const { render, ...entry } = entryWithRender;
-	return entry;
-}
-
-export function stripAllRenderFn(collection = []) {
-	return collection.map(stripRenderFn);
-}
diff --git a/packages/astro/test/fixtures/content-intellisense/src/content.config.ts b/packages/astro/test/fixtures/content-intellisense/src/content.config.ts
index d891b360499a..96b494303960 100644
--- a/packages/astro/test/fixtures/content-intellisense/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-intellisense/src/content.config.ts
@@ -2,7 +2,7 @@ import { glob, file } from 'astro/loaders';
 import { defineCollection, z } from 'astro:content';
 
 const blogCC = defineCollection({
-	type: 'content',
+	loader: glob({ pattern: "**/*.{md,mdx,mdoc}", base: "./src/content/blog-cc" }),
 	schema: z.object({
 		title: z.string(),
 		description: z.string().optional(),
diff --git a/packages/astro/test/fixtures/content-intellisense/src/utils.js b/packages/astro/test/fixtures/content-intellisense/src/utils.js
deleted file mode 100644
index 3a6244327862..000000000000
--- a/packages/astro/test/fixtures/content-intellisense/src/utils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function stripRenderFn(entryWithRender) {
-	const { render, ...entry } = entryWithRender;
-	return entry;
-}
-
-export function stripAllRenderFn(collection = []) {
-	return collection.map(stripRenderFn);
-}
diff --git a/packages/astro/test/fixtures/content-ssr-integration/src/content/config.ts b/packages/astro/test/fixtures/content-ssr-integration/src/content.config.ts
similarity index 64%
rename from packages/astro/test/fixtures/content-ssr-integration/src/content/config.ts
rename to packages/astro/test/fixtures/content-ssr-integration/src/content.config.ts
index 8d68c0ec3e85..eedbec2cc1f2 100644
--- a/packages/astro/test/fixtures/content-ssr-integration/src/content/config.ts
+++ b/packages/astro/test/fixtures/content-ssr-integration/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 		description: z.string(),
@@ -10,4 +12,4 @@ const blog = defineCollection({
 	}),
 });
 
-export const collections = { blog };
+export const collections = { blog };
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getdataentrybyid.astro b/packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getdataentrybyid.astro
new file mode 100644
index 000000000000..4fdd32abcad1
--- /dev/null
+++ b/packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getdataentrybyid.astro
@@ -0,0 +1,18 @@
+---
+import { getDataEntryById } from 'astro:content';
+const post = await getDataEntryById('blog', 'first-post');
+if (!post) {
+	return new Response('404', { status: 404 });
+}
+---
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Document</title>
+</head>
+<body>
+    <h1>{post.data.title}</h1>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getentrybyslug.astro b/packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getentrybyslug.astro
new file mode 100644
index 000000000000..70de0942a1be
--- /dev/null
+++ b/packages/astro/test/fixtures/content-ssr-integration/src/pages/deprecated-getentrybyslug.astro
@@ -0,0 +1,18 @@
+---
+import { getEntryBySlug } from 'astro:content';
+const post = await getEntryBySlug('blog', 'first-post');
+if (!post) {
+	return new Response('404', { status: 404 });
+}
+---
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Document</title>
+</head>
+<body>
+    <h1>{post.data.title}</h1>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/content-ssr-integration/src/pages/posts/[...slug].astro b/packages/astro/test/fixtures/content-ssr-integration/src/pages/posts/[...slug].astro
index 1cafafcf11b4..4fa4049184f1 100644
--- a/packages/astro/test/fixtures/content-ssr-integration/src/pages/posts/[...slug].astro
+++ b/packages/astro/test/fixtures/content-ssr-integration/src/pages/posts/[...slug].astro
@@ -1,13 +1,10 @@
 ---
-import { getCollection } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
 const { slug } = Astro.params;
-const posts = await getCollection('blog');
-const post = posts.find((post) => post.slug === slug);
-if (!post) {
-	throw new Error(`Not found: ${slug}`);
-}
-const { Content } = await post.render();
+const post = await getEntry('blog', slug);
+
+const { Content } = await render(post);
 ---
 
 <html lang="en">
diff --git a/packages/astro/test/fixtures/content-static-paths-integration/src/content.config.ts b/packages/astro/test/fixtures/content-static-paths-integration/src/content.config.ts
index 8d68c0ec3e85..1806ae5abdfb 100644
--- a/packages/astro/test/fixtures/content-static-paths-integration/src/content.config.ts
+++ b/packages/astro/test/fixtures/content-static-paths-integration/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 		description: z.string(),
diff --git a/packages/astro/test/fixtures/content-static-paths-integration/src/pages/posts/[...slug].astro b/packages/astro/test/fixtures/content-static-paths-integration/src/pages/posts/[...slug].astro
index 7175b61100e5..db05e1d91b56 100644
--- a/packages/astro/test/fixtures/content-static-paths-integration/src/pages/posts/[...slug].astro
+++ b/packages/astro/test/fixtures/content-static-paths-integration/src/pages/posts/[...slug].astro
@@ -1,16 +1,16 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const posts = await getCollection('blog');
 	return posts.map((post) => ({
-		params: { slug: post.slug },
+		params: { slug: post.id },
 		props: post,
 	}));
 }
 
 const { data: { title } } = Astro.props;
-const { Content } = await Astro.props.render();
+const { Content } = await render(Astro.props);
 ---
 
 <html lang="en">
diff --git a/packages/astro/test/fixtures/content/astro.config.mjs b/packages/astro/test/fixtures/content/astro.config.mjs
index 71f3d1c8665d..d69e57975a64 100644
--- a/packages/astro/test/fixtures/content/astro.config.mjs
+++ b/packages/astro/test/fixtures/content/astro.config.mjs
@@ -3,8 +3,4 @@ import { defineConfig } from 'astro/config';
 
 export default defineConfig({
   integrations: [mdx()],
-	legacy: {
-		// Enable legacy content collections as we test layout fields
-		collections: true
-	}
 });
diff --git a/packages/astro/test/fixtures/core-image-svg/src/content/config.ts b/packages/astro/test/fixtures/content/src/content.config.ts
similarity index 59%
rename from packages/astro/test/fixtures/core-image-svg/src/content/config.ts
rename to packages/astro/test/fixtures/content/src/content.config.ts
index fbf0a269703d..850bec0ade94 100644
--- a/packages/astro/test/fixtures/core-image-svg/src/content/config.ts
+++ b/packages/astro/test/fixtures/content/src/content.config.ts
@@ -1,10 +1,12 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 		description: z.string().max(60, 'For SEO purposes, keep descriptions short!'),
 	}),
 });
 
-export const collections = { blog };
+export const collections = { blog };
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content/src/content/blog/with-layout-prop.md b/packages/astro/test/fixtures/content/src/content/blog/with-layout-prop.md
deleted file mode 100644
index ce8a866cb9c0..000000000000
--- a/packages/astro/test/fixtures/content/src/content/blog/with-layout-prop.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: With Layout Prop
-description: Use a layout prop in a content collection
-layout: "../../components/LayoutProp.astro"
----
-
-## Content with a layout prop
-
-Sure, why not?
diff --git a/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro b/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro
index 3936b2f8d082..b8e36d1f52e6 100644
--- a/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro
+++ b/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const entry = await getEntryBySlug('blog', 'promo/launch-week-component-scripts');
-const { Content } = await entry.render();
+const entry = await getEntry('blog', 'promo/launch-week-component-scripts');
+const { Content } = await render(entry);
 ---
 <html>
 <head>
diff --git a/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro b/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro
index 463e6519129c..a77244f79f00 100644
--- a/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro
+++ b/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const entry = await getEntryBySlug('blog', 'promo/launch-week-components-export');
-const { Content } = await entry.render();
+const entry = await getEntry('blog', 'promo/launch-week-components-export');
+const { Content } = await render(entry);
 ---
 <html>
 <head>
diff --git a/packages/astro/test/fixtures/content/src/pages/launch-week.astro b/packages/astro/test/fixtures/content/src/pages/launch-week.astro
index e7a992e2dfe4..71231592330a 100644
--- a/packages/astro/test/fixtures/content/src/pages/launch-week.astro
+++ b/packages/astro/test/fixtures/content/src/pages/launch-week.astro
@@ -1,8 +1,9 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const entry = await getEntryBySlug('blog', 'promo/launch-week');
-const { Content } = await entry.render();
+const entry = await getEntry('blog', 'promo/launch-week');
+
+const { Content } = await render(entry);
 ---
 <html>
 <head>
diff --git a/packages/astro/test/fixtures/content/src/pages/with-layout-prop.astro b/packages/astro/test/fixtures/content/src/pages/with-layout-prop.astro
deleted file mode 100644
index 4cbb87624267..000000000000
--- a/packages/astro/test/fixtures/content/src/pages/with-layout-prop.astro
+++ /dev/null
@@ -1,9 +0,0 @@
----
-import { getEntryBySlug } from 'astro:content';
-import H3 from '../components/H3.astro';
-
-const entry = await getEntryBySlug('blog', 'with-layout-prop');
-const { Content } = await entry.render();
----
-<H3>H3 directly inserted to the page</H3>
-<Content />
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/core-image-base/src/content.config.ts b/packages/astro/test/fixtures/core-image-base/src/content.config.ts
index aa35fb4b6980..39428c387e24 100644
--- a/packages/astro/test/fixtures/core-image-base/src/content.config.ts
+++ b/packages/astro/test/fixtures/core-image-base/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: ({image}) => z.object({
     title: z.string(),
     image: image(),
diff --git a/packages/astro/test/fixtures/core-image-base/src/pages/blog/[...slug].astro b/packages/astro/test/fixtures/core-image-base/src/pages/blog/[...slug].astro
index 20b21bbd34eb..45dfb8ab9946 100644
--- a/packages/astro/test/fixtures/core-image-base/src/pages/blog/[...slug].astro
+++ b/packages/astro/test/fixtures/core-image-base/src/pages/blog/[...slug].astro
@@ -1,16 +1,16 @@
 ---
 import { getImage } from 'astro:assets';
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <html>
 	<head>
diff --git a/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts b/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts
index 1c0eae662372..0e376a0cc885 100644
--- a/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts
+++ b/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts
@@ -1,7 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
-  type: 'content',
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: z.object({
     title: z.string(),
   })
diff --git a/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro b/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro
index 63b6eb70e502..cbec825feb45 100644
--- a/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro
+++ b/packages/astro/test/fixtures/core-image-deletion/src/pages/blog/[slug].astro
@@ -1,12 +1,12 @@
 ---
-import { getCollection } from "astro:content";
+import { getCollection, render } from "astro:content";
 import type { GetStaticPaths } from "astro";
 
 export const getStaticPaths = (async () => {
 	const blog = await getCollection("blog");
 	return blog.map((post) => ({
 		params: {
-			slug: post.slug,
+			slug: post.id,
 		},
 		props: {
 			post
@@ -16,7 +16,7 @@ export const getStaticPaths = (async () => {
 
 const { post } = Astro.props;
 
-const { Content } = await post.render();
+const { Content } = await render(post);
 ---
 
 <Content />
diff --git a/packages/astro/test/fixtures/core-image-errors/astro.config.mjs b/packages/astro/test/fixtures/core-image-errors/astro.config.mjs
index cc0052535c1e..027b2e69cb46 100644
--- a/packages/astro/test/fixtures/core-image-errors/astro.config.mjs
+++ b/packages/astro/test/fixtures/core-image-errors/astro.config.mjs
@@ -2,8 +2,4 @@
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-	legacy: {
-		// Needed because we're using image().refine()
-		collections: true,
-	},
 });
diff --git a/packages/astro/test/fixtures/core-image-errors/src/content/config.ts b/packages/astro/test/fixtures/core-image-errors/src/content.config.ts
similarity index 66%
rename from packages/astro/test/fixtures/core-image-errors/src/content/config.ts
rename to packages/astro/test/fixtures/core-image-errors/src/content.config.ts
index aa35fb4b6980..bb3d90b3e9e2 100644
--- a/packages/astro/test/fixtures/core-image-errors/src/content/config.ts
+++ b/packages/astro/test/fixtures/core-image-errors/src/content.config.ts
@@ -1,13 +1,12 @@
 import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: ({image}) => z.object({
     title: z.string(),
     image: image(),
-		cover: z.object({
-			image: image()
-		})
-  }),
+  }), 
 });
 
 export const collections = {
diff --git a/packages/astro/test/fixtures/core-image-errors/src/pages/blog/[...slug].astro b/packages/astro/test/fixtures/core-image-errors/src/pages/blog/[...slug].astro
index b9e8895ff4bb..49733bd1e3d6 100644
--- a/packages/astro/test/fixtures/core-image-errors/src/pages/blog/[...slug].astro
+++ b/packages/astro/test/fixtures/core-image-errors/src/pages/blog/[...slug].astro
@@ -1,15 +1,15 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <html>
 	<head>
diff --git a/packages/astro/test/fixtures/core-image-ssg/src/content.config.ts b/packages/astro/test/fixtures/core-image-ssg/src/content.config.ts
index aa35fb4b6980..39428c387e24 100644
--- a/packages/astro/test/fixtures/core-image-ssg/src/content.config.ts
+++ b/packages/astro/test/fixtures/core-image-ssg/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: ({image}) => z.object({
     title: z.string(),
     image: image(),
diff --git a/packages/astro/test/fixtures/core-image-ssg/src/pages/blog/[...slug].astro b/packages/astro/test/fixtures/core-image-ssg/src/pages/blog/[...slug].astro
index 1173b0fd1e6e..b40fe4144a3b 100644
--- a/packages/astro/test/fixtures/core-image-ssg/src/pages/blog/[...slug].astro
+++ b/packages/astro/test/fixtures/core-image-ssg/src/pages/blog/[...slug].astro
@@ -1,15 +1,15 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <html>
 	<head>
diff --git a/packages/astro/test/fixtures/content/src/content/config.ts b/packages/astro/test/fixtures/core-image-svg/src/content.config.ts
similarity index 59%
rename from packages/astro/test/fixtures/content/src/content/config.ts
rename to packages/astro/test/fixtures/core-image-svg/src/content.config.ts
index fbf0a269703d..850bec0ade94 100644
--- a/packages/astro/test/fixtures/content/src/content/config.ts
+++ b/packages/astro/test/fixtures/core-image-svg/src/content.config.ts
@@ -1,10 +1,12 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 		description: z.string().max(60, 'For SEO purposes, keep descriptions short!'),
 	}),
 });
 
-export const collections = { blog };
+export const collections = { blog };
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/core-image-svg/src/pages/blog/[...slug].astro b/packages/astro/test/fixtures/core-image-svg/src/pages/blog/[...slug].astro
index e1ced40b1348..9320a5ad1ea9 100644
--- a/packages/astro/test/fixtures/core-image-svg/src/pages/blog/[...slug].astro
+++ b/packages/astro/test/fixtures/core-image-svg/src/pages/blog/[...slug].astro
@@ -1,15 +1,15 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 ---
 <html>
 	<head>
diff --git a/packages/astro/test/fixtures/core-image/astro.config.mjs b/packages/astro/test/fixtures/core-image/astro.config.mjs
index c628127e1fd5..74703959f216 100644
--- a/packages/astro/test/fixtures/core-image/astro.config.mjs
+++ b/packages/astro/test/fixtures/core-image/astro.config.mjs
@@ -2,8 +2,4 @@
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-	legacy: {
-		// Needed because we're using image().refine()
-		collections: true,
-	},
 });
diff --git a/packages/astro/test/fixtures/core-image/src/content/config.ts b/packages/astro/test/fixtures/core-image/src/content.config.ts
similarity index 73%
rename from packages/astro/test/fixtures/core-image/src/content/config.ts
rename to packages/astro/test/fixtures/core-image/src/content.config.ts
index 2d88c49eee36..8852ace386c8 100644
--- a/packages/astro/test/fixtures/core-image/src/content/config.ts
+++ b/packages/astro/test/fixtures/core-image/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from "astro:content";
+import { glob } from "astro/loaders";
 
 const blogCollection = defineCollection({
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
   schema: ({image}) => z.object({
     title: z.string(),
     image: image(),
@@ -8,11 +10,10 @@ const blogCollection = defineCollection({
 			image: image()
 		}),
 		arrayOfImages: z.array(image()),
-		refinedImage: image().refine((img) => img.width > 200)
   }),
 });
 
 
 export const collections = {
 	blog: blogCollection
-};
+};
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/core-image/src/content/blog/one.md b/packages/astro/test/fixtures/core-image/src/content/blog/one.md
index 1ddcce919440..52faffb8c7f3 100644
--- a/packages/astro/test/fixtures/core-image/src/content/blog/one.md
+++ b/packages/astro/test/fixtures/core-image/src/content/blog/one.md
@@ -6,11 +6,10 @@ cover:
 arrayOfImages:
   - ../../assets/penguin2.jpg
   - ../../assets/penguin1.jpg
-refinedImage: ../../assets/penguin1.jpg
 ---
 
 # A post
 
 text here
 
-![](blogfolder.jpg)
+![sir penguin](blogfolder.jpg)
diff --git a/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro b/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro
index dcf329ec423a..dc03dd559bcf 100644
--- a/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro
+++ b/packages/astro/test/fixtures/core-image/src/pages/blog/[...slug].astro
@@ -1,16 +1,16 @@
 ---
 import { Image, getImage} from 'astro:assets';
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
 const { entry } = Astro.props;
-const { Content } = await entry.render();
+const { Content } = await render(entry);
 const myImage = await getImage({src: entry.data.image});
 ---
 <html>
@@ -34,10 +34,6 @@ const myImage = await getImage({src: entry.data.image});
 			}
 		</div>
 
-		<div id="refined-image">
-			<img src={entry.data.refinedImage.src} />
-		</div>
-
 		<div id="optimized-image-get-image">
 			<img src={myImage.src} {...myImage.attributes} />
 		</div>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-2/astro.config.mjs b/packages/astro/test/fixtures/css-inline-stylesheets-2/astro.config.mjs
index 8ccbbc5b173c..afdd192283fa 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets-2/astro.config.mjs
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-2/astro.config.mjs
@@ -1,8 +1,5 @@
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-	legacy: {
-		// Enable legacy content collections as we test layout fields
-		collections: true
-	}
+
 });
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content.config.ts b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content.config.ts
new file mode 100644
index 000000000000..36d8e1e78b1b
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content.config.ts
@@ -0,0 +1,13 @@
+import { defineCollection } from "astro:content";
+import { glob } from "astro/loaders";
+
+const en = defineCollection({
+	loader: glob({
+		base: './src/content/en/',
+		pattern: '*.md',
+	})
+});
+
+export const collections = {
+	en
+};
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content/en/endeavour.md
index 240eeeae3993..428698f3a820 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content/en/endeavour.md
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/content/en/endeavour.md
@@ -2,7 +2,6 @@
 title: Endeavour
 description: 'Learn about the Endeavour NASA space shuttle.'
 publishedDate: 'Sun Jul 11 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
-layout: '../../layouts/Layout.astro'
 tags: [space, 90s]
 ---
 
diff --git a/packages/astro/test/fixtures/content-collections/src/content/without-config/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/endeavour.md
similarity index 97%
rename from packages/astro/test/fixtures/content-collections/src/content/without-config/endeavour.md
rename to packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/endeavour.md
index 51d6e8c42178..670cc693a0eb 100644
--- a/packages/astro/test/fixtures/content-collections/src/content/without-config/endeavour.md
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/endeavour.md
@@ -3,6 +3,7 @@ title: Endeavour
 description: 'Learn about the Endeavour NASA space shuttle.'
 publishedDate: 'Sun Jul 11 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: [space, 90s]
+layout: ../layouts/Layout.astro
 ---
 
 **Source:** [Wikipedia](https://en.wikipedia.org/wiki/Space_Shuttle_Endeavour)
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/index.astro
index 2aecfb0f2eb7..276094579883 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/index.astro
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-2/src/pages/index.astro
@@ -1,10 +1,12 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import Button from '../components/Button.astro';
+import Layout from '../layouts/Layout.astro';
 
-const entry = await getEntryBySlug('en', 'endeavour');
-const { Content } = await entry.render();
+const entry = await getEntry('en', 'endeavour');
+const { Content } = await render(entry);
 ---
+<Layout title={entry.data.title}>
 <style>
     #welcome::after {
         content: '🚀'
@@ -15,3 +17,4 @@ const { Content } = await entry.render();
     <Content/>
     <Button>Button used directly in page</Button>
 </main>
+</Layout>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-3/astro.config.mjs b/packages/astro/test/fixtures/css-inline-stylesheets-3/astro.config.mjs
index 8ccbbc5b173c..afdd192283fa 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets-3/astro.config.mjs
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-3/astro.config.mjs
@@ -1,8 +1,5 @@
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-	legacy: {
-		// Enable legacy content collections as we test layout fields
-		collections: true
-	}
+
 });
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-3/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets-3/src/content/en/endeavour.md
index 240eeeae3993..51d6e8c42178 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets-3/src/content/en/endeavour.md
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-3/src/content/en/endeavour.md
@@ -2,7 +2,6 @@
 title: Endeavour
 description: 'Learn about the Endeavour NASA space shuttle.'
 publishedDate: 'Sun Jul 11 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
-layout: '../../layouts/Layout.astro'
 tags: [space, 90s]
 ---
 
@@ -12,4 +11,4 @@ Space Shuttle Endeavour (Orbiter Vehicle Designation: OV-105) is a retired orbit
 
 The United States Congress approved the construction of Endeavour in 1987 to replace the Space Shuttle Challenger, which was destroyed in 1986.
 
-NASA chose, on cost grounds, to build much of Endeavour from spare parts rather than refitting the Space Shuttle Enterprise, and used structural spares built during the construction of Discovery and Atlantis in its assembly.
\ No newline at end of file
+NASA chose, on cost grounds, to build much of Endeavour from spare parts rather than refitting the Space Shuttle Enterprise, and used structural spares built during the construction of Discovery and Atlantis in its assembly.
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets-3/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets-3/src/pages/index.astro
index 2aecfb0f2eb7..bc96c02453f3 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets-3/src/pages/index.astro
+++ b/packages/astro/test/fixtures/css-inline-stylesheets-3/src/pages/index.astro
@@ -1,9 +1,9 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import Button from '../components/Button.astro';
 
-const entry = await getEntryBySlug('en', 'endeavour');
-const { Content } = await entry.render();
+const entry = await getEntry('en', 'endeavour');
+const { Content } = await render(entry);
 ---
 <style>
     #welcome::after {
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/astro.config.mjs b/packages/astro/test/fixtures/css-inline-stylesheets/astro.config.mjs
index 8ccbbc5b173c..20b0b8e2ba7f 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets/astro.config.mjs
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/astro.config.mjs
@@ -1,8 +1,4 @@
 import { defineConfig } from 'astro/config';
 
 export default defineConfig({
-	legacy: {
-		// Enable legacy content collections as we test layout fields
-		collections: true
-	}
 });
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/src/content.config.ts b/packages/astro/test/fixtures/css-inline-stylesheets/src/content.config.ts
new file mode 100644
index 000000000000..36d8e1e78b1b
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/src/content.config.ts
@@ -0,0 +1,13 @@
+import { defineCollection } from "astro:content";
+import { glob } from "astro/loaders";
+
+const en = defineCollection({
+	loader: glob({
+		base: './src/content/en/',
+		pattern: '*.md',
+	})
+});
+
+export const collections = {
+	en
+};
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets/src/content/en/endeavour.md
index 240eeeae3993..428698f3a820 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets/src/content/en/endeavour.md
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/src/content/en/endeavour.md
@@ -2,7 +2,6 @@
 title: Endeavour
 description: 'Learn about the Endeavour NASA space shuttle.'
 publishedDate: 'Sun Jul 11 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
-layout: '../../layouts/Layout.astro'
 tags: [space, 90s]
 ---
 
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/endeavour.md
similarity index 97%
rename from packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/endeavour.md
rename to packages/astro/test/fixtures/css-inline-stylesheets/src/pages/endeavour.md
index 51d6e8c42178..670cc693a0eb 100644
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/endeavour.md
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/endeavour.md
@@ -3,6 +3,7 @@ title: Endeavour
 description: 'Learn about the Endeavour NASA space shuttle.'
 publishedDate: 'Sun Jul 11 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: [space, 90s]
+layout: ../layouts/Layout.astro
 ---
 
 **Source:** [Wikipedia](https://en.wikipedia.org/wiki/Space_Shuttle_Endeavour)
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro
index 2aecfb0f2eb7..276094579883 100644
--- a/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro
@@ -1,10 +1,12 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 import Button from '../components/Button.astro';
+import Layout from '../layouts/Layout.astro';
 
-const entry = await getEntryBySlug('en', 'endeavour');
-const { Content } = await entry.render();
+const entry = await getEntry('en', 'endeavour');
+const { Content } = await render(entry);
 ---
+<Layout title={entry.data.title}>
 <style>
     #welcome::after {
         content: '🚀'
@@ -15,3 +17,4 @@ const { Content } = await entry.render();
     <Content/>
     <Button>Button used directly in page</Button>
 </main>
+</Layout>
diff --git a/packages/astro/test/fixtures/data-collections-schema/src/content.config.ts b/packages/astro/test/fixtures/data-collections-schema/src/content.config.ts
index 7cd0854d1e94..8a34bfc0234a 100644
--- a/packages/astro/test/fixtures/data-collections-schema/src/content.config.ts
+++ b/packages/astro/test/fixtures/data-collections-schema/src/content.config.ts
@@ -1,14 +1,15 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const docs = defineCollection({
-	type: 'content',
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/docs' }),
 	schema: z.object({
 		title: z.string(),
 	})
 });
 
 const i18n = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/i18n' }),
 	schema: z.object({
 		homepage: z.object({
 			greeting: z.string(),
@@ -18,7 +19,7 @@ const i18n = defineCollection({
 });
 
 const func = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/func' }),
 	schema: () => z.object({
 		homepage: z.object({
 			greeting: z.string(),
@@ -28,7 +29,7 @@ const func = defineCollection({
 });
 
 const image = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/image' }),
 	schema: ({ image }) => z.object({
 		homepage: z.object({
 			greeting: z.string(),
@@ -39,7 +40,7 @@ const image = defineCollection({
 });
 
 const authors = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/authors' }),
 });
 
 export const collections = { docs, func, image, i18n, authors };
diff --git a/packages/astro/test/fixtures/data-collections-schema/src/pages/translations/by-id.json.js b/packages/astro/test/fixtures/data-collections-schema/src/pages/translations/by-id.json.js
index 5f71c80e9f7b..d11253d8f22c 100644
--- a/packages/astro/test/fixtures/data-collections-schema/src/pages/translations/by-id.json.js
+++ b/packages/astro/test/fixtures/data-collections-schema/src/pages/translations/by-id.json.js
@@ -1,6 +1,6 @@
-import { getDataEntryById } from 'astro:content';
+import { getEntry } from 'astro:content';
 
 export async function GET() {
-	const item = await getDataEntryById('i18n', 'en');
+	const item = await getEntry('i18n', 'en');
 	return Response.json(item);
 }
diff --git a/packages/astro/test/fixtures/data-collections/src/content.config.ts b/packages/astro/test/fixtures/data-collections/src/content.config.ts
index b41988ec7f90..3694a022471f 100644
--- a/packages/astro/test/fixtures/data-collections/src/content.config.ts
+++ b/packages/astro/test/fixtures/data-collections/src/content.config.ts
@@ -1,24 +1,30 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const docs = defineCollection({
-	type: 'content',
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/docs' }),
 	schema: z.object({
 		title: z.string(),
-	})
+	}),
 });
 
 const i18n = defineCollection({
-	type: 'data',
+	loader: glob({ pattern: '**/*.{json,yaml,yml}', base: './src/content/i18n' }),
 	schema: z.object({
 		homepage: z.object({
 			greeting: z.string(),
 			preamble: z.string(),
-		})
+		}),
 	}),
 });
 
 const authors = defineCollection({
-	type: 'data'
+	loader: glob({
+		pattern: '**/*.{json,yaml,yml}',
+		base: './src/content/authors',
+		// Old data collection behavior
+		generateId: ({ entry }) => entry.split('.')[0],
+	}),
 });
 
 export const collections = { docs, i18n, authors };
diff --git a/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js b/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js
index 5f71c80e9f7b..d11253d8f22c 100644
--- a/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js
+++ b/packages/astro/test/fixtures/data-collections/src/pages/translations/by-id.json.js
@@ -1,6 +1,6 @@
-import { getDataEntryById } from 'astro:content';
+import { getEntry } from 'astro:content';
 
 export async function GET() {
-	const item = await getDataEntryById('i18n', 'en');
+	const item = await getEntry('i18n', 'en');
 	return Response.json(item);
 }
diff --git a/packages/astro/test/fixtures/legacy-content-collections/astro.config.mjs b/packages/astro/test/fixtures/legacy-content-collections/astro.config.mjs
deleted file mode 100644
index cc7f6f2d28ff..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/astro.config.mjs
+++ /dev/null
@@ -1,13 +0,0 @@
-import mdx from '@astrojs/mdx';
-import { defineConfig } from 'astro/config';
-
-// https://astro.build/config
-export default defineConfig({
-	integrations: [mdx()],
-	experimental: {
-		contentIntellisense: true,	
-	},
-	legacy: {
-		collections: true,
-	},
-});
diff --git a/packages/astro/test/fixtures/legacy-content-collections/package.json b/packages/astro/test/fixtures/legacy-content-collections/package.json
deleted file mode 100644
index f7cb90d61f41..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "@test/legacy-content-collections",
-  "version": "0.0.0",
-  "private": true,
-  "dependencies": {
-    "astro": "workspace:*",
-    "@astrojs/mdx": "workspace:*"
-  }
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/assets/the-future.jpg b/packages/astro/test/fixtures/legacy-content-collections/src/assets/the-future.jpg
deleted file mode 100644
index e9caf02ab6ee318cdbfbcc70ac050e6d2cd36575..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22792
zcmafZb95!ayX}c>+qRvFlZka=+cqY)CboToiESGb+qNd2x%u69?|Xl~-D`ENu3oEG
zb@#4a->&cbxB71vfGR8XT?zmO4gi3C9e{ru0C4~;JUjwC0@8m26$SPG0UaG33k&P(
zjEahmj){qdg@c3h)$!Hf;o%Vz6B1HTP%<!Z{2KtE!2<TcenNnu1HjP%5a@t^LjXbm
z02~7B3xNLx1SB{VG#Cs3_TM@H_W$&Y=Ugr{L24P*=SV2}SyMfln6yY;>N|HLP<UXS
zmKqw0q{7dXY2b7DpEo$|H<*UjT>jWieIsH(R)}CEbQn%@vRNrMl$KB7FZ!JcA$_`M
zT^44=KnzMM#_tLh7Er{DTg~e`Nio8-O)LWihBpM@wio*N;dC%i84MrUo`>@e7Di=z
zb$c(zyI=&vH=h>kr@bv1!Ol-7EGvxXpEZTJsz|;*l77qkF?Mt!Z~ftzR`q>-^9rj<
zR8lO{ZqEaJ1+Q2!H72qa^(TGdxP`68+#8pE)iICwI#l)F3Xn4}O$#YiZ@MQjSHPs<
zJ(YT|tp2!0=O2J%?A6-%jD^*}%^&;~+;9mV07*8;l<KJp!J~BkxvOkk8Eb=N0_){j
z9are|`@Pxh7k)3+5>67~YtsC_&XQ?2L(|{%#~}>=v5`vdOET^I7_GHc0+2f*_#6G%
z#_33r36f%B>|Yi8W~9~S$GMCo^e(~j?UCB5@zYNndp~W}6ZA*M{A8}YnrDTk6Yb-I
zj=9FXQ54IVWq-p<wx4ZItbEL~(g~A`>f2ivXHBvPrf0mH7Sc?`p9n<>*(*LVe*LEp
zxGI<Tz9<!++4&ah&NC0EBb*JEBYrogHH%$wL<~Ncr2(A6*#K|mUUPQWf$Lv_@hk4B
zt4acwU4|pqpRfqwQr4G!?k_h`wU1X=5Ef|`8r*x1o+Pwem%h()w{LO(06!5{Z{K|p
z(<_@I(yVpOp|7_1fu2a-*gpHY7e*^Uy|rxDD%FJPxgL-tfXQ0dIMr~g>%_Y7Av-`-
zj>OoA4*Pg1Ys&6O^4awXVZEBkaQQpXI%Ho{X<B?$<2Qlf$)CJ`fP;72E{9K0SCLPX
zf#j7b*Xl;_;_7Rjn(^s(GZ52JLp6f|Td_q`rC)I2Bd62btmuG&)<mOGk85D=77S;l
zp|XwU#KMsf_C!zINR!8+foZkUEO{>iY{HdrF5-64n$^hmPtJ+HnFfaO<D)AX_-If8
z_kDv+g43}pOvNZ|$Ch4Ff(K#+f@q<!qWd`~pr*~mqzg%GxPA{7%kFd=uC`{bO8okF
zqFMG!VTB3sO~)4ZgMWOTLwy>AQVl~7XHpN%lBqb7F5U90=6lm@ep*`Y8;*_DWpt)k
z;*XQ>rEyBQC9%Q_8yIJQ>g}=i7d?N^zKQX{EOb=NZI>VxIlh+5EmKa#?j_g$I-HV1
zF`6<_aOg*2pYbs;`DJ;!x|td`!?j3PeYFw?sb86isFq}ge@s{UOhN2<>bdc_RWRs%
z(*EnDv#S+BueGo@{a&#rRcl`hw~Vpldy;Cp7cox5i<9S0){FNqx~D|br<`dEzM6He
z16;{xV!Oh4%Q97&2F@tv=bPfSDSr}Q{|k?Q0IKwPbxW};CSu7rm^CQ$#vq2;z;;<}
z%&<)1*h6hu>cEIcB&L>`=4r%_`>&~Vh!;62*C6cIqW-!Y*MM)%*r81v;9<t%JJJsu
z&Yr&>7hm4Ak~H~J_8lvx(BSQNojZDCDdP!;NRrt<0KR$D_gh795Fch&l$(#gKvz5i
zl-ejky=oYL*oH)7q5?_m1w21<-wnXuL@w+!bY^A1(6=fVGnkErEKu<7vh_>o@W257
z(YgOsx&O3a;1G~d|E+T1s9%?lU_D;vg@|sM@V`Zpf+b^7Y|L|B9G8{hP6S}(jTQ<A
zWXQhfeAg`4A#`&OLk5CN=|r`FDae-`W=2BDG35F1n1ECxC{ktZ3L{HWrU%qeu{7nY
zS44C(Il|fwt?U4>Cz&-i>M|Eh+?clJ*mODV7xnU8)h+!EE@vD^IvDV2mQqotNP)}v
z`*c5b7E?KDt4G4vi$voO^tF&MX~Mw$3Y3$5fS_>NU}Xj$l<zj-SvsywOnf5H?Bm9j
z+7?MAEk3ecptFfm{CzY6qr+@_GDJ|#YY|NIu63<zEgZQ1g!=#!%?w$YdSs(_T2Z+^
zHW62z>b*ySfQiSrRq`PctcaQpLOFfcEeL(PVS;W^gg8%&>{RZE#2`mwoklopRtIQS
zucP`K-YydLlOi6tk#)qmeZ<Aaqb=ESoZB?RNTn$jyFqZ8In)p_(<&8(mQ-7P!#fL1
zJ)cVU)IO7eV(S$a*j&q7V%BhB0$O(Mns@eGJGfM8`0!N{P7FJ{ugFDvnXak7X07o%
z#|u1K;liqmiCX~^h&NTbO3O6MEta&~X-t7B^ktITT<n0uA9}}@#j{p5CY?aNxgwXD
zb4QG_*AAZgzO1x{TDzqOw|$;!d23sNnI>miA1<9CH@l`BBB_#$vvAqt=I~lp4{n|`
zI12letCit-UoJHWy4xK?$Y|A64jnD@a!!m^Y1w)FlP)YX)F-`rx0n4S70lmav?jLm
zt4jhJVMXatO7gFq<;Oo|!DL|+MM`|CeVB@}Q#LJu{FW(0MzY`GC6KekO%{6k?bZ9H
zT!O>0e^`lx{#1~GuSg`)_bK6VP|=`%h*ldUmq7=7hcL00-Ki>U(nuofs0>_~kU<y8
zk^ul<W%zw~3YS<@Hj+MuN#RAgI29<t*fGAdI1xdhf(88lhz;={Vn2k(8L(#r0ftt=
zG!=7CPblS?+-BibX}Is{IAxF^j7HtgL5mZq0-3w&N$04ewd%AYf%XfUirLoiz%Exw
zSvOI!2BxV#0CLTAhnuPdWwF(8q#G0B+-55~66r?KAYQq`xND>VD>zoi*=%meZ^&ec
zss*fa1&bJyxlw-hpYq}>O!!rzXbLLmxh)kyd8(PrV_6aMv^7@#AW<M19Te;m_CS$2
zhD5ND)aymA`Eq4uv;@d%Mt^Hb<}T+nP6a8}+aCFXX~I3vdW%gy28nCF+SEGocYAA<
z+YSQzCI-K*2%0##%X~S%yoLRgZH?5qegp!A1mY#)@rFcsjMoKUPli~Jd+iGB@4yFJ
zIn`)=YZuE6^h_Ps75QVy6d9>>RxG#ihbm9y#(6glElZK@RE*l6<?cDw%GcxL9U`&x
z9^P%XHsh!j-RFGF_Q@J$8h=t4MwI#29voH3b1C?3K+&mOai`YFdHRp8x!tT;8Yo(v
zB@Nj*7ka;SA;-!dyG(%AWF?(O$yVH1u1v9VoFF0%4y;o2RNC|+kaeW3N-X3+p@qWX
z`MN^G0ry?_x;xXjMIRf4<WK5KY5;Pv0NeC@1F?0>B>+(J8-Okb{WKJfZBurIUJT6F
z3IfMn1td`|Ftf`zsHa?>cowEB%Nl+CcuK1oA2#rucpoap3yBk_FFFBmsaNZId_#e4
z-RNxVBdl;=T|~0#tHNG^*f;$1bVTD7;272rc3`rmSjcc17&)rBR!AZMd}uHQ407nz
zO!mIi9JNv*5dacWJ$IHhsf-byDj+o2M+9I`t*WCiEV!YnVIRc_C;(Ubq9zwA02~|~
z4B|h41i*ZW?^j3*0f~kVg+Yc&&W6b@O2NTNDy9OBMX5@~$|WvgY~uVsQ70HI*!FQb
z-Ut-x9FHJs;d(=a1Y8BSQw|NTs?8U`5Eoa<%E}5bR80E8rzKH+GUi6&@VWAzoTdaD
zpkp*Uo!%UvgCa^>?rwQ+@LK{UuSpOYs67rae_e|RDsJxaLWj3+<hF2x9w07$0o>MA
zO&JyvRfPQIiNm>A9A9T}pX31_iZyPaG4|_z{R;}3^oP#w_dXFoo+YxHQGse5DMxsr
zmQ*<f@+WLoR@S4+*=T>LcUCkhexT^56z<$W8RkELAk5SvIj+P?c|yi$;!bJ6aIK$G
zg`%h>$!*oK@PeM~Jy=RGIs3Vt6510=;n!0zzD7~sGl((;P8%o+^VGyTNECR>(&gU}
zZFo}`sqyvRO!zfr-E?y!VnCa2|6Y092P~N!>R3Renu#+5BwhOe``3Ue)V`o%^U<&q
zqKB9ALl_itkIa=1#dRy>SwUpUl^yF2buxu5d>}>Yx8)^z684JT<#YBf^T;}_AUE3Z
zEkuB2u$`que_`GNM$xgXrPCSvJW7t!XmfLpgS_1QHr?g*4i>c<%Yoen{vV*f%DFPP
zARj*n;RU<uo-ElWtF9rL^#)YM$4=-M=iCm|gFip|<+f6rW(9jQHmrKgWK5Q}Jl#VV
zr9&(cX&fq6SG|b9qGZ<WH~W_}U~h@GYnivs*s{YJRY<UHhTKY#Ts!vHvGW{;L6-Ff
z<ttVqY^Ydc=m8#Z<%u2qSq7-n%OEQptft?j!=p-{;850EaH=o>X*&EpJ^Knwii;1c
zWpiK_dL1i=2Cj0%28`uS4zHI@=~RyEF;(KBJ?4Gi;wG(Jo?z^60%Rg_Zk<!i!7Sds
z174elk#^+>m(77fVz9WcTKOV~&z}qEo2;pKgyha7681N}q;<9-EX{&kqC3}<ge);p
z$?MwFZ=f+e6szNNG*)0I9-|e?#3NwD1#{Gk=WysRYbHrQNMm*k%2E~&sL?Vbb^_*Q
zjwM_jv>!o?xVgD_z|@hIfb%v%r44^oI3#6Ayz@%>UW>0k;KvvsOwH1U9X`YAo%MLV
z(yh3EF>1bXydu10mwaqWVm9fndrIAjmSbxmvAAfSV~GKuc+9oL2pI{RtMpPsZwRgS
zj=-#NpvLPYG?riPnqKw?>rXn;d#>ngp~eRo*Qo?7OrIE>aL40H;aCM5_yyD7?ZV__
z!;poCHR55nZad`#xByX$@&x%RTj0L-XIOD-Perd)=F92Cvh2bWwPc(&p-<lTjw~9*
z`l>o!UAP}GQqDP4&!z`R-Q5-&`K^)shU$~g2Ki^3j-T_8=Y}I3Kh_NIh9)fa_@j$S
zqLlGSP1k&wVH#=^KcXr&Ao}hp9{%=^RX_0NUVcq=0$a7>Q~6$`=(-vp>r6fk9fW9B
zeylG6Wul=k1>v1pr*-3|{!8uci5eyCzWFn7-5t@x`nR_vM+JwI^+K=1+E4#UcH|3;
zGNU6iXES*!P38qxo~lrx4%#zrv%F(-^%b$uS{s#A{ho!&CFu_}_@1GvmwmGU=*oB=
zBMjId9g0=Yipd}Or;QbAy3V|>a87e7R>C*uCT?zyMg<c$+=)yDIvu&<I5K@Jqh?ct
z9k*LqT=~j-!-}H={<H+1JV2FCfrbY8ZT(;kcF||V5y^+dtV}o~B0g=~rUtjcBoFJ+
z(??zy6PGw6<?qwy*k-LJ@%alFI8TfZ?I#OU2m5M^0)iSdpn(0%ozBcC<2M7<he_yQ
z+dG>njJHYtf(L%f*aTgYU=F!|0B4iG=}evrVuV4$1+x|2J60^;5?%g^!W=}9SJ5_x
zPr;a4R+=g=>AD{I3u$YTasyw^D$S!yug_mzCI>>tdnxZ*(>|c~DRhUt{caUOyw9sV
ziQh*{Zp)^koqJu+T;C$H?M|C(EF<}q$(%V{NvMW7A3q?6^>e4E`%JwtQYPLdrvCvJ
z7${NoV{2y@e5UjJM_1f5j@=$Qf6i30A~!&Kju9NFt!|uTZ1**+7<+*aR_V$NRcx1@
zE1}V^;*&x^iFrtHk^Dr3K6HM0e{xwJ2i;>gdumo&;0laYFZ1^N18mi%DzzH^u}u_B
zurISI7nWXhre`=iTFEXZ(3)Sk<G1JSIbgJBWa3ZrN%*Ztc%2`0^W|4m_feYv0TxR>
z<Ng*+{oQ%)0qr2=F0T$+Y6s*U)YO(U@1!bUE*X@ieaJ4R-Pxq}7jS&e^4s3EV$rC-
zq;OERu$QZ!3ws}MjTAiVosT-{l#_xgE1Rc4!CucWap|i$MOph+A96XMTw#$Nys7Hr
z`&sVSI~Hk77wQR{xGbgBG@&^BPUOTS(41Y1LXZx;LK;IhJG4azi_Y2V<obw1W3J<6
zkCJxd36g_s>kkLzqV|EQkO^v9O2FeU3Qz@-Nu=(ke9bIZ+KJ(GC|`P}h0HZq;&3}~
z!{(6wU~yjQQ{O=+amMQtjFI?c8|C_OZRrR3@0aJlrS$olrgBWobD5eC)RM93rjaZ3
zGd81ri*{2!t5szROn16>wVsdejCDc+X{!wAptjnRe}Lqfk|x);XsuIs#6N9WHnQJ^
zh2v;<9Y#CRqeHl*ByqG2Ew=3XW7n`l@sQU<ZOY<PqQwo|kkdv4=2m{zS06OEGW%tF
z#qXdMDxLLGuTRvLl2~@i>&3bonQp1Eadhgr9hSLm*bWudt$F&334=^Ztle;DO7rp+
z%Q|-QUX71wmP{$f&goK?t1s}63~o0xoi*KIR4#RfYTt$j#(&0{XH2z+v<=1~0cmEJ
z4@50!CvWnudB}~<-K=c3E8~$jh~MsMm-IztL4p=g++dWaM-RGKVbxc<QR8B+sj5->
z_7;X8!x~l0Wo5DMHY>?epk+s-nortcpnexq^X9n267~894=rAVX}9?f|0gnp^f9W^
zEZWPiMeKamlb(Thm5O@lpc;BG7~>;vy{7@Mz8r0JdAml+s*XC)$^4UP)qIV?7Wt}l
zF2>4rlOTeuGq-ggFUfNCVwBi)r6XPcms4==%u2V0KjSYVubDzEQN1(!^)Y<CO<(1!
zFivEyXH^UCcUPA~ZT+;RKZK<pD_(|;J=go(%C&iirJeAIl_`DF5t&QzP|BK)Lx-qh
z`Wq><ciqLC^sa~Bnob|Ij8u0Bg+`oM_4`9+?(^OFXe3w`Z>-dVyA;}`e~Lc=tcLyH
zi=8ogltOHg?y^5XI@Jx6Zn&k<uFd9dnm+0v_W)93-3-avrFwbBJEUj;U!{8&FYq4#
zmsoVEx#No@M=iFLaKoBM1FZNppt3D)g%3B<h9WBXumdg+J#1DH5gq$#=I9NjP7ibY
zcFk>;2V<rZLS;EDZ{J_)dvq#8a6h<LIp3^a;v+WcfUka@()Jg=tIgq4@9Bw4L7p(}
ze;8iY>f6yu>YNsqEGe$*XVJm#xqC=_xrr&%gT;S7Lp?C|N>Q6uK_eS9mnKyiCT<N!
zKfqb9^h_0Ze+4Ew5!RFKc5o&i#75WJ_OYHwN4gRlE%(}ilr=3d@Qx-Eu~>!)blN_t
z<GQ%=lC5l=)_<2=UL(-g52y;==|qI;O!XYqP?RP!aq$@cGLQ6tNZJj!<p5)khaR+A
zi$@nDK+W!H5)29hcBmG!Zy1VFyG=JPohifaFHtTR6LpkVJNCGL$#rXBmji-4F;GJ)
z=<05O4AGe=)?FF4B|Nmt>d?U!&QdaV77u)Ec@|Nr%g1%`FldEmC-e8V+B-)Kh1EvQ
zgy{M0iQ$p~C0+!n<UO2|HD|*p1}wnwUm{DnQqtjLW$Poym8Sbmx1tQm3D-rnrTSM@
z{GES;D@GdPf71)l?ID*bW$TSLX+AGbjLw->Y`(eWD`s!L*_<q_2<Nr0et&%GPtd~x
zySqc`^W$133C8R3weZOD7nm*ceyn+Y6MdCU6c*wpeV{$_=6<z#6XyM#`dXYoFEizF
zj8a%E4zlpuIX9jJ_4nC&3w|-&1P7~s_xF0(Su2|E<HDD`WjPoN&V?{7Aj}1;E7wS#
zl5{s3Z#vSOpm4j`7DBe)>(0J2QZ1ui4@@dW0ekU}IH^PDLJa47#c*dP^7DSf^;@C|
z`Z%~`@07*f35s;`<9c!J|El87bBFu~7~JtEgqoH4ixOOODDQ4_ZKKe9vlp^#84wUa
z`g=(FwH)ugYTb`>9N*?P-Qcn(eYZiUtn8k+Q#PiiWaTJvj<aE31}!sTj8PEWj^wrT
zNjPLhO*ab-wk9=9qh^dq2v6Ma*p#bDE2Pv!r`_VWN$c*>-?*a1`@xwm8-3|~Q+wo$
z&R;XcQoQ)7+mLo)2Und{mOVp_oyHrG7&x>{M6FF2woa<&o+w^Jt>NulyZNGL?Y$Rw
zp9I9gMAJUD4`<!-dYx<pBf>y!3hOgZ;icT36a-UZd#S&~>5!ab^qb<QN3Kxc+y3I8
zd}Q~d*)=)}jNZ3r(h3s3Z=!l_G&17Q2Ddu5v5kRa9xz^^(wNoH2{GT3p4p+~zM&}e
z`GW;JV8E1hO?y4Q<neq%eZf%s2RMnUqdwslgB?9zW{J^c)IHAD{6<BD%*@qxW7^9q
z?7`LUBGf`5;CAV<nalzq1jZ?}W~IfpbEuHW#?E{sP~i6yae`pKo}MdCOem5fAj;fa
z3wJYAntyTo(VvG0rZPJ_&oW`AYlh|)0+vq{CGy)FLDo(`<j37DO@@RzhP0E7gGzp)
zW|X0NX&1j%Ja>*%WK^8F2OGf3O1>vwLpf7l_|o;7i;;6sJM~H_@2xhlktRPlolJ#z
zeWEOD{-rT$J0m|bPggBEs!fPT(00K$`&+`dpCf*6aP7TABtc(H<vAMz6P(RF_J;Pp
zE9@ORI41~#rcvu@H`FNYdAkAaG=BK7BEs?!(GcG-I7*EhwtiNzBPXXBoo3P;x*>fI
z7S2&TetY{SJz?0idq}f61}t)R<*j)A7(69=iMllkdHB{jU;bI--}upgKj+u~-2bQg
zTgFbl<U56bo&UmpeGko_sF#pk@pIt?oa^sOSCrp~^EYrFaE?hb?s`!_%kVzyO%)5@
zlkdKLIb>1PFG~y#4GjYY1ND`N`Eui60B|%i2y`}46=PI#=b*%TQg+qC{`p%BF_WY{
zNLH8NqJ{wq4w2t?;%dt3A^+o+;l6>LW_T8xRT;1gl^OeL&K-YyF%UMex^9Q9h|ldx
ztq%=g4qVko=)F$*l`j*JLCRN&$nTMN`Dps#!y#T3@PZo<1Rnekknj8>HXuG`3X>?K
z9up$$eD;=A3)yhjmQZkFStxDoNwvSt{>+RstqDP{x}GndU~dFgoQ>IVkC&}2ACS-_
zFzcl5@QOvyBguSd`kUXlTS*S|_u#O%WOmWtLCn9{QHcmb1M<02OSErbNp?AF-d=jS
zimYK1=g(fNpC2bAC!Sd?K-;le_+(VFawfrJ&r3Oy+A9?JlY9vO(wLkN^BKn2iokKV
z<}|RR1oeKq?Ua?b#?vEr@7X{9@aO_)%eoe0-^kcTOO!>px<?!iVw)}UQKldmdHSy1
z_6BzlE2!2_y@zp}tG1s{4xZzG@%@YlK$@fNs7^1_@JoGalt3|>hbXMF)?quA^JrGO
z#*<E4kV~@)xF0|(@g%5ezPT~iuCqZMin0Y8246BplqiqPv$vfI95BJ587}Bcf;19H
zO-%T{4i;T?;RB(=x*4dzgV2Q0G|k_#OIBEfmw6i=QcmSE`ON1u3dG=GEY@akCM7aa
z3a9ItT3y8r=>XJDw#P@HSt;{<@+$_d0$uCl)!mBO2cTmd;-cf@@xJxgYodm=@BVUy
z@zVSXXGe4TPI+mXg*C>dnw=~OD2mY|!7=mT`fl{g9!`;n{sGkgJRHsS{fc-__4EKW
z;SL$HM}{)M=)=;cr*lHkC9<Cpz+d*77mJ3UKALtVPxFm3w7X54FhLBh#$gdVa3ugL
zC$k*!i+HuL$h@3VEj5-WcyA@^p?!6bEsHGe1m{9=uO<EDAoUPKlk=`0_qhq@_{%J~
zvp|+r-=bhqkL_9uEW=8!)g?!FvErZIbt<(*Q_c(zv3S<$0=QJ(q{X4qujyZukksW|
zMjSLlfCI}%8Di$4S>im#V8NFH8FL5?>Cvdb08T$liXMFAIX`}6z$1}{pwzH5p*{vt
zeU5UmgS)L4y`@7T$$2GQU`>tGJky@I8w{l$s`d5_c!@H0${!qca;#AGLqBXV^v-XW
zb?_(j>;%|Z*GqPBE4c%B<>=p`vEi(jox7Bdh`DL_UH^zo{pHbZXREeqFT!^x3aY#0
zXA>FtjA7Z-G?VxNtmbHPPwn4KHyx@SY>yA~A3QHcb5^v*1x6%n0`m;j=ZAHjm7y95
zSnmzsYTb>N2S~L{gJX%1ifycE+S^lh+33oC?wjp!eHWV@$Jho^;cZCmJc)%I{sTn+
z3dTUC#-?sBoDQs}KZwPm49v7jpE4hydsP1wd6Cs8z~V;44!(%^{@@wnRpX-;U}-7k
zbT7q7jrGf7GmT7e-CryAU`MM;4(yZGktEm1n|bVWvcbDmVNgPztJHyZodS|m6s;d@
zT*9h-h9KD5xdFm{Oq^;N)8Ye56L8_*tg-~HY~3)d9`L?=JQpU5-@92&#t^@_erS08
zsZ0Skc{DdqXiwV@A?tE}cOP9+u|4IVu|wqA28F}7qS9jdAWV4`Y->&DU_^EMp~UmS
z1h+jBf4s&rc-$Pz(ya#_!}lTm62>oXJy@L11^N*~G$Pk1Juc>K@I*n#qtp9@EK3@M
zOCWUQt3<U%((aR?u9DN7ZQ)F&vbc@tC28PI&G$!pz-EKJ9u`+ST#iyEcY+!{zY6tK
z<3_*s@H_(38i|q13`s55YSg(NAFa6*o?dax$|)bNJeqs6pBV|RH*>j|Sk|eJzKH@~
z9HKo$>zT#&PjOx;$%G(K7JGLdVoUhRpqkv^0a!PRo~f?=UBS|S5J0W@L?>YR64QYU
zenO~70CjfldvBWHM_N&td*7N})H4yl@ei<6>Yo?aX-fhK!(Ed;zR$aR(dwVVl2aH$
z78UK2#ff65<;h8o0!wkiNLhx(;Bc$KDNBSWh3&#6CnBS8?234%%{$%G{96rkt;U3g
z_p{=BLaea*AVjjHP&sjlHO4cFdIT<2AyI;xPa+i;&A*~*r8>DM7iMb9$IIa#fbwA2
zh%XnN4Vvhu`7qjkcGu(zq<`UMP*qnskQurPS{H-xS?tH$PLmXU6&InTUdt<mYFv}i
zZ{a;=bJc`K|D<?u7AIss?sebr#dTRLeW?xCm_nkeOP~~IywE;GR%uZo2>|T|`M5Gy
z{yAfK1tE~=h{)7Jy9$}tJA2MfJ_Uf@2<h05F!vn6rLo}R=_E2e@4j%DVU36LgZgcP
zp1P6tz+!Rjg!5iBR5JZ2dh$=o>iPON_J4qjg#f6)&xwj^FpPFE==oMNlM?XtPPuLV
z@i}QpQfu6CRW97wydc=u3K;(BAh^t5T4WdvbOjb7sKMvk&Krl#3D(OFz%ztP@P0%`
zRonO)9UkbxS(~=bt*~N=FzIFgDbx$XU`myyz>)XGvNvf0d{!E#Xs}n^wxc8~0sua9
ztNmZuqZ_nGVk!taC@_Fb6!xHvudwlPrPU#kX)&)^-u8b!FS*dDHx0kpdzi-SkIHF}
z-Yh$z;=B{QE$FyNk&)?OwAEO+lzB*WatgWxRTaVh;0lHCFLfqsXAPcMv=2%lvNN@h
z`UxVO3qU9c;;%WzI212h_=&n3+4H{0IJ$@t-dH`NwVF+xq%emElBGk~hRG@~CMRkE
z*?h}Xtsf}P)_|N!6ku2CVK?ncwFR7aTurWXQy;er_kLdUku7rIVHtzh4%7y%2C~gy
zD?!dtSyAT6{-Ce!V}mgZ+enPb#6Yg9ZA($=+9w12b{%n%+NZP}Ib8nOk@&&V)ZUU2
zuy5l~j}DG%YX{b@mqE_d(&Q_k0zI9zYDjhY%rQNTyUd=#_*PRY=~=)pDZ#cWu*5|2
zm~$N7JkNcQsc?QCiTh?h$Dl5tL!pD#B#oLUgBE+h6#ghr2&HU%vA6&ho8VFm?u^VG
z7fugoKQ{5m3<*_7r1F(|JR3nJMT2m3uk2q8;dMxlhJ+R4yXqHE-{vnOOpZdb)w_wh
z&f`W18)HNXrhnY$fjl9wWCU7|>=X$Zv&B;LdKIle7+oQq?JTs{N7}!&4l;nddb7kx
zJyrK#cbITHE4X8pYZ!q%#Z-(bAq2RJx)VVwr~slvy$mQyn<j9XniL1PrqnCnm{3B6
zKN5r(k=!i+FcQY(9vq2m=ft*2AE#VZKumMc^1i^n8j+(}6+UV+5<ywbsSYRn-1W#J
zfj}VAEnKJ_xvX=mGf>x98LT1x5Ru#;QT^V-LnjD)!G)_;x0!GQ%;KfMoKKck!wLQ6
zd9`AUqISWEV)^NFxrsX|evpB9b%Vj8q7sY*?pEC`31*AWtYRBwk1iz~XNm6DtNvle
z`{zP*v3ICL#5EaqmN+ToIpPehmI=F7rbRIWWgcbzW)9+~f-R0%b#XtZw3$)X=5F?~
zZD{x~iKR4X71!QPrDS_Q_91g*m0nz+K5bablmOYot9*G}XFqQzgQiJ}__m)HZyzH9
zHO6R<$(T#?7{20LB>7GzFxFS5k;zPt<q1<!RfTi|BY5PmtWzv$N7iUcG<w8Gpw9fX
zDWwIZ49=iLS_L>8#(L2KGKE02-Bnzqsu*q((NK9$;;(A|i?PJqLJSTwMZTi<uPt+K
zGY6Fotw_&erpmultdW`d+6=-ZZsJ+UX{>QAsahjj6OEo&811OiSUH74=XXqok}y&(
zK??r>JvIgxp4&y==nhPfBA2PwYmj1DTPgq80iLlg+6wl$g9Q?U;`YIy`v|sRFXf9G
z{{bxL*}A1*SL_EN=O{Grr&|Po7&)+s(D5)a1MhsyNN)1lOxDN^?`)qWmlc)L8Yb2J
z#rx65G!g6>dK4aFP%7U7A9Uy71_oI`q;Nmkq`*&$dl+!f0`>bLkm0&5((WX9G$5Gn
z)k_Wm!cZ{ccBtfk2An*c+fL&%x!FKWH2bvT#hmNKIJl5++!5~X*)@pdJquD>@yvqw
zOY#OLRI1>RQ$t<yx>>b<*e&`F!sg&3xqp08^hPS6QMxk_=_%X}44n@q%>6pcTd)&u
z6kl&eb970sE@;kfd!<R|e&ZP)bhF?syvz^c?}X?=gb$*++eL{kF$HneB*s!kCQHR_
zVww^nspTkB^N$)o%<bnK%GQjY7kQRFmp!NSWnkd*&_Y$0MA2gY&Qg}3@pOx5Ai?To
z$wBj{IU^~b=2U50B><a7)ftVe=e6q=t6OQ4s-`+WT<)%CrwnFK9?nT$E4AkS2Vk!l
zk78}vTT(|c7eU-SL53|`@?c6wGnT$+x8-T@W0hcgPWVGIM%xtQhiuBlIliB-#m!}E
zmB6;mp=jk>X2DXgP09lmDFsLZUw%<InSm!46J(iX2&PHc!llhUCFNH>jWHj#RW-PQ
z-sNod1__!(X!ma#;$BNk33bokD(BWWvQW}~ZS!8ih@Hu@_t*#o$9OYeaH0s)Jt@+R
zV24@Nullo#OQawoir;Re(aK@&MRUY@co&mL3wHI6J<ABfvmu|_O5oaeb|YytUnL9~
zKh4{(#riEW;9-w!Etfqg=yck>(bhfF9b*(cL|()DqUBDm)oBCP?x^_b=C<Q}8c4$T
zI)=VjqLO->1QUwE0FmkFWsvYPuR712*XSn&g}1%1Owi@_1j_0(rW{z%%c@0Xss>w+
zwv(v~qmh!j^$6A5AIC9Kre7V{Xk|Iqwev0pz@_#|K+jXI@6ZV@5tL^>s59?qy#7fR
zmzu{ky|9UjkDjmF_0+0lx`H^)mGW%!!u<2)q<Z@zWa05CqadBd*Ab<4$DZk%lFrlB
z{X9@JMMa2cSA4fQmXLzBEA?d!H348&p@CpFS5HWY(5NLp&x4&uD(jAmrHrqM)SA2X
z&$HqV8nj`Yt4%jcEQz!qROZx)ng;vPim|w|An$eORM5q*2O0}0-4u*!G#<^fHgoli
zUjJ4pb6OrdqU~dZgiFz@c4%CxUo(=z$J;7sX+s>B06IlLmue>4bM;6Vl2bT+($i}E
zv);WTg)CkY6z*r!4P)iVv=b0<=fbW1VkBO|hd;}T=dcS8<|r*FeG~tLunAL~2U(sI
z`;T9Fyx#sM?=5p_3<iDPs!K;cs5`BTRq%kMuAx*_uOkxG{{aL<KU38z3}0h>W0bi5
zXp%&g*8WvdcZ>aycRI!hUou>Nc-A@_HZ5L!6E11cW<<{U(5$o`?KgeKWz-;X4*oLf
zG^k&u{40$O`F{%~!2oDv|8eMF{=Bdrwf}a0?~e3;6W8BR%YOF;<5i^MxU@Et3SojB
zDyZZY?+;ZI!p4P^uqGgup{?eI4HJrXkQ02&+Kt{pCG5&rqV)gjatUvn8sredsDy8R
zLBb1dFHyt&bzA0DGm|yb<Hzr5S}<wUbtFD(sJ*I~BhCue*)~AmAA6oi_#ujmpD;Sv
zE4~edzO|VY?{AJ1(@3bcf*}E;#%#5_#^p_sMKwc36?|N2$cc<>f*c4_k>)$mk>QMP
zOR2KhY!ngr7{e`Zf!2us7iQPsXMtBn^DBiiTLI}*TQ8X52YpV*WADz2md?9@;Pb;3
zv7CO~AN1+gYZ8`=WB2*}NJlstq%{xsADuI<>E7F~Y5xHJma0T>Dj6vkv;+dgiibr6
zb4#Vx{D!+QGOF`0YbFelh1!;f*5EpQGt>+9{_?ZeWG?{z5ew81Xn};?00<;E{bl|p
z;U+)XwCLw)0XK5=%YT3XK<pqbdSDHB5A4|U?Wqqc$2R<JPtt=9|6_1)Iz^eMWcO2r
zzMZ(H0YO=u4Mi%I<OC1!JxIn-h*-M)A3!Evrph`PXG-@3<A>1<HG^RwUp#x!x8O)B
zAw9AW7xVlSk|0<q#sIpZrh1f6-_!#ZE1%}Jv5ntX8;lr|J(ip&g+r}(>_3=ds%{wG
zqJMc|AH1`d^{I$d%k&OP{soQHV=}-hK9Oh`)7NNrJREC}XV@~E-Xr*DXp>Lr$)W0<
zeisL#z6X1Sb@t3h-2POWnY<TvXVpZu-J@3n{mt_Y{aka{qS5{k-W$T4Q;b)l96*ia
zp3yZ(E}*ctP}BYqOgBSZiuQ<Dg<w$51xdYx)~FWvSNdsCaVKT)0Hs@ibrzWTcI!bK
zI0V<b`<>SS)hIQZ$w(fG-Og_00BOfqgTAsjIce;Xa$UdBe{awfqaF*Yo5=4(uh0Tf
z_P}m1V<H=@2`^yAJn#l!<k-S~yJiM|PC8nT*-0Xk<_cxGQax-)JIQ;;j5c;X-KVa6
z-(6$FepD#QW$$Fbbi)^GC)=w2h&@_}ehRQDlLX<<OChqFjy8Puo!5Z*?Ptx(G}B_&
zAaOw%V?f>1gmp1g58WxN+$fV4Ms-J21IuR7vr@PxFM2TKP99~U!7e}ZhTw`;Y#l$Y
z5V2!0$rnZ;r{X%%F6U4Dk5GSLOMJlWQ|u>{?4DpjS?_@v#C=uMwYTNe0>K(qmcl)G
z=GhK$Y$iX2q%zzgW~h)(YLZ(yY{-gCWVe>3dDe&z*w%uxfUh?Q&Y8ukgP4jkK8gd!
zWCdZ`Lo|j_TC1doD^7#o*h}Dpe^p8&H|Y`iKD|-=Nz|~ND;55o9IrTGvF;DUKAmmx
z9#01N(A=|w1UJdYi(L0XuUH64|1Chg!r+IK<DTXjmFT5i++(2=riYAa=%dQO9P#~5
z4lUYL(K7oAv;QRl%g2x6-8^h>wu>HE`X0v~IG@LBkk6W?V}QhDw^#d?02>>vmIA5w
zQ~)`(gMN(}B#rBRM{9mgp8)-9N<KSTJ1|2+!aZiu7<+>pTsLzENb<^0!RTmStYtO1
z?M_YqqVojl3hGy6zIXkN?HQ=Rdz3f0O{kDc%v>iDl<*g?ei}<_wDzc&p{#cE;5SUF
z4x2&Ea4MdHpkx?S_2bq_uNE)Kccnk%A*prVT#V;(a}2o%k8;&Gh9FnE!F=>v_b}02
zfoJmGpMhSAVb7@^LZ+^}ms@>V%rW!}<JiI&%-2*mV1T3IycKR$5J1*B>;q2Ct|Lb$
zn%X-ip613PfK1KAnxXGA%R7!UJf3A1rgkQ^VrM^cH51hUlFK}Sm)=dt{Vjz~5bbE6
z@d5i3tw`cobO@i1zE$}Wh3-l)&~*A6B56+e;#v0DIwLEm!U4~aUT*D2wSEbXHWYB1
zpq8sWP;`8rL}ihz;0&^qc>Q@12(&JBzA|}}XV|clo};B|F&LyqY+W~g6+U_D6vGT&
zj!l__B$xqoT#ihBXplb<=P1_H>xn}!8LvQWhc*#(emhm@ckPQ+yrCwI?OfX@^w$zm
z$l$g|PNH5j`lZ0V+}gn7z1CQtUKnE}r`C)M{z0TtGoqNqz-L+Am8&mbpL*B-VD-*s
z)nrhHVr$f%Y9>=P-W%9>hl<TdC8+$vNSz8tx}M&=9mot@MV*%cv3^ZC@((anO2S6p
z1W&L|9AY;l3ap79EBjujQejlDE{Y)!-8YavRp@ECOiFrA{@8FdfnMJjv%1BP)Fm5}
zs?phO@0HiYQjs8v)wzbHbB5+2dSty-jk@ER!h*E$j9j6*!3}j`;7ZTFkPM5vE6QlE
z4XX2-c_e5z(3aOr06A|Jk*_?O9t+>FMN=q>p6kTz$uJhq3$K1--x(^m66+~nY=#JZ
zjoR1{G${}Szu)GGOss2eXlb~bbg<sXr`J)J(nsU%7L7hDg1WWY><nQ-f!U*?cO&yx
z_N_0dbhDW?7q$S8>RQEGk2j&$oOawbQseSlF7k<}5PbAni5!{3m~t6;Z+lJS55Sa1
zf<%weYoUKu(rT}=tM*wGQb_I>m6Mifi%Y1s6>%4zp6^+HldN5bIjEn$YnS_dpmxB3
zO4Xu$=W?9x3$gXdTFgA}!8JeHC{Lf1=<LnkPX)<f=B(N7GVf!Nwcbpi((+6t2X%fo
zE!oP&5=(*b7uR$P`W31%twFDY$`h59tM*!P)H*V0WBCZx8NA`~_~Eu))71B!CUo>W
z0446N&w<a-CI-UaqN(bj7m1Z*2t@(Rz{GeS++!o^tCXGnTA+3QgT@<Cw7vsl>#z9G
zzK<M&>9-Fgp61eM&IJ_*X$ZOL%qg))6^iAr!s%CZFi>+$$5X{dGbE#CO#z-Pee}fR
z^qbsmVP5iI!NdysweeN%(l?wEvWXUb@P$0jUhSXHtl{Mh$2;h`%aUnWIjlVX#UJJl
z2$cco=jfI;AE&qSto$~e8Jextn#si*Ncm_@MYoROw++z?G5TyWNv$=(#v^Z@8Ch1E
z@_CYeTOyE9BCXGnQiU-P2H#}V2wW+gqb){qHwz#jB_%4x6am+h9q^#W0M+g>@<BTF
z7f;XmB0PK_&(ZrSQ1y(3kKe3>*Lv&|6~1<iB??c?!O)j0v+?K>n<%s`e&+zg&9*+;
zK~w%sx#uy8!TO{bV}<f~#H`@&E6;-U*WnM`NkV4o)x2X>Kt*jes*6gwkFiZQ$3*+6
zb^o(;<hOcaNFUd4^$Sx+2?381XZLxB$aA@wKhJ(q<?V~r24k}@Nb^>YU~;ZkU;a);
z#*9XQ5AxZl8KM_%7(j;JY*8c_Ag9aOd{k{TZv{7H1M7n7s9khoWm<itubq}wZXLT=
zwtH2oPm2uk`POae?i<+S*ejcB4$3mXstSc;R2k*+!YN$LSqClMYV}gV3njh7eD;u^
zf49xywXd+|N7$_}rNy%Cb2q=Vj24QxYk}ZkW8X*+(%usiK79Q62S`lpsXV;kLR$ZW
za7Q;DGM}Ja{fuiQ$JpGt;sh`=UDGU4K|Df+h9FL;Ze{Dqa}E({Wb9rsqi9NA##S@v
zrKR8r>bdy`XlU{qh)A{(3QDo8P}61zv?^*{R;Nk4`v(A`MJ^Cj$$9B_3>lH(T2cbE
zi*6rtrl2fVJ6)B83R-_}=Xyeem$-NBZ_S@EKR^$44EoM!=a>p}Z1ZzwtjLS6JLe`0
zjV|$o@(g;qUvN8XEU7A^Nb^T`rWls1zGa3c=q!s9LLJ%wjWc21giz+e&|pZD&gdl8
zXhAxpLYWur5kCw?M@vc#D@N-+hfVsX<9r~VAdfx7j2m~gSm4~Wh?jfzZs0ffle{M$
zj5H$j(jT9Kc<>R*{d>n%%iG{$4n$wQ%_nPLgaQs*(GQ1Lt^UGj6v|%Py<dzy^`p7I
zb}5xFN8_CJlrW9v`QJGMjgkXU{{dDwS>CPVN_?{V8seAEv|=I4HVL>73Xv0{i*CYd
z2<22%%KQQ>AjGDkb9Gd3T;uE72GSr(1%^scpVEO+(;_u}So(XK>3L8cqNk9^E7z0X
zhZE1FT8M2zIG77unBz5gt8j&gz^`U=0`y?8ogM`;hO8;f9eue~#JXDZsEz9258W;<
zD&RS&74qEEGvwsLXbi4}$Smm(Y}2((l@}k+b2_<DbsB2}0wVSncuxvSiv201wrJa@
zq-9ZRC_4IoYx$cx%C0!BK{|q^wO*~1d)1%{Rm>o)ZfrZ)J=iXN%FTba&iEHKl+*!P
za^pN~$OQnv1^00LiOnK}vAyL8-~#+W9dAKdzk3E)429OF>yW&f$j}_rkA!sbS*{;?
zWz8GOs0I7%-7s^Sg86F5OP+I5Yp8LW^9ZX@o9-ewgR|xFciky*w8Ne4tHlZhEKEI#
zkau<ZF(aC65&n6Y<|l=4O%q-h`>-O0zXRC;Gj3eV&T2#4aoTNcamPgAT;7p2wlWM0
zoE|yJeoXc&M9A$^W~#h=EGuYxb8`ex1lWS=i*sT4i}-h#7krQMFa>$pY{2@R2&v{@
zZal^Y9B4)BYUb59ahWOPFTl^-cR7U1ShxPTUVn3_fVbijE>d;$_r1&hAXuFy#;Y7O
zI2f$Z_-yJwnN?du#q~ZjxOAc_gI>6iW|p(oI`{N9GIv9a$MdB8n4S(@B3LGqmKtv=
zX#o9{CQi4>*#Iw94zzA;jl0ephDxTwa5>Xqy(WwllXs0Srw0VJHskY*<w00_ki#%P
zT~J`$vJ;1Gh(`!7<A!=yNPAF^+OcpeJdBXP7oSxqE;HRPO60WhPzAh*-$$Fp3p=d4
ziqTVU{fyXyFrMiv@$(Ih@^AkDp#UJ5;rHAL_$`D>)HV$aDBFB(MX-W;ky$nLP81FU
z8u(N*!Xm+K7Fx4<v9pWV4N`C2BZ{RTA=f&ol3iR{7L9LYfI2a+Xj=#-AP!4$rksuq
zXhTKm$4^#n(LVF1A=+-F5gOqP_0vkmIu?SS^_xm9l_p&7)Wjt|E9Z7!PX7W&@-rQW
zF}z7}n`4dGi_9Z(-jEI6c~4DSmM)fo)huQ~yjlE+jYc)G*O{xOO#%uLx|X1D{ne<H
z990I3kQG6>?{<6_PYNAiL^BQvj_CPwBo#->*e&f^qwA*GAma`90Tm>9#Ko%L2DitC
zVjm*G)cCI6+?;_&5X@w#Ro_kZS%@2+;>PgBruk(+CD<E2yccu7(2mX+#A>`v+0Oip
z;@y?Paow?R?Te=G1W%ip@+>9Is!|r*QW#Xw6gan>z0+~2HRdJgQlZ&g!2&y>MFaUf
z*O=FkksA8S+O<odQjYYUEVdJ+jaD?C=}i%@j!o?f@RiqjJ&&97jCsjj9b{ePba~1N
z(hC7=rXK>*lO|1t!Mn^?d7%o8gSQfTjIDkHn6xM9n|oM)P!<si_i?fkw9?O|;k|bQ
zdtY*X#xiSd5kIeMfVp2zOffb@Kv_`7f+2CZac;mTb|eJ#(KB0%`uDMm%-xyDO{)Z^
z08>W_m;x~w<g|-%mMYp2p>?Obcv;ATu}SDq4a{qBsest1tJ5Wr+FRb4K=2VhkdF2d
zDOxvmt_WSYb_Z-h5;Zi^rOz!JGo(F_=y;IEh0&xUSYgAYdkmFsuU3R$f_qIhrlnA#
zc6d(EAd|G~T0Bexd{N6_R2&Z9<gwZkWmnS|^OEZ7+ITCPS?Pu)6a1<g!cb@*Z>e1P
zs6Jx&$mYrU9ZtdZvk+BGt~&fg`{LbiG5#d50$bpxdHge-qa`VoH@vhL=dH1hLOEmz
zPMfhXp~IO60^PdMw2B+TS%bX(9tfy*DY9vVYu3UtCEKMjm6NG&oj6fnMW0DkNYdr2
z@NyJX?*8aID2Q^?359TLX>~hfw2-(LndQzBF2!|1kr_GOA$f%@ZQb}xBVvybI6yU$
zST9o~=i<cN{*dMK&xo;%bpLdqkE7!8&OJC*zP_-B^g`5FJr`RVa|nd2F(__S@}`>D
zA#pB%FMz6A^U(A;rj=UHa%hYfNA_d$p){DBSQ&tDsbQE?F0~JtOB}wQNP#sTAST)T
z<vmKp{1ltpsFfBN=$NJ@p6fQHFHzm(#?R=o>^h_$*aNZRr{{zNuY9C6k%0LoOU3|J
z*HpKx8OC}a7lAnh3a&7tL<Q`PRLxB=VmkT$1HkPA4xWlR*w2@g1cB4RH*zPTJEA|%
zeLMrV_3NlsL}`P$>Zs?2-|#a+ZlDN#LiG-<<QjB8r#kOb(HOo7qPb(~^Q|q`lGm){
zC<|7F%*EhK&6U@XlMf>!tWW3gl9}_MUlQ3qq3WoKC?7wV@4i?5pfe4Wte?P|;i5m~
z#KJmcx=F*-Z=shMj}G`l2Gq!j?&r36p@xNWX4gmm$fCkSFcJK&z!)YM(NF77gO=E~
zuPGt-GfbhK#KIDsb~SYr{R*>#w-wI>MG>=cnb4kHL>ZWC^0zp|)=2Z*8sTSBJHp9g
zkhp0F5!bIxV*sf7X;yTl3gM2i^tFaX-y?_=wk~_UH7~O?SLP7(iMQlD%cdW5&14%`
zz9Cdh>%!t)JRYZ+!6mWh7PcQWavQY_SVFMrIKTn=u?2I2QLRLHy@fxUp%wExPgu3J
zVigpoRsG_-g3m?b(OgMxs*@-D13B$h@q!7E>;jgDl(fp0Xjwc-&9-ewJw<DkA#SWh
zLa|R}0kK6!Y_dTicJ&y)A1RAN)){o3g5^yT*k{bm>$<w2pRdr9^B5XK*}XmC=VWg1
zi<7xznwFB<bPcqjxRz4S`@%E|5&DGN7A+*{q3(}=&G5i2A;Sn*DzoaDYYL}&9dmIa
z8RXtI-=PH-YO6j3Ed)CrkRP+vTl*bzvfDvGOVe~QOlxejDf)7Vt3J<p=Z+d>$WqUU
zqcBHuhfD@Cwlo)IUJ(wU0HBnuVv)35ct@Rtj*P%Y2Hp2?SGC&tak8FL{E0zyr;Y+0
zF>m7j)$e_Z(6D1y)cH{cvhah231$eEgVAdy`KX)G*eqexjVAq7M3Ao~ZMYCr_o}Rm
z4Z0>je`K&M^Op5bk`qi*d8DPX`Pw4l7qwkH<47PaadshD@wy^Xzo8mCOv>fu`ig6T
z5_9-(njOZisj?6z-5wt@NVyxy2kk9?eTD*bc9&b%0rKGI?F)Ygn;afW6dRd*2^R7f
zPzEN8d2rN4=H|V|XM(14^oe$1n^X7BKM_(Y=v{St7QF5<Z3GJV{c`H$_A3fUd0Pda
z(!EtTzOiaKs#H1lzfp8M(tpmv(#L3qFtDbWs)6dePQfd}A&B6~{7Jm?kBRcx`W;X>
z5?jSTZ4f9j{*>vQHFZSpq3@X>rF}AO;=g;=MQq|Oj?#-Q6^)wPw{2Jktt?ft9|u>d
zNlGGqxLcDcffqEi9IwNIwW6sL{G41!Zf4c*fiAn5zhvlg)>yyeFEc1j=Cb^pc-0&8
zFPDDMj(&KafQbaSnRF)MApz<z|M=j5IVK`$oHVFEmU=*-$XKJNO@kU{lENu|eh&_+
zmK1@JBViMZbTzr-L)87*Y;Rr8T?Hk<R1`DH`=ANn*6l?xfqG*GG!S%l%-V)$J(K_b
z+1cAYDAWCWrb|QZ8JX-kSMv;^0LhrXW$6?npLv-0awBBp$IYv-2-bU=ix2A$Lm8Hj
zf=^-P2(%}|Mb@>`Z<q5AOOyWq)NuaCiaqy>V45QI-S88CHX*?uvIRM=gV?)bZs&i|
zt7g}6JbjKJ471sYo<n3VtG->Ga#>9Ae6KFe73F=kG$G<t=obYW-^(t`s-+siV8Gsz
z9WL{kfNO^Z1r{`7uR+u)mdQM%o$&6g;$C3ZJr#ZG`lQ1cg5m|+{oKh+go@sf)8lfF
zR6!6s;-$ML{}nqJ#OLw5g1E7VU(8F0(V>1Gr)DFqfp}IX@t!;aD?BNC3Otph!vh|V
zKm;R3n;g(tY`nnEC~Cnd@@4{yO51NBJY+%K1Q-?VrRB=zw4z+l_+MA~A{~Mro*^%^
z7inzdJ^_C1%NC!!f8ACE{zT|kpiCu|aiQL0zxg>hc!|zEBAYQN)!eNCl}uCu>eWH&
zq#&S%Y}e3xy#85*?+g!e?CGg_W>TDq{R<unkG5g7i@KcQOWqlddL;^jHf8A&25T3%
ztO)1UUH#^=cnTdF*$~~0RRe!d%(E7~cJs&XVxXN}mDif)wJBJSiKL$T_CI$m8)^lj
ztp*LriAT-|%IDR~eqcpcL0c@xw@6rrn&~MPqXbGVC5Ys0q4H(gGQ1kkEpgvagNU`B
zg}_^A+OW;P0lxB(cN3~Je0R=saGo!Ud|CehWk*$3GQ7rDuc!M6Ur+By4`Krhea>+)
z%LHn(iDz1Zb%k+qnX6*G=JM)tZwK~?bx!@_w?%o+%tH8k7?wB>?|Eu9@<z|^h;*y2
zeqgjT{m^Ro)S}|Ew^8Vh6Y>Tg8Z7Y574X26wR*4+lbM99Pz|VUR9@m7EshZ|lAP8r
zCp|ZFUD@V5`1b>nYek`=D7PVH;MTa;iA@Tss=Rb=9;LafKAuOs0~KlI`ub*xPva8y
zvusa9t#bE?(?R82YDuo;i^bEW#Cx43AsS83H5xOVsVZbI=SaLZqNY)4domq@bq7#G
zv2Lz42arb&X$ZhmI$+Od?o~-bxkn*2)x)Vyv7oN5SFUxgBIbQMLGJ;3s)OS9#1{0-
z{{U(w)<1B+?aXTuy38rpekUz4yX)^8uAU$EV(RgkPA<RCXve*C^$$k$febQz{Zvt*
z9Cvg5+7y1qSZp|Uh1fo`ErHu`J<pe(NvDy(^71<@ddrtDB%1B<JzPry=|&SHhWX|P
z3$v5sFyWE0cy@KC#At&ngg1dI`oXI$)#d;`VVX~S1McEXFiO{hh23!rmZFL<&os?z
zIfr0Y4UM>`4@PQHoF%XOyr#B0(DD`$w<P!ir)ag-s;b{2<mT>MmzujR;4$+S3=JWd
z&PUXKyvH;hD9llHgZqXXccM01E$nLOVjW!r6V~-DTID544$@^7U97{c&7bdr8sLC#
zyJiJ@^_X7kr~XR|CTl+xIth<RZ|-8({u2f+{XeQI-=-#Smi*Kf82<A*)prB1`-!$v
zxqgYrV6HFxj%c-S27YC+SMC<8XmS1D;#2BYIQfW0MOp2MPW@R%wQXlJVDKYeRw6)7
zIgB24@+ECHO;5=Q0;M4Wcu?q~r<iciqrMD@0_}*c{0G1Kjev=k#_$)!4~0|`fy=0{
z&XS2-aNEjSdQ$t;E1Ndz@DF4bLpXN3%9FMuyK8q}+)0bCsm6YaKx_sY*f_;m^Te@4
z%?*_j5zQCU{{Z1vC<f6_OxNybGbOsO_ESL3u;VVgm6&&VTdrOI08n_Xm(iO&{{ZAA
zR!VKII^BKB0#LAGx@x^5wkw6czHSS8=6k$<*jvQN#(9I)ufO{*yIrV(D;3V=g7M!l
z=5Nh^*j|;hJaI9-n#8^b?FxFmUs7c`&-K7JXM9lyjfeTU(!pw}`0oZV57xImhi2=~
zGL%lXsvq)Whi3*jaqkWSdyer2DZLmdnfP9HkM<xlPUyLym+PPVFgw!2)3nP<Q)@`|
zyd&OIBjgp>Q1!nN)2o$}o<q=>7~3K78tFw2{-)_qeZt$avM4cQtrg{fKu~}H4gkP*
zpX9qDoE$gaGVQ^Bu94gi82X(hCq_W3<VBm>s-9{Zgauk1jt^N@oxzYiI?TRU()+yX
zX#}o@v%fD%)SnG|)C4RVTgx`t((4eQ!Wqrv@ol<I*Qva8k3?DN^|+^9dVJ4TrSC8I
zNnpcw1qJo#9x3?0)J_Y2{{Y@2fZ?A`lE#JoPA-kn_sq@QGkyAdMMdQHZJ2PDW}AF^
z%9iKf1OEVFVOdX%W28XPw%jfK?!R{*(*FQ?hfW^vH}Mw7z3u-1mjRo#HD-6O-Na2@
zF6_p7Uoz30UcbwmuMKx`imoNmr#$}ZVA!>FkBfjJf!Azx^A=UkGx5Aes8_Bh7!Z8t
z&o>-Lb>ASNfM+->Q?(DOKsjfV+{H_yrh!j89;74m!3Z7_&+ka~Rrfpp0K`?oIV|>K
zU(@a<N4km$biH-)5PNq%_fX2s)|1(R)?ZaGjHB%Zz95OLAZ0IFJ&=a52U<GTF1azN
zDB!Ts7o%E@lA7kI_XFmCxwPZ^p+9zg=k9&)siFPE`pNo!iO;L;pXPr50I93P?T^v*
zJ`q23ZSsES&wl2fKcZ>r`;Oo4Q)iFDY=iyzW{CW7b@cjAfc?#1U(|L;{`*gW{j=+R
zGwFRzlb=t+U*{7?^K)cvI?u#D&&2x8pDfk&o4ig@|HJ?`5dZ-L0t5sE1p@>E0{{R3
z009635g{=H5E4NkQDJctB7va<GLf;tFwyWcLSo?*QX_(r|Jncu0RjO5KLE}$eiq>|
z<&-u+f+Q#^GnFcGIh^4~5#cE2E{6mu4H8rFiM5oKgd9!joNyDczu9}!@|?i#g<-MH
zHH@W9aL!Z4e@Nys8Nx3N9aEfKYm+dEy$}En7)O$_-~Rw#&SxSeG!~wj$jEV6AdY6m
z3vd)|#536(Hx=POqGlLvZg?RKiGYPN-_!Gva0oaNITITuyH|XV5EH-=Il9S~;XE*g
zQNZj$VN#eKI-T_5cG<bXro6u^Sn8S>PUQ#!igJK5x{RmvT<|R<qF#57%S*YaaNP$y
zZzw)*OwMqH@-7mFCefRo8-MnIbN>Lud!Izs2HP=^Qm>YwFtG%wgaq5uu2fOUN-iLI
zQysD-s-RJL2pI}tY8}+(<D^P!K@v?<TF}!#yrYuD8k+(o7P+FR19S-^B31Yt=|QE*
ztqtpx6TBwjfqI^N1BPQE^LnrD^iOSP*$4uk?H3g#YAQ;cf#!+ILe>C9^RfsOGNLVt
zwu{8J>Q5!8jgfm?DzDp;l{`=ofQz8fH&*Cy&k3j3A%9d)o6!{LizbDO^7`=26sgPw
z2vHIgsZOX(bO?(nlxh_KwfO2#5`$1=?xHe+Dy2%3{25m%%Ty;BM&5{BADhv7s4h2v
zi@Y-vAz~R|@A?pelq91)KC0V=scI-Yx&=1r)=t~Da-~64LQu$A8X<J*1PYW6dVt+(
z89`8tp>$7~O4LA7UA2>{(VVHs6+ARkm?N*EBzEqYZf=Q|gyU3IR3KqV(o^g*9FS^l
zmL|!cGIfqxmZdIT<f+P0U+EiqA#~tLO&ce(O=U1@PqLmVQ<SJNm<kZX4iegTT3!`V
zkSd^^km?~9N$HjxNk@L^)(EUH2w&PzvT;GcBZx?Wlqf{<;2^iC=7~W5KIzV-5GY?P
zUzK5ezN-@40}aJJg|}4Wg`%jlNR-#<D^PH~{gXx0nhx-qG=%uw6E;DodME*X2YMj(
z^ZHlph#g0Dgk;lXXf|5dHzhciZ2>}s3K2X$$?W90<+5$c3m4@+iwwh4{#?M5kgH6s
zCQ!rXSB4gbtpR8p(P`SMy;SeeCxSrRAV{*-R=%snF%Y6|QF}1{XdTy#>`&=5pYnAY
zh6Xe0{8tW*r@9z8E!$UD67Ra!0D%MB?1Y-ZQbzIFU-vgu2oW|=p+YJYW&#7%6*mZ9
zChn#dEm<oFOHXv@f~l4mswtLE70ILoOsg$xTGR~@s7~9qRObqu)DCIb>}>~_@@-HU
z_?)o8^>QB#hT6N#dAQ2)03K2FvX{GP9cZ+T$vp)E6tDv>s&Z(qMu?HNUW?H|T2COM
z+|YlR)1t(GBwJ4CEz>tn-?Dk~eHInHQQx|ril{aP)DgOIdv{ui6~8n{3PJ=T<Z=Q^
z45ex6i?F7$Q(K1NMDPKn5JATrx<8}=1pffs^ym=qu&B^I5ymFUq}HdB0n`!)Pvz5a
ziQDR&%`H6kPunV$q@dD(gj5oPLUe2sZjI1J`D!DoahXms-&9OVDVU+p)4$v%-8+8C
z)>vi%?unnOJ0`R@zE0gcZpb)wPxCrJ*eEJMT7sD<VUtwR4ja{DyJ6~>z#yH}MMA`b
z9YQS+5J>}gPIUln8a7u=!;~6HhKT08GS@d(KI>(Rwo#N(MnuVsfdNQC!AL-&;mK;~
zr8`4f9C}lKrzFg9>O_5(B|?%QfdqaQy-lH5ZXwWXDb_-Q7RVZ}6@bBTSl<z*G}qM+
ziZ#^2cQLYVGcf>gULZph1aUzYDk^_vPDmk%00=;WM?#)F)6GVp5%P~^hzQf#6c}AC
z34=(QTju;9!ozSCrqvc$Zq)ahbXd1<s_{o6p6NM4g(xDe!wT899%u*<O2+`TwYRtB
zH^U}14rO?Za3oeXvN+nQ729QpistRTSBZ(L`fDPK7Zv1J5a0WGq45~Ni~O-&`lInU
z#?U<$AH+PLJs@A7r**5$W<yPRpvZ2v*0w5OI+YyxCIJEjCYFIyxl|=UM2Wic^C)*d
z$k2+K$`n!x2Yo<)IVS0u)hFB0VjFto;kpEZrMHMZ5R2;ikIIUQ^H7}Abka(;{3R3y
zQ;~2NQVI~7=QY$YQ{9O3Q|yZ*$%`PuJi%`@<bx%;g#K2E@7)&Gl<oeNN#wjSa0+Wk
z6BEu%pgE|G;C+)tYT!o4pG49c04sfux}pRP(K6trsz*dzD2tY_MT+8VR=ZZ{d_V@E
zmHz-Lepavf4kpn8SBzZQ0TNxg3;zHlP?dmONd)XxE6V@^=wo6>HHP`U7O=H8HbM=I
zqXO$wIjv1vn_#uHZi}1EYHu*LwHGjpiBz<q19U@q1aAN$TiB0uOb<kF%2Y#Z6VW-Q
zWL-J2Y825?*-4nRpdx`qN<UN>NQ(*jc0rOOQKh$9V{w1FbdgicNKPHlG?_h9f!LJR
zx+^o?0Pd=5Qk>vQ4+KI0M>VEJkZcQ8Gz#`bf;oDiB8coIV2GDa(4ALJ)`>Kt!@_}A
zF9)jd;>9((Xr2jL3erLX5p1TkL=;*->Jh^n)`b#JK1;(qiY!H?7M@1w%qN*erUfMi
z(Eyyqp?GuE5g+c0Q$@%{&D9{SP1q8(k{~oFbjgpp(g+~dvVZ|bQWLRxBI0wEB?dU}
z?wf{0)@Yp9y3LsD1J;OPVsD|or2fg6NBf8;ppVHxp{&zuuLll)yZ->Ee(AV+M1k)p
zIRdJoT^6Xy5S0Z*5q2gSA_RTMG{(f3mpZ+I6T0zwFBI|%#XOgadM_08UL(1$72MZ|
z?rX$%HLRV=l7nRi0H_wFsB;Tjd9M+x#0cVaMaA3&HwEth03QDUvTwt*T$B9i`9J`h
zR};#K)d{RIve8sUO426BBEYo5u|ged<Y=W76r$m|PIsKPPch09fsfv@u)(q5JYbGX
zS=nkUQCg1#C{m<mY3v7bu<*kNGr9a`Eo9%70aaB8rf|Efq7)FE=!9N@oP<guE3zS{
zf7|GQ8oayHr=oU|YW>q*1Amu=;)D6j@z`+;p=_gre#U-?5JZjh1{R?U4ce+FAn!3A
zqpnb*GBOsfYfw&ySgjqD1u9ct0@97sn<@g+JD|?_k;O$kBQq*hQQ*VHEb0?p*NGer
z^2~EV{M3V0Bc4-~jLUij9X+ywqca;VC}EYP_Twrtg$StQ8SbGFg)6@_&xj-DuTg)Z
zW7_*4=VUaFsF}`TYAabPPXH@YzEP1wEnU@2Z@~(j5TQp2QIv6<+m80%&EDz15XWE3
z-rrx{10qF72rBA0ExOex6+}-Z0!k<-84<w>IOFwBaDgqcj>*3e{owl_=b|4F!+9TX
zst#+cLG8h*NK{l*RN$O~ftK7`t<MhVqPELqKSy=H0RFBYf5A=pP{?2PfB(b)GZ6p+
z0s#X81q1;D1Ofv9000010udn)5-}h_15sgdffFJyGLfOt;XqQc!9rqkg7E*^00;pC
z0RcY%()C^^W;MGbwfHQu%lzv|tyuMA65K{99207~>hk#i0F%%E0FfCqNyYi=O`LR5
zMHQu&*IC!Li$$Ylk4K`5lM+iwO?EEyy=+Uk&fh=v(y&TN$JAO@wpo2Qs#!zlrF1=B
zyOF&Tp6nu@L+M<6=%U!;S|m8N^P*+`HKOE~I;|H&)%3<4_$MX8{(lS;e0iG~_b)>%
zqb7Q2WfW0e5QCRE5`=p<?u&}-i;L`s7(T;=agk`Wu7w{l!n=<}7R!u%St&Vl*WXN@
z6QYwZ{Pd)sB$edGsTD;OP|6`2c_lrrlEEo9)i+1o>UeKtt=$SrQdPxdZ6`#PKD4NE
zqD{RMp~=5b#{U3cfpPLiSf>4$)4cco3OP2SkwV~ld=$#bwXGP+)0{ku!#1xoYHyQd
zqVQdNob@8vlChFi*m}{PrT+k0Kh^sSkC9-F*(Z`5{{Z{UT6`O9s%0Z#g3!z9PMFtn
z&D7CuPnw~-(y`IOdO1;drsc*=X+{hbQApY)Ozu8D2#j)!R~Zy{#k!~NL1*C4MGpq=
zF}u=+h4cIgdK4s5)n-EOBqUKqtD_!kq4Gy0h0d*OwfP%mulW}`C4(g<RWEWXo6?!K
z#F<t!$|y)kMHI>?aekj7UUYbo<FK(JC{ZaEOMzD9U5N6<!7nk(*sFOwB~C|)z_~`&
zC^mgRHf@6KV)VgX9$zPM@OXG8$jf#=sV}yO@>fnuD5GjEYT3Gt?LWKVPBP>E#*!A+
zT38g<2G!1<Bj8vg+(?smM89REIUE}!;H6EwEgOsS66j4oPfa|&NUndToDA^4bH)A9
z9)FIHsS-0%{=%}$)tD^$o`&T<$J5+|oL>Z;k#zX7PT2))Nv`9PUZ>pnv-y6;*0@c3
z;N1NW5mtRkW%-ITeoNenQRUk=8;j8{nj+5Y<m^z%VIB|cc%QK!*?X;9q}aQcQbzSd
z@jVZ#BkD-sFGG9og*DvAp;;kH-d>VPn=p-(eKmI77hD@<E-jx)NB5Fn`mRr_2;wpR
zbNvT7%hTHi&o(xf2G=iNaV@{#rpYH=2(tBWNE>RH$H6Y&1zF)@ba<b!9#Qva8hDQa
z;Fs(sa#Lc)iY=c_n_3ge9^xI}7(NE;1bitxyn4$6ejGXb-<J_3<4xi}YVtyapDa;|
z^)34s@+9A)J&Ia4jS{k%PuQ<hAMP$IyDlc^`5Qjecu?+N-9tMP{=|EGo*MhxJYU%E
zkCN~?+u*eOP_|2yG?T{yOr|v0q3TCTIzyM1M5Z}O5pAL1b>Z!Q`Mjm&?mwyGJd46h
zoSZBw(aj-cuW}i?^AU7zLy|*xrsRoD@+SL|coql4_9Md6YIq{3iu;b_mI;yV?nCxG
zMfWdanHtTKm5f{>J<4QovRO={gnds!QcWHjT(VMb>hM_(<<@!fBOY9`#>X)@rES?M
z#!1$m7^xeEShQSOpCU=M!L^PorZ~2kqUhTE&f|03(niLzByw#{qH#-%5yM2X)A&1&
zfyPXXJkO`(ZEDfA`3?=68JeRb92**I_#p5%w%DHLL8pJojV1SCe;?SA_xA7oNv*Mp
z^T`8a^Abq!lW}%!M;c#E^jlH$cq3{}*ZKJyUPlFKEQxv>Q#Qofidy=QM%kJ-G02O%
zCBaP+@}b>T9v^>=5Yl{=FFW@df9?MOld!X8-V9r`Se|TptuIRGv82$F{CB5u=|^T$
z8f=a(%Cd?m*lhJStQ%0$DHB3Q#7;ED5~<+NeKX`_Ry*<&Xvvd0XY#H;CG;^5NoJOu
z5_h5-u{2r`^v$y(l^f9)QAXwG*Ih}X*Wj}HY3brss`5Ted7bRBWsW6jV`x&+?V*;7
zMXxa=$EBjtWtLfNwp%Tk(!VVfIzwqjE4$D3Eh=y1mek8k`95^ES;>{`VTj5TM6x7N
z6@(&5bXWRntz?~zt@wSv;SzW+%*Kg{k4vJ{L{+*J2O81cU|vH_b}E)de#2JE=&$q$
zqO{|oq|J>x<nb2FbE98sYuWmAT?wW*jWRbL#{U3DTV)hVIk7x1!+)N%Xui4Bs~wR1
zFCoTD21?SsO|&g3E*&5JgyY$pk!I`BHn}%?A5uQ2)Q^+vdMzuWx+_=HWuI`dts7G|
zBA1s$qh{R^Wr>zxYx2=ubWvJST??YUb!g+ItL$wWVnRZ_9t(e&bl#Vzp;e_6QA1yX
giq|Gbr4^$y_?D}o2z=<s@IEy|=wkd!sqwG>*>mGZ-~a#s

diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompA.astro b/packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompA.astro
deleted file mode 100644
index 8b1e7dff1638..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompA.astro
+++ /dev/null
@@ -1 +0,0 @@
-<script>console.log('ScriptCompA')</script>
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompB.astro b/packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompB.astro
deleted file mode 100644
index e133a2f51895..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/components/ScriptCompB.astro
+++ /dev/null
@@ -1 +0,0 @@
-<script>console.log('ScriptCompB')</script>
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/config.ts b/packages/astro/test/fixtures/legacy-content-collections/src/content/config.ts
deleted file mode 100644
index 23908e32cb6d..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/config.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { defineCollection, z } from 'astro:content';
-
-const withData = defineCollection({
-	type: 'data',
-	schema: z.object({
-		title: z.string(),
-	}),
-});
-
-const withCustomSlugs = defineCollection({
-	// Ensure schema passes even when `slug` is present
-	schema: z.object({}).strict(),
-});
-
-const withSchemaConfig = defineCollection({
-	schema: z.object({
-		title: z.string(),
-		isDraft: z.boolean().default(false),
-		lang: z.enum(['en', 'fr', 'es']).default('en'),
-		publishedAt: z.date().transform((val) => new Date(val)),
-	}),
-});
-
-const withUnionSchema = defineCollection({
-	schema: z.discriminatedUnion('type', [
-		z.object({
-			type: z.literal('post'),
-			title: z.string(),
-			description: z.string(),
-		}),
-		z.object({
-			type: z.literal('newsletter'),
-			subject: z.string(),
-		}),
-	]),
-});
-
-const withSymlinkedData = defineCollection({
-	type: 'data',
-	schema: ({ image }) =>
-		z.object({
-			alt: z.string(),
-			src: image(),
-		}),
-});
-
-const withSymlinkedContent = defineCollection({
-	type: 'content',
-	schema: z.object({
-		title: z.string(),
-		date: z.date(),
-	}),
-});
-
-export const collections = {
-	'with-data': withData,
-	'with-custom-slugs': withCustomSlugs,
-	'with-schema-config': withSchemaConfig,
-	'with-union-schema': withUnionSchema,
-	'with-symlinked-data': withSymlinkedData,
-	'with-symlinked-content': withSymlinkedContent,
-};
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/one.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/one.md
deleted file mode 100644
index d6d5bd90791f..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/one.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-slug: fancy-one
----
-
-# It's the first page, fancy!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/three.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/three.md
deleted file mode 100644
index 7352e4e0f553..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/three.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-slug: excellent-three
----
-
-# It's the third page, excellent!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/two.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/two.md
deleted file mode 100644
index 292cdfc04830..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-custom-slugs/two.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-slug: interesting-two
----
-
-# It's the second page, interesting!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/one.json b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/one.json
deleted file mode 100644
index efc60137d68e..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/one.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"title": "One"
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/three.json b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/three.json
deleted file mode 100644
index 7d028e937a71..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/three.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"title": "Three"
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/two.json b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/two.json
deleted file mode 100644
index 1a8215509b0a..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-data/two.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"title": "Two"
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore/file.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore/file.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore/ignore/file.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/_ignore/ignore/file.md
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/four%.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/four%.md
deleted file mode 100644
index bad429c8cfe9..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/four%.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Four
-description: The forth page
-lang: en
-publishedAt: 2021-01-01
----
-
-# It's the forth page, fancy!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/one.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/one.md
deleted file mode 100644
index a470f86cb634..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/one.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: One
-description: The first page
-lang: en
-publishedAt: 2021-01-01
----
-
-# It's the first page, fancy!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/three.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/three.md
deleted file mode 100644
index e5c3191e5cf6..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/three.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Three
-description: The third page
-lang: es
-publishedAt: 2021-01-03
----
-
-# It's the third page, excellent!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/two.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/two.md
deleted file mode 100644
index d4de3edf71ee..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-schema-config/two.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Two
-description: The second page
-lang: en
-publishedAt: 2021-01-02
----
-
-# It's the second page, interesting!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-scripts/one.mdx b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-scripts/one.mdx
deleted file mode 100644
index 049a25a37791..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-scripts/one.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
-import ScriptCompA from '../../components/ScriptCompA.astro'
-import ScriptCompB from '../../components/ScriptCompB.astro'
-
-Both scripts should exist.
-
-<ScriptCompA />
-<ScriptCompB />
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-content b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-content
deleted file mode 120000
index e66bf94bc1f0..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-content
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinked-collections/content-collection
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-data b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-data
deleted file mode 120000
index f90d3eb907e7..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-symlinked-data
+++ /dev/null
@@ -1 +0,0 @@
-../../symlinked-collections/data-collection
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/newsletter.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/newsletter.md
deleted file mode 100644
index 6e8703a1b646..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/newsletter.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-type: newsletter
-subject: My Newsletter
----
-
-# It's a newsletter!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/post.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/post.md
deleted file mode 100644
index fb260d6645f4..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/with-union-schema/post.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: post
-title: My Post
-description: This is my post
----
-
-# It's a post!
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/columbia.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/columbia.md
deleted file mode 100644
index 4971108e36ed..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/columbia.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Columbia
-description: 'Learn about the Columbia NASA space shuttle.'
-publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: [space, 90s]
----
-
-**Source:** [Wikipedia](https://en.wikipedia.org/wiki/Space_Shuttle_Endeavour)
-
-Space Shuttle Endeavour (Orbiter Vehicle Designation: OV-105) is a retired orbiter from NASA's Space Shuttle program and the fifth and final operational Shuttle built. It embarked on its first mission, STS-49, in May 1992 and its 25th and final mission, STS-134, in May 2011. STS-134 was expected to be the final mission of the Space Shuttle program, but with the authorization of STS-135, Atlantis became the last shuttle to fly.
-
-The United States Congress approved the construction of Endeavour in 1987 to replace the Space Shuttle Challenger, which was destroyed in 1986.
-
-NASA chose, on cost grounds, to build much of Endeavour from spare parts rather than refitting the Space Shuttle Enterprise, and used structural spares built during the construction of Discovery and Atlantis in its assembly.
-Space Shuttle Endeavour (Orbiter Vehicle Designation: OV-105) is a retired orbiter from NASA's Space Shuttle program and the fifth and final operational Shuttle built. It embarked on its first mission, STS-49, in May 1992 and its 25th and final mission, STS-134, in May 2011. STS-134 was expected to be the final mission of the Space Shuttle program, but with the authorization of STS-135, Atlantis became the last shuttle to fly.
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/enterprise.md b/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/enterprise.md
deleted file mode 100644
index 3131e6d5df3a..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/enterprise.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: 'Enterprise'
-description: 'Learn about the Enterprise NASA space shuttle.'
-publishedDate: 'Tue Jun 08 2021 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: [space, 70s]
----
-
-**Source:** [Wikipedia](https://en.wikipedia.org/wiki/Space_Shuttle_Enterprise)
-
-Space Shuttle Enterprise (Orbiter Vehicle Designation: OV-101) was the first orbiter of the Space Shuttle system. Rolled out on September 17, 1976, it was built for NASA as part of the Space Shuttle program to perform atmospheric test flights after being launched from a modified Boeing 747. It was constructed without engines or a functional heat shield. As a result, it was not capable of spaceflight.
-
-Originally, Enterprise had been intended to be refitted for orbital flight to become the second space-rated orbiter in service. However, during the construction of Space Shuttle Columbia, details of the final design changed, making it simpler and less costly to build Challenger around a body frame that had been built as a test article. Similarly, Enterprise was considered for refit to replace Challenger after the latter was destroyed, but Endeavour was built from structural spares instead.
-
-Enterprise was restored and placed on display in 2003 at the Smithsonian's new Steven F. Udvar-Hazy Center in Virginia. Following the retirement of the Space Shuttle fleet, Discovery replaced Enterprise at the Udvar-Hazy Center, and Enterprise was transferred to the Intrepid Sea, Air & Space Museum in New York City, where it has been on display since July 2012.
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/_launch-week-styles.css b/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/_launch-week-styles.css
deleted file mode 100644
index cce2effe20c1..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/_launch-week-styles.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-	font-family: 'Comic Sans MS', sans-serif;
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/launch week.mdx b/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/launch week.mdx
deleted file mode 100644
index 22ed07c43f0c..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/content/without-config/promo/launch week.mdx	
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: 'Launch week!'
-description: 'Join us for the exciting launch of SPACE BLOG'
-publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: ['announcement']
----
-
-import './_launch-week-styles.css';
-
-Join us for the space blog launch!
-
-- THIS THURSDAY
-- Houston, TX
-- Dress code: **interstellar casual** ✨
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/pages/collections.json.js b/packages/astro/test/fixtures/legacy-content-collections/src/pages/collections.json.js
deleted file mode 100644
index 16350c5ad320..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/pages/collections.json.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { getCollection } from 'astro:content';
-import * as devalue from 'devalue';
-import { stripAllRenderFn } from '../utils.js';
-
-export async function GET() {
-	const withoutConfig = stripAllRenderFn(await getCollection('without-config'));
-	const withSchemaConfig = stripAllRenderFn(await getCollection('with-schema-config'));
-	const withSlugConfig = stripAllRenderFn(await getCollection('with-custom-slugs'));
-	const withUnionSchema = stripAllRenderFn(await getCollection('with-union-schema'));
-	const withSymlinkedContent = stripAllRenderFn(await getCollection('with-symlinked-content'));
-	const withSymlinkedData = stripAllRenderFn(await getCollection('with-symlinked-data'));
-	const filtered = stripAllRenderFn(await getCollection('without-config', (entry) => entry.slug));
-
-	return new Response(
-		devalue.stringify({
-			withoutConfig,
-			withSchemaConfig,
-			withSlugConfig,
-			withUnionSchema,
-			withSymlinkedContent,
-			withSymlinkedData,
-			filtered,
-		}),
-	);
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/pages/entries.json.js b/packages/astro/test/fixtures/legacy-content-collections/src/pages/entries.json.js
deleted file mode 100644
index a05a9138b1d8..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/pages/entries.json.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { getEntryBySlug } from 'astro:content';
-import * as devalue from 'devalue';
-import { stripRenderFn } from '../utils.js';
-
-export async function GET() {
-	const columbiaWithoutConfig = stripRenderFn(await getEntryBySlug('without-config', 'columbia'));
-	const oneWithSchemaConfig = stripRenderFn(await getEntryBySlug('with-schema-config', 'one'));
-	const twoWithSlugConfig = stripRenderFn(
-		await getEntryBySlug('with-custom-slugs', 'interesting-two')
-	);
-	const postWithUnionSchema = stripRenderFn(await getEntryBySlug('with-union-schema', 'post'));
-
-	return new Response(
-		devalue.stringify({
-			columbiaWithoutConfig,
-			oneWithSchemaConfig,
-			twoWithSlugConfig,
-			postWithUnionSchema,
-		})
-	);
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/pages/index.astro b/packages/astro/test/fixtures/legacy-content-collections/src/pages/index.astro
deleted file mode 100644
index 468b70e7bc34..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/pages/index.astro
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
----
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width" />
-    <title>It's content time!</title>
-    <style>
-      html,
-      body {
-        font-family: system-ui;
-        margin: 0;
-      }
-      body {
-        padding: 2rem;
-      }
-    </style>
-  </head>
-  <body>
-    <main>
-    </main>
-  </body>
-</html>
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/pages/propagation.astro b/packages/astro/test/fixtures/legacy-content-collections/src/pages/propagation.astro
deleted file mode 100644
index 3775697acd00..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/pages/propagation.astro
+++ /dev/null
@@ -1,22 +0,0 @@
----
-import { getCollection } from "astro:content";
-const posts = await getCollection("with-schema-config");
----
-
-<html>
-	<body>
-		<div class="foo">
-			<div>Hello World</div>
-			<span>Styles?</span>
-		</div>
-	</body>
-</html>
-
-<style>
-	.foo {
-		background-color: blue;
-	}
-	span::after {
-		content: "works!";
-	}
-</style>
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/pages/with-scripts/[...slug].astro b/packages/astro/test/fixtures/legacy-content-collections/src/pages/with-scripts/[...slug].astro
deleted file mode 100644
index 893cbb9c61ff..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/pages/with-scripts/[...slug].astro
+++ /dev/null
@@ -1,21 +0,0 @@
----
-import { getCollection } from 'astro:content';
-
-export async function getStaticPaths() {
-  const blogEntries = await getCollection('with-scripts');
-  return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
-  }));
-}
-
-const { entry } = Astro.props;
-
-const { Content } = await entry.render();
-const { title } = entry.data;
----
-
-<article>
-  <h1>This is a content collection post</h1>
-  <h2>{title}</h2>
-  <Content />
-</article>
diff --git a/packages/astro/test/fixtures/legacy-content-collections/src/utils.js b/packages/astro/test/fixtures/legacy-content-collections/src/utils.js
deleted file mode 100644
index 3a6244327862..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/src/utils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function stripRenderFn(entryWithRender) {
-	const { render, ...entry } = entryWithRender;
-	return entry;
-}
-
-export function stripAllRenderFn(collection = []) {
-	return collection.map(stripRenderFn);
-}
diff --git a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/first.md b/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/first.md
deleted file mode 100644
index 0ecb2d8587b0..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/first.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "First Blog"
-date: 2024-04-05
----
-
-First blog content.
diff --git a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/second.md b/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/second.md
deleted file mode 100644
index dcded99ccf63..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/second.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "Second Blog"
-date: 2024-04-06
----
-
-Second blog content.
diff --git a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/third.md b/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/third.md
deleted file mode 100644
index 1adee317378b..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/content-collection/third.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: "Third Blog"
-date: 2024-04-07
----
-
-Third blog content.
diff --git a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/data-collection/welcome.json b/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/data-collection/welcome.json
deleted file mode 100644
index 8ab06ff1f24f..000000000000
--- a/packages/astro/test/fixtures/legacy-content-collections/symlinked-collections/data-collection/welcome.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "alt": "Futuristic landscape with chrome buildings and blue skies",
-  "src": "../../assets/the-future.jpg"
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/astro.config.mjs b/packages/astro/test/fixtures/legacy-data-collections/astro.config.mjs
deleted file mode 100644
index 3f4722ff1bb4..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/astro.config.mjs
+++ /dev/null
@@ -1,9 +0,0 @@
-// @ts-check
-import { defineConfig } from 'astro/config';
-
-// https://astro.build/config
-export default defineConfig({
-	legacy: {
-		collections: true,
-	},
-});
diff --git a/packages/astro/test/fixtures/legacy-data-collections/package.json b/packages/astro/test/fixtures/legacy-data-collections/package.json
deleted file mode 100644
index 48fdc63bed82..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "@test/legacy-data-collections",
-  "type": "module",
-  "version": "0.0.1",
-  "private": true,
-  "scripts": {
-    "dev": "astro dev",
-    "build": "astro build",
-    "preview": "astro preview",
-    "astro": "astro"
-  },
-  "dependencies": {
-    "astro": "workspace:*"
-  }
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Ben Holmes.yml b/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Ben Holmes.yml
deleted file mode 100644
index 54e6743d96cc..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Ben Holmes.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
-name: Ben J Holmes
-twitter: https://twitter.com/bholmesdev
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Fred K Schott.yml b/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Fred K Schott.yml
deleted file mode 100644
index 0b51067d9529..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Fred K Schott.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
-name: Fred K Schott
-twitter: https://twitter.com/FredKSchott
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Nate Moore.yml b/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Nate Moore.yml
deleted file mode 100644
index 953f348a08f8..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/authors-without-config/Nate Moore.yml	
+++ /dev/null
@@ -1,2 +0,0 @@
-name: Nate Something Moore
-twitter: https://twitter.com/n_moore
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/config.ts b/packages/astro/test/fixtures/legacy-data-collections/src/content/config.ts
deleted file mode 100644
index 5f3de9423806..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/config.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { defineCollection, z } from 'astro:content';
-
-const docs = defineCollection({
-	type: 'content',
-	schema: z.object({
-		title: z.string(),
-	})
-});
-
-const i18n = defineCollection({
-	type: 'data',
-	schema: z.object({
-		homepage: z.object({
-			greeting: z.string(),
-			preamble: z.string(),
-		})
-	}),
-});
-
-export const collections = { docs, i18n };
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/docs/example.md b/packages/astro/test/fixtures/legacy-data-collections/src/content/docs/example.md
deleted file mode 100644
index 356e65f64b6a..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/docs/example.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: The future of content
----
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/en.json b/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/en.json
deleted file mode 100644
index 51d127f4a744..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/en.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "homepage": {
-    "greeting": "Hello World!",
-    "preamble": "Welcome to the future of content."
-  }
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/es.json b/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/es.json
deleted file mode 100644
index bf4c7af0fd05..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/es.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "homepage": {
-    "greeting": "¡Hola Mundo!",
-    "preamble": "Bienvenido al futuro del contenido."
-  }
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/fr.yaml b/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/fr.yaml
deleted file mode 100644
index 90a86d411f6e..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/content/i18n/fr.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-homepage:
-  greeting: "Bonjour le monde!"
-  preamble: "Bienvenue dans le futur du contenu."
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/[id].json.js b/packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/[id].json.js
deleted file mode 100644
index 8d5365a2eb2d..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/[id].json.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getEntry } from 'astro:content';
-
-const ids = ['Ben Holmes', 'Fred K Schott', 'Nate Moore'];
-
-export function getStaticPaths() {
-	return ids.map((id) => ({ params: { id } }));
-}
-
-/** @param {import('astro').APIContext} params */
-export async function GET({ params }) {
-	const { id } = params;
-	const author = await getEntry('authors-without-config', id);
-	if (!author) {
-		return Response.json({ error: `Author ${id} Not found` });
-	} else {
-		return Response.json(author);
-	}
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/all.json.js b/packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/all.json.js
deleted file mode 100644
index 79dd8cd9dd3c..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/pages/authors/all.json.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { getCollection } from 'astro:content';
-
-export async function GET() {
-	const authors = await getCollection('authors-without-config');
-	return Response.json(authors);
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/[lang].json.js b/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/[lang].json.js
deleted file mode 100644
index c6b0cfff669b..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/[lang].json.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getEntry } from 'astro:content';
-
-const langs = ['en', 'es', 'fr'];
-
-export function getStaticPaths() {
-	return langs.map((lang) => ({ params: { lang } }));
-}
-
-/** @param {import('astro').APIContext} params */
-export async function GET({ params }) {
-	const { lang } = params;
-	const translations = await getEntry('i18n', lang);
-	if (!translations) {
-		return Response.json({ error: `Translation ${lang} Not found` });
-	} else {
-		return Response.json(translations);
-	}
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/all.json.js b/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/all.json.js
deleted file mode 100644
index f1ebb15b761e..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/all.json.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { getCollection } from 'astro:content';
-
-export async function GET() {
-	const translations = await getCollection('i18n');
-	return Response.json(translations);
-}
diff --git a/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/by-id.json.js b/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/by-id.json.js
deleted file mode 100644
index 5f71c80e9f7b..000000000000
--- a/packages/astro/test/fixtures/legacy-data-collections/src/pages/translations/by-id.json.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { getDataEntryById } from 'astro:content';
-
-export async function GET() {
-	const item = await getDataEntryById('i18n', 'en');
-	return Response.json(item);
-}
diff --git a/packages/astro/test/legacy-content-collections.test.js b/packages/astro/test/legacy-content-collections.test.js
deleted file mode 100644
index e4327ceb3de9..000000000000
--- a/packages/astro/test/legacy-content-collections.test.js
+++ /dev/null
@@ -1,456 +0,0 @@
-import assert from 'node:assert/strict';
-import { before, describe, it } from 'node:test';
-import * as cheerio from 'cheerio';
-import * as devalue from 'devalue';
-import testAdapter from './test-adapter.js';
-import { preventNodeBuiltinDependencyPlugin } from './test-plugins.js';
-import { loadFixture } from './test-utils.js';
-
-describe('Legacy Content Collections', () => {
-	describe('Query', () => {
-		let fixture;
-		before(async () => {
-			fixture = await loadFixture({ root: './fixtures/legacy-content-collections/' });
-			await fixture.build();
-		});
-
-		describe('Collection', () => {
-			let json;
-			before(async () => {
-				const rawJson = await fixture.readFile('/collections.json');
-				json = devalue.parse(rawJson);
-			});
-
-			it('Returns `without config` collection', async () => {
-				assert.ok(json.hasOwnProperty('withoutConfig'));
-				assert.equal(Array.isArray(json.withoutConfig), true);
-
-				const ids = json.withoutConfig.map((item) => item.id);
-				assert.deepEqual(
-					ids.sort(),
-					[
-						'columbia.md',
-						'endeavour.md',
-						'enterprise.md',
-						// Spaces allowed in IDs
-						'promo/launch week.mdx',
-					].sort(),
-				);
-			});
-
-			it('Handles spaces in `without config` slugs', async () => {
-				assert.ok(json.hasOwnProperty('withoutConfig'));
-				assert.equal(Array.isArray(json.withoutConfig), true);
-
-				const slugs = json.withoutConfig.map((item) => item.slug);
-				assert.deepEqual(
-					slugs.sort(),
-					[
-						'columbia',
-						'endeavour',
-						'enterprise',
-						// "launch week.mdx" is converted to "launch-week.mdx"
-						'promo/launch-week',
-					].sort(),
-				);
-			});
-
-			it('Passes legacy entry to filter function', async () => {
-				assert.ok(json.hasOwnProperty('filtered'));
-				assert.ok(Array.isArray(json.filtered));
-				assert.ok(json.filtered.length > 0);
-			});
-
-			it('Returns `with schema` collection', async () => {
-				assert.ok(json.hasOwnProperty('withSchemaConfig'));
-				assert.equal(Array.isArray(json.withSchemaConfig), true);
-
-				const ids = json.withSchemaConfig.map((item) => item.id);
-				const publishedDates = json.withSchemaConfig.map((item) => item.data.publishedAt);
-				assert.deepEqual(ids.sort(), ['four%.md', 'one.md', 'three.md', 'two.md'].sort());
-				assert.equal(
-					publishedDates.every((date) => date instanceof Date),
-					true,
-					'Not all publishedAt dates are Date objects',
-				);
-				assert.deepEqual(
-					publishedDates.map((date) => date.toISOString()),
-					[
-						'2021-01-01T00:00:00.000Z',
-						'2021-01-01T00:00:00.000Z',
-						'2021-01-03T00:00:00.000Z',
-						'2021-01-02T00:00:00.000Z',
-					],
-				);
-			});
-
-			it('Returns `with custom slugs` collection', async () => {
-				assert.ok(json.hasOwnProperty('withSlugConfig'));
-				assert.equal(Array.isArray(json.withSlugConfig), true);
-
-				const slugs = json.withSlugConfig.map((item) => item.slug);
-				assert.deepEqual(slugs, ['fancy-one', 'excellent-three', 'interesting-two']);
-			});
-
-			it('Returns `with union schema` collection', async () => {
-				assert.ok(json.hasOwnProperty('withUnionSchema'));
-				assert.equal(Array.isArray(json.withUnionSchema), true);
-
-				const post = json.withUnionSchema.find((item) => item.id === 'post.md');
-				assert.notEqual(post, undefined);
-				assert.deepEqual(post.data, {
-					type: 'post',
-					title: 'My Post',
-					description: 'This is my post',
-				});
-				const newsletter = json.withUnionSchema.find((item) => item.id === 'newsletter.md');
-				assert.notEqual(newsletter, undefined);
-				assert.deepEqual(newsletter.data, {
-					type: 'newsletter',
-					subject: 'My Newsletter',
-				});
-			});
-
-			it('Handles symlinked content', async () => {
-				assert.ok(json.hasOwnProperty('withSymlinkedContent'));
-				assert.equal(Array.isArray(json.withSymlinkedContent), true);
-				const ids = json.withSymlinkedContent.map((item) => item.id);
-				assert.deepEqual(ids.sort(), ['first.md', 'second.md', 'third.md'].sort());
-				assert.equal(
-					json.withSymlinkedContent.find(({ id }) => id === 'first.md').data.title,
-					'First Blog',
-				);
-			});
-
-			it('Handles symlinked data', async () => {
-				assert.ok(json.hasOwnProperty('withSymlinkedData'));
-				assert.equal(Array.isArray(json.withSymlinkedData), true);
-
-				const ids = json.withSymlinkedData.map((item) => item.id);
-				assert.deepEqual(ids, ['welcome']);
-				assert.equal(
-					json.withSymlinkedData[0].data.alt,
-					'Futuristic landscape with chrome buildings and blue skies',
-				);
-				assert.notEqual(json.withSymlinkedData[0].data.src.src, undefined);
-			});
-		});
-
-		describe('Propagation', () => {
-			it('Applies styles', async () => {
-				const html = await fixture.readFile('/propagation/index.html');
-				const $ = cheerio.load(html);
-				assert.equal($('style').text().includes('content:"works!"'), true);
-			});
-		});
-
-		describe('Entry', () => {
-			let json;
-			before(async () => {
-				const rawJson = await fixture.readFile('/entries.json');
-				json = devalue.parse(rawJson);
-			});
-
-			it('Returns `without config` collection entry', async () => {
-				assert.ok(json.hasOwnProperty('columbiaWithoutConfig'));
-				assert.equal(json.columbiaWithoutConfig.id, 'columbia.md');
-			});
-
-			it('Returns `with schema` collection entry', async () => {
-				assert.ok(json.hasOwnProperty('oneWithSchemaConfig'));
-				assert.equal(json.oneWithSchemaConfig.id, 'one.md');
-				assert.equal(json.oneWithSchemaConfig.data.publishedAt instanceof Date, true);
-				assert.equal(
-					json.oneWithSchemaConfig.data.publishedAt.toISOString(),
-					'2021-01-01T00:00:00.000Z',
-				);
-			});
-
-			it('Returns `with custom slugs` collection entry', async () => {
-				assert.ok(json.hasOwnProperty('twoWithSlugConfig'));
-				assert.equal(json.twoWithSlugConfig.slug, 'interesting-two');
-			});
-
-			it('Returns `with union schema` collection entry', async () => {
-				assert.ok(json.hasOwnProperty('postWithUnionSchema'));
-				assert.equal(json.postWithUnionSchema.id, 'post.md');
-				assert.deepEqual(json.postWithUnionSchema.data, {
-					type: 'post',
-					title: 'My Post',
-					description: 'This is my post',
-				});
-			});
-		});
-
-		describe('Scripts', () => {
-			it('Contains all the scripts imported by components', async () => {
-				const html = await fixture.readFile('/with-scripts/one/index.html');
-				const $ = cheerio.load(html);
-				assert.equal($('script').length, 2);
-				// Read the scripts' content
-				const scriptsCode = $('script')
-					.map((_, el) => $(el).text())
-					.toArray()
-					.join('\n');
-				assert.match(scriptsCode, /ScriptCompA/);
-				assert.match(scriptsCode, /ScriptCompB/);
-			});
-		});
-	});
-
-	const blogSlugToContents = {
-		'first-post': {
-			title: 'First post',
-			element: 'blockquote',
-			content: 'First post loaded: yes!',
-		},
-		'second-post': {
-			title: 'Second post',
-			element: 'blockquote',
-			content: 'Second post loaded: yes!',
-		},
-		'third-post': {
-			title: 'Third post',
-			element: 'blockquote',
-			content: 'Third post loaded: yes!',
-		},
-		'using-mdx': {
-			title: 'Using MDX',
-			element: 'a[href="#"]',
-			content: 'Embedded component in MDX',
-		},
-	};
-
-	describe('Static paths integration', () => {
-		let fixture;
-
-		before(async () => {
-			fixture = await loadFixture({
-				root: './fixtures/content-static-paths-integration/',
-				legacy: {
-					collections: true,
-				},
-			});
-			await fixture.build();
-		});
-
-		it('Generates expected pages', async () => {
-			for (const slug in blogSlugToContents) {
-				assert.equal(fixture.pathExists(`/posts/${slug}`), true);
-			}
-		});
-
-		it('Renders titles', async () => {
-			for (const slug in blogSlugToContents) {
-				const post = await fixture.readFile(`/posts/${slug}/index.html`);
-				const $ = cheerio.load(post);
-				assert.equal($('h1').text(), blogSlugToContents[slug].title);
-			}
-		});
-
-		it('Renders content', async () => {
-			for (const slug in blogSlugToContents) {
-				const post = await fixture.readFile(`/posts/${slug}/index.html`);
-				const $ = cheerio.load(post);
-				assert.equal(
-					$(blogSlugToContents[slug].element).text().trim(),
-					blogSlugToContents[slug].content,
-				);
-			}
-		});
-	});
-
-	describe('With spaces in path', () => {
-		it('Does not throw', async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content with spaces in folder name/',
-				legacy: {
-					collections: true,
-				},
-			});
-			let error = null;
-			try {
-				await fixture.build({ force: true });
-			} catch (e) {
-				error = e.message;
-			}
-			assert.equal(error, null);
-		});
-	});
-	describe('With config.mjs', () => {
-		it("Errors when frontmatter doesn't match schema", async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content-collections-with-config-mjs/',
-				legacy: {
-					collections: true,
-				},
-			});
-			let error;
-			try {
-				await fixture.build();
-			} catch (e) {
-				error = e.message;
-			}
-			assert.match(error, /\*\*title\*\*: Expected type `"string"`, received `"number"`/);
-		});
-	});
-	describe('With config.mts', () => {
-		it("Errors when frontmatter doesn't match schema", async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content-collections-with-config-mts/',
-				legacy: {
-					collections: true,
-				},
-			});
-			let error;
-			try {
-				await fixture.build();
-			} catch (e) {
-				error = e.message;
-			}
-			assert.match(error, /\*\*title\*\*: Expected type `"string"`, received `"number"`/);
-		});
-	});
-
-	describe('With empty markdown file', () => {
-		it('Throws the right error', async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content-collections-empty-md-file/',
-				legacy: {
-					collections: true,
-				},
-			});
-			let error;
-			try {
-				await fixture.build();
-			} catch (e) {
-				error = e.message;
-			}
-			assert.equal(error.includes('**title**: Required'), true);
-		});
-	});
-
-	describe('With empty collections directory', () => {
-		it('Handles the empty directory correctly', async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content-collections-empty-dir/',
-				legacy: {
-					collections: true,
-				},
-			});
-			let error;
-			try {
-				await fixture.build();
-			} catch (e) {
-				error = e.message;
-			}
-			assert.equal(error, undefined);
-
-			const html = await fixture.readFile('/index.html');
-			const $ = cheerio.load(html);
-			const h1 = $('h1');
-			assert.equal(h1.text(), 'Entries length: 0');
-			assert.equal(h1.attr('data-entries'), '[]');
-		});
-	});
-
-	describe('SSR integration', () => {
-		let app;
-
-		before(async () => {
-			const fixture = await loadFixture({
-				root: './fixtures/content-ssr-integration/',
-				output: 'server',
-				adapter: testAdapter(),
-				vite: {
-					plugins: [preventNodeBuiltinDependencyPlugin()],
-				},
-				legacy: {
-					collections: true,
-				},
-			});
-			await fixture.build();
-			app = await fixture.loadTestAdapterApp();
-		});
-
-		it('Responds 200 for expected pages', async () => {
-			for (const slug in blogSlugToContents) {
-				const request = new Request('http://example.com/posts/' + slug);
-				const response = await app.render(request);
-				assert.equal(response.status, 200);
-			}
-		});
-
-		it('Renders titles', async () => {
-			for (const slug in blogSlugToContents) {
-				const request = new Request('http://example.com/posts/' + slug);
-				const response = await app.render(request);
-				const body = await response.text();
-				const $ = cheerio.load(body);
-				assert.equal($('h1').text(), blogSlugToContents[slug].title);
-			}
-		});
-
-		it('Renders content', async () => {
-			for (const slug in blogSlugToContents) {
-				const request = new Request('http://example.com/posts/' + slug);
-				const response = await app.render(request);
-				const body = await response.text();
-				const $ = cheerio.load(body);
-				assert.equal(
-					$(blogSlugToContents[slug].element).text().trim(),
-					blogSlugToContents[slug].content,
-				);
-			}
-		});
-	});
-
-	describe('Base configuration', () => {
-		let fixture;
-
-		before(async () => {
-			fixture = await loadFixture({
-				root: './fixtures/content-collections-base/',
-				legacy: {
-					collections: true,
-				},
-			});
-			await fixture.build();
-		});
-
-		it('Includes base in links', async () => {
-			const html = await fixture.readFile('/docs/index.html');
-			const $ = cheerio.load(html);
-			assert.equal($('link').attr('href').startsWith('/docs'), true);
-		});
-
-		it('Includes base in scripts', async () => {
-			const html = await fixture.readFile('/docs/index.html');
-			const $ = cheerio.load(html);
-			assert.equal($('script').attr('src').startsWith('/docs'), true);
-		});
-	});
-
-	describe('Mutation', () => {
-		let fixture;
-
-		before(async () => {
-			fixture = await loadFixture({
-				root: './fixtures/content-collections-mutation/',
-				legacy: {
-					collections: true,
-				},
-			});
-			await fixture.build();
-		});
-
-		it('Does not mutate cached collection', async () => {
-			const html = await fixture.readFile('/index.html');
-			const index = cheerio.load(html)('h2:first').text();
-			const html2 = await fixture.readFile('/another_page/index.html');
-			const anotherPage = cheerio.load(html2)('h2:first').text();
-
-			assert.equal(index, anotherPage);
-		});
-	});
-});
diff --git a/packages/astro/test/legacy-data-collections.test.js b/packages/astro/test/legacy-data-collections.test.js
deleted file mode 100644
index 6bd5f19493c9..000000000000
--- a/packages/astro/test/legacy-data-collections.test.js
+++ /dev/null
@@ -1,159 +0,0 @@
-import assert from 'node:assert/strict';
-import { before, describe, it } from 'node:test';
-import { loadFixture } from './test-utils.js';
-
-const authorIds = ['Ben Holmes', 'Fred K Schott', 'Nate Moore'];
-const translationIds = ['en', 'es', 'fr'];
-
-describe('Content Collections - legacy data collections', () => {
-	let fixture;
-	before(async () => {
-		fixture = await loadFixture({ root: './fixtures/legacy-data-collections/' });
-		await fixture.build({ force: true });
-	});
-
-	describe('Authors Collection', () => {
-		let json;
-		before(async () => {
-			const rawJson = await fixture.readFile('/authors/all.json');
-			json = JSON.parse(rawJson);
-		});
-
-		it('Returns', async () => {
-			assert.equal(Array.isArray(json), true);
-			assert.equal(json.length, 3);
-		});
-
-		it('Generates correct ids', async () => {
-			const ids = json.map((item) => item.id).sort();
-			assert.deepEqual(ids, ['Ben Holmes', 'Fred K Schott', 'Nate Moore']);
-		});
-
-		it('Generates correct data', async () => {
-			const names = json.map((item) => item.data.name);
-			assert.deepEqual(names, ['Ben J Holmes', 'Fred K Schott', 'Nate Something Moore']);
-
-			const twitterUrls = json.map((item) => item.data.twitter);
-			assert.deepEqual(twitterUrls, [
-				'https://twitter.com/bholmesdev',
-				'https://twitter.com/FredKSchott',
-				'https://twitter.com/n_moore',
-			]);
-		});
-	});
-
-	describe('getDataEntryById', () => {
-		let json;
-		before(async () => {
-			const rawJson = await fixture.readFile('/translations/by-id.json');
-			json = JSON.parse(rawJson);
-		});
-		it('Grabs the item by the base file name', () => {
-			assert.equal(json.id, 'en');
-		});
-	});
-
-	describe('Authors Entry', () => {
-		for (const authorId of authorIds) {
-			let json;
-			before(async () => {
-				const rawJson = await fixture.readFile(`/authors/${authorId}.json`);
-				json = JSON.parse(rawJson);
-			});
-
-			it(`Returns ${authorId}`, async () => {
-				assert.equal(json.hasOwnProperty('id'), true);
-				assert.equal(json.id, authorId);
-			});
-
-			it(`Generates correct data for ${authorId}`, async () => {
-				assert.equal(json.hasOwnProperty('data'), true);
-				assert.equal(json.data.hasOwnProperty('name'), true);
-				assert.equal(json.data.hasOwnProperty('twitter'), true);
-
-				switch (authorId) {
-					case 'Ben Holmes':
-						assert.equal(json.data.name, 'Ben J Holmes');
-						assert.equal(json.data.twitter, 'https://twitter.com/bholmesdev');
-						break;
-					case 'Fred K Schott':
-						assert.equal(json.data.name, 'Fred K Schott');
-						assert.equal(json.data.twitter, 'https://twitter.com/FredKSchott');
-						break;
-					case 'Nate Moore':
-						assert.equal(json.data.name, 'Nate Something Moore');
-						assert.equal(json.data.twitter, 'https://twitter.com/n_moore');
-						break;
-				}
-			});
-		}
-	});
-
-	describe('Translations Collection', () => {
-		let json;
-		before(async () => {
-			const rawJson = await fixture.readFile('/translations/all.json');
-			json = JSON.parse(rawJson);
-		});
-
-		it('Returns', async () => {
-			assert.equal(Array.isArray(json), true);
-			assert.equal(json.length, 3);
-		});
-
-		it('Generates correct ids', async () => {
-			const ids = json.map((item) => item.id).sort();
-			assert.deepEqual(ids, translationIds);
-		});
-
-		it('Generates correct data', async () => {
-			const sorted = json.sort((a, b) => a.id.localeCompare(b.id));
-			const homepageGreetings = sorted.map((item) => item.data.homepage?.greeting);
-			assert.deepEqual(homepageGreetings, ['Hello World!', '¡Hola Mundo!', 'Bonjour le monde!']);
-
-			const homepagePreambles = sorted.map((item) => item.data.homepage?.preamble);
-			assert.deepEqual(homepagePreambles, [
-				'Welcome to the future of content.',
-				'Bienvenido al futuro del contenido.',
-				'Bienvenue dans le futur du contenu.',
-			]);
-		});
-	});
-
-	describe('Translations Entry', () => {
-		for (const translationId of translationIds) {
-			let json;
-			before(async () => {
-				const rawJson = await fixture.readFile(`/translations/${translationId}.json`);
-				json = JSON.parse(rawJson);
-			});
-
-			it(`Returns ${translationId}`, async () => {
-				assert.equal(json.hasOwnProperty('id'), true);
-				assert.equal(json.id, translationId);
-			});
-
-			it(`Generates correct data for ${translationId}`, async () => {
-				assert.equal(json.hasOwnProperty('data'), true);
-				assert.equal(json.data.hasOwnProperty('homepage'), true);
-				assert.equal(json.data.homepage.hasOwnProperty('greeting'), true);
-				assert.equal(json.data.homepage.hasOwnProperty('preamble'), true);
-
-				switch (translationId) {
-					case 'en':
-						assert.equal(json.data.homepage.greeting, 'Hello World!');
-						assert.equal(json.data.homepage.preamble, 'Welcome to the future of content.');
-						break;
-					case 'es':
-						assert.equal(json.data.homepage.greeting, '¡Hola Mundo!');
-						assert.equal(json.data.homepage.preamble, 'Bienvenido al futuro del contenido.');
-						break;
-					case 'fr':
-						assert.equal(json.data.homepage.greeting, 'Bonjour le monde!');
-						assert.equal(json.data.homepage.preamble, 'Bienvenue dans le futur du contenu.');
-						break;
-				}
-			});
-		}
-	});
-});
diff --git a/packages/astro/test/units/content-collections/frontmatter.test.js b/packages/astro/test/units/content-collections/frontmatter.test.js
index feffabf9567a..30e32f867dd4 100644
--- a/packages/astro/test/units/content-collections/frontmatter.test.js
+++ b/packages/astro/test/units/content-collections/frontmatter.test.js
@@ -12,8 +12,10 @@ describe('frontmatter', () => {
 				`,
 			'/src/content.config.ts': `\
 					import { defineCollection, z } from 'astro:content';
+					import { glob } from 'astro/loaders';
 
 					const posts = defineCollection({
+						loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/posts' }),
 						schema: z.string()
 					});
 
diff --git a/packages/astro/test/units/content-collections/get-entry-type.test.js b/packages/astro/test/units/content-collections/get-entry-type.test.js
index d8dcb459b85c..45d3c57081c9 100644
--- a/packages/astro/test/units/content-collections/get-entry-type.test.js
+++ b/packages/astro/test/units/content-collections/get-entry-type.test.js
@@ -19,7 +19,7 @@ const fixtures = [
 		title: 'With underscore levels above the content directory tree',
 		contentPaths: {
 			config: {
-				url: new URL('_src/content/config.ts', import.meta.url),
+				url: new URL('_src/content.config.ts', import.meta.url),
 				exists: true,
 			},
 			contentDir: new URL('_src/content/', import.meta.url),
diff --git a/packages/astro/test/units/dev/collections-mixed-content-errors.test.js b/packages/astro/test/units/dev/collections-mixed-content-errors.test.js
deleted file mode 100644
index 295662c93110..000000000000
--- a/packages/astro/test/units/dev/collections-mixed-content-errors.test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import * as assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import _sync from '../../../dist/core/sync/index.js';
-import { createFixture } from '../test-utils.js';
-
-async function sync(root) {
-	try {
-		await _sync({
-			root,
-			logLevel: 'silent',
-		});
-		return 0;
-	} catch {
-		return 1;
-	}
-}
-
-const baseFileTree = {
-	'/astro.config.mjs': `export default { legacy: { collections: true }}`,
-	'/src/content/authors/placeholder.json': `{ "name": "Placeholder" }`,
-	'/src/content/blog/placeholder.md': `\
----
-title: Placeholder post
----
-`,
-	'/src/pages/authors.astro': `\
----
-import { getCollection } from 'astro:content';
-try {
-	await getCollection('authors')
-} catch (e) {
-	return e
-}
----
-
-<h1>Worked</h1>
-`,
-	'/src/pages/blog.astro': `\
----
-import { getCollection } from 'astro:content';
-
-await getCollection('blog')
----
-
-<h1>Worked</h1>`,
-};
-
-describe('Content Collections - mixed content errors', () => {
-	it('raises "mixed content" error when content in data collection', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/content/authors/ben.md': `\
----
-name: Ben
----
-
-# Ben
-`,
-			'/src/content/authors/tony.json': `{ "name": "Tony" }`,
-			'/src/content.config.ts': `\
-import { z, defineCollection } from 'astro:content';
-
-const authors = defineCollection({
-	type: 'data',
-	schema: z.object({
-		name: z.string(),
-	}),
-});
-
-export const collections = { authors };
-`,
-		});
-
-		assert.equal(await sync(fixture.path), 1);
-	});
-
-	it('raises "mixed content" error when data in content collection', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/content/blog/post.md': `\
----
-title: Post
----
-
-# Post
-`,
-			'/src/content/blog/post.yaml': `title: YAML Post`,
-			'/src/content.config.ts': `\
-import { z, defineCollection } from 'astro:content';
-
-const blog = defineCollection({
-	type: 'content',
-	schema: z.object({
-		title: z.string(),
-	}),
-});
-
-export const collections = { blog };
-`,
-		});
-
-		assert.equal(await sync(fixture.path), 1);
-	});
-
-	it('raises error when data collection configured as content collection', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/content/banners/welcome.json': `{ "src": "/example", "alt": "Welcome" }`,
-			'/src/content/config.ts': `\
-import { z, defineCollection } from 'astro:content';
-
-const banners = defineCollection({
-	schema: z.object({
-		src: z.string(),
-		alt: z.string(),
-	}),
-});
-
-export const collections = { banners };
-`,
-		});
-
-		assert.equal(await sync(fixture.path), 1);
-	});
-
-	it('does not raise error for empty collection with config', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			// Add placeholder to ensure directory exists
-			'/src/content/i18n/_placeholder.txt': 'Need content here',
-			'/src/content.config.ts': `\
-import { z, defineCollection } from 'astro:content';
-
-const i18n = defineCollection({
-	type: 'data',
-	schema: z.object({
-		greeting: z.string(),
-	}),
-});
-
-export const collections = { i18n };
-`,
-		});
-
-		assert.equal(await sync(fixture.path), 0);
-	});
-});
diff --git a/packages/astro/test/units/dev/collections-renderentry.test.js b/packages/astro/test/units/dev/collections-renderentry.test.js
deleted file mode 100644
index 298c433b8b16..000000000000
--- a/packages/astro/test/units/dev/collections-renderentry.test.js
+++ /dev/null
@@ -1,298 +0,0 @@
-import * as assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import * as cheerio from 'cheerio';
-
-import { attachContentServerListeners } from '../../../dist/content/server-listeners.js';
-import { createFixture, createRequestAndResponse, runInContainer } from '../test-utils.js';
-
-const baseFileTree = {
-	'astro.config.mjs': `\
-import mdx from '@astrojs/mdx';
-export default {
-	integrations: [mdx()],
-	legacy: {
-		// Enable legacy content collections as we test layout fields
-		collections: true
-	}
-};
-`,
-	'/src/content/blog/promo/_launch-week-styles.css': `\
-body {
-	font-family: 'Comic Sans MS', sans-serif;
-}
-`,
-	'/src/content/blog/promo/launch-week.mdx': `\
----
-title: 'Launch week!'
-description: 'Join us for the exciting launch of SPACE BLOG'
-publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
-tags: ['announcement']
----
-
-import './_launch-week-styles.css';
-
-Join us for the space blog launch!
-
-- THIS THURSDAY
-- Houston, TX
-- Dress code: **interstellar casual** ✨
-`,
-};
-
-/** @type {typeof runInContainer} */
-async function runInContainerWithContentListeners(params, callback) {
-	return await runInContainer(params, async (container) => {
-		await attachContentServerListeners(container);
-		await callback(container);
-	});
-}
-
-describe('Content Collections - render()', () => {
-	it('can be called in a page component', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/content/config.ts': `
-					import { z, defineCollection } from 'astro:content';
-
-					const blog = defineCollection({
-						schema: z.object({
-							title: z.string(),
-							description: z.string().max(60, 'For SEO purposes, keep descriptions short!'),
-						}),
-					});
-
-					export const collections = { blog };
-				`,
-			'/src/pages/index.astro': `
-					---
-					import { getCollection } from 'astro:content';
-					const blog = await getCollection('blog');
-					const launchWeekEntry = blog.find(post => post.id === 'promo/launch-week.mdx');
-					const { Content } = await launchWeekEntry.render();
-					---
-					<html>
-						<head><title>Testing</title></head>
-						<body>
-							<h1>testing</h1>
-							<Content />
-						</body>
-					</html>
-				`,
-		});
-
-		await runInContainerWithContentListeners(
-			{
-				inlineConfig: {
-					root: fixture.path,
-					vite: { server: { middlewareMode: true } },
-				},
-			},
-			async (container) => {
-				const { req, res, done, text } = createRequestAndResponse({
-					method: 'GET',
-					url: '/',
-				});
-				container.handle(req, res);
-				await done;
-				const html = await text();
-
-				const $ = cheerio.load(html);
-				// Rendered the content
-				assert.equal($('ul li').length, 3);
-
-				// Rendered the styles
-				assert.equal($('style').length, 1);
-			},
-		);
-	});
-
-	it('can be used in a layout component', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/components/Layout.astro': `
-					---
-					import { getCollection } from 'astro:content';
-					const blog = await getCollection('blog');
-					const launchWeekEntry = blog.find(post => post.id === 'promo/launch-week.mdx');
-					const { Content } = await launchWeekEntry.render();
-					---
-					<html>
-						<head></head>
-						<body>
-							<slot name="title"></slot>
-							<article>
-								<Content />
-							</article>
-						</body>
-					</html>
-
-				`,
-			'/src/pages/index.astro': `
-					---
-					import Layout from '../components/Layout.astro';
-					---
-					<Layout>
-						<h1 slot="title">Index page</h2>
-					</Layout>
-				`,
-		});
-
-		await runInContainerWithContentListeners(
-			{
-				inlineConfig: {
-					root: fixture.path,
-					vite: { server: { middlewareMode: true } },
-				},
-			},
-			async (container) => {
-				const { req, res, done, text } = createRequestAndResponse({
-					method: 'GET',
-					url: '/',
-				});
-				container.handle(req, res);
-				await done;
-				const html = await text();
-
-				const $ = cheerio.load(html);
-				// Rendered the content
-				assert.equal($('ul li').length, 3);
-
-				// Rendered the styles
-				assert.equal($('style').length, 1);
-			},
-		);
-	});
-
-	it('can be used in a slot', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/content.config.ts': `
-					import { z, defineCollection } from 'astro:content';
-
-					const blog = defineCollection({
-						schema: z.object({
-							title: z.string(),
-							description: z.string().max(60, 'For SEO purposes, keep descriptions short!'),
-						}),
-					});
-
-					export const collections = { blog };
-				`,
-			'/src/components/Layout.astro': `
-					<html>
-						<head></head>
-						<body>
-							<slot name="title"></slot>
-							<article>
-								<slot name="main"></slot>
-							</article>
-						</body>
-					</html>
-				`,
-			'/src/pages/index.astro': `
-					---
-					import Layout from '../components/Layout.astro';
-					import { getCollection } from 'astro:content';
-					const blog = await getCollection('blog');
-					const launchWeekEntry = blog.find(post => post.id === 'promo/launch-week.mdx');
-					const { Content } = await launchWeekEntry.render();
-					---
-					<Layout>
-						<h1 slot="title">Index page</h2>
-						<Content slot="main" />
-					</Layout>
-				`,
-		});
-
-		await runInContainerWithContentListeners(
-			{
-				inlineConfig: {
-					root: fixture.path,
-					vite: { server: { middlewareMode: true } },
-				},
-			},
-			async (container) => {
-				const { req, res, done, text } = createRequestAndResponse({
-					method: 'GET',
-					url: '/',
-				});
-				container.handle(req, res);
-				await done;
-				const html = await text();
-
-				const $ = cheerio.load(html);
-				// Rendered the content
-				assert.equal($('ul li').length, 3);
-
-				// Rendered the styles
-				assert.equal($('style').length, 1);
-			},
-		);
-	});
-
-	it('can be called from any js/ts file', async () => {
-		const fixture = await createFixture({
-			...baseFileTree,
-			'/src/content.config.ts': `
-					import { z, defineCollection } from 'astro:content';
-
-					const blog = defineCollection({
-						schema: z.object({
-							title: z.string(),
-							description: z.string().max(60, 'For SEO purposes, keep descriptions short!'),
-						}),
-					});
-
-					export const collections = { blog };
-				`,
-			'/src/launch-week.ts': `
-					import { getCollection } from 'astro:content';
-
-					export let Content;
-
-					const blog = await getCollection('blog');
-					const launchWeekEntry = blog.find(post => post.id === 'promo/launch-week.mdx');
-					const mod = await launchWeekEntry.render();
-
-					Content = mod.Content;
-				`,
-			'/src/pages/index.astro': `
-					---
-					import { Content } from '../launch-week.ts';
-					---
-					<html>
-						<head><title>Testing</title></head>
-						<body>
-							<h1>Testing</h1>
-							<Content />
-						</body>
-					</html>
-				`,
-		});
-
-		await runInContainerWithContentListeners(
-			{
-				inlineConfig: {
-					root: fixture.path,
-					vite: { server: { middlewareMode: true } },
-				},
-			},
-			async (container) => {
-				const { req, res, done, text } = createRequestAndResponse({
-					method: 'GET',
-					url: '/',
-				});
-				container.handle(req, res);
-				await done;
-				const html = await text();
-
-				const $ = cheerio.load(html);
-				// Rendered the content
-				assert.equal($('ul li').length, 3);
-
-				// Rendered the styles
-				assert.equal($('style').length, 1);
-			},
-		);
-	});
-});
diff --git a/packages/astro/test/vitest.test.js b/packages/astro/test/vitest.test.js
index c7c4180f3e81..083b45dada3a 100644
--- a/packages/astro/test/vitest.test.js
+++ b/packages/astro/test/vitest.test.js
@@ -1,15 +1,18 @@
 import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
+import { after, before, describe, it } from 'node:test';
 import { fileURLToPath } from 'node:url';
 import { createVitest } from 'vitest/node';
 
 describe('vitest', () => {
-	it('basics', async () => {
-		const config = new URL('./fixtures/vitest/vitest.config.js', import.meta.url);
+	let originalCwd;
+	before(() => {
+		originalCwd = process.cwd();
+		// We chdir rather than setting the root in vitest, because otherwise it sets the wrong root in the site config
+		process.chdir(fileURLToPath(new URL('./fixtures/vitest/', import.meta.url)));
+	});
 
+	it('basics', async () => {
 		const vitest = await createVitest('test', {
-			config: fileURLToPath(config),
-			root: fileURLToPath(new URL('./fixtures/vitest/', import.meta.url)),
 			watch: false,
 		});
 
@@ -21,4 +24,8 @@ describe('vitest', () => {
 			await vitest.close();
 		}
 	});
+
+	after(() => {
+		process.chdir(originalCwd);
+	});
 });
diff --git a/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/content/config.ts b/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/content.config.ts
similarity index 79%
rename from packages/integrations/cloudflare/test/fixtures/compile-image-service/src/content/config.ts
rename to packages/integrations/cloudflare/test/fixtures/compile-image-service/src/content.config.ts
index ce06042f6ae3..8692f75e2a18 100644
--- a/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/content/config.ts
+++ b/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/content.config.ts
@@ -1,7 +1,9 @@
 import type { ImageMetadata } from 'astro';
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
 	schema: ({ image }) =>
 		z.object({
 			image: z
diff --git a/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/pages/blog/[...slug].astro b/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/pages/blog/[...slug].astro
index 6246901f0cdf..5aa37bc37e94 100644
--- a/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/pages/blog/[...slug].astro
+++ b/packages/integrations/cloudflare/test/fixtures/compile-image-service/src/pages/blog/[...slug].astro
@@ -1,5 +1,5 @@
 ---
-import { getEntry, type CollectionEntry } from "astro:content";
+import { getEntry, render, type CollectionEntry } from "astro:content";
 
 export const prerender = false;
 
@@ -8,7 +8,7 @@ type Props = CollectionEntry<"blog">;
 const post = await getEntry("blog", Astro.params.slug!);
 if (!post) return Astro.rewrite("/404");
 
-const { Content } = await post.render();
+const { Content } = await render(post);
 
 ---
 
diff --git a/packages/integrations/markdoc/test/content-collections.test.js b/packages/integrations/markdoc/test/content-collections.test.js
index 48e97d45d670..d9e88c868e65 100644
--- a/packages/integrations/markdoc/test/content-collections.test.js
+++ b/packages/integrations/markdoc/test/content-collections.test.js
@@ -78,8 +78,7 @@ describe('Markdoc - Content Collections', () => {
 });
 
 const post1Entry = {
-	id: 'post-1.mdoc',
-	slug: 'post-1',
+	id: 'post-1',
 	collection: 'blog',
 	data: {
 		schemaWorks: true,
@@ -92,8 +91,7 @@ const post1Entry = {
 };
 
 const post2Entry = {
-	id: 'post-2.mdoc',
-	slug: 'post-2',
+	id: 'post-2',
 	collection: 'blog',
 	data: {
 		schemaWorks: true,
@@ -106,8 +104,7 @@ const post2Entry = {
 };
 
 const post3Entry = {
-	id: 'post-3.mdoc',
-	slug: 'post-3',
+	id: 'post-3',
 	collection: 'blog',
 	data: {
 		schemaWorks: true,
diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/content-collections/src/content.config.ts
similarity index 68%
rename from packages/integrations/markdoc/test/fixtures/content-collections/src/content/config.ts
rename to packages/integrations/markdoc/test/fixtures/content-collections/src/content.config.ts
index 3b411201a22e..bdc0b100eafd 100644
--- a/packages/integrations/markdoc/test/fixtures/content-collections/src/content/config.ts
+++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string(),
 	}).transform(data => ({
diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js
index cb3c84652622..595145f38a29 100644
--- a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js
+++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/collection.json.js
@@ -1,8 +1,7 @@
 import { getCollection } from 'astro:content';
 import { stringify } from 'devalue';
-import { stripAllRenderFn } from '../../utils.js';
 
 export async function GET() {
 	const posts = await getCollection('blog');
-	return new Response(stringify(stripAllRenderFn(posts)));
+	return new Response(stringify(posts));
 }
diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js
index 53dd17013ba7..8ddc63348d13 100644
--- a/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js
+++ b/packages/integrations/markdoc/test/fixtures/content-collections/src/pages/entry.json.js
@@ -1,8 +1,7 @@
-import { getEntryBySlug } from 'astro:content';
+import { getEntry } from 'astro:content';
 import { stringify } from 'devalue';
-import { stripRenderFn } from '../../utils.js';
 
 export async function GET() {
-	const post = await getEntryBySlug('blog', 'post-1');
-	return new Response(stringify(stripRenderFn(post)));
+	const post = await getEntry('blog', 'post-1');
+	return new Response(stringify(post));
 }
diff --git a/packages/integrations/markdoc/test/fixtures/content-collections/utils.js b/packages/integrations/markdoc/test/fixtures/content-collections/utils.js
deleted file mode 100644
index 3a6244327862..000000000000
--- a/packages/integrations/markdoc/test/fixtures/content-collections/utils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export function stripRenderFn(entryWithRender) {
-	const { render, ...entry } = entryWithRender;
-	return entry;
-}
-
-export function stripAllRenderFn(collection = []) {
-	return collection.map(stripRenderFn);
-}
diff --git a/packages/integrations/markdoc/test/fixtures/headings-custom/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/headings-custom/src/content.config.ts
new file mode 100644
index 000000000000..72dc34f67011
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/headings-custom/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const docs = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/docs' }),
+});
+
+export const collections = {
+	docs,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/headings-custom/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/headings-custom/src/content/config.ts
deleted file mode 100644
index a142ace11a74..000000000000
--- a/packages/integrations/markdoc/test/fixtures/headings-custom/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const docs = defineCollection({});
-
-export const collections = {
-	docs,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro
index 90b021e95525..47565187b3a5 100644
--- a/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro
+++ b/packages/integrations/markdoc/test/fixtures/headings-custom/src/pages/[slug].astro
@@ -1,14 +1,14 @@
 ---
-import { CollectionEntry, getCollection } from "astro:content";
+import { CollectionEntry, getCollection, render } from "astro:content";
 
 export async function getStaticPaths() {
 	const docs = await getCollection('docs');
-	return docs.map(doc => ({ params: { slug: doc.slug }, props: doc }));
+	return docs.map(doc => ({ params: { slug: doc.id }, props: doc }));
 }
 
 type Props = CollectionEntry<'docs'>;
 
-const { Content, headings } = await Astro.props.render();
+const { Content, headings } = await render(Astro.props);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/headings/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/headings/src/content.config.ts
new file mode 100644
index 000000000000..72dc34f67011
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/headings/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const docs = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/docs' }),
+});
+
+export const collections = {
+	docs,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/headings/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/headings/src/content/config.ts
deleted file mode 100644
index a142ace11a74..000000000000
--- a/packages/integrations/markdoc/test/fixtures/headings/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const docs = defineCollection({});
-
-export const collections = {
-	docs,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro
index 90b021e95525..47565187b3a5 100644
--- a/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro
+++ b/packages/integrations/markdoc/test/fixtures/headings/src/pages/[slug].astro
@@ -1,14 +1,14 @@
 ---
-import { CollectionEntry, getCollection } from "astro:content";
+import { CollectionEntry, getCollection, render } from "astro:content";
 
 export async function getStaticPaths() {
 	const docs = await getCollection('docs');
-	return docs.map(doc => ({ params: { slug: doc.slug }, props: doc }));
+	return docs.map(doc => ({ params: { slug: doc.id }, props: doc }));
 }
 
 type Props = CollectionEntry<'docs'>;
 
-const { Content, headings } = await Astro.props.render();
+const { Content, headings } = await render(Astro.props);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content.config.ts
new file mode 100644
index 000000000000..72dc34f67011
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const docs = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/docs' }),
+});
+
+export const collections = {
+	docs,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content/config.ts
deleted file mode 100644
index a142ace11a74..000000000000
--- a/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const docs = defineCollection({});
-
-export const collections = {
-	docs,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/pages/index.astro
index 51810b4a8cb5..cdb9dab892f0 100644
--- a/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/image-assets-custom/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const intro = await getEntryBySlug('docs', 'intro');
-const { Content } = await intro.render();
+const intro = await getEntry('docs', 'intro');
+const { Content } = await render(intro);
 ---
 
 <html lang="en">
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/image-assets/src/content.config.ts
new file mode 100644
index 000000000000..72dc34f67011
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/image-assets/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const docs = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/docs' }),
+});
+
+export const collections = {
+	docs,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/image-assets/src/content/config.ts
deleted file mode 100644
index a142ace11a74..000000000000
--- a/packages/integrations/markdoc/test/fixtures/image-assets/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const docs = defineCollection({});
-
-export const collections = {
-	docs,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/image-assets/src/pages/index.astro
index 51810b4a8cb5..cdb9dab892f0 100644
--- a/packages/integrations/markdoc/test/fixtures/image-assets/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/image-assets/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const intro = await getEntryBySlug('docs', 'intro');
-const { Content } = await intro.render();
+const intro = await getEntry('docs', 'intro');
+const { Content } = await render(intro);
 ---
 
 <html lang="en">
diff --git a/packages/integrations/markdoc/test/fixtures/propagated-assets/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/propagated-assets/src/content.config.ts
new file mode 100644
index 000000000000..e6435a6a79da
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/propagated-assets/src/content.config.ts
@@ -0,0 +1,8 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx,mdoc}', base: './src/content/blog' }),
+});
+
+export const collections = { blog };
\ No newline at end of file
diff --git a/packages/integrations/markdoc/test/fixtures/propagated-assets/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/propagated-assets/src/pages/[slug].astro
index baee15375526..4fb007e80b4b 100644
--- a/packages/integrations/markdoc/test/fixtures/propagated-assets/src/pages/[slug].astro
+++ b/packages/integrations/markdoc/test/fixtures/propagated-assets/src/pages/[slug].astro
@@ -1,15 +1,15 @@
 ---
-import { getCollection } from 'astro:content';
+import { getCollection, render } from 'astro:content';
 
 export async function getStaticPaths() {
 	const posts = await getCollection('blog');
 	return posts.map((post) => ({
-		params: { slug: post.slug },
+		params: { slug: post.id },
 		props: post,
 	}));
 }
 
-const { Content } = await Astro.props.render();
+const { Content } = await render(Astro.props);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render with-space/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render with-space/src/content.config.ts
new file mode 100644
index 000000000000..e7e7a998b90f
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render with-space/src/content.config.ts	
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx,mdoc}', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render with-space/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render with-space/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render with-space/src/content/config.ts	
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render with-space/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render with-space/src/pages/index.astro
index 940eef154005..c628759e7dba 100644
--- a/packages/integrations/markdoc/test/fixtures/render with-space/src/pages/index.astro	
+++ b/packages/integrations/markdoc/test/fixtures/render with-space/src/pages/index.astro	
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'simple');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'simple');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-html/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-html/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-html/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-html/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-html/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-html/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro b/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro
index bea51d3b584b..3799c4a23712 100644
--- a/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro
+++ b/packages/integrations/markdoc/test/fixtures/render-html/src/pages/[slug].astro
@@ -1,15 +1,15 @@
 ---
-import { getCollection, getEntryBySlug } from "astro:content";
+import { getCollection, getEntry, render } from "astro:content";
 
 const { slug } = Astro.params;
 
-const post = await getEntryBySlug('blog', slug);
-const { Content } = await post.render();
+const post = await getEntry('blog', slug);
+const { Content } = await render(post);
 
 export async function getStaticPaths() {
   const blogEntries = await getCollection('blog');
   return blogEntries.map(entry => ({
-    params: { slug: entry.slug }, props: { entry },
+    params: { slug: entry.id }, props: { entry },
   }));
 }
 
diff --git a/packages/integrations/markdoc/test/fixtures/render-null/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-null/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-null/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-null/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-null/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-null/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-null/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-null/src/pages/index.astro
index ed8417c5b373..3c934a903019 100644
--- a/packages/integrations/markdoc/test/fixtures/render-null/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-null/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'render-null');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'render-null');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-partials/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-partials/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-partials/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-partials/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-partials/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-partials/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-partials/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-partials/src/pages/index.astro
index e9549f314926..7c7e6b72c7b3 100644
--- a/packages/integrations/markdoc/test/fixtures/render-partials/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-partials/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const post = await getEntryBySlug('blog', 'with-partials');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'with-partials');
+const { Content } = await render(post);
 ---
 
 <!doctype html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-simple/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-simple/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-simple/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-simple/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-simple/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-simple/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-simple/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-simple/src/pages/index.astro
index 940eef154005..c628759e7dba 100644
--- a/packages/integrations/markdoc/test/fixtures/render-simple/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-simple/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'simple');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'simple');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-typographer/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-typographer/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-typographer/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-typographer/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-typographer/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-typographer/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-typographer/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-typographer/src/pages/index.astro
index 88fc531fa2e1..910920e1779b 100644
--- a/packages/integrations/markdoc/test/fixtures/render-typographer/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-typographer/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'typographer');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'typographer');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-components/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-with-components/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-with-components/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-components/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-with-components/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-with-components/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-components/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-with-components/src/pages/index.astro
index 52239acce73e..5c7747eef923 100644
--- a/packages/integrations/markdoc/test/fixtures/render-with-components/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-with-components/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'with-components');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'with-components');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-config/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-with-config/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-with-config/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-config/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-with-config/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-with-config/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-config/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-with-config/src/pages/index.astro
index 616d5ec0aa8d..f4727432e055 100644
--- a/packages/integrations/markdoc/test/fixtures/render-with-config/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-with-config/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'with-config');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'with-config');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/pages/index.astro
index 52239acce73e..5c7747eef923 100644
--- a/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-with-extends-components/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'with-components');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'with-components');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content.config.ts b/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content.config.ts
new file mode 100644
index 000000000000..663df266cccb
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content.config.ts
@@ -0,0 +1,10 @@
+import { defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content/config.ts
deleted file mode 100644
index 629486e48aa5..000000000000
--- a/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/content/config.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { defineCollection } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = {
-	blog,
-};
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/pages/index.astro
index 0ae7ed4c9da3..e50cbf100980 100644
--- a/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/render-with-indented-components/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from "astro:content";
+import { getEntry, render } from "astro:content";
 
-const post = await getEntryBySlug('blog', 'with-indented-components');
-const { Content } = await post.render();
+const post = await getEntry('blog', 'with-indented-components');
+const { Content } = await render(post);
 ---
 
 <!DOCTYPE html>
diff --git a/packages/integrations/markdoc/test/fixtures/variables/src/content/config.ts b/packages/integrations/markdoc/test/fixtures/variables/src/content.config.ts
similarity index 66%
rename from packages/integrations/markdoc/test/fixtures/variables/src/content/config.ts
rename to packages/integrations/markdoc/test/fixtures/variables/src/content.config.ts
index ff473d4af5be..958e209bf450 100644
--- a/packages/integrations/markdoc/test/fixtures/variables/src/content/config.ts
+++ b/packages/integrations/markdoc/test/fixtures/variables/src/content.config.ts
@@ -1,6 +1,8 @@
 import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
+	loader: glob({ pattern: '**/*.mdoc', base: './src/content/blog' }),
 	schema: z.object({
 		title: z.string().transform(v => 'Processed by schema: ' + v),
 	}),
diff --git a/packages/integrations/markdoc/test/fixtures/variables/src/content/blog/entry.mdoc b/packages/integrations/markdoc/test/fixtures/variables/src/content/blog/entry.mdoc
index 151d5a81d2fd..cc7d99c3e816 100644
--- a/packages/integrations/markdoc/test/fixtures/variables/src/content/blog/entry.mdoc
+++ b/packages/integrations/markdoc/test/fixtures/variables/src/content/blog/entry.mdoc
@@ -5,5 +5,4 @@ title: Test entry
 # {% $entry.data.title %}
 
 - id: {% $entry.id %} {% #id %}
-- slug: {% $entry.slug %} {% #slug %}
 - collection: {% $entry.collection %} {% #collection %}
diff --git a/packages/integrations/markdoc/test/fixtures/variables/src/pages/index.astro b/packages/integrations/markdoc/test/fixtures/variables/src/pages/index.astro
index a2766faf051b..66d38083157d 100644
--- a/packages/integrations/markdoc/test/fixtures/variables/src/pages/index.astro
+++ b/packages/integrations/markdoc/test/fixtures/variables/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry, render } from 'astro:content';
 
-const entry = await getEntryBySlug('blog', 'entry');
-const { Content } = await entry.render();
+const entry = await getEntry('blog', 'entry');
+const { Content } = await render(entry);
 ---
 
 <html lang="en">
diff --git a/packages/integrations/markdoc/test/variables.test.js b/packages/integrations/markdoc/test/variables.test.js
index 9873afcb77e2..2225f19c8d86 100644
--- a/packages/integrations/markdoc/test/variables.test.js
+++ b/packages/integrations/markdoc/test/variables.test.js
@@ -32,8 +32,7 @@ describe('Markdoc - Variables', () => {
 			const html = await res.text();
 			const { document } = parseHTML(html);
 			assert.equal(document.querySelector('h1')?.textContent, 'Processed by schema: Test entry');
-			assert.equal(document.getElementById('id')?.textContent?.trim(), 'id: entry.mdoc');
-			assert.equal(document.getElementById('slug')?.textContent?.trim(), 'slug: entry');
+			assert.equal(document.getElementById('id')?.textContent?.trim(), 'id: entry');
 			assert.equal(document.getElementById('collection')?.textContent?.trim(), 'collection: blog');
 		});
 	});
@@ -47,8 +46,7 @@ describe('Markdoc - Variables', () => {
 			const html = await baseFixture.readFile('/index.html');
 			const { document } = parseHTML(html);
 			assert.equal(document.querySelector('h1')?.textContent, 'Processed by schema: Test entry');
-			assert.equal(document.getElementById('id')?.textContent?.trim(), 'id: entry.mdoc');
-			assert.equal(document.getElementById('slug')?.textContent?.trim(), 'slug: entry');
+			assert.equal(document.getElementById('id')?.textContent?.trim(), 'id: entry');
 			assert.equal(document.getElementById('collection')?.textContent?.trim(), 'collection: blog');
 		});
 	});
diff --git a/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/config.ts b/packages/integrations/mdx/test/fixtures/css-head-mdx/src/content.config.ts
similarity index 100%
rename from packages/integrations/mdx/test/fixtures/css-head-mdx/src/content/config.ts
rename to packages/integrations/mdx/test/fixtures/css-head-mdx/src/content.config.ts
diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/src/content.config.ts b/packages/integrations/mdx/test/fixtures/mdx-images/src/content.config.ts
new file mode 100644
index 000000000000..4621eee5fbaf
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/mdx-images/src/content.config.ts
@@ -0,0 +1,8 @@
+import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+const blog = defineCollection({
+	loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
+});
+
+export const collections = { blog };
diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/src/content/config.ts b/packages/integrations/mdx/test/fixtures/mdx-images/src/content/config.ts
deleted file mode 100644
index 14443e78d6f7..000000000000
--- a/packages/integrations/mdx/test/fixtures/mdx-images/src/content/config.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { defineCollection, z } from 'astro:content';
-
-const blog = defineCollection({});
-
-export const collections = { blog };
diff --git a/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/content/config.js b/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/content.config.js
similarity index 67%
rename from packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/content/config.js
rename to packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/content.config.js
index 6250d13c8188..0f045f564881 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/content/config.js
+++ b/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/content.config.js
@@ -1,11 +1,12 @@
 import { z, defineCollection } from "astro:content";
+import { glob } from "astro/loaders";
 
 const filesSchema = () => {
   return z.object({});
 };
 
 const filesCollection = defineCollection({
-  type: "content",
+  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/files' }),
   schema: filesSchema(),
 });
 
diff --git a/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/pages/broken.astro b/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/pages/broken.astro
index bee4c85b5331..fd096e8501f2 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/pages/broken.astro
+++ b/packages/integrations/mdx/test/fixtures/mdx-plus-react-errors/src/pages/broken.astro
@@ -1,8 +1,8 @@
 ---
-import { getCollection } from "astro:content";
+import { getCollection, render } from "astro:content";
 const files = await getCollection("files");
 
-const { Content } = await files[0].render();
+const { Content } = await render(files[0]);
 ---
 
 <Content />
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 888f7177c7f5..106ae354a1ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2710,12 +2710,6 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
-  packages/astro/test/fixtures/content-collections-with-config-mts:
-    dependencies:
-      astro:
-        specifier: workspace:*
-        version: link:../../..
-
   packages/astro/test/fixtures/content-intellisense:
     dependencies:
       '@astrojs/markdoc':
@@ -3499,21 +3493,6 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
-  packages/astro/test/fixtures/legacy-content-collections:
-    dependencies:
-      '@astrojs/mdx':
-        specifier: workspace:*
-        version: link:../../../../integrations/mdx
-      astro:
-        specifier: workspace:*
-        version: link:../../..
-
-  packages/astro/test/fixtures/legacy-data-collections:
-    dependencies:
-      astro:
-        specifier: workspace:*
-        version: link:../../..
-
   packages/astro/test/fixtures/live-loaders:
     dependencies:
       '@astrojs/node':

From 51a697d8a3d5da9e685e815707d5f1224762e97c Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Wed, 24 Sep 2025 12:31:29 +0100
Subject: [PATCH 07/36] chore: fix content collection tests (#14431)

---
 .../e2e/fixtures/actions-blog/db/seed.ts      |  4 +--
 .../e2e/fixtures/actions-react-19/db/seed.ts  |  4 +--
 .../src/pages/blog/[...slug].astro            |  4 +--
 .../test/content-collections-render.test.js   | 31 ++++++-------------
 .../astro/test/content-collections.test.js    |  5 +--
 .../src/content/blog/{one.md => 1-one.md}     |  2 +-
 ...dx => 2-launch-week-component-scripts.mdx} |  2 +-
 ...dx => 3-launch-week-components-export.mdx} |  2 +-
 .../{launch-week.mdx => 4-launch-week.mdx}    |  2 +-
 .../pages/launch-week-component-scripts.astro |  2 +-
 .../pages/launch-week-components-export.astro |  2 +-
 .../content/src/pages/launch-week.astro       |  2 +-
 .../src/pages/sort-blog-collection.astro      |  2 +-
 .../core-image-deletion/src/content.config.ts |  2 +-
 14 files changed, 25 insertions(+), 41 deletions(-)
 rename packages/astro/test/fixtures/content/src/content/blog/{one.md => 1-one.md} (69%)
 rename packages/astro/test/fixtures/content/src/content/blog/promo/{launch-week-component-scripts.mdx => 2-launch-week-component-scripts.mdx} (93%)
 rename packages/astro/test/fixtures/content/src/content/blog/promo/{launch-week-components-export.mdx => 3-launch-week-components-export.mdx} (93%)
 rename packages/astro/test/fixtures/content/src/content/blog/promo/{launch-week.mdx => 4-launch-week.mdx} (92%)

diff --git a/packages/astro/e2e/fixtures/actions-blog/db/seed.ts b/packages/astro/e2e/fixtures/actions-blog/db/seed.ts
index 11dc55f7fe00..4e54174b1ede 100644
--- a/packages/astro/e2e/fixtures/actions-blog/db/seed.ts
+++ b/packages/astro/e2e/fixtures/actions-blog/db/seed.ts
@@ -3,12 +3,12 @@ import { db, Likes, Comment } from "astro:db";
 // https://astro.build/db/seed
 export default async function seed() {
   await db.insert(Likes).values({
-    postId: "first-post.md",
+    postId: "first-post",
     likes: 10,
   });
 
   await db.insert(Comment).values({
-    postId: "first-post.md",
+    postId: "first-post",
     author: "Alice",
     body: "Great post!",
   });
diff --git a/packages/astro/e2e/fixtures/actions-react-19/db/seed.ts b/packages/astro/e2e/fixtures/actions-react-19/db/seed.ts
index 11dc55f7fe00..4e54174b1ede 100644
--- a/packages/astro/e2e/fixtures/actions-react-19/db/seed.ts
+++ b/packages/astro/e2e/fixtures/actions-react-19/db/seed.ts
@@ -3,12 +3,12 @@ import { db, Likes, Comment } from "astro:db";
 // https://astro.build/db/seed
 export default async function seed() {
   await db.insert(Likes).values({
-    postId: "first-post.md",
+    postId: "first-post",
     likes: 10,
   });
 
   await db.insert(Comment).values({
-    postId: "first-post.md",
+    postId: "first-post",
     author: "Alice",
     body: "Great post!",
   });
diff --git a/packages/astro/e2e/fixtures/actions-react-19/src/pages/blog/[...slug].astro b/packages/astro/e2e/fixtures/actions-react-19/src/pages/blog/[...slug].astro
index f89badfcb05a..59824d83efb2 100644
--- a/packages/astro/e2e/fixtures/actions-react-19/src/pages/blog/[...slug].astro
+++ b/packages/astro/e2e/fixtures/actions-react-19/src/pages/blog/[...slug].astro
@@ -1,5 +1,5 @@
 ---
-import { type CollectionEntry, getCollection, getEntry } from 'astro:content';
+import { type CollectionEntry, getCollection, getEntry, render } from 'astro:content';
 import BlogPost from '../../layouts/BlogPost.astro';
 import { db, eq, Likes } from 'astro:db';
 import { Like, LikeWithActionState } from '../../components/Like';
@@ -17,7 +17,7 @@ export async function getStaticPaths() {
 type Props = CollectionEntry<'blog'>;
 
 const post = await getEntry('blog', Astro.params.slug)!;
-const { Content } = await post.render();
+const { Content } = await render(post)
 
 const likesRes = await db.select().from(Likes).where(eq(Likes.postId, post.id)).get()!;
 ---
diff --git a/packages/astro/test/content-collections-render.test.js b/packages/astro/test/content-collections-render.test.js
index 259034218721..2338b04e0dc3 100644
--- a/packages/astro/test/content-collections-render.test.js
+++ b/packages/astro/test/content-collections-render.test.js
@@ -142,17 +142,23 @@ describe('Content Collections - render()', () => {
 		it('getCollection should return new instances of the array to be mutated safely', async () => {
 			const app = await fixture.loadTestAdapterApp();
 
-			let request = new Request('http://example.com/sort-blog-collection');
+			let request = new Request('http://example.com/');
 			let response = await app.render(request);
 			let html = await response.text();
 			let $ = cheerio.load(html);
-			assert.equal($('li').first().text(), 'Launch week!');
+			const firstText = $('li').first().text();
+
+			request = new Request('http://example.com/sort-blog-collection');
+			response = await app.render(request);
+			html = await response.text();
+			$ = cheerio.load(html);
+			assert.notEqual($('li').first().text(), firstText);
 
 			request = new Request('http://example.com/');
 			response = await app.render(request);
 			html = await response.text();
 			$ = cheerio.load(html);
-			assert.equal($('li').first().text(), 'Hello world');
+			assert.equal($('li').first().text(), firstText);
 		});
 	});
 
@@ -212,24 +218,5 @@ describe('Content Collections - render()', () => {
 			assert.equal(h2.length, 1);
 			assert.equal(h2.attr('data-components-export-applied'), 'true');
 		});
-
-		it.skip('Supports layout prop with recursive getCollection() call - DEPRECATED: layout props removed in Astro 5', async () => {
-			const response = await fixture.fetch('/with-layout-prop', { method: 'GET' });
-			assert.equal(response.status, 200);
-
-			const html = await response.text();
-			const $ = cheerio.load(html);
-
-			const body = $('body');
-			assert.equal(body.attr('data-layout-prop'), 'true');
-
-			const h1 = $('h1');
-			assert.equal(h1.length, 1);
-			assert.equal(h1.text(), 'With Layout Prop');
-
-			const h2 = $('h2');
-			assert.equal(h2.length, 1);
-			assert.equal(h2.text(), 'Content with a layout prop');
-		});
 	});
 });
diff --git a/packages/astro/test/content-collections.test.js b/packages/astro/test/content-collections.test.js
index d01f9f05ec6b..c7664d541840 100644
--- a/packages/astro/test/content-collections.test.js
+++ b/packages/astro/test/content-collections.test.js
@@ -233,10 +233,7 @@ describe('Content Collections', () => {
 			} catch (e) {
 				error = e.message;
 			}
-			assert.equal(
-				error,
-				'Found legacy content config file in "src/content/config.mjs". Please move this file to "src/content.config.mjs" and ensure each collection has a loader defined.',
-			);
+			assert.ok(error.startsWith('Found legacy content config file in'));
 		});
 	});
 
diff --git a/packages/astro/test/fixtures/content/src/content/blog/one.md b/packages/astro/test/fixtures/content/src/content/blog/1-one.md
similarity index 69%
rename from packages/astro/test/fixtures/content/src/content/blog/one.md
rename to packages/astro/test/fixtures/content/src/content/blog/1-one.md
index f4293f0a5ee5..6488b194cc70 100644
--- a/packages/astro/test/fixtures/content/src/content/blog/one.md
+++ b/packages/astro/test/fixtures/content/src/content/blog/1-one.md
@@ -1,5 +1,5 @@
 ---
-title: Hello world
+title: 1 Hello world
 description: Just a demo
 ---
 This is a post
diff --git a/packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-component-scripts.mdx b/packages/astro/test/fixtures/content/src/content/blog/promo/2-launch-week-component-scripts.mdx
similarity index 93%
rename from packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-component-scripts.mdx
rename to packages/astro/test/fixtures/content/src/content/blog/promo/2-launch-week-component-scripts.mdx
index 586c50da7e66..cdf3aecef617 100644
--- a/packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-component-scripts.mdx
+++ b/packages/astro/test/fixtures/content/src/content/blog/promo/2-launch-week-component-scripts.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Launch week!'
+title: '2 Launch week!'
 description: 'Join us for the exciting launch of SPACE BLOG'
 publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: ['announcement']
diff --git a/packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-components-export.mdx b/packages/astro/test/fixtures/content/src/content/blog/promo/3-launch-week-components-export.mdx
similarity index 93%
rename from packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-components-export.mdx
rename to packages/astro/test/fixtures/content/src/content/blog/promo/3-launch-week-components-export.mdx
index 40012b8ef46b..c803d5b8e466 100644
--- a/packages/astro/test/fixtures/content/src/content/blog/promo/launch-week-components-export.mdx
+++ b/packages/astro/test/fixtures/content/src/content/blog/promo/3-launch-week-components-export.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Launch week!'
+title: '3 Launch week!'
 description: 'Join us for the exciting launch of SPACE BLOG'
 publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: ['announcement']
diff --git a/packages/astro/test/fixtures/content/src/content/blog/promo/launch-week.mdx b/packages/astro/test/fixtures/content/src/content/blog/promo/4-launch-week.mdx
similarity index 92%
rename from packages/astro/test/fixtures/content/src/content/blog/promo/launch-week.mdx
rename to packages/astro/test/fixtures/content/src/content/blog/promo/4-launch-week.mdx
index 22ed07c43f0c..9b22e505e3f1 100644
--- a/packages/astro/test/fixtures/content/src/content/blog/promo/launch-week.mdx
+++ b/packages/astro/test/fixtures/content/src/content/blog/promo/4-launch-week.mdx
@@ -1,5 +1,5 @@
 ---
-title: 'Launch week!'
+title: '4 Launch week!'
 description: 'Join us for the exciting launch of SPACE BLOG'
 publishedDate: 'Sat May 21 2022 00:00:00 GMT-0400 (Eastern Daylight Time)'
 tags: ['announcement']
diff --git a/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro b/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro
index b8e36d1f52e6..928eae258ae7 100644
--- a/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro
+++ b/packages/astro/test/fixtures/content/src/pages/launch-week-component-scripts.astro
@@ -1,7 +1,7 @@
 ---
 import { getEntry, render } from 'astro:content';
 
-const entry = await getEntry('blog', 'promo/launch-week-component-scripts');
+const entry = await getEntry('blog', 'promo/2-launch-week-component-scripts');
 const { Content } = await render(entry);
 ---
 <html>
diff --git a/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro b/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro
index a77244f79f00..bd40b4d57857 100644
--- a/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro
+++ b/packages/astro/test/fixtures/content/src/pages/launch-week-components-export.astro
@@ -1,7 +1,7 @@
 ---
 import { getEntry, render } from 'astro:content';
 
-const entry = await getEntry('blog', 'promo/launch-week-components-export');
+const entry = await getEntry('blog', 'promo/3-launch-week-components-export');
 const { Content } = await render(entry);
 ---
 <html>
diff --git a/packages/astro/test/fixtures/content/src/pages/launch-week.astro b/packages/astro/test/fixtures/content/src/pages/launch-week.astro
index 71231592330a..ee4b361f3819 100644
--- a/packages/astro/test/fixtures/content/src/pages/launch-week.astro
+++ b/packages/astro/test/fixtures/content/src/pages/launch-week.astro
@@ -1,7 +1,7 @@
 ---
 import { getEntry, render } from 'astro:content';
 
-const entry = await getEntry('blog', 'promo/launch-week');
+const entry = await getEntry('blog', 'promo/4-launch-week');
 
 const { Content } = await render(entry);
 ---
diff --git a/packages/astro/test/fixtures/content/src/pages/sort-blog-collection.astro b/packages/astro/test/fixtures/content/src/pages/sort-blog-collection.astro
index 5426068197ad..9eb681ee259c 100644
--- a/packages/astro/test/fixtures/content/src/pages/sort-blog-collection.astro
+++ b/packages/astro/test/fixtures/content/src/pages/sort-blog-collection.astro
@@ -4,7 +4,7 @@ import { getCollection } from 'astro:content';
 const blog = await getCollection('blog');
 
 // Sort descending by title, make sure mutating `blog` doesn't mutate other pages that call `getCollection` too
-blog.sort((a, b) => a.data.title < b.data.title ? 1 : -1)
+blog.sort((a, b) => b.data.title.localeCompare(a.data.title));
 ---
 <html>
 <head>
diff --git a/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts b/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts
index 0e376a0cc885..89756e2d112c 100644
--- a/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts
+++ b/packages/astro/test/fixtures/core-image-deletion/src/content.config.ts
@@ -2,7 +2,7 @@ import { defineCollection, z } from 'astro:content';
 import { glob } from 'astro/loaders';
 
 const blog = defineCollection({
-  loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/blog' }),
+  loader: glob({ pattern: '**/*.*', base: './src/content/blog' }),
   schema: z.object({
     title: z.string(),
   })

From 861b9cc770a05d9fcfcb2f1f442a3ba41e94b510 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Wed, 24 Sep 2025 14:13:33 +0200
Subject: [PATCH 08/36] feat!: remove emitESMImage() (#14426)

Co-authored-by: Matt Kane <m@mk.gg>
---
 .changeset/busy-olives-chew.md                | 22 +++++
 packages/astro/src/assets/utils/index.ts      |  8 +-
 .../astro/src/assets/utils/node/emitAsset.ts  | 85 -------------------
 .../astro/src/assets/vite-plugin-assets.ts    | 11 +--
 packages/astro/src/content/content-layer.ts   |  2 -
 packages/astro/src/content/runtime-assets.ts  |  8 +-
 packages/astro/src/content/utils.ts           | 10 +--
 .../content/vite-plugin-content-imports.ts    |  4 -
 .../markdoc/src/content-entry-type.ts         | 10 +--
 9 files changed, 31 insertions(+), 129 deletions(-)
 create mode 100644 .changeset/busy-olives-chew.md

diff --git a/.changeset/busy-olives-chew.md b/.changeset/busy-olives-chew.md
new file mode 100644
index 000000000000..060a5d8f03f6
--- /dev/null
+++ b/.changeset/busy-olives-chew.md
@@ -0,0 +1,22 @@
+---
+'astro': major
+---
+
+Removes the deprecated `emitESMImage()` function
+
+In Astro 5.6.2, the `emitESMImage()` function was deprecated in favor of `emitImageMetadata()`, which removes two deprecated arguments that were not meant to be exposed for public use: `_watchMode` and `experimentalSvgEnabled`.
+
+Astro 6.0 removes `emitESMImage()` entirely. Update to `emitImageMetadata()` to keep your current behavior.
+
+#### What should I do?
+
+Replace all occurrences of the `emitESMImage()` with `emitImageMetadata()` and remove unused arguments:
+
+```diff
+-import { emitESMImage } from 'astro/assets/utils';
++import { emitImageMetadata } from 'astro/assets/utils';
+
+const imageId = '/images/photo.jpg';
+-const result = await emitESMImage(imageId, false, false);
++const result = await emitImageMetadata(imageId);
+```
diff --git a/packages/astro/src/assets/utils/index.ts b/packages/astro/src/assets/utils/index.ts
index 0960d01ecf2f..6733481a4263 100644
--- a/packages/astro/src/assets/utils/index.ts
+++ b/packages/astro/src/assets/utils/index.ts
@@ -7,13 +7,7 @@
 
 export { isESMImportedImage, isRemoteImage, resolveSrc } from './imageKind.js';
 export { imageMetadata } from './metadata.js';
-export {
-	/**
-	 * @deprecated
-	 */
-	emitESMImage,
-	emitImageMetadata,
-} from './node/emitAsset.js';
+export { emitImageMetadata } from './node/emitAsset.js';
 export { getOrigQueryParams } from './queryParams.js';
 export {
 	isRemoteAllowed,
diff --git a/packages/astro/src/assets/utils/node/emitAsset.ts b/packages/astro/src/assets/utils/node/emitAsset.ts
index 59e1150fa71a..eb60e54c0b48 100644
--- a/packages/astro/src/assets/utils/node/emitAsset.ts
+++ b/packages/astro/src/assets/utils/node/emitAsset.ts
@@ -59,91 +59,6 @@ async function handleSvgDeduplication(
 	}
 }
 
-/**
- * Processes an image file and emits its metadata and optionally its contents. This function supports both build and development modes.
- *
- * @param {string | undefined} id - The identifier or path of the image file to process. If undefined, the function returns immediately.
- * @param {boolean} _watchMode - **Deprecated**: Indicates if the method is operating in watch mode. This parameter will be removed or updated in the future.
- * @param {boolean} _experimentalSvgEnabled - **Deprecated**: A flag to enable experimental handling of SVG files. Embeds SVG file data if set to true.
- * @param {FileEmitter | undefined} [fileEmitter] - Function for emitting files during the build process. May throw in certain scenarios.
- * @return {Promise<ImageMetadataWithContents | undefined>} Resolves to metadata with optional image contents or `undefined` if processing fails.
- */
-// We want to internally use this function until we fix the memory in the SVG features
-export async function emitESMImage(
-	id: string | undefined,
-	/** @deprecated */
-	_watchMode: boolean,
-	// FIX: in Astro 6, this function should not be passed in dev mode at all.
-	// Or rethink the API so that a function that throws isn't passed through.
-	/** @deprecated */
-	_experimentalSvgEnabled: boolean,
-	fileEmitter?: FileEmitter,
-): Promise<ImageMetadataWithContents | undefined> {
-	if (!id) {
-		return undefined;
-	}
-
-	const url = pathToFileURL(id);
-	let fileData: Buffer;
-	try {
-		fileData = await fs.readFile(url);
-	} catch {
-		return undefined;
-	}
-
-	const fileMetadata = await imageMetadata(fileData, id);
-
-	const emittedImage: Omit<ImageMetadataWithContents, 'fsPath'> = {
-		src: '',
-		...fileMetadata,
-	};
-
-	// Private for now, we generally don't want users to rely on filesystem paths, but we need it so that we can maybe remove the original asset from the build if it's unused.
-	Object.defineProperty(emittedImage, 'fsPath', {
-		enumerable: false,
-		writable: false,
-		value: id,
-	});
-
-	// Build
-	let isBuild = typeof fileEmitter === 'function';
-	if (isBuild) {
-		const pathname = decodeURI(url.pathname);
-		const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
-
-		try {
-			let handle: string;
-
-			if (fileMetadata.format === 'svg') {
-				// check if this content already exists
-				handle = await handleSvgDeduplication(fileData, filename, fileEmitter!);
-			} else {
-				// Non-SVG assets: emit normally
-				handle = fileEmitter!({
-					name: filename,
-					source: fileData,
-					type: 'asset',
-				});
-			}
-
-			emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
-		} catch {
-			isBuild = false;
-		}
-	}
-
-	if (!isBuild) {
-		// Pass the original file information through query params so we don't have to load the file twice
-		url.searchParams.append('origWidth', fileMetadata.width.toString());
-		url.searchParams.append('origHeight', fileMetadata.height.toString());
-		url.searchParams.append('origFormat', fileMetadata.format);
-
-		emittedImage.src = `/@fs` + prependForwardSlash(fileURLToNormalizedPath(url));
-	}
-
-	return emittedImage as ImageMetadataWithContents;
-}
-
 /**
  * Processes an image file and emits its metadata and optionally its contents. This function supports both build and development modes.
  *
diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index edb5f2e488df..411745150f8f 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -18,7 +18,7 @@ import { fontsPlugin } from './fonts/vite-plugin-fonts.js';
 import type { ImageTransform } from './types.js';
 import { getAssetsPrefix } from './utils/getAssetsPrefix.js';
 import { isESMImportedImage } from './utils/imageKind.js';
-import { emitESMImage } from './utils/node/emitAsset.js';
+import { emitImageMetadata } from './utils/node/emitAsset.js';
 import { getProxyCode } from './utils/proxy.js';
 import { makeSvgComponent } from './utils/svg.js';
 import { hashTransform, propsToFilename } from './utils/transformToPath.js';
@@ -221,13 +221,8 @@ export default function assets({ fs, settings, sync, logger }: Options): vite.Pl
 						return;
 					}
 
-					const emitFile = shouldEmitFile ? this.emitFile.bind(this) : undefined;
-					const imageMetadata = await emitESMImage(
-						id,
-						this.meta.watchMode,
-						id.endsWith('.svg'),
-						emitFile,
-					);
+					const fileEmitter = shouldEmitFile ? this.emitFile.bind(this) : undefined;
+					const imageMetadata = await emitImageMetadata(id, fileEmitter);
 
 					if (!imageMetadata) {
 						throw new AstroError({
diff --git a/packages/astro/src/content/content-layer.ts b/packages/astro/src/content/content-layer.ts
index 0f819847bd37..227c5028ba9a 100644
--- a/packages/astro/src/content/content-layer.ts
+++ b/packages/astro/src/content/content-layer.ts
@@ -282,8 +282,6 @@ class ContentLayer {
 						},
 						collectionWithResolvedSchema,
 						false,
-						// FUTURE: Remove in this in v6
-						id.endsWith('.svg'),
 					);
 
 					return parsedData;
diff --git a/packages/astro/src/content/runtime-assets.ts b/packages/astro/src/content/runtime-assets.ts
index 7bba50ee1154..b23642faa03a 100644
--- a/packages/astro/src/content/runtime-assets.ts
+++ b/packages/astro/src/content/runtime-assets.ts
@@ -1,22 +1,18 @@
 import type { PluginContext } from 'rollup';
 import { z } from 'zod';
 import type { ImageMetadata, OmitBrand } from '../assets/types.js';
-import { emitESMImage } from '../assets/utils/node/emitAsset.js';
+import { emitImageMetadata } from '../assets/utils/node/emitAsset.js';
 
 export function createImage(
 	pluginContext: PluginContext,
 	shouldEmitFile: boolean,
 	entryFilePath: string,
-	experimentalSvgEnabled: boolean,
 ) {
 	return () => {
 		return z.string().transform(async (imagePath, ctx) => {
 			const resolvedFilePath = (await pluginContext.resolve(imagePath, entryFilePath))?.id;
-			const metadata = (await emitESMImage(
+			const metadata = (await emitImageMetadata(
 				resolvedFilePath,
-				pluginContext.meta.watchMode,
-				// FUTURE: Remove in this in v6
-				experimentalSvgEnabled,
 				shouldEmitFile ? pluginContext.emitFile : undefined,
 			)) as OmitBrand<ImageMetadata>;
 
diff --git a/packages/astro/src/content/utils.ts b/packages/astro/src/content/utils.ts
index 766d27eb93c4..bedd4c93c5a4 100644
--- a/packages/astro/src/content/utils.ts
+++ b/packages/astro/src/content/utils.ts
@@ -133,7 +133,6 @@ export async function getEntryDataAndImages<
 	},
 	collectionConfig: CollectionConfig,
 	shouldEmitFile: boolean,
-	experimentalSvgEnabled: boolean,
 	pluginContext?: PluginContext,
 ): Promise<{ data: TOutputData; imageImports: Array<string> }> {
 	let data = entry.unvalidatedData as TOutputData;
@@ -145,12 +144,7 @@ export async function getEntryDataAndImages<
 	if (typeof schema === 'function') {
 		if (pluginContext) {
 			schema = schema({
-				image: createImage(
-					pluginContext,
-					shouldEmitFile,
-					entry._internal.filePath,
-					experimentalSvgEnabled,
-				),
+				image: createImage(pluginContext, shouldEmitFile, entry._internal.filePath),
 			});
 		} else if (collectionConfig.type === CONTENT_LAYER_TYPE) {
 			schema = schema({
@@ -211,14 +205,12 @@ export async function getEntryData(
 	},
 	collectionConfig: CollectionConfig,
 	shouldEmitFile: boolean,
-	experimentalSvgEnabled: boolean,
 	pluginContext?: PluginContext,
 ) {
 	const { data } = await getEntryDataAndImages(
 		entry,
 		collectionConfig,
 		shouldEmitFile,
-		experimentalSvgEnabled,
 		pluginContext,
 	);
 	return data;
diff --git a/packages/astro/src/content/vite-plugin-content-imports.ts b/packages/astro/src/content/vite-plugin-content-imports.ts
index 23a6147ce363..4950d2d9b2e7 100644
--- a/packages/astro/src/content/vite-plugin-content-imports.ts
+++ b/packages/astro/src/content/vite-plugin-content-imports.ts
@@ -245,8 +245,6 @@ async function getContentEntryModule(
 				{ id, collection, _internal, unvalidatedData },
 				collectionConfig,
 				params.shouldEmitFile,
-				// FUTURE: Remove in this in v6
-				id.endsWith('.svg'),
 				pluginContext,
 			)
 		: unvalidatedData;
@@ -282,8 +280,6 @@ async function getDataEntryModule(
 				{ id, collection, _internal, unvalidatedData },
 				collectionConfig,
 				params.shouldEmitFile,
-				// FUTURE: Remove in this in v6
-				id.endsWith('.svg'),
 				pluginContext,
 			)
 		: unvalidatedData;
diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts
index f68e237018ac..bcebff33af94 100644
--- a/packages/integrations/markdoc/src/content-entry-type.ts
+++ b/packages/integrations/markdoc/src/content-entry-type.ts
@@ -5,7 +5,7 @@ import { parseFrontmatter } from '@astrojs/markdown-remark';
 import type { Config as MarkdocConfig, Node } from '@markdoc/markdoc';
 import Markdoc from '@markdoc/markdoc';
 import type { AstroConfig, ContentEntryType } from 'astro';
-import { emitESMImage } from 'astro/assets/utils';
+import { emitImageMetadata } from 'astro/assets/utils';
 import type { Rollup, ErrorPayload as ViteErrorPayload } from 'vite';
 import type { ComponentConfig } from './config.js';
 import { htmlTokenTransform } from './html/transform/html-token-transform.js';
@@ -319,13 +319,7 @@ async function emitOptimizedImages(
 				const resolved = await ctx.pluginContext.resolve(node.attributes.src, ctx.filePath);
 
 				if (resolved?.id && fs.existsSync(new URL(prependForwardSlash(resolved.id), 'file://'))) {
-					const src = await emitESMImage(
-						resolved.id,
-						ctx.pluginContext.meta.watchMode,
-						// FUTURE: Remove in this in v6
-						resolved.id.endsWith('.svg'),
-						ctx.pluginContext.emitFile,
-					);
+					const src = await emitImageMetadata(resolved.id, ctx.pluginContext.emitFile);
 
 					const fsPath = resolved.id;
 

From 4f11510c9ed932f5cb6d1075b1172909dd5db23e Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 25 Sep 2025 10:48:36 +0200
Subject: [PATCH 09/36] feat(astro)!: update `i18n.redirectToDefaultLocale`
 default (#14406)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/sad-lines-hear.md                  | 27 ++++++++++++++++++
 .../astro/src/core/config/schemas/base.ts     |  3 +-
 .../astro/src/core/config/schemas/refined.ts  | 28 +++++++++----------
 packages/astro/src/integrations/hooks.ts      |  8 +-----
 packages/astro/src/types/public/config.ts     |  6 ++--
 .../i18n-double-prefix/astro.config.mjs       |  2 +-
 .../i18n-double-prefix/src/pages/index.astro  |  0
 .../astro.config.mjs                          |  1 +
 8 files changed, 47 insertions(+), 28 deletions(-)
 create mode 100644 .changeset/sad-lines-hear.md
 create mode 100644 packages/astro/test/fixtures/i18n-double-prefix/src/pages/index.astro

diff --git a/.changeset/sad-lines-hear.md b/.changeset/sad-lines-hear.md
new file mode 100644
index 000000000000..91cd76e4edf2
--- /dev/null
+++ b/.changeset/sad-lines-hear.md
@@ -0,0 +1,27 @@
+---
+'astro': major
+---
+
+Changes the default routing configuration value of `i18n.routing.redirectToDefaultLocale` from `true` to `false`.
+
+In Astro v5.0, `i18n.routing.redirectToDefaultLocale` was `true` by default. When combined with the `i18n.routing.prefixDefaultLocale` default value of `false`, the resulting redirects could cause infinite loops.
+
+In Astro v6.0, `i18n.routing.redirectToDefaultLocale` now defaults to `false`. Additionally, it can now only be used if `i18n.routing.prefixDefaultLocale` is set to `true`.
+
+#### What should I do?
+
+Review your Astro `i18n` config as you may now need to explicitly set values for `redirectToDefaultLocale` and `prefixDefaultLocale` to recreate your project's previous behavior.
+
+```diff
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+  i18n: {
+    routing: {
+      prefixDefaultLocale: true,
++      redirectToDefaultLocale: true
+    }
+  }
+})
+```
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index 2b0be0910f65..ddba2f3f2ca6 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -407,8 +407,7 @@ export const AstroConfigSchema = z.object({
 					.or(
 						z.object({
 							prefixDefaultLocale: z.boolean().optional().default(false),
-							// TODO: Astro 6.0 change to false
-							redirectToDefaultLocale: z.boolean().optional().default(true),
+							redirectToDefaultLocale: z.boolean().optional().default(false),
 							fallbackType: z.enum(['redirect', 'rewrite']).optional().default('redirect'),
 						}),
 					)
diff --git a/packages/astro/src/core/config/schemas/refined.ts b/packages/astro/src/core/config/schemas/refined.ts
index 1caff3ad2794..d5940f224fcf 100644
--- a/packages/astro/src/core/config/schemas/refined.ts
+++ b/packages/astro/src/core/config/schemas/refined.ts
@@ -42,21 +42,19 @@ export const AstroConfigRefinedSchema = z.custom<AstroConfig>().superRefine((con
 		}
 	}
 
-	// TODO: Astro 6.0
-	// Uncomment this validation check, and change the default value of redirectToDefaultLocale to false
-	// if (
-	// 	config.i18n &&
-	// 	typeof config.i18n.routing !== 'string' &&
-	// 	config.i18n.routing.prefixDefaultLocale === false &&
-	// 	config.i18n.routing.redirectToDefaultLocale === true
-	// ) {
-	// 	ctx.addIssue({
-	// 		code: z.ZodIssueCode.custom,
-	// 		message:
-	// 			'The option `i18n.routing.redirectToDefaultLocale` can be used only when `i18n.routing.prefixDefaultLocale` is set to `true`, otherwise redirects might cause infinite loops. Remove the option `i18n.routing.redirectToDefaultLocale`, or change its value to `false`.',
-	// 		path: ['i18n', 'routing', 'redirectToDefaultLocale'],
-	// 	});
-	// }
+	if (
+		config.i18n &&
+		typeof config.i18n.routing !== 'string' &&
+		config.i18n.routing.prefixDefaultLocale === false &&
+		config.i18n.routing.redirectToDefaultLocale === true
+	) {
+		ctx.addIssue({
+			code: z.ZodIssueCode.custom,
+			message:
+				'The option `i18n.routing.redirectToDefaultLocale` can be used only when `i18n.routing.prefixDefaultLocale` is set to `true`, otherwise redirects might cause infinite loops. Remove the option `i18n.routing.redirectToDefaultLocale`, or change its value to `false`.',
+			path: ['i18n', 'routing', 'redirectToDefaultLocale'],
+		});
+	}
 
 	if (config.outDir.toString().startsWith(config.publicDir.toString())) {
 		ctx.addIssue({
diff --git a/packages/astro/src/integrations/hooks.ts b/packages/astro/src/integrations/hooks.ts
index 7e28a782d7d6..6d954cb843dc 100644
--- a/packages/astro/src/integrations/hooks.ts
+++ b/packages/astro/src/integrations/hooks.ts
@@ -353,13 +353,6 @@ export async function runHookConfigSetup({
 		updatedSettings.renderers.push(astroJSXRenderer);
 	}
 
-	// TODO: Astro 6.0
-	// Remove this hack to avoid breaking changes, and change the default value of redirectToDefaultLocale
-	if (updatedConfig.i18n && typeof updatedConfig.i18n.routing !== 'string') {
-		updatedConfig.i18n.routing.redirectToDefaultLocale ??=
-			updatedConfig.i18n.routing.prefixDefaultLocale || false;
-	}
-
 	updatedSettings.config = updatedConfig;
 	return updatedSettings;
 }
@@ -609,6 +602,7 @@ export async function runHookBuildGenerated({
 type RunHookBuildDone = {
 	settings: AstroSettings;
 	pages: string[];
+	// TODO: remove in Astro 6
 	routes: RouteData[];
 	logger: Logger;
 };
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 1d35329e8d6e..bd82172a645a 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -1770,14 +1770,14 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
 					 * @name i18n.routing.redirectToDefaultLocale
 					 * @kind h4
 					 * @type {boolean}
-					 * @default `true`
+					 * @default `false`
 					 * @version 4.2.0
 					 * @description
 					 *
 					 * Configures whether or not the home URL (`/`) generated by `src/pages/index.astro`
 					 * will redirect to `/[defaultLocale]` when `prefixDefaultLocale: true` is set.
 					 *
-					 * Set `redirectToDefaultLocale: false` to disable this automatic redirection at the root of your site:
+					 * Set `redirectToDefaultLocale: true` to enable this automatic redirection at the root of your site:
 					 * ```js
 					 * // astro.config.mjs
 					 * export default defineConfig({
@@ -1786,7 +1786,7 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
 					 * 		locales: ["en", "fr"],
 					 *     routing: {
 					 *       prefixDefaultLocale: true,
-					 *       redirectToDefaultLocale: false
+					 *       redirectToDefaultLocale: true
 					 *     }
 					 *   }
 					 * })
diff --git a/packages/astro/test/fixtures/i18n-double-prefix/astro.config.mjs b/packages/astro/test/fixtures/i18n-double-prefix/astro.config.mjs
index e701e7f2d017..a64f1df5d452 100644
--- a/packages/astro/test/fixtures/i18n-double-prefix/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-double-prefix/astro.config.mjs
@@ -11,7 +11,7 @@ export default defineConfig({
 			},
 		],
 		routing: {
-			prefixDefaultLocale: false,
+			prefixDefaultLocale: true,
 			redirectToDefaultLocale: true,
 			fallback: {
 				es: 'en',
diff --git a/packages/astro/test/fixtures/i18n-double-prefix/src/pages/index.astro b/packages/astro/test/fixtures/i18n-double-prefix/src/pages/index.astro
new file mode 100644
index 000000000000..e69de29bb2d1
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 6ab4d1305f35..890cf886222a 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
@@ -11,6 +11,7 @@ export default defineConfig({
 			], 
 			routing: {
 				prefixDefaultLocale: true,
+				redirectToDefaultLocale: true
 			}
 		},
 		base: "/new-site"

From df6d2d7bbcaf6b6a327a37a6437d4adade6e2485 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 25 Sep 2025 15:51:24 +0200
Subject: [PATCH 10/36] feat!: remove Astro.glob (#14421)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/kind-pears-behave.md               | 24 +++++++
 packages/astro/e2e/errors.test.js             | 12 ----
 .../src/components/AstroGlobOutsideAstro.js   |  3 -
 .../src/pages/astro-glob-no-match.astro       |  3 -
 .../src/pages/astro-glob-outside-astro.astro  |  5 --
 packages/astro/package.json                   |  2 -
 packages/astro/src/core/create-vite.ts        |  2 -
 packages/astro/src/core/errors/README.md      |  2 +-
 packages/astro/src/core/errors/dev/vite.ts    | 25 +------
 packages/astro/src/core/errors/errors-data.ts |  3 +
 packages/astro/src/core/render-context.ts     |  1 -
 .../astro/src/runtime/server/astro-global.ts  | 30 ---------
 packages/astro/src/types/public/context.ts    | 22 -------
 .../vite-plugin-astro-postprocess/README.md   |  3 -
 .../vite-plugin-astro-postprocess/index.ts    | 65 -------------------
 packages/astro/test/astro-global.test.js      |  6 +-
 packages/astro/test/astro-scripts.test.js     |  4 +-
 .../astro-global/src/pages/glob.astro         |  2 +-
 .../src/pages/omit-markdown-extensions.astro  |  2 +-
 .../astro-global/src/pages/posts/[page].astro |  2 +-
 .../src/pages/posts/[slug]/[page].astro       |  2 +-
 .../pages/posts/named-root-page/[page].astro  |  2 +-
 .../posts/optional-root-page/[...page].astro  |  2 +-
 .../astro-scripts/src/pages/glob.astro        |  2 +-
 .../src/pages/episodes/[...page].astro        |  2 +-
 .../src/pages/posts/[slug].astro              |  2 +-
 .../src/components/Footer.astro               |  2 +-
 .../src/components/Navbar.astro               |  2 +-
 .../static-build/src/pages/index.astro        |  2 +-
 packages/astro/test/glob-pages-css.test.js    |  2 +-
 packages/astro/test/static-build.test.js      |  2 +-
 .../test/units/runtime/astro-global.test.js   | 29 ---------
 .../mdx-component/src/pages/glob.astro        |  2 +-
 .../src/pages/[slug].astro                    |  2 +-
 .../mdx-infinite-loop/src/pages/index.astro   |  2 +-
 .../fixtures/mdx-slots/src/pages/glob.astro   |  2 +-
 pnpm-lock.yaml                                |  6 --
 37 files changed, 52 insertions(+), 231 deletions(-)
 create mode 100644 .changeset/kind-pears-behave.md
 delete mode 100644 packages/astro/e2e/fixtures/errors/src/components/AstroGlobOutsideAstro.js
 delete mode 100644 packages/astro/e2e/fixtures/errors/src/pages/astro-glob-no-match.astro
 delete mode 100644 packages/astro/e2e/fixtures/errors/src/pages/astro-glob-outside-astro.astro
 delete mode 100644 packages/astro/src/vite-plugin-astro-postprocess/README.md
 delete mode 100644 packages/astro/src/vite-plugin-astro-postprocess/index.ts
 delete mode 100644 packages/astro/test/units/runtime/astro-global.test.js

diff --git a/.changeset/kind-pears-behave.md b/.changeset/kind-pears-behave.md
new file mode 100644
index 000000000000..d34012a6991e
--- /dev/null
+++ b/.changeset/kind-pears-behave.md
@@ -0,0 +1,24 @@
+---
+'astro': major
+---
+
+Removes `Astro.glob()`
+
+In Astro 5.0, `Astro.glob()` was deprecated in favor of using `getCollection()` to query your collections, and `import.meta.glob()` to query other source files in your project.
+
+Astro 6.0 removes `Astro.glob()` entirely. Update to `import.meta.glob()` to keep your current behavior.
+
+#### What should I do?
+
+Replace all use of `Astro.glob()` with `import.meta.glob()`. Note that `import.meta.glob()` no longer returns a `Promise`, so you may have to update your code accordingly. You should not require any updates to your glob patterns.
+
+```astro
+---
+// src/pages/blog.astro
+-const posts = await Astro.glob('./posts/*.md');
++const posts = Object.values(import.meta.glob('./posts/*.md', { eager: true }));
+---
+{posts.map((post) => <li><a href={post.url}>{post.frontmatter.title}</a></li>)}
+```
+
+Where appropriate, consider using content collections to organize your content, which has its own newer, more performant querying functions.
diff --git a/packages/astro/e2e/errors.test.js b/packages/astro/e2e/errors.test.js
index f64a22b5cfc9..85edc09ae960 100644
--- a/packages/astro/e2e/errors.test.js
+++ b/packages/astro/e2e/errors.test.js
@@ -117,18 +117,6 @@ test.describe('Error display', () => {
 		expect(await page.locator('vite-error-overlay').count()).toEqual(0);
 	});
 
-	test('astro glob no match error', async ({ page, astro }) => {
-		await page.goto(astro.resolveUrl('/astro-glob-no-match'), { waitUntil: 'networkidle' });
-		const message = (await getErrorOverlayContent(page)).message;
-		expect(message).toMatch('did not return any matching files');
-	});
-
-	test('astro glob used outside of an astro file', async ({ page, astro }) => {
-		await page.goto(astro.resolveUrl('/astro-glob-outside-astro'), { waitUntil: 'networkidle' });
-		const message = (await getErrorOverlayContent(page)).message;
-		expect(message).toMatch('can only be used in');
-	});
-
 	test('can handle DomException errors', async ({ page, astro }) => {
 		await page.goto(astro.resolveUrl('/dom-exception'), { waitUntil: 'networkidle' });
 		const message = (await getErrorOverlayContent(page)).message;
diff --git a/packages/astro/e2e/fixtures/errors/src/components/AstroGlobOutsideAstro.js b/packages/astro/e2e/fixtures/errors/src/components/AstroGlobOutsideAstro.js
deleted file mode 100644
index 5307474c035a..000000000000
--- a/packages/astro/e2e/fixtures/errors/src/components/AstroGlobOutsideAstro.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function globSomething(Astro) {
-  return Astro.glob('./*.lua')
-}
diff --git a/packages/astro/e2e/fixtures/errors/src/pages/astro-glob-no-match.astro b/packages/astro/e2e/fixtures/errors/src/pages/astro-glob-no-match.astro
deleted file mode 100644
index a7739af5807f..000000000000
--- a/packages/astro/e2e/fixtures/errors/src/pages/astro-glob-no-match.astro
+++ /dev/null
@@ -1,3 +0,0 @@
----
-Astro.glob('./*.lua')
----
\ No newline at end of file
diff --git a/packages/astro/e2e/fixtures/errors/src/pages/astro-glob-outside-astro.astro b/packages/astro/e2e/fixtures/errors/src/pages/astro-glob-outside-astro.astro
deleted file mode 100644
index 328de56ecf25..000000000000
--- a/packages/astro/e2e/fixtures/errors/src/pages/astro-glob-outside-astro.astro
+++ /dev/null
@@ -1,5 +0,0 @@
----
-import { globSomething } from '../components/AstroGlobOutsideAstro'
-
-globSomething(Astro)
----
\ No newline at end of file
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 24e26d5f9e11..021ad68d87d1 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -113,7 +113,6 @@
     "@capsizecss/unpack": "^2.4.0",
     "@oslojs/encoding": "^1.1.0",
     "@rollup/pluginutils": "^5.2.0",
-    "acorn": "^8.15.0",
     "aria-query": "^5.3.2",
     "axobject-query": "^4.1.0",
     "boxen": "8.0.1",
@@ -130,7 +129,6 @@
     "dset": "^3.1.4",
     "es-module-lexer": "^1.7.0",
     "esbuild": "^0.25.0",
-    "estree-walker": "^3.0.3",
     "flattie": "^1.1.1",
     "fontace": "~0.3.0",
     "github-slugger": "^2.0.0",
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 6a8bbdacd0d5..eecbfa33070a 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -22,7 +22,6 @@ import astroDevToolbar from '../toolbar/vite-plugin-dev-toolbar.js';
 import astroTransitions from '../transitions/vite-plugin-transitions.js';
 import type { AstroSettings, RoutesList } from '../types/astro.js';
 import astroVitePlugin from '../vite-plugin-astro/index.js';
-import astroPostprocessVitePlugin from '../vite-plugin-astro-postprocess/index.js';
 import { vitePluginAstroServer } from '../vite-plugin-astro-server/index.js';
 import configAliasVitePlugin from '../vite-plugin-config-alias/index.js';
 import vitePluginFileURL from '../vite-plugin-fileurl/index.js';
@@ -158,7 +157,6 @@ export async function createVite(
 			astroEnv({ settings, sync, envLoader }),
 			markdownVitePlugin({ settings, logger }),
 			htmlVitePlugin(),
-			astroPostprocessVitePlugin(),
 			astroIntegrationsContainerPlugin({ settings, logger }),
 			astroScriptsPageSSRPlugin({ settings }),
 			astroHeadPlugin(),
diff --git a/packages/astro/src/core/errors/README.md b/packages/astro/src/core/errors/README.md
index 65e7743a0293..bf0753927da8 100644
--- a/packages/astro/src/core/errors/README.md
+++ b/packages/astro/src/core/errors/README.md
@@ -97,7 +97,7 @@ If the error cannot be triggered at all anymore, it can deprecated by adding a `
 ```js
 /**
  * @docs
- * @deprecated Removed in Astro v9.8.6 as it is no longer relevant due to...
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of...
  */
 ```
 
diff --git a/packages/astro/src/core/errors/dev/vite.ts b/packages/astro/src/core/errors/dev/vite.ts
index b624fdad5d62..f2212dbd03bd 100644
--- a/packages/astro/src/core/errors/dev/vite.ts
+++ b/packages/astro/src/core/errors/dev/vite.ts
@@ -6,7 +6,7 @@ import type { ErrorPayload } from 'vite';
 import type { SSRLoadedRenderer } from '../../../types/public/internal.js';
 import type { ModuleLoader } from '../../module-loader/index.js';
 import { AstroError, type ErrorWithMetadata } from '../errors.js';
-import { FailedToLoadModuleSSR, InvalidGlob, MdxIntegrationMissingError } from '../errors-data.js';
+import { FailedToLoadModuleSSR, MdxIntegrationMissingError } from '../errors-data.js';
 import { createSafeError } from '../utils.js';
 import { getDocsForError, renderErrorMarkdown } from './utils.js';
 
@@ -76,29 +76,6 @@ export function enhanceViteSSRError({
 				stack: safeError.stack,
 			}) as ErrorWithMetadata;
 		}
-
-		// Since Astro.glob is a wrapper around Vite's import.meta.glob, errors don't show accurate information, let's fix that
-		if (safeError.message.includes('Invalid glob')) {
-			const globPattern = /glob: "(.+)" \(/.exec(safeError.message)?.[1];
-
-			if (globPattern) {
-				safeError.message = InvalidGlob.message(globPattern);
-				safeError.name = 'InvalidGlob';
-				safeError.title = InvalidGlob.title;
-
-				const line = lns.findIndex((ln) => ln.includes(globPattern));
-
-				if (line !== -1) {
-					const column = lns[line]?.indexOf(globPattern);
-
-					safeError.loc = {
-						file: path,
-						line: line + 1,
-						column,
-					};
-				}
-			}
-		}
 	}
 
 	return safeError;
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index d78e6263aac3..9471a5501ec4 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -951,6 +951,7 @@ export const LocalImageUsedWrongly = {
  * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
  * @description
  * `Astro.glob()` can only be used in `.astro` files. You can use [`import.meta.glob()`](https://vite.dev/guide/features.html#glob-import) instead to achieve the same result.
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of `Astro.glob()`.
  */
 export const AstroGlobUsedOutside = {
 	name: 'AstroGlobUsedOutside',
@@ -966,6 +967,7 @@ export const AstroGlobUsedOutside = {
  * - [Astro.glob](https://docs.astro.build/en/reference/api-reference/#astroglob)
  * @description
  * `Astro.glob()` did not return any matching files. There might be a typo in the glob pattern.
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of `Astro.glob()`.
  */
 export const AstroGlobNoMatch = {
 	name: 'AstroGlobNoMatch',
@@ -1075,6 +1077,7 @@ export const FailedToLoadModuleSSR = {
  * - [Glob Patterns](https://docs.astro.build/en/guides/imports/#glob-patterns)
  * @description
  * Astro encountered an invalid glob pattern. This is often caused by the glob pattern not being a valid file path.
+ * @deprecated This error was removed in Astro v6.0.0 along with the removal of `Astro.glob()`.
  */
 export const InvalidGlob = {
 	name: 'InvalidGlob',
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index 3fc04db5803a..f766f3206c61 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -662,7 +662,6 @@ export class RenderContext {
 
 		return {
 			generator: astroStaticPartial.generator,
-			glob: astroStaticPartial.glob,
 			routePattern: this.routeData.route,
 			isPrerendered: this.routeData.prerender,
 			cookies,
diff --git a/packages/astro/src/runtime/server/astro-global.ts b/packages/astro/src/runtime/server/astro-global.ts
index ea211004abad..31f352805a13 100644
--- a/packages/astro/src/runtime/server/astro-global.ts
+++ b/packages/astro/src/runtime/server/astro-global.ts
@@ -1,41 +1,11 @@
 import { ASTRO_VERSION } from '../../core/constants.js';
-import { AstroError, AstroErrorData } from '../../core/errors/index.js';
 import type { AstroGlobalPartial } from '../../types/public/context.js';
 
-/** Create the Astro.glob() runtime function. */
-function createAstroGlobFn() {
-	const globHandler = (importMetaGlobResult: Record<string, any>) => {
-		// This is created inside of the runtime so we don't have access to the Astro logger.
-		console.warn(`Astro.glob is deprecated and will be removed in a future major version of Astro.
-Use import.meta.glob instead: https://vitejs.dev/guide/features.html#glob-import`);
-
-		if (typeof importMetaGlobResult === 'string') {
-			throw new AstroError({
-				...AstroErrorData.AstroGlobUsedOutside,
-				message: AstroErrorData.AstroGlobUsedOutside.message(JSON.stringify(importMetaGlobResult)),
-			});
-		}
-		let allEntries = [...Object.values(importMetaGlobResult)];
-		if (allEntries.length === 0) {
-			throw new AstroError({
-				...AstroErrorData.AstroGlobNoMatch,
-				message: AstroErrorData.AstroGlobNoMatch.message(JSON.stringify(importMetaGlobResult)),
-			});
-		}
-		// Map over the `import()` promises, calling to load them.
-		return Promise.all(allEntries.map((fn) => fn()));
-	};
-	// Cast the return type because the argument that the user sees (string) is different from the argument
-	// that the runtime sees post-compiler (Record<string, Module>).
-	return globHandler as unknown as AstroGlobalPartial['glob'];
-}
-
 // This is used to create the top-level Astro global; the one that you can use
 // inside of getStaticPaths. See the `astroGlobalArgs` option for parameter type.
 export function createAstro(site: string | undefined): AstroGlobalPartial {
 	return {
 		site: site ? new URL(site) : undefined,
 		generator: `Astro v${ASTRO_VERSION}`,
-		glob: createAstroGlobFn(),
 	};
 }
diff --git a/packages/astro/src/types/public/context.ts b/packages/astro/src/types/public/context.ts
index 46e1ce811068..bc5cdc0bf6a5 100644
--- a/packages/astro/src/types/public/context.ts
+++ b/packages/astro/src/types/public/context.ts
@@ -4,14 +4,12 @@ import type {
 	ActionClient,
 	ActionReturnType,
 } from '../../actions/runtime/virtual/server.js';
-import type { SUPPORTED_MARKDOWN_FILE_EXTENSIONS } from '../../core/constants.js';
 import type { AstroCookies } from '../../core/cookies/cookies.js';
 import type { CspDirective, CspHash } from '../../core/csp/config.js';
 import type { AstroSession } from '../../core/session.js';
 import type { AstroComponentFactory } from '../../runtime/server/index.js';
 import type { Params, RewritePayload } from './common.js';
 import type { ValidRedirectStatus } from './config.js';
-import type { AstroInstance, MarkdownInstance, MDXInstance } from './content.js';
 
 /**
  * Astro global available in all contexts in .astro files
@@ -208,27 +206,7 @@ export interface AstroGlobal<
 	};
 }
 
-/** Union type of supported markdown file extensions */
-type MarkdownFileExtension = (typeof SUPPORTED_MARKDOWN_FILE_EXTENSIONS)[number];
-
 export interface AstroGlobalPartial {
-	/**
-	 * Fetch local files into your static site setup
-	 *
-	 * Example usage:
-	 * ```typescript
-	 * const posts = await Astro.glob('../pages/post/*.md');
-	 * ```
-	 *
-	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroglob)
-	 * @deprecated Astro.glob is deprecated and will be removed in the next major version of Astro. Use `import.meta.glob` instead: https://vitejs.dev/guide/features.html#glob-import
-	 */
-	glob(globStr: `${any}.astro`): Promise<AstroInstance[]>;
-	glob<T extends Record<string, any>>(
-		globStr: `${any}${MarkdownFileExtension}`,
-	): Promise<MarkdownInstance<T>[]>;
-	glob<T extends Record<string, any>>(globStr: `${any}.mdx`): Promise<MDXInstance<T>[]>;
-	glob<T extends Record<string, any>>(globStr: string): Promise<T[]>;
 	/**
 	 * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
 	 *
diff --git a/packages/astro/src/vite-plugin-astro-postprocess/README.md b/packages/astro/src/vite-plugin-astro-postprocess/README.md
deleted file mode 100644
index f4cc5fd6cced..000000000000
--- a/packages/astro/src/vite-plugin-astro-postprocess/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# vite-plugin-astro-postprocess
-
-Adds last-minute transforms to `.astro` files
diff --git a/packages/astro/src/vite-plugin-astro-postprocess/index.ts b/packages/astro/src/vite-plugin-astro-postprocess/index.ts
deleted file mode 100644
index 0e48d8a663ac..000000000000
--- a/packages/astro/src/vite-plugin-astro-postprocess/index.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { parse } from 'acorn';
-import type { Node as ESTreeNode } from 'estree-walker';
-import { walk } from 'estree-walker';
-import MagicString from 'magic-string';
-import type { Plugin } from 'vite';
-import { isMarkdownFile } from '../core/util.js';
-
-// Check for `Astro.glob()`. Be very forgiving of whitespace. False positives are okay.
-const ASTRO_GLOB_REGEX = /Astro2?\s*\.\s*glob\s*\(/;
-
-export default function astro(): Plugin {
-	return {
-		name: 'astro:postprocess',
-		async transform(code, id) {
-			// Currently only supported in ".astro" and ".md" (or any alternative markdown file extension like `.markdown`) files
-			if (!id.endsWith('.astro') && !isMarkdownFile(id)) {
-				return null;
-			}
-
-			// Optimization: Detect usage with a quick string match.
-			// Only perform the transform if this function is found
-			if (!ASTRO_GLOB_REGEX.test(code)) {
-				return null;
-			}
-
-			let s: MagicString | undefined;
-			const ast = parse(code, {
-				ecmaVersion: 'latest',
-				sourceType: 'module',
-			});
-
-			walk(ast as ESTreeNode, {
-				enter(node: any) {
-					// Transform `Astro.glob("./pages/*.astro")` to `Astro.glob(import.meta.glob("./pages/*.astro"), () => "./pages/*.astro")`
-					// Also handle for `Astro2.glob()`
-					if (
-						node.type === 'CallExpression' &&
-						node.callee.type === 'MemberExpression' &&
-						node.callee.property.name === 'glob' &&
-						(node.callee.object.name === 'Astro' || node.callee.object.name === 'Astro2') &&
-						node.arguments.length
-					) {
-						const firstArgStart = node.arguments[0].start;
-						const firstArgEnd = node.arguments[0].end;
-						const lastArgEnd = node.arguments[node.arguments.length - 1].end;
-						const firstArg = code.slice(firstArgStart, firstArgEnd);
-						s ??= new MagicString(code);
-						s.overwrite(
-							firstArgStart,
-							lastArgEnd,
-							`import.meta.glob(${firstArg}), () => ${firstArg}`,
-						);
-					}
-				},
-			});
-
-			if (s) {
-				return {
-					code: s.toString(),
-					map: s.generateMap({ hires: 'boundary' }),
-				};
-			}
-		},
-	};
-}
diff --git a/packages/astro/test/astro-global.test.js b/packages/astro/test/astro-global.test.js
index c996de4364b3..c8f8e2292537 100644
--- a/packages/astro/test/astro-global.test.js
+++ b/packages/astro/test/astro-global.test.js
@@ -38,7 +38,7 @@ describe('Astro Global', () => {
 			assert.equal($('#nested-child-pathname').text(), '/blog/');
 		});
 
-		it('Astro.glob() returned `url` metadata of each markdown file extensions DOES NOT include the extension', async () => {
+		it('import.meta.glob() returned `url` metadata of each markdown file extensions DOES NOT include the extension', async () => {
 			const html = await fixture.fetch('/blog/omit-markdown-extensions/').then((res) => res.text());
 			const $ = cheerio.load(html);
 			assert.equal(
@@ -90,13 +90,13 @@ describe('Astro Global', () => {
 			assert.equal($('#site').attr('href'), 'https://mysite.dev/subsite/');
 		});
 
-		it('Astro.glob() correctly returns an array of all posts', async () => {
+		it('import.meta.glob() correctly returns an array of all posts', async () => {
 			const html = await fixture.readFile('/posts/1/index.html');
 			const $ = cheerio.load(html);
 			assert.equal($('.post-url').attr('href'), '/blog/post/post-2');
 		});
 
-		it('Astro.glob() correctly returns meta info for MD and Astro files', async () => {
+		it('import.meta.glob() correctly returns meta info for MD and Astro files', async () => {
 			const html = await fixture.readFile('/glob/index.html');
 			const $ = cheerio.load(html);
 			assert.equal($('[data-file]').length, 8);
diff --git a/packages/astro/test/astro-scripts.test.js b/packages/astro/test/astro-scripts.test.js
index 528a147cbf17..ed7b849ae701 100644
--- a/packages/astro/test/astro-scripts.test.js
+++ b/packages/astro/test/astro-scripts.test.js
@@ -58,7 +58,7 @@ describe('Scripts', () => {
 			assert.equal(entryURL.includes('_astro/'), true);
 		});
 
-		it('Scripts added via Astro.glob are hoisted', async () => {
+		it('Scripts added via import.meta.glob are hoisted', async () => {
 			let glob = await fixture.readFile('/glob/index.html');
 			let $ = cheerio.load(glob);
 
@@ -131,7 +131,7 @@ describe('Scripts', () => {
 			await devServer.stop();
 		});
 
-		it('Scripts added via Astro.glob are hoisted', async () => {
+		it('Scripts added via import.meta.glob are hoisted', async () => {
 			let res = await fixture.fetch('/glob');
 			let html = await res.text();
 			let $ = cheerio.load(html);
diff --git a/packages/astro/test/fixtures/astro-global/src/pages/glob.astro b/packages/astro/test/fixtures/astro-global/src/pages/glob.astro
index c25d3733dca9..85a371881ac4 100644
--- a/packages/astro/test/fixtures/astro-global/src/pages/glob.astro
+++ b/packages/astro/test/fixtures/astro-global/src/pages/glob.astro
@@ -1,5 +1,5 @@
 ---
-const data = await Astro.glob('./post/**/*');
+const data = Object.values(import.meta.glob('./post/**/*', { eager: true }));
 ---
 
 <html>
diff --git a/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro b/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro
index 68101d447d60..794683a2ac39 100644
--- a/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro
+++ b/packages/astro/test/fixtures/astro-global/src/pages/omit-markdown-extensions.astro
@@ -1,7 +1,7 @@
 ---
 import Route from "../components/Route.astro";
 
-const markdownPosts = await Astro.glob('./post/**/*.{markdown,mdown,mkdn,mkd,mdwn,md}');
+const markdownPosts = Object.values(import.meta.glob('./post/**/*.{markdown,mdown,mkdn,mkd,mdwn,md}', { eager: true }));
 const markdownExtensions = /(\.(markdown|mdown|mkdn|mkd|mdwn|md))$/g
 const aUrlContainsExtension = markdownPosts.some((page:any)=> {
 	return markdownExtensions.test(page.url)
diff --git a/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro b/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro
index 7bdaa3b364d7..deefd1a61e24 100644
--- a/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro
+++ b/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro
@@ -2,7 +2,7 @@
 import Route from "../../components/Route.astro";
 
 export async function getStaticPaths({paginate}) {
-  const data = await Astro.glob('../post/*.md');
+  const data = Object.values(import.meta.glob('../post/*.md', { eager: true }));
   return paginate(data, {pageSize: 1});
 }
 const { page } = Astro.props;
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro
index 33df98cf598c..ea824e7053be 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro
@@ -1,6 +1,6 @@
 ---
 export async function getStaticPaths({paginate}) {
-  const allPosts = await Astro.glob('../../post/*.md');
+  const allPosts = Object.values(import.meta.glob('../../post/*.md', { eager: true }));
   return ['red', 'blue'].flatMap((filter) => {
     const filteredPosts = allPosts.filter((post) => post.frontmatter.tag === filter);
     return paginate(filteredPosts, {
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro
index c908f1c431f5..ff0a5f202eaf 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro
@@ -1,6 +1,6 @@
 ---
 export async function getStaticPaths({paginate}) {
-  const data = await Astro.glob('../../post/*.md');
+  const data = Object.values(import.meta.glob('../../post/*.md', { eager: true }));
   return paginate(data, {pageSize: 1});
 }
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro
index c908f1c431f5..ff0a5f202eaf 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro
@@ -1,6 +1,6 @@
 ---
 export async function getStaticPaths({paginate}) {
-  const data = await Astro.glob('../../post/*.md');
+  const data = Object.values(import.meta.glob('../../post/*.md', { eager: true }));
   return paginate(data, {pageSize: 1});
 }
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
diff --git a/packages/astro/test/fixtures/astro-scripts/src/pages/glob.astro b/packages/astro/test/fixtures/astro-scripts/src/pages/glob.astro
index cb5124da6085..c18131b85875 100644
--- a/packages/astro/test/fixtures/astro-scripts/src/pages/glob.astro
+++ b/packages/astro/test/fixtures/astro-scripts/src/pages/glob.astro
@@ -1,6 +1,6 @@
 ---
 import '../styles/global.css';
-const components = await Astro.glob('/src/components/Glob/*');
+const components = Object.values(import.meta.glob('/src/components/Glob/*', { eager: true }));
 const MyComponent = components[0].default;
 ---
 
diff --git a/packages/astro/test/fixtures/astro-sitemap-rss/src/pages/episodes/[...page].astro b/packages/astro/test/fixtures/astro-sitemap-rss/src/pages/episodes/[...page].astro
index 3732c4ba31b0..93366b73e378 100644
--- a/packages/astro/test/fixtures/astro-sitemap-rss/src/pages/episodes/[...page].astro
+++ b/packages/astro/test/fixtures/astro-sitemap-rss/src/pages/episodes/[...page].astro
@@ -1,6 +1,6 @@
 ---
 export async function getStaticPaths({paginate, rss}) {
-  const episodes = (await Astro.glob('../episode/*.md')).sort((a, b) => new Date(b.frontmatter.pubDate) - new Date(a.frontmatter.pubDate));
+  const episodes = Object.values(import.meta.glob('../episode/*.md', { eager: true })).sort((a, b) => new Date(b.frontmatter.pubDate) - new Date(a.frontmatter.pubDate));
   rss({
     title: 'MF Doomcast',
     description: 'The podcast about the things you find on a picnic, or at a picnic table',
diff --git a/packages/astro/test/fixtures/debug-component/src/pages/posts/[slug].astro b/packages/astro/test/fixtures/debug-component/src/pages/posts/[slug].astro
index ed85be913b6b..fc0a6f351ba1 100644
--- a/packages/astro/test/fixtures/debug-component/src/pages/posts/[slug].astro
+++ b/packages/astro/test/fixtures/debug-component/src/pages/posts/[slug].astro
@@ -3,7 +3,7 @@ import Debug from 'astro/debug';
 
 // all the content that should be generated
 export async function getStaticPaths() {
-    const data = await Astro.glob('../../data/posts/*.md')
+    const data = Object.values(import.meta.glob('../../data/posts/*.md', { eager: true }));
 
     const allArticles = data.map((article) => {
         return {
diff --git a/packages/astro/test/fixtures/glob-pages-css/src/components/Footer.astro b/packages/astro/test/fixtures/glob-pages-css/src/components/Footer.astro
index 32d8844f24be..2cbc2fbd2f42 100644
--- a/packages/astro/test/fixtures/glob-pages-css/src/components/Footer.astro
+++ b/packages/astro/test/fixtures/glob-pages-css/src/components/Footer.astro
@@ -1,6 +1,6 @@
 ---
 // The side-effect of this happening is needed for the test.
-await Astro.glob("../pages/**/*.astro");
+Object.values(import.meta.glob("../pages/**/*.astro", { eager: true }));
 ---
 <style>
 	.box {
diff --git a/packages/astro/test/fixtures/glob-pages-css/src/components/Navbar.astro b/packages/astro/test/fixtures/glob-pages-css/src/components/Navbar.astro
index 65168efce7f7..614b9c7cab7e 100644
--- a/packages/astro/test/fixtures/glob-pages-css/src/components/Navbar.astro
+++ b/packages/astro/test/fixtures/glob-pages-css/src/components/Navbar.astro
@@ -1,6 +1,6 @@
 ---
 // The side-effect of this happening is needed for the test.
-const pages = await Astro.glob("../pages/**/*.astro");
+const pages = Object.values(import.meta.glob("../pages/**/*.astro", { eager: true }));
 ---
 
 <div>navbar</div>
diff --git a/packages/astro/test/fixtures/static-build/src/pages/index.astro b/packages/astro/test/fixtures/static-build/src/pages/index.astro
index 054b82a01fb7..ae51555d2cd4 100644
--- a/packages/astro/test/fixtures/static-build/src/pages/index.astro
+++ b/packages/astro/test/fixtures/static-build/src/pages/index.astro
@@ -2,7 +2,7 @@
 import { test as ssrConfigTest } from '@test/static-build-pkg';
 import MainHead from '../components/MainHead.astro';
 import Nav from '../components/Nav/index.jsx';
-let allPosts = await Astro.glob('./posts/*.md');
+let allPosts = Object.values(import.meta.glob('./posts/*.md', { eager: true }));
 
 // Note that this just tests a warning
 Astro.request.headers;
diff --git a/packages/astro/test/glob-pages-css.test.js b/packages/astro/test/glob-pages-css.test.js
index 07b427cb0dc8..8be649c8e165 100644
--- a/packages/astro/test/glob-pages-css.test.js
+++ b/packages/astro/test/glob-pages-css.test.js
@@ -3,7 +3,7 @@ import { before, describe, it } from 'node:test';
 import * as cheerio from 'cheerio';
 import { loadFixture } from './test-utils.js';
 
-describe('Astro.glob on pages/ directory', () => {
+describe('import.meta.glob on pages/ directory', () => {
 	let fixture;
 
 	before(async () => {
diff --git a/packages/astro/test/static-build.test.js b/packages/astro/test/static-build.test.js
index 32cb114f6f47..e94c0af65bee 100644
--- a/packages/astro/test/static-build.test.js
+++ b/packages/astro/test/static-build.test.js
@@ -55,7 +55,7 @@ describe('Static build', () => {
 		assert.equal(typeof html, 'string');
 	});
 
-	it('can build pages using Astro.glob()', async () => {
+	it('can build pages using import.meta.glob()', async () => {
 		const html = await fixture.readFile('/index.html');
 		const $ = cheerioLoad(html);
 		const link = $('.posts a');
diff --git a/packages/astro/test/units/runtime/astro-global.test.js b/packages/astro/test/units/runtime/astro-global.test.js
deleted file mode 100644
index 524a7b1fb5fd..000000000000
--- a/packages/astro/test/units/runtime/astro-global.test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import * as assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import { createAstro } from '../../../dist/runtime/server/index.js';
-
-describe('astro global', () => {
-	it('Glob should error if passed incorrect value', async () => {
-		const Astro = createAstro(undefined);
-		assert.throws(
-			() => {
-				Astro.glob('./**/*.md');
-			},
-			{
-				message: /can only be used in/,
-			},
-		);
-	});
-
-	it('Glob should error if has no results', async () => {
-		const Astro = createAstro(undefined);
-		assert.throws(
-			() => {
-				Astro.glob([], () => './**/*.md');
-			},
-			{
-				message: /did not return any matching files/,
-			},
-		);
-	});
-});
diff --git a/packages/integrations/mdx/test/fixtures/mdx-component/src/pages/glob.astro b/packages/integrations/mdx/test/fixtures/mdx-component/src/pages/glob.astro
index ab5f417b1da6..b18f65fd383a 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-component/src/pages/glob.astro
+++ b/packages/integrations/mdx/test/fixtures/mdx-component/src/pages/glob.astro
@@ -1,6 +1,6 @@
 ---
 import { parse } from 'node:path';
-const components = await Astro.glob('../components/*.mdx');
+const components = Object.values(import.meta.glob('../components/*.mdx', { eager: true }));
 ---
 
 <div data-default-export>
diff --git a/packages/integrations/mdx/test/fixtures/mdx-get-static-paths/src/pages/[slug].astro b/packages/integrations/mdx/test/fixtures/mdx-get-static-paths/src/pages/[slug].astro
index fe453a8bf880..01fc3a2573f6 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-get-static-paths/src/pages/[slug].astro
+++ b/packages/integrations/mdx/test/fixtures/mdx-get-static-paths/src/pages/[slug].astro
@@ -1,6 +1,6 @@
 ---
 export const getStaticPaths = async () => {
-	const content = await Astro.glob('../content/*.mdx');
+	const content = Object.values(import.meta.glob('../content/*.mdx', { eager: true }));
 
 	return content
     .filter((page) => !page.frontmatter.draft) // skip drafts
diff --git a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/src/pages/index.astro b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/src/pages/index.astro
index 11f7af3859bc..d7d9e76b0ded 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/src/pages/index.astro
+++ b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-const files = await Astro.glob('./**/*.mdx')
+const files = Object.values(import.meta.glob('./**/*.mdx', { eager: true }));
 ---
 
 {files.map((file: any) => <file.Content />)}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-slots/src/pages/glob.astro b/packages/integrations/mdx/test/fixtures/mdx-slots/src/pages/glob.astro
index ae857fe27f90..2bd8e613c113 100644
--- a/packages/integrations/mdx/test/fixtures/mdx-slots/src/pages/glob.astro
+++ b/packages/integrations/mdx/test/fixtures/mdx-slots/src/pages/glob.astro
@@ -1,5 +1,5 @@
 ---
-const components = await Astro.glob('../components/*.mdx');
+const components = Object.values(import.meta.glob('../components/*.mdx', { eager: true }));
 ---
 
 <div data-default-export>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b370a4ef9ae8..aff7905ecc4e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -491,9 +491,6 @@ importers:
       '@rollup/pluginutils':
         specifier: ^5.2.0
         version: 5.3.0(rollup@4.50.2)
-      acorn:
-        specifier: ^8.15.0
-        version: 8.15.0
       aria-query:
         specifier: ^5.3.2
         version: 5.3.2
@@ -542,9 +539,6 @@ importers:
       esbuild:
         specifier: ^0.25.0
         version: 0.25.5
-      estree-walker:
-        specifier: ^3.0.3
-        version: 3.0.3
       flattie:
         specifier: ^1.1.1
         version: 1.1.1

From e1312615b39c59ebc05d5bb905ee0960b50ad3cf Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 25 Sep 2025 16:04:04 +0200
Subject: [PATCH 11/36] feat!: drop node 18 and 20 (#14427)

---
 .changeset/puny-poems-create.md               | 37 +++++++++++++++++++
 .devcontainer/Dockerfile                      |  2 +-
 .devcontainer/examples.Dockerfile             |  2 +-
 .github/ISSUE_TEMPLATE/---01-bug-report.yml   |  2 +-
 .github/workflows/ci.yml                      | 10 ++---
 .nvmrc                                        |  2 +-
 CONTRIBUTING.md                               |  4 +-
 benchmark/bench/_util.js                      |  2 +-
 benchmark/packages/adapter/src/server.ts      |  3 --
 benchmark/packages/timer/src/server.ts        |  4 +-
 biome.jsonc                                   |  2 +-
 examples/basics/.codesandbox/Dockerfile       |  2 +-
 examples/blog/.codesandbox/Dockerfile         |  2 +-
 .../.codesandbox/Dockerfile                   |  2 +-
 .../framework-alpine/.codesandbox/Dockerfile  |  2 +-
 .../.codesandbox/Dockerfile                   |  2 +-
 .../framework-preact/.codesandbox/Dockerfile  |  2 +-
 .../framework-react/.codesandbox/Dockerfile   |  2 +-
 .../framework-solid/.codesandbox/Dockerfile   |  2 +-
 .../framework-svelte/.codesandbox/Dockerfile  |  2 +-
 .../framework-vue/.codesandbox/Dockerfile     |  2 +-
 examples/hackernews/.codesandbox/Dockerfile   |  2 +-
 examples/minimal/.codesandbox/Dockerfile      |  2 +-
 examples/portfolio/.codesandbox/Dockerfile    |  2 +-
 examples/ssr/.codesandbox/Dockerfile          |  2 +-
 examples/toolbar-app/.codesandbox/Dockerfile  |  2 +-
 examples/with-markdoc/.codesandbox/Dockerfile |  2 +-
 examples/with-mdx/.codesandbox/Dockerfile     |  2 +-
 .../with-nanostores/.codesandbox/Dockerfile   |  2 +-
 .../with-tailwindcss/.codesandbox/Dockerfile  |  2 +-
 examples/with-vitest/.codesandbox/Dockerfile  |  2 +-
 package.json                                  |  2 +-
 packages/astro-prism/package.json             |  2 +-
 packages/astro/{astro.js => bin/astro.mjs}    | 15 ++++----
 packages/astro/package.json                   |  7 ++--
 packages/astro/src/assets/build/remote.ts     | 18 ++-------
 packages/astro/src/cli/add/index.ts           |  2 -
 packages/astro/src/cli/db/index.ts            |  2 -
 packages/astro/src/cli/info/index.ts          |  2 -
 packages/astro/src/cli/preferences/index.ts   |  2 -
 packages/astro/src/container/index.ts         |  1 -
 packages/astro/src/container/polyfill.ts      |  3 --
 packages/astro/src/core/app/node.ts           |  2 -
 packages/astro/src/core/build/index.ts        |  2 -
 .../src/core/build/plugins/plugin-manifest.ts |  5 +--
 packages/astro/src/core/dev/container.ts      |  2 -
 packages/astro/src/core/polyfill.ts           | 22 -----------
 packages/astro/src/core/preview/index.ts      |  2 -
 packages/astro/test/test-adapter.js           |  6 +--
 packages/astro/test/test-utils.js             |  2 +-
 .../astro/test/units/cookies/delete.test.js   |  3 --
 .../astro/test/units/cookies/error.test.js    |  3 --
 packages/astro/test/units/cookies/get.test.js |  3 --
 packages/astro/test/units/cookies/has.test.js |  3 --
 packages/astro/test/units/cookies/set.test.js |  3 --
 packages/create-astro/create-astro.mjs        |  4 +-
 packages/create-astro/package.json            |  2 +-
 .../fixtures/libsql-remote/temp/.gitignore    |  1 +
 .../test/fixtures/libsql-remote/temp/.gitkeep |  0
 packages/db/test/libsql-remote.test.js        |  4 +-
 .../cloudflare/test/_test-utils.js            |  2 +-
 packages/integrations/markdoc/package.json    |  2 +-
 packages/integrations/mdx/package.json        |  2 +-
 packages/integrations/netlify/src/polyfill.ts |  3 --
 .../integrations/netlify/src/ssr-function.ts  |  5 +--
 .../integrations/node/src/log-listening-on.ts |  9 +----
 packages/integrations/node/src/polyfill.ts    |  3 --
 packages/integrations/node/src/server.ts      |  3 --
 packages/integrations/preact/package.json     |  2 +-
 packages/integrations/react/package.json      |  2 +-
 packages/integrations/solid/package.json      |  2 +-
 packages/integrations/svelte/package.json     |  2 +-
 .../vercel/src/serverless/entrypoint.ts       |  2 -
 .../vercel/src/serverless/polyfill.ts         |  3 --
 packages/markdown/remark/package.json         |  1 -
 .../remark/src/import-plugin-default.ts       |  8 ++--
 packages/upgrade/package.json                 |  2 +-
 packages/upgrade/upgrade.mjs                  |  4 +-
 pnpm-lock.yaml                                | 36 +++++++++++-------
 pnpm-workspace.yaml                           |  2 -
 scripts/cmd/build.js                          |  3 +-
 scripts/smoke/check.js                        |  2 +-
 82 files changed, 139 insertions(+), 196 deletions(-)
 create mode 100644 .changeset/puny-poems-create.md
 rename packages/astro/{astro.js => bin/astro.mjs} (84%)
 delete mode 100644 packages/astro/src/container/polyfill.ts
 delete mode 100644 packages/astro/src/core/polyfill.ts
 create mode 100644 packages/db/test/fixtures/libsql-remote/temp/.gitignore
 create mode 100644 packages/db/test/fixtures/libsql-remote/temp/.gitkeep
 delete mode 100644 packages/integrations/netlify/src/polyfill.ts
 delete mode 100644 packages/integrations/node/src/polyfill.ts
 delete mode 100644 packages/integrations/vercel/src/serverless/polyfill.ts

diff --git a/.changeset/puny-poems-create.md b/.changeset/puny-poems-create.md
new file mode 100644
index 000000000000..35ecc1ba9a43
--- /dev/null
+++ b/.changeset/puny-poems-create.md
@@ -0,0 +1,37 @@
+---
+'@astrojs/markdoc': minor
+'@astrojs/preact': major
+'@astrojs/svelte': major
+'@astrojs/react': major
+'@astrojs/solid-js': major
+'@astrojs/mdx': major
+'create-astro': major
+'@astrojs/prism': major
+'@astrojs/upgrade': minor
+'astro': major
+---
+
+Increases minimum Node.js version to 22.0.0
+
+Node 18 reached its End of Life in March 2025 and Node 20 is scheduled to reach its End of Life in April 2026.
+
+Astro v6.0 drops Node 18 and Node 20 support entirely so that all Astro users can take advantage of Node's more modern features.
+
+#### What should I do?
+
+Check that both your development environment and your deployment environment are using **Node `22.0.0` or higher**.
+
+1. Check your local version of Node using:
+
+  ```sh
+  node -v
+  ```
+
+2. Check your deployment environment's own documentation to verify that they support Node 22.
+
+  You can specify Node `22.0.0` for your Astro project either in a dashboard configuration setting or a `.nvmrc` file.
+
+  ```bash
+  # .nvmrc
+  22.0.0
+  ```
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 49a76b9a5b3c..39c78e92de45 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:1-18
+FROM mcr.microsoft.com/devcontainers/javascript-node:1-22
 
 # Install playwright
 RUN npm install -g @playwright/test
diff --git a/.devcontainer/examples.Dockerfile b/.devcontainer/examples.Dockerfile
index 6ab758c823fd..ee0f03789427 100644
--- a/.devcontainer/examples.Dockerfile
+++ b/.devcontainer/examples.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:1-18
+FROM mcr.microsoft.com/devcontainers/javascript-node:1-22
 
 # Install latest pnpm
 RUN npm install -g pnpm
diff --git a/.github/ISSUE_TEMPLATE/---01-bug-report.yml b/.github/ISSUE_TEMPLATE/---01-bug-report.yml
index eb1ee8ae2ba6..3935797e89e8 100644
--- a/.github/ISSUE_TEMPLATE/---01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/---01-bug-report.yml
@@ -10,7 +10,7 @@ body:
         Thank you for taking the time to file a bug report! Please fill out this form as completely as possible.
 
         ✅ I am using the **latest version of Astro** and all plugins.
-        ✅ I am using a version of Node that Astro supports (`v18.20.8`, `v20.3.0`, `v22.0.0` or higher.)
+        ✅ I am using a version of Node that Astro supports (`v22.0.0` or higher.)
   - type: textarea
     id: astro-info
     attributes:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2dd4b54b2238..4469a8fb6623 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,7 +110,7 @@ jobs:
     strategy:
       matrix:
         OS: [ubuntu-latest, macos-14, windows-2025]
-        NODE_VERSION: [18, 20, 22]
+        NODE_VERSION: [22, 24]
         TEST_SUITE:
           - { name: astro, script: 'pnpm run test:astro' }
           - { name: integrations, script: 'pnpm run test:integrations' }
@@ -119,13 +119,9 @@ jobs:
         # Windows and use one of the older Node versions.
         exclude:
           - os: macos-14
-            NODE_VERSION: 18
-          - os: macos-14
-            NODE_VERSION: 20
-          - os: windows-2025
-            NODE_VERSION: 18
+            NODE_VERSION: 22
           - os: windows-2025
-            NODE_VERSION: 20
+            NODE_VERSION: 22
       fail-fast: false
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
diff --git a/.nvmrc b/.nvmrc
index 08b7109d009b..442c7587a99a 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.20.8
+22.20.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5703b4248d68..f05652ee04ab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,8 +11,8 @@ We welcome contributions of any size and skill level. As an open source project,
 ### Prerequisites
 
 ```shell
-node: "^>=18.20.8"
-pnpm: "^9.12.1"
+node: "^>=22.0.0"
+pnpm: "^10.17.0"
 # otherwise, your build will fail
 ```
 
diff --git a/benchmark/bench/_util.js b/benchmark/bench/_util.js
index d9dfe5b19076..2f8e60ec2127 100644
--- a/benchmark/bench/_util.js
+++ b/benchmark/bench/_util.js
@@ -3,7 +3,7 @@ import path from 'node:path';
 
 const astroPkgPath = createRequire(import.meta.url).resolve('astro/package.json');
 
-export const astroBin = path.resolve(astroPkgPath, '../astro.js');
+export const astroBin = path.resolve(astroPkgPath, '../bin/astro.mjs');
 
 /** @typedef {{ avg: number, stdev: number, max: number }} Stat */
 
diff --git a/benchmark/packages/adapter/src/server.ts b/benchmark/packages/adapter/src/server.ts
index 37c5ead102f2..e53401d1e541 100644
--- a/benchmark/packages/adapter/src/server.ts
+++ b/benchmark/packages/adapter/src/server.ts
@@ -1,9 +1,6 @@
 import * as fs from 'node:fs';
 import type { SSRManifest } from 'astro';
 import { App } from 'astro/app';
-import { applyPolyfills } from 'astro/app/node';
-
-applyPolyfills();
 
 class MyApp extends App {
 	#manifest: SSRManifest | undefined;
diff --git a/benchmark/packages/timer/src/server.ts b/benchmark/packages/timer/src/server.ts
index 39f18e9986f3..d9f5802cf29a 100644
--- a/benchmark/packages/timer/src/server.ts
+++ b/benchmark/packages/timer/src/server.ts
@@ -1,8 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { SSRManifest } from 'astro';
-import { applyPolyfills, NodeApp } from 'astro/app/node';
-
-applyPolyfills();
+import { NodeApp } from 'astro/app/node';
 
 export function createExports(manifest: SSRManifest) {
 	const app = new NodeApp(manifest);
diff --git a/biome.jsonc b/biome.jsonc
index 796ea9f12129..fecc7e32c2d8 100644
--- a/biome.jsonc
+++ b/biome.jsonc
@@ -146,7 +146,7 @@
         "**/packages/db/**/cli/**/*.ts",
         "**/benchmark/**/*.js",
         "**/packages/astro/src/cli/**/*.ts",
-        "**/packages/astro/astro.js"
+        "**/packages/astro/bin/**/*.mjs"
       ],
       "linter": {
         "rules": {
diff --git a/examples/basics/.codesandbox/Dockerfile b/examples/basics/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/basics/.codesandbox/Dockerfile
+++ b/examples/basics/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/blog/.codesandbox/Dockerfile b/examples/blog/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/blog/.codesandbox/Dockerfile
+++ b/examples/blog/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/container-with-vitest/.codesandbox/Dockerfile b/examples/container-with-vitest/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/container-with-vitest/.codesandbox/Dockerfile
+++ b/examples/container-with-vitest/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-alpine/.codesandbox/Dockerfile b/examples/framework-alpine/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-alpine/.codesandbox/Dockerfile
+++ b/examples/framework-alpine/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-multiple/.codesandbox/Dockerfile b/examples/framework-multiple/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-multiple/.codesandbox/Dockerfile
+++ b/examples/framework-multiple/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-preact/.codesandbox/Dockerfile b/examples/framework-preact/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-preact/.codesandbox/Dockerfile
+++ b/examples/framework-preact/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-react/.codesandbox/Dockerfile b/examples/framework-react/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-react/.codesandbox/Dockerfile
+++ b/examples/framework-react/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-solid/.codesandbox/Dockerfile b/examples/framework-solid/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-solid/.codesandbox/Dockerfile
+++ b/examples/framework-solid/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-svelte/.codesandbox/Dockerfile b/examples/framework-svelte/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-svelte/.codesandbox/Dockerfile
+++ b/examples/framework-svelte/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/framework-vue/.codesandbox/Dockerfile b/examples/framework-vue/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/framework-vue/.codesandbox/Dockerfile
+++ b/examples/framework-vue/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/hackernews/.codesandbox/Dockerfile b/examples/hackernews/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/hackernews/.codesandbox/Dockerfile
+++ b/examples/hackernews/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/minimal/.codesandbox/Dockerfile b/examples/minimal/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/minimal/.codesandbox/Dockerfile
+++ b/examples/minimal/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/portfolio/.codesandbox/Dockerfile b/examples/portfolio/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/portfolio/.codesandbox/Dockerfile
+++ b/examples/portfolio/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/ssr/.codesandbox/Dockerfile b/examples/ssr/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/ssr/.codesandbox/Dockerfile
+++ b/examples/ssr/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/toolbar-app/.codesandbox/Dockerfile b/examples/toolbar-app/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/toolbar-app/.codesandbox/Dockerfile
+++ b/examples/toolbar-app/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/with-markdoc/.codesandbox/Dockerfile b/examples/with-markdoc/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/with-markdoc/.codesandbox/Dockerfile
+++ b/examples/with-markdoc/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/with-mdx/.codesandbox/Dockerfile b/examples/with-mdx/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/with-mdx/.codesandbox/Dockerfile
+++ b/examples/with-mdx/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/with-nanostores/.codesandbox/Dockerfile b/examples/with-nanostores/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/with-nanostores/.codesandbox/Dockerfile
+++ b/examples/with-nanostores/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/with-tailwindcss/.codesandbox/Dockerfile b/examples/with-tailwindcss/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/with-tailwindcss/.codesandbox/Dockerfile
+++ b/examples/with-tailwindcss/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/examples/with-vitest/.codesandbox/Dockerfile b/examples/with-vitest/.codesandbox/Dockerfile
index c3b5c81a121d..46f1ca14f894 100644
--- a/examples/with-vitest/.codesandbox/Dockerfile
+++ b/examples/with-vitest/.codesandbox/Dockerfile
@@ -1 +1 @@
-FROM node:18-bullseye
+FROM node:22-bullseye
diff --git a/package.json b/package.json
index 6337568adf56..43f3455cb0ff 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "packages/*"
   ],
   "engines": {
-    "node": "^18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": ">=22.0.0"
   },
   "packageManager": "pnpm@10.17.0",
   "dependencies": {
diff --git a/packages/astro-prism/package.json b/packages/astro-prism/package.json
index 37ca54bfb986..411ea0a0914a 100644
--- a/packages/astro-prism/package.json
+++ b/packages/astro-prism/package.json
@@ -39,6 +39,6 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   }
 }
diff --git a/packages/astro/astro.js b/packages/astro/bin/astro.mjs
similarity index 84%
rename from packages/astro/astro.js
rename to packages/astro/bin/astro.mjs
index 79108396b388..5c8797cf4844 100755
--- a/packages/astro/astro.js
+++ b/packages/astro/bin/astro.mjs
@@ -1,9 +1,6 @@
 #!/usr/bin/env node
 'use strict';
 
-// ISOMORPHIC FILE: NO TOP-LEVEL IMPORT/REQUIRE() ALLOWED
-// This file has to run as both ESM and CJS on older Node.js versions
-
 const CI_INSTRUCTIONS = {
 	NETLIFY: 'https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript',
 	GITHUB_ACTIONS:
@@ -11,9 +8,12 @@ const CI_INSTRUCTIONS = {
 	VERCEL: 'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
 };
 
+// TODO: remove once Stackblitz supports Node 22
+const IS_STACKBLITZ = !!process.versions.webcontainer;
+
 // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
-const engines = '>=18.20.8';
-const skipSemverCheckIfAbove = 19;
+const engines = IS_STACKBLITZ ? '>=20.19.5' : '>=22.0.0';
+const skipSemverCheckIfAbove = IS_STACKBLITZ ? 21 : 23;
 
 /** `astro *` */
 async function main() {
@@ -39,7 +39,7 @@ async function main() {
 		if (correctedCwd !== cwd) process.chdir(correctedCwd);
 	}
 
-	return import('./dist/cli/index.js')
+	return import('../dist/cli/index.js')
 		.then(({ cli }) => cli(process.argv))
 		.catch((error) => {
 			console.error(error);
@@ -52,8 +52,7 @@ async function errorNodeUnsupported() {
 Node.js v${process.versions.node} is not supported by Astro!
 Please upgrade Node.js to a supported version: "${engines}"\n`);
 
-	// eslint-disable-next-line @typescript-eslint/no-require-imports
-	const ci = typeof require !== 'undefined' ? require('ci-info') : await import('ci-info');
+	const ci = await import('ci-info');
 
 	// Special instructions for CI environments, which may have special steps needed.
 	// This is a common issue that we can help users with proactively.
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 021ad68d87d1..e9e46537f513 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -73,14 +73,14 @@
     "./virtual-modules/*": "./dist/virtual-modules/*"
   },
   "bin": {
-    "astro": "astro.js"
+    "astro": "./bin/astro.mjs"
   },
   "files": [
     "components/*.{astro,css,ts}",
     "tsconfigs",
     "dist",
     "types",
-    "astro.js",
+    "bin",
     "env.d.ts",
     "client.d.ts",
     "jsx-runtime.d.ts",
@@ -134,7 +134,6 @@
     "github-slugger": "^2.0.0",
     "html-escaper": "3.0.3",
     "http-cache-semantics": "^4.2.0",
-    "import-meta-resolve": "^4.2.0",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
     "magic-string": "^0.30.18",
@@ -209,7 +208,7 @@
     "vitest": "^3.2.4"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0",
+    "node": "^20.19.5 || >=22.0.0",
     "npm": ">=9.6.5",
     "pnpm": ">=7.1.0"
   },
diff --git a/packages/astro/src/assets/build/remote.ts b/packages/astro/src/assets/build/remote.ts
index 55ee9a205013..3c6f6fae3c01 100644
--- a/packages/astro/src/assets/build/remote.ts
+++ b/packages/astro/src/assets/build/remote.ts
@@ -82,27 +82,17 @@ export async function revalidateRemoteImage(
 	};
 }
 
-function webToCachePolicyRequest({ url, method, headers: _headers }: Request): CachePolicy.Request {
-	let headers: CachePolicy.Headers = {};
-	// Be defensive here due to a cookie header bug in node@18.14.1 + undici
-	try {
-		headers = Object.fromEntries(_headers.entries());
-	} catch {}
+function webToCachePolicyRequest({ url, method, headers }: Request): CachePolicy.Request {
 	return {
 		method,
 		url,
-		headers,
+		headers: Object.fromEntries(headers.entries()),
 	};
 }
 
-function webToCachePolicyResponse({ status, headers: _headers }: Response): CachePolicy.Response {
-	let headers: CachePolicy.Headers = {};
-	// Be defensive here due to a cookie header bug in node@18.14.1 + undici
-	try {
-		headers = Object.fromEntries(_headers.entries());
-	} catch {}
+function webToCachePolicyResponse({ status, headers }: Response): CachePolicy.Response {
 	return {
 		status,
-		headers,
+		headers: Object.fromEntries(headers.entries()),
 	};
 }
diff --git a/packages/astro/src/cli/add/index.ts b/packages/astro/src/cli/add/index.ts
index fbdbfef18b7a..a53bd23382fb 100644
--- a/packages/astro/src/cli/add/index.ts
+++ b/packages/astro/src/cli/add/index.ts
@@ -27,7 +27,6 @@ import type { Logger } from '../../core/logger/core.js';
 import * as msg from '../../core/messages.js';
 import { printHelp } from '../../core/messages.js';
 import { appendForwardSlash } from '../../core/path.js';
-import { apply as applyPolyfill } from '../../core/polyfill.js';
 import { ensureProcessNodeEnv, parseNpmName } from '../../core/util.js';
 import { eventCliSession, telemetry } from '../../events/index.js';
 import { exec } from '../exec.js';
@@ -91,7 +90,6 @@ const OFFICIAL_ADAPTER_TO_IMPORT_MAP: Record<string, string> = {
 
 export async function add(names: string[], { flags }: AddOptions) {
 	ensureProcessNodeEnv('production');
-	applyPolyfill();
 	const inlineConfig = flagsToAstroInlineConfig(flags);
 	const { userConfig } = await resolveConfig(inlineConfig, 'add');
 	telemetry.record(eventCliSession('add', userConfig));
diff --git a/packages/astro/src/cli/db/index.ts b/packages/astro/src/cli/db/index.ts
index 0dda4f30b708..8dce31cbc223 100644
--- a/packages/astro/src/cli/db/index.ts
+++ b/packages/astro/src/cli/db/index.ts
@@ -1,6 +1,5 @@
 import type { Arguments } from 'yargs-parser';
 import { resolveConfig } from '../../core/config/config.js';
-import { apply as applyPolyfill } from '../../core/polyfill.js';
 import type { AstroConfig } from '../../types/public/config.js';
 import { createLoggerFromFlags, flagsToAstroInlineConfig } from '../flags.js';
 import { getPackage } from '../install-package.js';
@@ -10,7 +9,6 @@ type DBPackage = {
 };
 
 export async function db({ flags }: { flags: Arguments }) {
-	applyPolyfill();
 	const logger = createLoggerFromFlags(flags);
 	const getPackageOpts = {
 		skipAsk: !!flags.yes || !!flags.y,
diff --git a/packages/astro/src/cli/info/index.ts b/packages/astro/src/cli/info/index.ts
index 50476df4221f..85c781c789b3 100644
--- a/packages/astro/src/cli/info/index.ts
+++ b/packages/astro/src/cli/info/index.ts
@@ -4,7 +4,6 @@ import * as colors from 'kleur/colors';
 import prompts from 'prompts';
 import { resolveConfig } from '../../core/config/index.js';
 import { ASTRO_VERSION } from '../../core/constants.js';
-import { apply as applyPolyfill } from '../../core/polyfill.js';
 import type { AstroConfig, AstroUserConfig } from '../../types/public/config.js';
 import { type Flags, flagsToAstroInlineConfig } from '../flags.js';
 
@@ -80,7 +79,6 @@ export async function getInfoOutput({
 }
 
 export async function printInfo({ flags }: InfoOptions) {
-	applyPolyfill();
 	const { userConfig } = await resolveConfig(flagsToAstroInlineConfig(flags), 'info');
 	const output = await getInfoOutput({ userConfig, print: true });
 	await copyToClipboard(output, flags.copy);
diff --git a/packages/astro/src/cli/preferences/index.ts b/packages/astro/src/cli/preferences/index.ts
index 8a22802a3f6c..fc828e499376 100644
--- a/packages/astro/src/cli/preferences/index.ts
+++ b/packages/astro/src/cli/preferences/index.ts
@@ -7,7 +7,6 @@ import { resolveConfig } from '../../core/config/config.js';
 import { createSettings } from '../../core/config/settings.js';
 import { collectErrorMetadata } from '../../core/errors/dev/utils.js';
 import * as msg from '../../core/messages.js';
-import { apply as applyPolyfill } from '../../core/polyfill.js';
 import { DEFAULT_PREFERENCES } from '../../preferences/defaults.js';
 import { coerce, isValidKey, type PreferenceKey } from '../../preferences/index.js';
 import type { AstroSettings } from '../../types/astro.js';
@@ -41,7 +40,6 @@ export async function preferences(
 	value: string | undefined,
 	{ flags }: PreferencesOptions,
 ): Promise<number> {
-	applyPolyfill();
 	if (!isValidSubcommand(subcommand) || flags?.help || flags?.h) {
 		msg.printHelp({
 			commandName: 'astro preferences',
diff --git a/packages/astro/src/container/index.ts b/packages/astro/src/container/index.ts
index 1894ed530fc7..353fca4c4fa6 100644
--- a/packages/astro/src/container/index.ts
+++ b/packages/astro/src/container/index.ts
@@ -1,4 +1,3 @@
-import './polyfill.js';
 import { posix } from 'node:path';
 import { getDefaultClientDirectives } from '../core/client-directive/index.js';
 import { ASTRO_CONFIG_DEFAULTS } from '../core/config/schemas/index.js';
diff --git a/packages/astro/src/container/polyfill.ts b/packages/astro/src/container/polyfill.ts
deleted file mode 100644
index baf53359686c..000000000000
--- a/packages/astro/src/container/polyfill.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { applyPolyfills } from '../core/app/node.js';
-
-applyPolyfills();
diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts
index 4939356a9883..78e0a95f4089 100644
--- a/packages/astro/src/core/app/node.ts
+++ b/packages/astro/src/core/app/node.ts
@@ -10,8 +10,6 @@ import type { RenderOptions } from './index.js';
 import { App } from './index.js';
 import type { NodeAppHeadersJson, SerializedSSRManifest, SSRManifest } from './types.js';
 
-export { apply as applyPolyfills } from '../polyfill.js';
-
 /**
  * Allow the request body to be explicitly overridden. For example, this
  * is used by the Express JSON middleware.
diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts
index 30030dcc94be..2096723706e5 100644
--- a/packages/astro/src/core/build/index.ts
+++ b/packages/astro/src/core/build/index.ts
@@ -22,7 +22,6 @@ import { createKey, getEnvironmentKey, hasEnvironmentKey } from '../encryption.j
 import { AstroError, AstroErrorData } from '../errors/index.js';
 import type { Logger } from '../logger/core.js';
 import { levels, timerMessage } from '../logger/core.js';
-import { apply as applyPolyfill } from '../polyfill.js';
 import { createRoutesList } from '../routing/index.js';
 import { getServerIslandRouteData } from '../server-islands/endpoint.js';
 import { clearContentLayerCache } from '../sync/index.js';
@@ -63,7 +62,6 @@ export default async function build(
 	options: BuildOptions = {},
 ): Promise<void> {
 	ensureProcessNodeEnv(options.devOutput ? 'development' : 'production');
-	applyPolyfill();
 	const logger = createNodeLogger(inlineConfig);
 	const { userConfig, astroConfig } = await resolveConfig(inlineConfig, 'build');
 	telemetry.record(eventCliSession('build', userConfig));
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 86d5aefd1702..8d2b146a7d65 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -1,5 +1,4 @@
 import { fileURLToPath } from 'node:url';
-import { resolve as importMetaResolve } from 'import-meta-resolve';
 import type { OutputChunk } from 'rollup';
 import { glob } from 'tinyglobby';
 import { type BuiltinDriverName, builtinDrivers } from 'unstorage';
@@ -50,10 +49,10 @@ function resolveSessionDriver(driver: string | undefined): string | null {
 	}
 	try {
 		if (driver === 'fs') {
-			return importMetaResolve(builtinDrivers.fsLite, import.meta.url);
+			return import.meta.resolve(builtinDrivers.fsLite, import.meta.url);
 		}
 		if (driver in builtinDrivers) {
-			return importMetaResolve(builtinDrivers[driver as BuiltinDriverName], import.meta.url);
+			return import.meta.resolve(builtinDrivers[driver as BuiltinDriverName], import.meta.url);
 		}
 	} catch {
 		return null;
diff --git a/packages/astro/src/core/dev/container.ts b/packages/astro/src/core/dev/container.ts
index 771992f0e892..03166a0c866e 100644
--- a/packages/astro/src/core/dev/container.ts
+++ b/packages/astro/src/core/dev/container.ts
@@ -13,7 +13,6 @@ import type { AstroInlineConfig } from '../../types/public/config.js';
 import { createDevelopmentManifest } from '../../vite-plugin-astro-server/plugin.js';
 import { createVite } from '../create-vite.js';
 import type { Logger } from '../logger/core.js';
-import { apply as applyPolyfill } from '../polyfill.js';
 import { createRoutesList } from '../routing/index.js';
 import { syncInternal } from '../sync/index.js';
 import { warnMissingAdapter } from './adapter-validation.js';
@@ -45,7 +44,6 @@ export async function createContainer({
 	fs = nodeFs,
 }: CreateContainerParams): Promise<Container> {
 	// Initialize
-	applyPolyfill();
 	settings = await runHookConfigSetup({
 		settings,
 		command: 'dev',
diff --git a/packages/astro/src/core/polyfill.ts b/packages/astro/src/core/polyfill.ts
deleted file mode 100644
index 7b0280fb7f86..000000000000
--- a/packages/astro/src/core/polyfill.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import buffer from 'node:buffer';
-import crypto from 'node:crypto';
-
-/**
- * Astro aims to compatible with web standards as much as possible.
- * This function adds two objects that are globally-available on most javascript runtimes but not on node 18.
- */
-export function apply() {
-	// Remove when Node 18 is dropped for Node 20
-	if (!globalThis.crypto) {
-		Object.defineProperty(globalThis, 'crypto', {
-			value: crypto.webcrypto,
-		});
-	}
-
-	// Remove when Node 18 is dropped for Node 20
-	if (!globalThis.File) {
-		Object.defineProperty(globalThis, 'File', {
-			value: buffer.File,
-		});
-	}
-}
diff --git a/packages/astro/src/core/preview/index.ts b/packages/astro/src/core/preview/index.ts
index 7a11a755ef06..9b9482ae8ba0 100644
--- a/packages/astro/src/core/preview/index.ts
+++ b/packages/astro/src/core/preview/index.ts
@@ -10,7 +10,6 @@ import type { PreviewModule, PreviewServer } from '../../types/public/preview.js
 import { resolveConfig } from '../config/config.js';
 import { createNodeLogger } from '../config/logging.js';
 import { createSettings } from '../config/settings.js';
-import { apply as applyPolyfills } from '../polyfill.js';
 import { createRoutesList } from '../routing/index.js';
 import { ensureProcessNodeEnv } from '../util.js';
 import createStaticPreviewServer from './static-preview-server.js';
@@ -23,7 +22,6 @@ import { getResolvedHostForHttpServer } from './util.js';
  * @experimental The JavaScript API is experimental
  */
 export default async function preview(inlineConfig: AstroInlineConfig): Promise<PreviewServer> {
-	applyPolyfills();
 	ensureProcessNodeEnv('production');
 	const logger = createNodeLogger(inlineConfig);
 	const { userConfig, astroConfig } = await resolveConfig(inlineConfig ?? {}, 'preview');
diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js
index 6189b3623971..e872ef35213c 100644
--- a/packages/astro/test/test-adapter.js
+++ b/packages/astro/test/test-adapter.js
@@ -86,11 +86,7 @@ export default function ({
 														locals,
 														addCookieHeader,
 														prerenderedErrorPageFetch,
-													${
-														provideAddress
-															? `clientAddress: clientAddress ?? '0.0.0.0',`
-															: ''
-													}
+													${provideAddress ? `clientAddress: clientAddress ?? '0.0.0.0',` : ''}
 													});
 												}
 											}
diff --git a/packages/astro/test/test-utils.js b/packages/astro/test/test-utils.js
index 1178c4ceb602..30332c98ff0b 100644
--- a/packages/astro/test/test-utils.js
+++ b/packages/astro/test/test-utils.js
@@ -312,7 +312,7 @@ function parseAddressToHost(address) {
 	return address;
 }
 
-const cliPath = fileURLToPath(new URL('../astro.js', import.meta.url));
+const cliPath = fileURLToPath(new URL('../bin/astro.mjs', import.meta.url));
 
 /** Returns a process running the Astro CLI. */
 export function cli(/** @type {string[]} */ ...args) {
diff --git a/packages/astro/test/units/cookies/delete.test.js b/packages/astro/test/units/cookies/delete.test.js
index 539c796b00ea..0c16c9ed0255 100644
--- a/packages/astro/test/units/cookies/delete.test.js
+++ b/packages/astro/test/units/cookies/delete.test.js
@@ -1,9 +1,6 @@
 import * as assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { AstroCookies } from '../../../dist/core/cookies/index.js';
-import { apply as applyPolyfill } from '../../../dist/core/polyfill.js';
-
-applyPolyfill();
 
 describe('astro/src/core/cookies', () => {
 	describe('Astro.cookies.delete', () => {
diff --git a/packages/astro/test/units/cookies/error.test.js b/packages/astro/test/units/cookies/error.test.js
index 027474424a2e..6a5a3186f88e 100644
--- a/packages/astro/test/units/cookies/error.test.js
+++ b/packages/astro/test/units/cookies/error.test.js
@@ -1,9 +1,6 @@
 import * as assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { AstroCookies } from '../../../dist/core/cookies/index.js';
-import { apply as applyPolyfill } from '../../../dist/core/polyfill.js';
-
-applyPolyfill();
 
 describe('astro/src/core/cookies', () => {
 	describe('errors', () => {
diff --git a/packages/astro/test/units/cookies/get.test.js b/packages/astro/test/units/cookies/get.test.js
index b6ffaf62d5ff..751a6cea72ba 100644
--- a/packages/astro/test/units/cookies/get.test.js
+++ b/packages/astro/test/units/cookies/get.test.js
@@ -1,9 +1,6 @@
 import * as assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { AstroCookies } from '../../../dist/core/cookies/index.js';
-import { apply as applyPolyfill } from '../../../dist/core/polyfill.js';
-
-applyPolyfill();
 
 export const encode = (data) => {
 	const dataSerialized = typeof data === 'string' ? data : JSON.stringify(data);
diff --git a/packages/astro/test/units/cookies/has.test.js b/packages/astro/test/units/cookies/has.test.js
index 351893d1e044..36df2a1c46a2 100644
--- a/packages/astro/test/units/cookies/has.test.js
+++ b/packages/astro/test/units/cookies/has.test.js
@@ -1,9 +1,6 @@
 import * as assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { AstroCookies } from '../../../dist/core/cookies/index.js';
-import { apply as applyPolyfill } from '../../../dist/core/polyfill.js';
-
-applyPolyfill();
 
 describe('astro/src/core/cookies', () => {
 	describe('Astro.cookies.has', () => {
diff --git a/packages/astro/test/units/cookies/set.test.js b/packages/astro/test/units/cookies/set.test.js
index 120ff92bf64a..d5863ef3a638 100644
--- a/packages/astro/test/units/cookies/set.test.js
+++ b/packages/astro/test/units/cookies/set.test.js
@@ -1,9 +1,6 @@
 import * as assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { AstroCookies } from '../../../dist/core/cookies/index.js';
-import { apply as applyPolyfill } from '../../../dist/core/polyfill.js';
-
-applyPolyfill();
 
 describe('astro/src/core/cookies', () => {
 	describe('Astro.cookies.set', () => {
diff --git a/packages/create-astro/create-astro.mjs b/packages/create-astro/create-astro.mjs
index 5e25e5e94a3d..6a7359eb4f0c 100755
--- a/packages/create-astro/create-astro.mjs
+++ b/packages/create-astro/create-astro.mjs
@@ -4,7 +4,9 @@
 
 const currentVersion = process.versions.node;
 const requiredMajorVersion = parseInt(currentVersion.split('.')[0], 10);
-const minimumMajorVersion = 18;
+// TODO: remove once Stackblitz supports Node 22
+const IS_STACKBLITZ = !!process.versions.webcontainer;
+const minimumMajorVersion = IS_STACKBLITZ ? 20 : 22;
 
 if (requiredMajorVersion < minimumMajorVersion) {
 	console.error(`Node.js v${currentVersion} is out of date and unsupported!`);
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index 246e7edf51a3..b06bac0f8ec4 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -39,7 +39,7 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/db/test/fixtures/libsql-remote/temp/.gitignore b/packages/db/test/fixtures/libsql-remote/temp/.gitignore
new file mode 100644
index 000000000000..3997beadf829
--- /dev/null
+++ b/packages/db/test/fixtures/libsql-remote/temp/.gitignore
@@ -0,0 +1 @@
+*.db
\ No newline at end of file
diff --git a/packages/db/test/fixtures/libsql-remote/temp/.gitkeep b/packages/db/test/fixtures/libsql-remote/temp/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/db/test/libsql-remote.test.js b/packages/db/test/libsql-remote.test.js
index 089db50f0f4e..d65d4b052902 100644
--- a/packages/db/test/libsql-remote.test.js
+++ b/packages/db/test/libsql-remote.test.js
@@ -21,7 +21,7 @@ describe('astro:db local database', () => {
 		before(async () => {
 			clearEnvironment();
 
-			const absoluteFileUrl = new URL('./fixtures/libsql-remote/dist/absolute.db', import.meta.url);
+			const absoluteFileUrl = new URL('./fixtures/libsql-remote/temp/absolute.db', import.meta.url);
 			// Remove the file if it exists to avoid conflict between test runs
 			await rm(absoluteFileUrl, { force: true });
 
@@ -48,7 +48,7 @@ describe('astro:db local database', () => {
 		before(async () => {
 			clearEnvironment();
 
-			const absoluteFileUrl = new URL('./fixtures/libsql-remote/dist/relative.db', import.meta.url);
+			const absoluteFileUrl = new URL('./fixtures/libsql-remote/temp/relative.db', import.meta.url);
 			const prodDbPath = relative(process.cwd(), fileURLToPath(absoluteFileUrl));
 
 			// Remove the file if it exists to avoid conflict between test runs
diff --git a/packages/integrations/cloudflare/test/_test-utils.js b/packages/integrations/cloudflare/test/_test-utils.js
index 381c66a8b8b0..1981d495384f 100644
--- a/packages/integrations/cloudflare/test/_test-utils.js
+++ b/packages/integrations/cloudflare/test/_test-utils.js
@@ -6,7 +6,7 @@ import { loadFixture as baseLoadFixture } from '../../../astro/test/test-utils.j
  * @typedef {{ stop: Promise<void>, port: number }} WranglerCLI
  */
 
-const astroPath = fileURLToPath(new URL('../node_modules/astro/astro.js', import.meta.url));
+const astroPath = fileURLToPath(new URL('../node_modules/astro/bin/astro.mjs', import.meta.url));
 /** Returns a process running the Astro CLI. */
 export function astroCli(cwd, /** @type {string[]} */ ...args) {
 	const spawned = execa(astroPath, [...args], {
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index 70e5e5f20979..dd33fe348c26 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -82,7 +82,7 @@
     "vite": "^6.3.6"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index c2816713157a..bed6e0004f60 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -72,7 +72,7 @@
     "vite": "^6.3.6"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/netlify/src/polyfill.ts b/packages/integrations/netlify/src/polyfill.ts
deleted file mode 100644
index dc00f45d7fd9..000000000000
--- a/packages/integrations/netlify/src/polyfill.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { applyPolyfills } from 'astro/app/node';
-
-applyPolyfills();
diff --git a/packages/integrations/netlify/src/ssr-function.ts b/packages/integrations/netlify/src/ssr-function.ts
index bc7d712f5ad1..2a21ced61b63 100644
--- a/packages/integrations/netlify/src/ssr-function.ts
+++ b/packages/integrations/netlify/src/ssr-function.ts
@@ -1,6 +1,3 @@
-// Keep at the top
-import './polyfill.js';
-
 import type { Context } from '@netlify/functions';
 import type { SSRManifest } from 'astro';
 import { App } from 'astro/app';
@@ -46,7 +43,7 @@ export const createExports = (manifest: SSRManifest, { middlewareSecret }: Args)
 			const response = await app.render(request, {
 				routeData,
 				locals,
-				clientAddress: context.ip
+				clientAddress: context.ip,
 			});
 
 			if (app.setCookieHeaders) {
diff --git a/packages/integrations/node/src/log-listening-on.ts b/packages/integrations/node/src/log-listening-on.ts
index 805f568ab5a6..e93f3692972e 100644
--- a/packages/integrations/node/src/log-listening-on.ts
+++ b/packages/integrations/node/src/log-listening-on.ts
@@ -57,14 +57,7 @@ function getNetworkAddress(
 	};
 	Object.values(os.networkInterfaces())
 		.flatMap((nInterface) => nInterface ?? [])
-		.filter(
-			(detail) =>
-				detail &&
-				detail.address &&
-				(detail.family === 'IPv4' ||
-					// @ts-expect-error Node 18.0 - 18.3 returns number
-					detail.family === 4),
-		)
+		.filter((detail) => detail && detail.address && detail.family === 'IPv4')
 		.forEach((detail) => {
 			let host = detail.address.replace(
 				'127.0.0.1',
diff --git a/packages/integrations/node/src/polyfill.ts b/packages/integrations/node/src/polyfill.ts
deleted file mode 100644
index dc00f45d7fd9..000000000000
--- a/packages/integrations/node/src/polyfill.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { applyPolyfills } from 'astro/app/node';
-
-applyPolyfills();
diff --git a/packages/integrations/node/src/server.ts b/packages/integrations/node/src/server.ts
index 5706e2cb5e74..68eb5cb66ef6 100644
--- a/packages/integrations/node/src/server.ts
+++ b/packages/integrations/node/src/server.ts
@@ -1,6 +1,3 @@
-// Keep at the top
-import './polyfill.js';
-
 import { existsSync, readFileSync } from 'node:fs';
 import type { NodeAppHeadersJson, SSRManifest } from 'astro';
 import { NodeApp } from 'astro/app/node';
diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json
index 4aeeeda068d0..fb555e3a3bdf 100644
--- a/packages/integrations/preact/package.json
+++ b/packages/integrations/preact/package.json
@@ -49,7 +49,7 @@
     "preact": "^10.6.5"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index ccdbf0b60470..4d01cf0c34cc 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -59,7 +59,7 @@
     "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json
index f77db74f810e..c2dc568243f8 100644
--- a/packages/integrations/solid/package.json
+++ b/packages/integrations/solid/package.json
@@ -52,7 +52,7 @@
     }
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index fbb8c7d9eb72..b99b12cb993c 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -52,7 +52,7 @@
     "typescript": "^5.3.3"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts
index a99911f23ab2..087aa40bcb1b 100644
--- a/packages/integrations/vercel/src/serverless/entrypoint.ts
+++ b/packages/integrations/vercel/src/serverless/entrypoint.ts
@@ -1,5 +1,3 @@
-// Keep at the top
-import './polyfill.js';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { SSRManifest } from 'astro';
 import { NodeApp } from 'astro/app/node';
diff --git a/packages/integrations/vercel/src/serverless/polyfill.ts b/packages/integrations/vercel/src/serverless/polyfill.ts
deleted file mode 100644
index dc00f45d7fd9..000000000000
--- a/packages/integrations/vercel/src/serverless/polyfill.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { applyPolyfills } from 'astro/app/node';
-
-applyPolyfills();
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index 6bde2c991452..63abae114a0f 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -37,7 +37,6 @@
     "github-slugger": "^2.0.0",
     "hast-util-from-html": "^2.0.3",
     "hast-util-to-text": "^4.0.2",
-    "import-meta-resolve": "^4.2.0",
     "js-yaml": "^4.1.0",
     "mdast-util-definitions": "^6.0.0",
     "rehype-raw": "^7.0.0",
diff --git a/packages/markdown/remark/src/import-plugin-default.ts b/packages/markdown/remark/src/import-plugin-default.ts
index 2b898aa9376d..94dd71433aaa 100644
--- a/packages/markdown/remark/src/import-plugin-default.ts
+++ b/packages/markdown/remark/src/import-plugin-default.ts
@@ -1,10 +1,12 @@
+// This file should be imported as `#import-plugin`
+
+import { createRequire } from 'node:module';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
-// This file should be imported as `#import-plugin`
-import { resolve as importMetaResolve } from 'import-meta-resolve';
 import type * as unified from 'unified';
 
 let cwdUrlStr: string | undefined;
+const require = createRequire(import.meta.url);
 
 // In non-browser environments, we can try to resolve from the filesystem too
 export async function importPlugin(p: string): Promise<unified.Plugin> {
@@ -16,7 +18,7 @@ export async function importPlugin(p: string): Promise<unified.Plugin> {
 
 	// Try import from user project
 	cwdUrlStr ??= pathToFileURL(path.join(process.cwd(), 'package.json')).toString();
-	const resolved = importMetaResolve(p, cwdUrlStr);
+	const resolved = pathToFileURL(require.resolve(p, { paths: [cwdUrlStr] })).toString();
 	const importResult = await import(/* @vite-ignore */ resolved);
 	return importResult.default;
 }
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index a42727f0c895..6b0a5153850a 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -40,6 +40,6 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": "18.20.8 || ^20.3.0 || >=22.0.0"
+    "node": "^20.19.5 || >=22.0.0"
   }
 }
diff --git a/packages/upgrade/upgrade.mjs b/packages/upgrade/upgrade.mjs
index 5e25e5e94a3d..6a7359eb4f0c 100755
--- a/packages/upgrade/upgrade.mjs
+++ b/packages/upgrade/upgrade.mjs
@@ -4,7 +4,9 @@
 
 const currentVersion = process.versions.node;
 const requiredMajorVersion = parseInt(currentVersion.split('.')[0], 10);
-const minimumMajorVersion = 18;
+// TODO: remove once Stackblitz supports Node 22
+const IS_STACKBLITZ = !!process.versions.webcontainer;
+const minimumMajorVersion = IS_STACKBLITZ ? 20 : 22;
 
 if (requiredMajorVersion < minimumMajorVersion) {
 	console.error(`Node.js v${currentVersion} is out of date and unsupported!`);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aff7905ecc4e..51e1087faf10 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,7 +5,6 @@ settings:
   excludeLinksFromLockfile: false
 
 overrides:
-  undici: ^6.21.3
   wrangler: 4.14.1
 
 importers:
@@ -554,9 +553,6 @@ importers:
       http-cache-semantics:
         specifier: ^4.2.0
         version: 4.2.0
-      import-meta-resolve:
-        specifier: ^4.2.0
-        version: 4.2.0
       js-yaml:
         specifier: ^4.1.0
         version: 4.1.0
@@ -6289,9 +6285,6 @@ importers:
       hast-util-to-text:
         specifier: ^4.0.2
         version: 4.0.2
-      import-meta-resolve:
-        specifier: ^4.2.0
-        version: 4.2.0
       js-yaml:
         specifier: ^4.1.0
         version: 4.1.0
@@ -7873,6 +7866,10 @@ packages:
   '@fastify/accept-negotiator@2.0.1':
     resolution: {integrity: sha512-/c/TW2bO/v9JeEgoD/g1G5GxGeCF1Hafdf79WPmUlgYiBXummY0oX3VVq4yFkKKVBKDNlaDUYoab7g38RpPqCQ==}
 
+  '@fastify/busboy@2.1.1':
+    resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
+    engines: {node: '>=14'}
+
   '@fastify/busboy@3.2.0':
     resolution: {integrity: sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==}
 
@@ -11128,9 +11125,6 @@ packages:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
 
-  import-meta-resolve@4.2.0:
-    resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==}
-
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
     engines: {node: '>=0.8.19'}
@@ -13514,10 +13508,18 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici@5.29.0:
+    resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==}
+    engines: {node: '>=14.0'}
+
   undici@6.21.3:
     resolution: {integrity: sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==}
     engines: {node: '>=18.17'}
 
+  undici@7.16.0:
+    resolution: {integrity: sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==}
+    engines: {node: '>=20.18.1'}
+
   unenv@2.0.0-rc.15:
     resolution: {integrity: sha512-J/rEIZU8w6FOfLNz/hNKsnY+fFHWnu9MH4yRbSZF3xbbGHovcetXPs7sD+9p8L6CeNC//I9bhRYAOsBt2u7/OA==}
 
@@ -15532,6 +15534,8 @@ snapshots:
 
   '@fastify/accept-negotiator@2.0.1': {}
 
+  '@fastify/busboy@2.1.1': {}
+
   '@fastify/busboy@3.2.0': {}
 
   '@fontsource/monofett@5.2.6': {}
@@ -17679,7 +17683,7 @@ snapshots:
       parse5: 7.3.0
       parse5-htmlparser2-tree-adapter: 7.1.0
       parse5-parser-stream: 7.1.2
-      undici: 6.21.3
+      undici: 7.16.0
       whatwg-mimetype: 4.0.0
 
   chokidar@4.0.3:
@@ -19106,8 +19110,6 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  import-meta-resolve@4.2.0: {}
-
   imurmurhash@0.1.4: {}
 
   indent-string@5.0.0: {}
@@ -20138,7 +20140,7 @@ snapshots:
       exit-hook: 2.2.1
       glob-to-regexp: 0.4.1
       stoppable: 1.1.0
-      undici: 6.21.3
+      undici: 5.29.0
       workerd: 1.20250428.0
       ws: 8.18.0
       youch: 3.3.4
@@ -21988,8 +21990,14 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici@5.29.0:
+    dependencies:
+      '@fastify/busboy': 2.1.1
+
   undici@6.21.3: {}
 
+  undici@7.16.0: {}
+
   unenv@2.0.0-rc.15:
     dependencies:
       defu: 6.1.4
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 42557f8621aa..c3c82fd1ae14 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -11,8 +11,6 @@ packages:
   - '!**/.vercel/**'
 # TODO: remove in Astro 6
 overrides:
-  # Cheerio uses ^7, which requires node 20
-  'undici': '^6.21.3'
   # A later wrangler minor dropeed support for node 18
   'wrangler': '4.14.1'
 # Wait until three days after release to install new versions of packages
diff --git a/scripts/cmd/build.js b/scripts/cmd/build.js
index 3eb982e105f0..ca0a8fee6446 100644
--- a/scripts/cmd/build.js
+++ b/scripts/cmd/build.js
@@ -9,7 +9,8 @@ const defaultConfig = {
 	minify: false,
 	format: 'esm',
 	platform: 'node',
-	target: 'node18',
+	// TODO: update once Stackblitz supports Node 22
+	target: 'node20',
 	sourcemap: false,
 	sourcesContent: false,
 };
diff --git a/scripts/smoke/check.js b/scripts/smoke/check.js
index 9f00384681ed..1f199aac21a1 100644
--- a/scripts/smoke/check.js
+++ b/scripts/smoke/check.js
@@ -33,7 +33,7 @@ function checkExamples() {
 
 						const originalConfig = prepareExample(example.name);
 						let data = '';
-						const child = spawn('node', ['../../packages/astro/astro.js', 'check'], {
+						const child = spawn('node', ['../../packages/astro/bin/astro.mjs', 'check'], {
 							cwd: path.join('./examples', example.name),
 							env: { ...process.env, FORCE_COLOR: 'true' },
 						});

From eea321b1994bf28b5f588df760d3adca0c59b6eb Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 25 Sep 2025 16:32:22 +0200
Subject: [PATCH 12/36] feat: update minimum node version to 22.12 (#14436)

---
 .changeset/puny-poems-create.md             | 8 ++++----
 .github/ISSUE_TEMPLATE/---01-bug-report.yml | 2 +-
 CONTRIBUTING.md                             | 2 +-
 package.json                                | 2 +-
 packages/astro-prism/package.json           | 2 +-
 packages/astro/bin/astro.mjs                | 2 +-
 packages/astro/package.json                 | 2 +-
 packages/create-astro/package.json          | 2 +-
 packages/integrations/markdoc/package.json  | 2 +-
 packages/integrations/mdx/package.json      | 2 +-
 packages/integrations/preact/package.json   | 2 +-
 packages/integrations/react/package.json    | 2 +-
 packages/integrations/solid/package.json    | 2 +-
 packages/integrations/svelte/package.json   | 2 +-
 packages/upgrade/package.json               | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.changeset/puny-poems-create.md b/.changeset/puny-poems-create.md
index 35ecc1ba9a43..06fa9c230a48 100644
--- a/.changeset/puny-poems-create.md
+++ b/.changeset/puny-poems-create.md
@@ -11,7 +11,7 @@
 'astro': major
 ---
 
-Increases minimum Node.js version to 22.0.0
+Increases minimum Node.js version to 22.12.0
 
 Node 18 reached its End of Life in March 2025 and Node 20 is scheduled to reach its End of Life in April 2026.
 
@@ -19,7 +19,7 @@ Astro v6.0 drops Node 18 and Node 20 support entirely so that all Astro users ca
 
 #### What should I do?
 
-Check that both your development environment and your deployment environment are using **Node `22.0.0` or higher**.
+Check that both your development environment and your deployment environment are using **Node `22.12.0` or higher**.
 
 1. Check your local version of Node using:
 
@@ -29,9 +29,9 @@ Check that both your development environment and your deployment environment are
 
 2. Check your deployment environment's own documentation to verify that they support Node 22.
 
-  You can specify Node `22.0.0` for your Astro project either in a dashboard configuration setting or a `.nvmrc` file.
+  You can specify Node `22.12.0` for your Astro project either in a dashboard configuration setting or a `.nvmrc` file.
 
   ```bash
   # .nvmrc
-  22.0.0
+  22.12.0
   ```
diff --git a/.github/ISSUE_TEMPLATE/---01-bug-report.yml b/.github/ISSUE_TEMPLATE/---01-bug-report.yml
index 3935797e89e8..5184530e0065 100644
--- a/.github/ISSUE_TEMPLATE/---01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/---01-bug-report.yml
@@ -10,7 +10,7 @@ body:
         Thank you for taking the time to file a bug report! Please fill out this form as completely as possible.
 
         ✅ I am using the **latest version of Astro** and all plugins.
-        ✅ I am using a version of Node that Astro supports (`v22.0.0` or higher.)
+        ✅ I am using a version of Node that Astro supports (`v22.12.0` or higher.)
   - type: textarea
     id: astro-info
     attributes:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f05652ee04ab..d3e3b7c89e67 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ We welcome contributions of any size and skill level. As an open source project,
 ### Prerequisites
 
 ```shell
-node: "^>=22.0.0"
+node: "^>=22.12.0"
 pnpm: "^10.17.0"
 # otherwise, your build will fail
 ```
diff --git a/package.json b/package.json
index 43f3455cb0ff..028baef28e71 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "packages/*"
   ],
   "engines": {
-    "node": ">=22.0.0"
+    "node": ">=22.12.0"
   },
   "packageManager": "pnpm@10.17.0",
   "dependencies": {
diff --git a/packages/astro-prism/package.json b/packages/astro-prism/package.json
index 411ea0a0914a..176bbcd47f2f 100644
--- a/packages/astro-prism/package.json
+++ b/packages/astro-prism/package.json
@@ -39,6 +39,6 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   }
 }
diff --git a/packages/astro/bin/astro.mjs b/packages/astro/bin/astro.mjs
index 5c8797cf4844..d73881a6c3b0 100755
--- a/packages/astro/bin/astro.mjs
+++ b/packages/astro/bin/astro.mjs
@@ -12,7 +12,7 @@ const CI_INSTRUCTIONS = {
 const IS_STACKBLITZ = !!process.versions.webcontainer;
 
 // Hardcode supported Node.js version so we don't have to read differently in CJS & ESM.
-const engines = IS_STACKBLITZ ? '>=20.19.5' : '>=22.0.0';
+const engines = IS_STACKBLITZ ? '>=20.19.5' : '>=22.12.0';
 const skipSemverCheckIfAbove = IS_STACKBLITZ ? 21 : 23;
 
 /** `astro *` */
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 4d3cf8743816..21e97b9968b1 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -208,7 +208,7 @@
     "vitest": "^3.2.4"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0",
+    "node": "^20.19.5 || >=22.12.0",
     "npm": ">=9.6.5",
     "pnpm": ">=7.1.0"
   },
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index b06bac0f8ec4..5adef5cece04 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -39,7 +39,7 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index dd33fe348c26..aa73cc208eee 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -82,7 +82,7 @@
     "vite": "^6.3.6"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index bed6e0004f60..16c77edb663f 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -72,7 +72,7 @@
     "vite": "^6.3.6"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json
index fb555e3a3bdf..6c5b3e5d80aa 100644
--- a/packages/integrations/preact/package.json
+++ b/packages/integrations/preact/package.json
@@ -49,7 +49,7 @@
     "preact": "^10.6.5"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 043a64fa474b..0cc0d40db3f7 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -59,7 +59,7 @@
     "react-dom": "^17.0.2 || ^18.0.0 || ^19.0.0"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json
index c2dc568243f8..8fea43cbdd3d 100644
--- a/packages/integrations/solid/package.json
+++ b/packages/integrations/solid/package.json
@@ -52,7 +52,7 @@
     }
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index b99b12cb993c..3f38b5697593 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -52,7 +52,7 @@
     "typescript": "^5.3.3"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 6b0a5153850a..13392388daf1 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -40,6 +40,6 @@
     "astro-scripts": "workspace:*"
   },
   "engines": {
-    "node": "^20.19.5 || >=22.0.0"
+    "node": "^20.19.5 || >=22.12.0"
   }
 }

From ecb0b98396f639d830a99ddb5895ab9223e4dc87 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 29 Sep 2025 16:27:21 +0200
Subject: [PATCH 13/36] feat: update vite (#14445)

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>
---
 .changeset/tricky-donkeys-camp.md             |  22 ++
 packages/astro/package.json                   |   2 +-
 packages/astro/src/core/errors/overlay.ts     |   2 +-
 .../fixtures/astro-info-versions/package.json |   2 +-
 packages/db/package.json                      |   2 +-
 packages/integrations/alpinejs/package.json   |   2 +-
 packages/integrations/cloudflare/package.json |   2 +-
 packages/integrations/markdoc/package.json    |   2 +-
 packages/integrations/mdx/package.json        |   2 +-
 packages/integrations/netlify/package.json    |   2 +-
 packages/integrations/preact/package.json     |   2 +-
 packages/integrations/react/package.json      |   2 +-
 packages/integrations/solid/package.json      |   2 +-
 packages/integrations/svelte/package.json     |   2 +-
 packages/integrations/vue/package.json        |   2 +-
 pnpm-lock.yaml                                | 246 +++++++++++-------
 16 files changed, 193 insertions(+), 103 deletions(-)
 create mode 100644 .changeset/tricky-donkeys-camp.md

diff --git a/.changeset/tricky-donkeys-camp.md b/.changeset/tricky-donkeys-camp.md
new file mode 100644
index 000000000000..5de13325cf6f
--- /dev/null
+++ b/.changeset/tricky-donkeys-camp.md
@@ -0,0 +1,22 @@
+---
+'@astrojs/cloudflare': major
+'@astrojs/alpinejs': minor
+'@astrojs/markdoc': minor
+'@astrojs/netlify': major
+'@astrojs/preact': major
+'@astrojs/svelte': major
+'@astrojs/react': major
+'@astrojs/solid-js': major
+'@astrojs/mdx': major
+'@astrojs/vue': major
+'astro': major
+'@astrojs/db': minor
+---
+
+Updates Vite to 7.0
+
+Astro v6.0 upgrades to Vite v7.0 as the development server and production bundler.
+
+#### What should I do?
+
+If you are using Vite-specific plugins, configuration, or APIs, check the [Vite migration guide](https://vite.dev/guide/migration) for their breaking changes and upgrade your project as needed.
diff --git a/packages/astro/package.json b/packages/astro/package.json
index c5d00bf544d5..a09e1c64e04f 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -157,7 +157,7 @@
     "unist-util-visit": "^5.0.0",
     "unstorage": "^1.17.0",
     "vfile": "^6.0.3",
-    "vite": "^6.3.6",
+    "vite": "^7.1.7",
     "vitefu": "^1.1.1",
     "xxhash-wasm": "^1.1.0",
     "yargs-parser": "^21.1.1",
diff --git a/packages/astro/src/core/errors/overlay.ts b/packages/astro/src/core/errors/overlay.ts
index 0579f5b1f22b..baa14ec77162 100644
--- a/packages/astro/src/core/errors/overlay.ts
+++ b/packages/astro/src/core/errors/overlay.ts
@@ -747,5 +747,5 @@ function getOverlayCode() {
 }
 
 export function patchOverlay(code: string) {
-	return code.replace('class ErrorOverlay', getOverlayCode() + '\nclass ViteErrorOverlay');
+	return code.replace('var ErrorOverlay', getOverlayCode() + '\nvar ViteErrorOverlay');
 }
diff --git a/packages/astro/test/fixtures/astro-info-versions/package.json b/packages/astro/test/fixtures/astro-info-versions/package.json
index 69ac118b5de0..208cb86a159c 100644
--- a/packages/astro/test/fixtures/astro-info-versions/package.json
+++ b/packages/astro/test/fixtures/astro-info-versions/package.json
@@ -10,7 +10,7 @@
     "astro": "workspace:*",
     "react": "19.1.1",
     "react-dom": "19.1.1",
-    "vite": "6.3.6"
+    "vite": "7.1.7"
   },
   "scripts": {
     "astro": "astro"
diff --git a/packages/db/package.json b/packages/db/package.json
index 20df36a2df8b..591ac9fe5770 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -90,6 +90,6 @@
     "cheerio": "1.1.2",
     "expect-type": "^1.2.2",
     "typescript": "^5.9.2",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   }
 }
diff --git a/packages/integrations/alpinejs/package.json b/packages/integrations/alpinejs/package.json
index 0c3dd6089eff..253305983098 100644
--- a/packages/integrations/alpinejs/package.json
+++ b/packages/integrations/alpinejs/package.json
@@ -41,7 +41,7 @@
     "@playwright/test": "1.55.0",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index 33925f9a3846..c224a665e739 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -40,7 +40,7 @@
     "@astrojs/underscore-redirects": "workspace:*",
     "@cloudflare/workers-types": "^4.20250913.0",
     "tinyglobby": "^0.2.15",
-    "vite": "^6.3.6",
+    "vite": "^7.1.7",
     "wrangler": "4.37.0"
   },
   "peerDependencies": {
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index aa73cc208eee..223d3f20007f 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -79,7 +79,7 @@
     "astro-scripts": "workspace:*",
     "devalue": "^5.3.2",
     "linkedom": "^0.18.12",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "engines": {
     "node": "^20.19.5 || >=22.12.0"
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index 16c77edb663f..dc68136f4cac 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -69,7 +69,7 @@
     "remark-toc": "^9.0.0",
     "shiki": "^3.12.0",
     "unified": "^11.0.5",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "engines": {
     "node": "^20.19.5 || >=22.12.0"
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index 0d9b73d49c84..2eae30efd7d2 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -47,7 +47,7 @@
     "@vercel/nft": "^0.30.1",
     "esbuild": "^0.25.0",
     "tinyglobby": "^0.2.15",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "peerDependencies": {
     "astro": "^5.7.0"
diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json
index 6c5b3e5d80aa..073a674a45ed 100644
--- a/packages/integrations/preact/package.json
+++ b/packages/integrations/preact/package.json
@@ -38,7 +38,7 @@
     "@preact/preset-vite": "^2.10.2",
     "@preact/signals": "^2.3.1",
     "preact-render-to-string": "^6.6.1",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 0cc0d40db3f7..f54589a627d1 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@vitejs/plugin-react": "^4.7.0",
     "ultrahtml": "^1.6.0",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "devDependencies": {
     "@types/react": "^18.3.24",
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json
index 8fea43cbdd3d..732757b068a9 100644
--- a/packages/integrations/solid/package.json
+++ b/packages/integrations/solid/package.json
@@ -34,7 +34,7 @@
     "dev": "astro-scripts dev \"src/**/*.ts\""
   },
   "dependencies": {
-    "vite": "^6.3.6",
+    "vite": "^7.1.7",
     "vite-plugin-solid": "^2.11.8"
   },
   "devDependencies": {
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 3f38b5697593..1fa774759c81 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -38,7 +38,7 @@
   "dependencies": {
     "@sveltejs/vite-plugin-svelte": "^5.1.1",
     "svelte2tsx": "^0.7.42",
-    "vite": "^6.3.6"
+    "vite": "^7.1.7"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index fcc003c451d0..6fbb95779d43 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -39,7 +39,7 @@
     "@vitejs/plugin-vue": "5.2.1",
     "@vitejs/plugin-vue-jsx": "^4.2.0",
     "@vue/compiler-sfc": "^3.5.21",
-    "vite": "^6.3.6",
+    "vite": "^7.1.7",
     "vite-plugin-vue-devtools": "^7.7.7"
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 96783ce7779b..633ea9e64892 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -108,7 +108,7 @@ importers:
     devDependencies:
       '@codspeed/vitest-plugin':
         specifier: 4.0.1
-        version: 4.0.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.0.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       vitest:
         specifier: ^3.2.4
         version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
@@ -444,7 +444,7 @@ importers:
         version: link:../../packages/integrations/mdx
       '@tailwindcss/vite':
         specifier: ^4.1.13
-        version: 4.1.13(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.1.13(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       '@types/canvas-confetti':
         specifier: ^1.9.0
         version: 1.9.0
@@ -623,11 +623,11 @@ importers:
         specifier: ^6.0.3
         version: 6.0.3
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vitefu:
         specifier: ^1.1.1
-        version: 1.1.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       xxhash-wasm:
         specifier: ^1.1.0
         version: 1.1.0
@@ -1586,7 +1586,7 @@ importers:
     dependencies:
       '@tailwindcss/vite':
         specifier: ^4.1.12
-        version: 4.1.13(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.1.13(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -2210,8 +2210,8 @@ importers:
         specifier: 19.1.1
         version: 19.1.1(react@19.1.1)
       vite:
-        specifier: 6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: 7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   packages/astro/test/fixtures/astro-jsx:
     dependencies:
@@ -2397,7 +2397,7 @@ importers:
     dependencies:
       '@tailwindcss/vite':
         specifier: ^4.1.12
-        version: 4.1.13(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.1.13(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -3541,7 +3541,7 @@ importers:
     dependencies:
       '@tailwindcss/vite':
         specifier: ^4.1.12
-        version: 4.1.13(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.1.13(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -4337,7 +4337,7 @@ importers:
         version: link:../../../../integrations/mdx
       '@tailwindcss/vite':
         specifier: ^4.1.12
-        version: 4.1.13(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.1.13(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -4547,8 +4547,8 @@ importers:
         specifier: ^5.9.2
         version: 5.9.2
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   packages/db/test/fixtures/basics:
     dependencies:
@@ -4703,8 +4703,8 @@ importers:
         specifier: workspace:*
         version: link:../../../scripts
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   packages/integrations/alpinejs/test/fixtures/basics:
     dependencies:
@@ -4766,8 +4766,8 @@ importers:
         specifier: ^0.2.15
         version: 0.2.15
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       wrangler:
         specifier: 4.14.1
         version: 4.14.1(@cloudflare/workers-types@4.20250913.0)
@@ -4987,8 +4987,8 @@ importers:
         specifier: ^0.18.12
         version: 0.18.12
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   packages/integrations/markdoc/test/fixtures/content-collections:
     dependencies:
@@ -5243,8 +5243,8 @@ importers:
         specifier: ^11.0.5
         version: 11.0.5
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   packages/integrations/mdx/test/fixtures/css-head-mdx:
     dependencies:
@@ -5418,7 +5418,7 @@ importers:
         version: 4.2.5(rollup@4.50.2)
       '@netlify/vite-plugin':
         specifier: ^2.5.9
-        version: 2.5.9(@vercel/functions@2.2.13)(rollup@4.50.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 2.5.9(@vercel/functions@2.2.13)(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       '@vercel/nft':
         specifier: ^0.30.1
         version: 0.30.1(rollup@4.50.2)
@@ -5429,8 +5429,8 @@ importers:
         specifier: ^0.2.15
         version: 0.2.15
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     devDependencies:
       '@types/node':
         specifier: ^22.10.6
@@ -5737,7 +5737,7 @@ importers:
     dependencies:
       '@preact/preset-vite':
         specifier: ^2.10.2
-        version: 2.10.2(@babel/core@7.28.4)(preact@10.27.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 2.10.2(@babel/core@7.28.4)(preact@10.27.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       '@preact/signals':
         specifier: ^2.3.1
         version: 2.3.1(preact@10.27.2)
@@ -5745,8 +5745,8 @@ importers:
         specifier: ^6.6.1
         version: 6.6.1(preact@10.27.2)
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     devDependencies:
       astro:
         specifier: workspace:*
@@ -5762,13 +5762,13 @@ importers:
     dependencies:
       '@vitejs/plugin-react':
         specifier: ^4.7.0
-        version: 4.7.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 4.7.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       ultrahtml:
         specifier: ^1.6.0
         version: 1.6.0
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     devDependencies:
       '@types/react':
         specifier: ^18.3.24
@@ -5877,11 +5877,11 @@ importers:
   packages/integrations/solid:
     dependencies:
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vite-plugin-solid:
         specifier: ^2.11.8
-        version: 2.11.8(solid-js@1.9.9)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 2.11.8(solid-js@1.9.9)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
     devDependencies:
       astro:
         specifier: workspace:*
@@ -5897,13 +5897,13 @@ importers:
     dependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^5.1.1
-        version: 5.1.1(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       svelte2tsx:
         specifier: ^0.7.42
         version: 0.7.42(svelte@5.39.3)(typescript@5.9.2)
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     devDependencies:
       astro:
         specifier: workspace:*
@@ -6151,19 +6151,19 @@ importers:
     dependencies:
       '@vitejs/plugin-vue':
         specifier: 5.2.1
-        version: 5.2.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 5.2.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       '@vitejs/plugin-vue-jsx':
         specifier: ^4.2.0
-        version: 4.2.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 4.2.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/compiler-sfc':
         specifier: ^3.5.21
         version: 3.5.21
       vite:
-        specifier: ^6.3.6
-        version: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        specifier: ^7.1.7
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vite-plugin-vue-devtools:
         specifier: ^7.7.7
-        version: 7.7.7(rollup@4.50.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 7.7.7(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
     devDependencies:
       astro:
         specifier: workspace:*
@@ -13826,6 +13826,46 @@ packages:
       yaml:
         optional: true
 
+  vite@7.1.7:
+    resolution: {integrity: sha512-VbA8ScMvAISJNJVbRDTJdCwqQoAareR/wutevKanhR2/1EkoXVZVkkORaYm/tNVCjP/UDTKtcw3bAkwOUdedmA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      lightningcss: ^1.21.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
   vitefu@1.1.1:
     resolution: {integrity: sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==}
     peerDependencies:
@@ -14834,10 +14874,10 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  '@codspeed/vitest-plugin@4.0.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@codspeed/vitest-plugin@4.0.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
       '@codspeed/core': 4.0.1
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - debug
@@ -16137,11 +16177,11 @@ snapshots:
 
   '@netlify/types@2.0.3': {}
 
-  '@netlify/vite-plugin@2.5.9(@vercel/functions@2.2.13)(rollup@4.50.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@netlify/vite-plugin@2.5.9(@vercel/functions@2.2.13)(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
       '@netlify/dev': 4.5.9(@vercel/functions@2.2.13)(rollup@4.50.2)
       '@netlify/dev-utils': 4.1.3
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@azure/app-configuration'
       - '@azure/cosmos'
@@ -16355,18 +16395,18 @@ snapshots:
 
   '@polka/url@1.0.0-next.29': {}
 
-  '@preact/preset-vite@2.10.2(@babel/core@7.28.4)(preact@10.27.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@preact/preset-vite@2.10.2(@babel/core@7.28.4)(preact@10.27.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.4)
       '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.28.4)
-      '@prefresh/vite': 2.4.10(preact@10.27.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      '@prefresh/vite': 2.4.10(preact@10.27.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       '@rollup/pluginutils': 4.2.1
       babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.28.4)
       debug: 4.4.3
       picocolors: 1.1.1
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-      vite-prerender-plugin: 0.5.12(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite-prerender-plugin: 0.5.12(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - preact
       - supports-color
@@ -16386,7 +16426,7 @@ snapshots:
 
   '@prefresh/utils@1.2.1': {}
 
-  '@prefresh/vite@2.4.10(preact@10.27.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@prefresh/vite@2.4.10(preact@10.27.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
       '@babel/core': 7.28.4
       '@prefresh/babel-plugin': 0.5.2
@@ -16394,7 +16434,7 @@ snapshots:
       '@prefresh/utils': 1.2.1
       '@rollup/pluginutils': 4.2.1
       preact: 10.27.2
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16529,25 +16569,25 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
-  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)))(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)))(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       debug: 4.4.3
       svelte: 5.39.3
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)))(svelte@5.39.3)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)))(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       debug: 4.4.3
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.19
       svelte: 5.39.3
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vitefu: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - supports-color
 
@@ -16619,12 +16659,12 @@ snapshots:
       '@tailwindcss/oxide-win32-arm64-msvc': 4.1.13
       '@tailwindcss/oxide-win32-x64-msvc': 4.1.13
 
-  '@tailwindcss/vite@4.1.13(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@tailwindcss/vite@4.1.13(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
       '@tailwindcss/node': 4.1.13
       '@tailwindcss/oxide': 4.1.13
       tailwindcss: 4.1.13
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   '@trysound/sax@0.2.0': {}
 
@@ -17011,20 +17051,32 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue-jsx@4.2.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-react@4.7.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+    dependencies:
+      '@babel/core': 7.28.4
+      '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.4)
+      '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.4)
+      '@rolldown/pluginutils': 1.0.0-beta.27
+      '@types/babel__core': 7.20.5
+      react-refresh: 0.17.0
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@vitejs/plugin-vue-jsx@4.2.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
       '@rolldown/pluginutils': 1.0.0-beta.36
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vue: 3.5.21(typescript@5.9.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@5.2.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vue: 3.5.21(typescript@5.9.2)
 
   '@vitest/expect@3.2.4':
@@ -17035,13 +17087,13 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.19
     optionalDependencies:
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -17178,14 +17230,14 @@ snapshots:
       '@vue/compiler-dom': 3.5.21
       '@vue/shared': 3.5.21
 
-  '@vue/devtools-core@7.7.7(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vue/devtools-core@7.7.7(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
     dependencies:
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      vite-hot-client: 2.1.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       vue: 3.5.21(typescript@5.9.2)
     transitivePeerDependencies:
       - vite
@@ -22194,9 +22246,9 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-hot-client@2.1.0(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+  vite-hot-client@2.1.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
     dependencies:
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   vite-node@3.2.4(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1):
     dependencies:
@@ -22204,7 +22256,7 @@ snapshots:
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -22219,7 +22271,7 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-inspect@0.8.9(rollup@4.50.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+  vite-plugin-inspect@0.8.9(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
@@ -22230,12 +22282,12 @@ snapshots:
       perfect-debounce: 1.0.0
       picocolors: 1.1.1
       sirv: 3.0.2
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
 
-  vite-plugin-solid@2.11.8(solid-js@1.9.9)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+  vite-plugin-solid@2.11.8(solid-js@1.9.9)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.28.4
       '@types/babel__core': 7.20.5
@@ -22243,28 +22295,28 @@ snapshots:
       merge-anything: 5.1.7
       solid-js: 1.9.9
       solid-refresh: 0.6.3(solid-js@1.9.9)
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vitefu: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@7.7.7(rollup@4.50.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
+  vite-plugin-vue-devtools@7.7.7(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
     dependencies:
-      '@vue/devtools-core': 7.7.7(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+      '@vue/devtools-core': 7.7.7(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       execa: 9.6.0
       sirv: 3.0.2
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-      vite-plugin-inspect: 0.8.9(rollup@4.50.2)(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
-      vite-plugin-vue-inspector: 5.3.2(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite-plugin-inspect: 0.8.9(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      vite-plugin-vue-inspector: 5.3.2(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - rollup
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.3.2(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+  vite-plugin-vue-inspector@5.3.2(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.4)
@@ -22275,11 +22327,11 @@ snapshots:
       '@vue/compiler-dom': 3.5.21
       kolorist: 1.8.0
       magic-string: 0.30.19
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  vite-prerender-plugin@0.5.12(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+  vite-prerender-plugin@0.5.12(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
     dependencies:
       kolorist: 1.8.0
       magic-string: 0.30.19
@@ -22287,7 +22339,7 @@ snapshots:
       simple-code-frame: 1.3.0
       source-map: 0.7.6
       stack-trace: 1.0.0-pre2
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   vite-svg-loader@5.1.0(vue@3.5.21(typescript@5.9.2)):
     dependencies:
@@ -22310,15 +22362,31 @@ snapshots:
       sass: 1.92.1
       yaml: 2.8.1
 
-  vitefu@1.1.1(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+  vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1):
+    dependencies:
+      esbuild: 0.25.5
+      fdir: 6.5.0(picomatch@4.0.3)
+      picomatch: 4.0.3
+      postcss: 8.5.6
+      rollup: 4.50.2
+      tinyglobby: 0.2.15
     optionalDependencies:
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      '@types/node': 22.18.1
+      fsevents: 2.3.3
+      jiti: 2.5.1
+      lightningcss: 1.30.1
+      sass: 1.92.1
+      yaml: 2.8.1
+
+  vitefu@1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
+    optionalDependencies:
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
 
   vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -22336,7 +22404,7 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       vite-node: 3.2.4(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:

From ece667a737a96c8bfea2702de7207bed0842b37c Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 29 Sep 2025 16:45:51 +0200
Subject: [PATCH 14/36] feat: cleanup integration api (#14446)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/beige-clowns-read.md               |  27 ++++
 .changeset/cuddly-worlds-beam.md              |  40 +++++
 .github/workflows/ci.yml                      |   6 +-
 packages/astro/src/core/build/index.ts        |   4 +-
 packages/astro/src/core/build/internal.ts     |   4 +-
 .../src/core/build/plugins/plugin-manifest.ts |   1 -
 .../astro/src/core/server-islands/endpoint.ts |   2 +-
 packages/astro/src/integrations/hooks.ts      |  28 ----
 .../astro/src/types/public/integrations.ts    |  22 ---
 packages/astro/test/middleware.test.js        |   4 +-
 .../test/static-build-page-dist-url.test.js   |  20 +--
 packages/astro/test/test-adapter.js           |  15 +-
 packages/integrations/sitemap/src/index.ts    |  13 +-
 packages/integrations/vercel/src/index.ts     | 140 +++++++-----------
 14 files changed, 147 insertions(+), 179 deletions(-)
 create mode 100644 .changeset/beige-clowns-read.md
 create mode 100644 .changeset/cuddly-worlds-beam.md

diff --git a/.changeset/beige-clowns-read.md b/.changeset/beige-clowns-read.md
new file mode 100644
index 000000000000..826fc9d7c747
--- /dev/null
+++ b/.changeset/beige-clowns-read.md
@@ -0,0 +1,27 @@
+---
+'astro': major
+---
+
+Removes `entryPoints` on `astro:build:ssr` hook (Integration API)
+
+In Astro 5.0, `functionPerRoute` was deprecated. That meant that `entryPoints` on the `astro:build:ssr` hook was always empty. Astro integrations may have continued to work, even while `entryPoints` was not providing any useful data.
+
+Astro 6.0 removes the `entryPoints` map passed to this hook entirely. Integrations may no longer include `entryPoints`.
+
+#### What should I do?
+
+Remove any instance of `entryPoints` passed to `astro:build:ssr`. This should be safe to remove because this logic was not providing any useful data, but you may need to restructure your code accordingly for its removal:
+
+```diff
+// my-integration.mjs
+const integration = () => {
+    return {
+        name: 'my-integration',
+        hooks: {
+            'astro:build:ssr': (params) => {
+-                someLogic(params.entryPoints)
+            },
+        }
+    }
+}
+```
diff --git a/.changeset/cuddly-worlds-beam.md b/.changeset/cuddly-worlds-beam.md
new file mode 100644
index 000000000000..133173256d90
--- /dev/null
+++ b/.changeset/cuddly-worlds-beam.md
@@ -0,0 +1,40 @@
+---
+'astro': major
+---
+
+Removes `routes` on `astro:build:done` hook (Integration API)
+
+In Astro 5.0, accessing `routes` on the `astro:build:done` hook was deprecated in favour of a new `astro:routes:resolved` hook. However, Astro integrations may have continued to function using the `routes` array.
+
+Astro 6.0 removes the `routes` array passed to this hook entirely. Instead, the `astro:routes:resolved` hook must be used. 
+
+#### What should I do?
+
+Remove any instance of `routes` passed to `astro:build:done` in your Astro integration and replace it with the new `astro:routes:resolved` hook. You can access `distURL` on the newly exposed `assets` map:
+
+```diff
+// my-integration.mjs
+const integration = () => {
++   let routes
+    return {
+        name: 'my-integration',
+        hooks: {
++           'astro:routes:resolved': (params) => {
++               routes = params.routes
++           },
+            'astro:build:done': ({
+-               routes
++               assets
+            }) => {
++               for (const route of routes) {
++                   const distURL = assets.get(route.pattern)
++                   if (distURL) {
++                       Object.assign(route, { distURL })
++                   }
++               }
+                console.log(routes)
+            }
+        }
+    }
+}
+```
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4469a8fb6623..15b7b9ea222f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -219,11 +219,11 @@ jobs:
         with:
           repository: withastro/docs
           path: smoke/docs
-          # For a commit event on the `next` branch (`ref_name`), use the `5.0.0-beta` branch.
-          # For a pull_request event merging into the `next` branch (`base_ref`), use the `5.0.0-beta` branch.
+          # For a commit event on the `next` branch (`ref_name`), use the `v6` branch.
+          # For a pull_request event merging into the `next` branch (`base_ref`), use the `v6` branch.
           # NOTE: For a pull_request event, the `ref_name` is something like `<pr-number>/merge` than the branch name.
           # NOTE: Perhaps docs repo should use a consistent `next` branch in the future.
-          ref: ${{ (github.ref_name == 'next' || github.base_ref == 'next') && '5.0.0-beta' || 'main' }}
+          ref: ${{ (github.ref_name == 'next' || github.base_ref == 'next') && 'v6' || 'main' }}
 
       - name: Install dependencies
         run: pnpm install --no-frozen-lockfile
diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts
index 2096723706e5..5307091e3558 100644
--- a/packages/astro/src/core/build/index.ts
+++ b/packages/astro/src/core/build/index.ts
@@ -23,7 +23,6 @@ import { AstroError, AstroErrorData } from '../errors/index.js';
 import type { Logger } from '../logger/core.js';
 import { levels, timerMessage } from '../logger/core.js';
 import { createRoutesList } from '../routing/index.js';
-import { getServerIslandRouteData } from '../server-islands/endpoint.js';
 import { clearContentLayerCache } from '../sync/index.js';
 import { ensureProcessNodeEnv } from '../util.js';
 import { collectPagesData } from './page-data.js';
@@ -242,8 +241,7 @@ class AstroBuilder {
 			pages: pageNames,
 			routes: Object.values(allPages)
 				.flat()
-				.map((pageData) => pageData.route)
-				.concat(hasServerIslands ? getServerIslandRouteData(this.settings.config) : []),
+				.map((pageData) => pageData.route),
 			logger: this.logger,
 		});
 
diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts
index 5f303596b620..cb6e349f64fe 100644
--- a/packages/astro/src/core/build/internal.ts
+++ b/packages/astro/src/core/build/internal.ts
@@ -1,5 +1,5 @@
 import type { Rollup } from 'vite';
-import type { RouteData, SSRResult } from '../../types/public/internal.js';
+import type { SSRResult } from '../../types/public/internal.js';
 import { prependForwardSlash, removeFileExtension } from '../path.js';
 import { viteID } from '../util.js';
 import { makePageDataKey } from './plugins/util.js';
@@ -89,7 +89,6 @@ export interface BuildInternals {
 	// The SSR manifest entry chunk.
 	manifestEntryChunk?: Rollup.OutputChunk;
 	manifestFileName?: string;
-	entryPoints: Map<RouteData, URL>;
 	componentMetadata: SSRResult['componentMetadata'];
 	middlewareEntryPoint: URL | undefined;
 	astroActionsEntryPoint: URL | undefined;
@@ -121,7 +120,6 @@ export function createBuildInternals(): BuildInternals {
 		discoveredScripts: new Set(),
 		staticFiles: new Set(),
 		componentMetadata: new Map(),
-		entryPoints: new Map(),
 		prerenderOnlyChunks: [],
 		astroActionsEntryPoint: undefined,
 		middlewareEntryPoint: undefined,
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index 8d2b146a7d65..b45e484c07ab 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -140,7 +140,6 @@ export function pluginManifest(
 					config: options.settings.config,
 					manifest,
 					logger: options.logger,
-					entryPoints: internals.entryPoints,
 					middlewareEntryPoint: shouldPassMiddlewareEntryPoint
 						? internals.middlewareEntryPoint
 						: undefined,
diff --git a/packages/astro/src/core/server-islands/endpoint.ts b/packages/astro/src/core/server-islands/endpoint.ts
index 6a640ee41df7..994455c7c431 100644
--- a/packages/astro/src/core/server-islands/endpoint.ts
+++ b/packages/astro/src/core/server-islands/endpoint.ts
@@ -17,7 +17,7 @@ export const SERVER_ISLAND_BASE_PREFIX = '_server-islands';
 
 type ConfigFields = Pick<SSRManifest, 'base' | 'trailingSlash'>;
 
-export function getServerIslandRouteData(config: ConfigFields) {
+function getServerIslandRouteData(config: ConfigFields) {
 	const segments = [
 		[{ content: '_server-islands', dynamic: false, spread: false }],
 		[{ content: 'name', dynamic: true, spread: false }],
diff --git a/packages/astro/src/integrations/hooks.ts b/packages/astro/src/integrations/hooks.ts
index 6d954cb843dc..777d4092c4d3 100644
--- a/packages/astro/src/integrations/hooks.ts
+++ b/packages/astro/src/integrations/hooks.ts
@@ -30,7 +30,6 @@ import type {
 	BaseIntegrationHooks,
 	HookParameters,
 	IntegrationResolvedRoute,
-	IntegrationRouteData,
 	RouteOptions,
 	RouteToHeaders,
 } from '../types/public/integrations.js';
@@ -548,7 +547,6 @@ type RunHookBuildSsr = {
 	config: AstroConfig;
 	manifest: SerializedSSRManifest;
 	logger: Logger;
-	entryPoints: Map<RouteData, URL>;
 	middlewareEntryPoint: URL | undefined;
 };
 
@@ -556,13 +554,8 @@ export async function runHookBuildSsr({
 	config,
 	manifest,
 	logger,
-	entryPoints,
 	middlewareEntryPoint,
 }: RunHookBuildSsr) {
-	const entryPointsMap = new Map();
-	for (const [key, value] of entryPoints) {
-		entryPointsMap.set(toIntegrationRouteData(key), value);
-	}
 	for (const integration of config.integrations) {
 		await runHookInternal({
 			integration,
@@ -570,7 +563,6 @@ export async function runHookBuildSsr({
 			logger,
 			params: () => ({
 				manifest,
-				entryPoints: entryPointsMap,
 				middlewareEntryPoint,
 			}),
 		});
@@ -602,7 +594,6 @@ export async function runHookBuildGenerated({
 type RunHookBuildDone = {
 	settings: AstroSettings;
 	pages: string[];
-	// TODO: remove in Astro 6
 	routes: RouteData[];
 	logger: Logger;
 };
@@ -610,7 +601,6 @@ type RunHookBuildDone = {
 export async function runHookBuildDone({ settings, pages, routes, logger }: RunHookBuildDone) {
 	const dir = getClientOutputDirectory(settings);
 	await fsMod.promises.mkdir(dir, { recursive: true });
-	const integrationRoutes = routes.map(toIntegrationRouteData);
 
 	for (const integration of settings.config.integrations) {
 		await runHookInternal({
@@ -620,7 +610,6 @@ export async function runHookBuildDone({ settings, pages, routes, logger }: RunH
 			params: () => ({
 				pages: pages.map((p) => ({ pathname: p })),
 				dir,
-				routes: integrationRoutes,
 				assets: new Map(
 					routes.filter((r) => r.distURL !== undefined).map((r) => [r.route, r.distURL!]),
 				),
@@ -701,20 +690,3 @@ export function toIntegrationResolvedRoute(route: RouteData): IntegrationResolve
 			: undefined,
 	};
 }
-
-function toIntegrationRouteData(route: RouteData): IntegrationRouteData {
-	return {
-		route: route.route,
-		component: route.component,
-		generate: route.generate,
-		params: route.params,
-		pathname: route.pathname,
-		segments: route.segments,
-		prerender: route.prerender,
-		redirect: route.redirect,
-		redirectRoute: route.redirectRoute ? toIntegrationRouteData(route.redirectRoute) : undefined,
-		type: route.type,
-		pattern: route.pattern,
-		distURL: route.distURL,
-	};
-}
diff --git a/packages/astro/src/types/public/integrations.ts b/packages/astro/src/types/public/integrations.ts
index da08c0bd913f..0c07b3e89257 100644
--- a/packages/astro/src/types/public/integrations.ts
+++ b/packages/astro/src/types/public/integrations.ts
@@ -211,12 +211,6 @@ export interface BaseIntegrationHooks {
 	'astro:server:done': (options: { logger: AstroIntegrationLogger }) => void | Promise<void>;
 	'astro:build:ssr': (options: {
 		manifest: SerializedSSRManifest;
-		/**
-		 * This maps a {@link RouteData} to an {@link URL}, this URL represents
-		 * the physical file you should import.
-		 */
-		// TODO: Change in Astro 6.0
-		entryPoints: Map<IntegrationRouteData, URL>;
 		/**
 		 * File path of the emitted middleware
 		 */
@@ -239,8 +233,6 @@ export interface BaseIntegrationHooks {
 	'astro:build:done': (options: {
 		pages: { pathname: string }[];
 		dir: URL;
-		/** @deprecated Use the `assets` map and the new `astro:routes:resolved` hook */
-		routes: IntegrationRouteData[];
 		assets: Map<string, URL[]>;
 		logger: AstroIntegrationLogger;
 	}) => void | Promise<void>;
@@ -263,20 +255,6 @@ export interface AstroIntegration {
 	} & Partial<Record<string, unknown>>;
 }
 
-/**
- * A smaller version of the {@link RouteData} that is used in the integrations.
- * @deprecated Use {@link IntegrationResolvedRoute}
- */
-export type IntegrationRouteData = Omit<
-	RouteData,
-	'isIndex' | 'fallbackRoutes' | 'redirectRoute' | 'origin'
-> & {
-	/**
-	 * {@link RouteData.redirectRoute}
-	 */
-	redirectRoute?: IntegrationRouteData;
-};
-
 export type RouteToHeaders = Map<string, HeaderPayload>;
 
 export type HeaderPayload = {
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
index 5d0322ea2ccd..2d8c39909789 100644
--- a/packages/astro/test/middleware.test.js
+++ b/packages/astro/test/middleware.test.js
@@ -349,8 +349,8 @@ describe('Middleware API in PROD mode, SSR', () => {
 						edgeMiddleware: true,
 					},
 				},
-				setMiddlewareEntryPoint(entryPointsOrMiddleware) {
-					middlewarePath = entryPointsOrMiddleware;
+				setMiddlewareEntryPoint(middlewareEntryPoint) {
+					middlewarePath = middlewareEntryPoint;
 				},
 			}),
 		});
diff --git a/packages/astro/test/static-build-page-dist-url.test.js b/packages/astro/test/static-build-page-dist-url.test.js
index ebfa75d0e90e..671de39c56b2 100644
--- a/packages/astro/test/static-build-page-dist-url.test.js
+++ b/packages/astro/test/static-build-page-dist-url.test.js
@@ -3,8 +3,8 @@ import { before, describe, it } from 'node:test';
 import { loadFixture } from './test-utils.js';
 
 describe('Static build: pages routes have distURL', () => {
-	/** @type {RouteData[]} */
-	let checkRoutes;
+	/** @type {Map<string, URL[]>} */
+	let assets;
 	before(async () => {
 		/** @type {import('./test-utils').Fixture} */
 		const fixture = await loadFixture({
@@ -13,8 +13,8 @@ describe('Static build: pages routes have distURL', () => {
 				{
 					name: '@astrojs/distURL',
 					hooks: {
-						'astro:build:done': ({ routes }) => {
-							checkRoutes = routes.filter((p) => p.type === 'page');
+						'astro:build:done': (params) => {
+							assets = params.assets;
 						},
 					},
 				},
@@ -23,11 +23,11 @@ describe('Static build: pages routes have distURL', () => {
 		await fixture.build();
 	});
 	it('Pages routes have distURL', async () => {
-		assert.equal(checkRoutes.length > 0, true, 'Pages not found: build end hook not being called');
-		checkRoutes.forEach((p) => {
-			p.distURL.forEach((distURL) => {
-				assert.equal(distURL instanceof URL, true, `${p.pathname} doesn't include distURL`);
-			});
-		});
+		assert.equal(assets.size > 0, true, 'Pages not found: build end hook not being called');
+		for (const [p, distURL] of assets.entries()) {
+			for (const url of distURL) {
+				assert.equal(url instanceof URL, true, `${p.pathname} doesn't include distURL`);
+			}
+		}
 	});
 });
diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js
index e872ef35213c..0dc4cb55bf6b 100644
--- a/packages/astro/test/test-adapter.js
+++ b/packages/astro/test/test-adapter.js
@@ -3,7 +3,6 @@ import { viteID } from '../dist/core/util.js';
 /**
  * @typedef {import('../src/types/public/integrations.js').AstroAdapter} AstroAdapter
  * @typedef {import('../src/types/public/integrations.js').AstroIntegration} AstroIntegration
- * @typedef {import('../src/types/public/integrations.js').HookParameters<"astro:build:ssr">['entryPoints']} EntryPoints
  * @typedef {import('../src/types/public/integrations.js').HookParameters<"astro:build:ssr">['middlewareEntryPoint']} MiddlewareEntryPoint
  * @typedef {import('../src/types/public/integrations.js').HookParameters<"astro:build:done">['routes']} Routes
  */
@@ -13,9 +12,7 @@ import { viteID } from '../dist/core/util.js';
  * @param {{
  * 	provideAddress?: boolean;
  * 	extendAdapter?: AstroAdapter;
- * 	setEntryPoints?: (entryPoints: EntryPoints) => void;
  * 	setMiddlewareEntryPoint?: (middlewareEntryPoint: MiddlewareEntryPoint) => void;
- * 	setRoutes?: (routes: Routes) => void;
  * 	env: Record<string, string | undefined>;
  * }} param0
  * @returns {AstroIntegration}
@@ -24,9 +21,7 @@ export default function ({
 	provideAddress = true,
 	staticHeaders = false,
 	extendAdapter,
-	setEntryPoints,
 	setMiddlewareEntryPoint,
-	setRoutes,
 	setManifest,
 	setRouteToHeaders,
 	env,
@@ -126,10 +121,7 @@ export default function ({
 					...extendAdapter,
 				});
 			},
-			'astro:build:ssr': ({ entryPoints, middlewareEntryPoint, manifest }) => {
-				if (setEntryPoints) {
-					setEntryPoints(entryPoints);
-				}
+			'astro:build:ssr': ({ middlewareEntryPoint, manifest }) => {
 				if (setMiddlewareEntryPoint) {
 					setMiddlewareEntryPoint(middlewareEntryPoint);
 				}
@@ -137,11 +129,6 @@ export default function ({
 					setManifest(manifest);
 				}
 			},
-			'astro:build:done': ({ routes }) => {
-				if (setRoutes) {
-					setRoutes(routes);
-				}
-			},
 			'astro:build:generated': ({ experimentalRouteToHeaders }) => {
 				if (setRouteToHeaders) {
 					setRouteToHeaders(experimentalRouteToHeaders);
diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts
index e7b87ddc9b97..c59c7f6eb24b 100644
--- a/packages/integrations/sitemap/src/index.ts
+++ b/packages/integrations/sitemap/src/index.ts
@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import type { AstroConfig, AstroIntegration } from 'astro';
+import type { AstroConfig, AstroIntegration, IntegrationResolvedRoute } from 'astro';
 import type { EnumChangefreq, LinkItem as LinkItemBase, SitemapItemLoose } from 'sitemap';
 import { ZodError } from 'zod';
 
@@ -76,17 +76,22 @@ const isStatusCodePage = (locales: string[]) => {
 	};
 };
 const createPlugin = (options?: SitemapOptions): AstroIntegration => {
+	let _routes: Array<IntegrationResolvedRoute>
 	let config: AstroConfig;
 
 	return {
 		name: PKG_NAME,
 
 		hooks: {
+			'astro:routes:resolved': ({ routes }) => {
+				_routes = routes;
+			},
+
 			'astro:config:done': async ({ config: cfg }) => {
 				config = cfg;
 			},
 
-			'astro:build:done': async ({ dir, routes, pages, logger }) => {
+			'astro:build:done': async ({ dir, pages, logger }) => {
 				try {
 					if (!config.site) {
 						logger.warn(
@@ -112,7 +117,7 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 							return new URL(fullPath, finalSiteUrl).href;
 						});
 
-					const routeUrls = routes.reduce<string[]>((urls, r) => {
+					const routeUrls = _routes.reduce<string[]>((urls, r) => {
 						// Only expose pages, not endpoints or redirects
 						if (r.type !== 'page') return urls;
 
@@ -120,7 +125,7 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						 * Dynamic URLs have entries with `undefined` pathnames
 						 */
 						if (r.pathname) {
-							if (shouldIgnoreStatus(r.pathname ?? r.route)) return urls;
+							if (shouldIgnoreStatus(r.pathname ?? r.pattern)) return urls;
 
 							// `finalSiteUrl` may end with a trailing slash
 							// or not because of base paths.
diff --git a/packages/integrations/vercel/src/index.ts b/packages/integrations/vercel/src/index.ts
index 9234e051aaf6..617eca0674f0 100644
--- a/packages/integrations/vercel/src/index.ts
+++ b/packages/integrations/vercel/src/index.ts
@@ -1,5 +1,4 @@
 import { cpSync, existsSync, mkdirSync, readFileSync } from 'node:fs';
-import { basename } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { emptyDir, removeDir, writeJson } from '@astrojs/internal-helpers/fs';
 import {
@@ -230,7 +229,6 @@ export default function vercelAdapter({
 	let _config: AstroConfig;
 	let _buildTempFolder: URL;
 	let _serverEntry: string;
-	let _entryPoints: Map<Pick<IntegrationResolvedRoute, 'entrypoint' | 'patternRegex'>, URL>;
 	let _middlewareEntryPoint: URL | undefined;
 	let _routeToHeaders: RouteToHeaders | undefined = undefined;
 	// Extra files to be merged with `includeFiles` during build
@@ -358,18 +356,7 @@ export default function vercelAdapter({
 				// Ensure to have `.vercel/output` empty.
 				await emptyDir(new URL('./.vercel/output/', _config.root));
 			},
-			'astro:build:ssr': async ({ entryPoints, middlewareEntryPoint }) => {
-				_entryPoints = new Map(
-					Array.from(entryPoints)
-						.filter(([routeData]) => !routeData.prerender)
-						.map(([routeData, url]) => [
-							{
-								entrypoint: routeData.component,
-								patternRegex: routeData.pattern,
-							},
-							url,
-						]),
-				);
+			'astro:build:ssr': async ({ middlewareEntryPoint }) => {
 				_middlewareEntryPoint = middlewareEntryPoint;
 			},
 
@@ -432,92 +419,69 @@ export default function vercelAdapter({
 						maxDuration,
 					);
 
-					// Multiple entrypoint support
-					if (_entryPoints.size) {
-						const getRouteFuncName = (route: Pick<IntegrationResolvedRoute, 'entrypoint'>) =>
-							route.entrypoint.replace('src/pages/', '');
-
-						const getFallbackFuncName = (entryFile: URL) =>
-							basename(entryFile.toString())
-								.replace('entry.', '')
-								.replace(/\.mjs$/, '');
-
-						for (const [route, entryFile] of _entryPoints) {
-							const func = route.entrypoint.startsWith('src/pages/')
-								? getRouteFuncName(route)
-								: getFallbackFuncName(entryFile);
+					const entryFile = new URL(_serverEntry, _buildTempFolder);
+					if (isr) {
+						const isrConfig = typeof isr === 'object' ? isr : {};
+						await builder.buildServerlessFolder(entryFile, NODE_PATH, _config.root);
+						if (isrConfig.exclude?.length) {
+							const expandedExclusions = isrConfig.exclude.reduce<string[]>((acc, exclusion) => {
+								if (exclusion instanceof RegExp) {
+									return [
+										...acc,
+										...routes
+											.filter((route) => exclusion.test(route.pattern))
+											.map((route) => route.pattern),
+									];
+								}
 
-							await builder.buildServerlessFolder(entryFile, func, _config.root);
+								return [...acc, exclusion];
+							}, []);
 
-							routeDefinitions.push({
-								src: route.patternRegex.source,
-								dest: func,
-							});
+							const dest = _middlewareEntryPoint ? MIDDLEWARE_PATH : NODE_PATH;
+							for (const route of expandedExclusions) {
+								// vercel interprets src as a regex pattern, so we need to escape it
+								routeDefinitions.push({
+									src: escapeRegex(route),
+									dest,
+								});
+							}
 						}
-					} else {
-						const entryFile = new URL(_serverEntry, _buildTempFolder);
-						if (isr) {
-							const isrConfig = typeof isr === 'object' ? isr : {};
-							await builder.buildServerlessFolder(entryFile, NODE_PATH, _config.root);
-							if (isrConfig.exclude?.length) {
-								const expandedExclusions = isrConfig.exclude.reduce<string[]>((acc, exclusion) => {
-									if (exclusion instanceof RegExp) {
-										return [
-											...acc,
-											...routes
-												.filter((route) => exclusion.test(route.pattern))
-												.map((route) => route.pattern),
-										];
-									}
-
-									return [...acc, exclusion];
-								}, []);
-
-								const dest = _middlewareEntryPoint ? MIDDLEWARE_PATH : NODE_PATH;
-								for (const route of expandedExclusions) {
-									// vercel interprets src as a regex pattern, so we need to escape it
-									routeDefinitions.push({
-										src: escapeRegex(route),
-										dest,
-									});
+						await builder.buildISRFolder(entryFile, '_isr', isrConfig, _config.root);
+						for (const route of routes) {
+							// Do not create _isr route entries for excluded routes
+							const excludeRouteFromIsr = isrConfig.exclude?.some((exclusion) => {
+								if (exclusion instanceof RegExp) {
+									return exclusion.test(route.pattern);
 								}
-							}
-							await builder.buildISRFolder(entryFile, '_isr', isrConfig, _config.root);
-							for (const route of routes) {
-								// Do not create _isr route entries for excluded routes
-								const excludeRouteFromIsr = isrConfig.exclude?.some((exclusion) => {
-									if (exclusion instanceof RegExp) {
-										return exclusion.test(route.pattern);
-									}
-
-									return exclusion === route.pattern;
-								});
 
-								if (!excludeRouteFromIsr) {
-									const src = route.patternRegex.source;
-									const dest =
-										src.startsWith('^\\/_image') || src.startsWith('^\\/_server-islands')
-											? NODE_PATH
-											: ISR_PATH;
-									if (!route.isPrerendered)
-										routeDefinitions.push({
-											src,
-											dest,
-										});
-								}
-							}
-						} else {
-							await builder.buildServerlessFolder(entryFile, NODE_PATH, _config.root);
-							const dest = _middlewareEntryPoint ? MIDDLEWARE_PATH : NODE_PATH;
-							for (const route of routes) {
+								return exclusion === route.pattern;
+							});
+
+							if (!excludeRouteFromIsr) {
+								const src = route.patternRegex.source;
+								const dest =
+									src.startsWith('^\\/_image') || src.startsWith('^\\/_server-islands')
+										? NODE_PATH
+										: ISR_PATH;
 								if (!route.isPrerendered)
 									routeDefinitions.push({
-										src: route.patternRegex.source,
+										src,
 										dest,
 									});
 							}
 						}
+					} else {
+						await builder.buildServerlessFolder(entryFile, NODE_PATH, _config.root);
+						const dest = _middlewareEntryPoint ? MIDDLEWARE_PATH : NODE_PATH;
+						for (const route of routes) {
+							if (!route.isPrerendered)
+								routeDefinitions.push({
+									src: route.patternRegex.source,
+									dest,
+								});
+						}
 					}
+
 					if (_middlewareEntryPoint) {
 						await builder.buildMiddlewareFolder(
 							_middlewareEntryPoint,

From b1d87ec3bc2fbe214437990e871df93909d18f62 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 29 Sep 2025 17:04:09 +0200
Subject: [PATCH 15/36] feat: deprecate Astro in getStaticPaths (#14432)

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>
Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/fast-bushes-fall.md                | 27 +++++
 packages/astro/package.json                   |  2 +-
 packages/astro/src/core/constants.ts          |  2 +
 packages/astro/src/core/errors/errors-data.ts | 13 +++
 packages/astro/src/core/middleware/index.ts   |  4 +-
 packages/astro/src/core/render-context.ts     | 31 ++----
 .../astro/src/runtime/server/astro-global.ts  | 98 ++++++++++++++++++-
 packages/astro/src/types/public/context.ts    | 38 ++++---
 packages/astro/src/types/public/internal.ts   |  8 +-
 .../astro/test/astro-get-static-paths.test.js | 69 ++++++++++++-
 .../src/pages/food/[name].astro               | 13 ++-
 packages/astro/test/test-utils.js             |  5 +-
 pnpm-lock.yaml                                | 72 ++------------
 pnpm-workspace.yaml                           |  3 +-
 14 files changed, 253 insertions(+), 132 deletions(-)
 create mode 100644 .changeset/fast-bushes-fall.md

diff --git a/.changeset/fast-bushes-fall.md b/.changeset/fast-bushes-fall.md
new file mode 100644
index 000000000000..56b7ca615a15
--- /dev/null
+++ b/.changeset/fast-bushes-fall.md
@@ -0,0 +1,27 @@
+---
+'astro': major
+---
+
+Deprecates `Astro` in `getStaticPaths()`
+
+In Astro 5.x, it was possible to access an `Astro` object inside `getStaticPaths()`. However, despite being typed the same as the `Astro` object accessible in the frontmatter, this object only had `site` and `generator` properties. This could lead to confusion about which `Astro` object properties were available inside `getStaticPaths()`.
+
+Astro 6.0 deprecates this object for `getStaticPaths()` to avoid confusion and improves error handling when attempting to access `Astro` values that are unavailable. Using `Astro.site` or `Astro.generator` within `getStaticPaths()` will now log a deprecation warning, and accessing any other property will throw a specific error with a helpful message. In a future major version, this object will be removed entirely, and accessing `Astro.site` or `Astro.generator` will also throw an error.
+
+#### What should I do?
+
+Update your `getStaticPaths()` function if you were attempting to access any `Astro` properties inside its scope. Remove `Astro.generator` entirely, and replace all occurrences of `Astro.site()` with `import.meta.env.SITE`:
+
+```diff
+---
+// src/pages/blog/[slug].astro
+import { getPages } from "../../../utils/data";
+
+export async function getStaticPaths() {
+-    console.log(Astro.generator);
+-    return getPages(Astro.site);
++    return getPages(import.meta.env.SITE);
+}
+---
+```
+
diff --git a/packages/astro/package.json b/packages/astro/package.json
index a09e1c64e04f..eb9d539f65e3 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -106,7 +106,7 @@
     "test:integration": "astro-scripts test \"test/*.test.js\""
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.12.2",
+    "@astrojs/compiler": "0.0.0-next-result-create-astro-20250926081949",
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/markdown-remark": "workspace:*",
     "@astrojs/telemetry": "workspace:*",
diff --git a/packages/astro/src/core/constants.ts b/packages/astro/src/core/constants.ts
index 265b5a3aeef0..1d27d57b8d92 100644
--- a/packages/astro/src/core/constants.ts
+++ b/packages/astro/src/core/constants.ts
@@ -1,6 +1,8 @@
 // process.env.PACKAGE_VERSION is injected when we build and publish the astro package.
 export const ASTRO_VERSION = process.env.PACKAGE_VERSION ?? 'development';
 
+export const ASTRO_GENERATOR = `Astro v${ASTRO_VERSION}`;
+
 /**
  * The name for the header used to help rerouting behavior.
  * When set to "no", astro will NOT try to reroute an error response to the corresponding error page, which is the default behavior that can sometimes lead to loops.
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index def9e1a9fb01..a0542effe3f5 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -1417,6 +1417,19 @@ export const CspNotEnabled = {
 	message: "The `experimental.csp` configuration isn't enabled.",
 } satisfies ErrorData;
 
+/**
+ * @docs
+ * @description
+ * Unavailable Astro global in getStaticPaths
+ * @message
+ * The Astro global is not available in getStaticPaths().
+ */
+export const UnavailableAstroGlobal = {
+	name: 'UnavailableAstroGlobal',
+	title: 'Unavailable Astro global in getStaticPaths()',
+	message: (name: string) => `The Astro global is not available in this scope. Please remove "Astro.${name}" from your getStaticPaths() function.`,
+} satisfies ErrorData;
+
 /**
  * @docs
  * @kind heading
diff --git a/packages/astro/src/core/middleware/index.ts b/packages/astro/src/core/middleware/index.ts
index 904774e5552b..2963c13700c2 100644
--- a/packages/astro/src/core/middleware/index.ts
+++ b/packages/astro/src/core/middleware/index.ts
@@ -6,7 +6,7 @@ import {
 } from '../../i18n/utils.js';
 import type { MiddlewareHandler, Params, RewritePayload } from '../../types/public/common.js';
 import type { APIContext, AstroSharedContextCsp } from '../../types/public/context.js';
-import { ASTRO_VERSION } from '../constants.js';
+import { ASTRO_GENERATOR } from '../constants.js';
 import { AstroCookies } from '../cookies/index.js';
 import { AstroError, AstroErrorData } from '../errors/index.js';
 import { getClientIpAddress } from '../routing/request.js';
@@ -73,7 +73,7 @@ function createContext({
 		request,
 		params,
 		site: undefined,
-		generator: `Astro v${ASTRO_VERSION}`,
+		generator: ASTRO_GENERATOR,
 		props: {},
 		rewrite,
 		routePattern: '',
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index f766f3206c61..719feea66786 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -12,16 +12,11 @@ import { renderEndpoint } from '../runtime/server/endpoint.js';
 import { renderPage } from '../runtime/server/index.js';
 import type { ComponentInstance } from '../types/astro.js';
 import type { MiddlewareHandler, Props, RewritePayload } from '../types/public/common.js';
-import type {
-	APIContext,
-	AstroGlobal,
-	AstroGlobalPartial,
-	AstroSharedContextCsp,
-} from '../types/public/context.js';
+import type { APIContext, AstroGlobal, AstroSharedContextCsp } from '../types/public/context.js';
 import type { RouteData, SSRResult } from '../types/public/internal.js';
 import type { SSRActions } from './app/types.js';
 import {
-	ASTRO_VERSION,
+	ASTRO_GENERATOR,
 	REROUTE_DIRECTIVE_HEADER,
 	REWRITE_DIRECTIVE_HEADER_KEY,
 	REWRITE_DIRECTIVE_HEADER_VALUE,
@@ -384,7 +379,6 @@ export class RenderContext {
 	createActionAPIContext(): ActionAPIContext {
 		const renderContext = this;
 		const { params, pipeline, url } = this;
-		const generator = `Astro v${ASTRO_VERSION}`;
 
 		const rewrite = async (reroutePayload: RewritePayload) => {
 			return await this.#executeRewrite(reroutePayload);
@@ -403,7 +397,7 @@ export class RenderContext {
 			get currentLocale() {
 				return renderContext.computeCurrentLocale();
 			},
-			generator,
+			generator: ASTRO_GENERATOR,
 			get locals() {
 				return renderContext.locals;
 			},
@@ -532,8 +526,7 @@ export class RenderContext {
 			compressHTML,
 			cookies,
 			/** This function returns the `Astro` faux-global */
-			createAstro: (astroGlobal, props, slots) =>
-				this.createAstro(result, astroGlobal, props, slots, ctx),
+			createAstro: (props, slots) => this.createAstro(result, props, slots, ctx),
 			links,
 			params: this.params,
 			partial,
@@ -588,7 +581,6 @@ export class RenderContext {
 	 */
 	createAstro(
 		result: SSRResult,
-		astroStaticPartial: AstroGlobalPartial,
 		props: Record<string, any>,
 		slotValues: Record<string, any> | null,
 		apiContext: ActionAPIContext,
@@ -596,18 +588,10 @@ export class RenderContext {
 		let astroPagePartial;
 		// During rewriting, we must recompute the Astro global, because we need to purge the previous params/props/etc.
 		if (this.isRewriting) {
-			astroPagePartial = this.#astroPagePartial = this.createAstroPagePartial(
-				result,
-				astroStaticPartial,
-				apiContext,
-			);
+			astroPagePartial = this.#astroPagePartial = this.createAstroPagePartial(result, apiContext);
 		} else {
 			// Create page partial with static partial so they can be cached together.
-			astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(
-				result,
-				astroStaticPartial,
-				apiContext,
-			);
+			astroPagePartial = this.#astroPagePartial ??= this.createAstroPagePartial(result, apiContext);
 		}
 		// Create component-level partials. `Astro.self` is added by the compiler.
 		const astroComponentPartial = { props, self: null };
@@ -638,7 +622,6 @@ export class RenderContext {
 
 	createAstroPagePartial(
 		result: SSRResult,
-		astroStaticPartial: AstroGlobalPartial,
 		apiContext: ActionAPIContext,
 	): Omit<AstroGlobal, 'props' | 'self' | 'slots'> {
 		const renderContext = this;
@@ -661,7 +644,7 @@ export class RenderContext {
 		const callAction = createCallAction(apiContext);
 
 		return {
-			generator: astroStaticPartial.generator,
+			generator: ASTRO_GENERATOR,
 			routePattern: this.routeData.route,
 			isPrerendered: this.routeData.prerender,
 			cookies,
diff --git a/packages/astro/src/runtime/server/astro-global.ts b/packages/astro/src/runtime/server/astro-global.ts
index 31f352805a13..a9913c6b7a2f 100644
--- a/packages/astro/src/runtime/server/astro-global.ts
+++ b/packages/astro/src/runtime/server/astro-global.ts
@@ -1,11 +1,99 @@
-import { ASTRO_VERSION } from '../../core/constants.js';
-import type { AstroGlobalPartial } from '../../types/public/context.js';
+import { ASTRO_GENERATOR } from '../../core/constants.js';
+import { AstroError, AstroErrorData } from '../../core/errors/index.js';
+import type { AstroGlobal } from '../../types/public/context.js';
+
+function createError(name: string) {
+	return new AstroError({
+		...AstroErrorData.UnavailableAstroGlobal,
+		message: AstroErrorData.UnavailableAstroGlobal.message(name),
+	});
+}
 
 // This is used to create the top-level Astro global; the one that you can use
 // inside of getStaticPaths. See the `astroGlobalArgs` option for parameter type.
-export function createAstro(site: string | undefined): AstroGlobalPartial {
+export function createAstro(site: string | undefined): AstroGlobal {
 	return {
-		site: site ? new URL(site) : undefined,
-		generator: `Astro v${ASTRO_VERSION}`,
+		// TODO: throw in Astro 7
+		get site() {
+			// This is created inside of the runtime so we don't have access to the Astro logger.
+			console.warn(
+				`Astro.site inside getStaticPaths is deprecated and will be removed in a future major version of Astro. Use import.meta.env.SITE instead`,
+			);
+			return site ? new URL(site) : undefined;
+		},
+		// TODO: throw in Astro 7
+		get generator() {
+			// This is created inside of the runtime so we don't have access to the Astro logger.
+			console.warn(
+				`Astro.generator inside getStaticPaths is deprecated and will be removed in a future major version of Astro.`,
+			);
+			return ASTRO_GENERATOR;
+		},
+		get callAction(): any {
+			throw createError('callAction');
+		},
+		get clientAddress(): any {
+			throw createError('clientAddress');
+		},
+		get cookies(): any {
+			throw createError('cookies');
+		},
+		get csp(): any {
+			throw createError('csp');
+		},
+		get currentLocale(): any {
+			throw createError('currentLocale');
+		},
+		get getActionResult(): any {
+			throw createError('getActionResult');
+		},
+		get isPrerendered(): any {
+			throw createError('isPrerendered');
+		},
+		get locals(): any {
+			throw createError('locals');
+		},
+		get originPathname(): any {
+			throw createError('originPathname');
+		},
+		get params(): any {
+			throw createError('params');
+		},
+		get preferredLocale(): any {
+			throw createError('preferredLocale');
+		},
+		get preferredLocaleList(): any {
+			throw createError('preferredLocaleList');
+		},
+		get props(): any {
+			throw createError('props');
+		},
+		get redirect(): any {
+			throw createError('redirect');
+		},
+		get request(): any {
+			throw createError('request');
+		},
+		get response(): any {
+			throw createError('response');
+		},
+		get rewrite(): any {
+			throw createError('rewrite');
+		},
+		get routePattern(): any {
+			throw createError('routePattern');
+		},
+		get self(): any {
+			throw createError('self');
+		},
+		get slots(): any {
+			throw createError('slots');
+		},
+		get url(): any {
+			throw createError('url');
+		},
+		get session(): any {
+			throw createError('session');
+		},
 	};
 }
diff --git a/packages/astro/src/types/public/context.ts b/packages/astro/src/types/public/context.ts
index bc5cdc0bf6a5..c1fd617641c8 100644
--- a/packages/astro/src/types/public/context.ts
+++ b/packages/astro/src/types/public/context.ts
@@ -21,8 +21,23 @@ export interface AstroGlobal<
 	Self = AstroComponentFactory,
 	// eslint-disable-next-line @typescript-eslint/no-shadow
 	Params extends Record<string, string | undefined> = Record<string, string | undefined>,
-> extends AstroGlobalPartial,
-		AstroSharedContext<Props, Params> {
+> extends AstroSharedContext<Props, Params> {
+	/**
+	 * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
+	 *
+	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
+	 */
+	site: URL | undefined;
+	/**
+	 * Returns a string with the current version of Astro.
+	 *
+	 * Useful for using `<meta name="generator" content={Astro.generator} />` or crediting Astro in a site footer.
+	 *
+	 * [HTML Specification for `generator`](https://html.spec.whatwg.org/multipage/semantics.html#meta-generator)
+	 *
+	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrogenerator)
+	 */
+	generator: string;
 	/**
 	 * A full URL object of the request URL.
 	 * Equivalent to: `new URL(Astro.request.url)`
@@ -206,25 +221,6 @@ export interface AstroGlobal<
 	};
 }
 
-export interface AstroGlobalPartial {
-	/**
-	 * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
-	 *
-	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
-	 */
-	site: URL | undefined;
-	/**
-	 * Returns a string with the current version of Astro.
-	 *
-	 * Useful for using `<meta name="generator" content={Astro.generator} />` or crediting Astro in a site footer.
-	 *
-	 * [HTML Specification for `generator`](https://html.spec.whatwg.org/multipage/semantics.html#meta-generator)
-	 *
-	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrogenerator)
-	 */
-	generator: string;
-}
-
 // Shared types between `Astro` global and API context object
 export interface AstroSharedContext<
 	Props extends Record<string, any> = Record<string, any>,
diff --git a/packages/astro/src/types/public/internal.ts b/packages/astro/src/types/public/internal.ts
index 9f65e4b32b5e..9adbcea20255 100644
--- a/packages/astro/src/types/public/internal.ts
+++ b/packages/astro/src/types/public/internal.ts
@@ -6,7 +6,7 @@ import type { AstroCookies } from '../../core/cookies/cookies.js';
 import type { AstroComponentInstance, ServerIslandComponent } from '../../runtime/server/index.js';
 import type { Params } from './common.js';
 import type { AstroConfig, RedirectConfig } from './config.js';
-import type { AstroGlobal, AstroGlobalPartial } from './context.js';
+import type { AstroGlobal } from './context.js';
 import type { AstroRenderer } from './integrations.js';
 
 export type { SSRActions, SSRManifest, SSRManifestCSP } from '../../core/app/types.js';
@@ -221,11 +221,7 @@ export interface SSRResult {
 	links: Set<SSRElement>;
 	componentMetadata: Map<string, SSRComponentMetadata>;
 	inlinedScripts: Map<string, string>;
-	createAstro(
-		Astro: AstroGlobalPartial,
-		props: Record<string, any>,
-		slots: Record<string, any> | null,
-	): AstroGlobal;
+	createAstro(props: Record<string, any>, slots: Record<string, any> | null): AstroGlobal;
 	params: Params;
 	resolve: (s: string) => Promise<string>;
 	response: AstroGlobal['response'];
diff --git a/packages/astro/test/astro-get-static-paths.test.js b/packages/astro/test/astro-get-static-paths.test.js
index eb3f08194bf9..0f0d35b57835 100644
--- a/packages/astro/test/astro-get-static-paths.test.js
+++ b/packages/astro/test/astro-get-static-paths.test.js
@@ -1,24 +1,28 @@
+// @ts-check
 import assert from 'node:assert/strict';
 import { after, afterEach, before, describe, it } from 'node:test';
 import * as cheerio from 'cheerio';
 import { loadFixture } from './test-utils.js';
 
+const root = new URL('./fixtures/astro-get-static-paths/', import.meta.url);
+
 describe('getStaticPaths - build calls', () => {
 	/** @type {import('./test-utils').Fixture} */
 	let fixture;
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/astro-get-static-paths/',
+			root,
 			site: 'https://mysite.dev/',
 			trailingSlash: 'never',
 			base: '/blog',
 		});
-		await fixture.build();
+		await fixture.build({});
 	});
 
 	afterEach(() => {
 		// reset the flag used by [...calledTwiceTest].astro between each test
+		// @ts-expect-error not typed
 		globalThis.isCalledOnce = false;
 	});
 
@@ -36,12 +40,14 @@ describe('getStaticPaths - build calls', () => {
 });
 
 describe('getStaticPaths - dev calls', () => {
+	/** @type {import('./test-utils').Fixture} */
 	let fixture;
+	/** @type {import('./test-utils').DevServer} */
 	let devServer;
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/astro-get-static-paths/',
+			root,
 			site: 'https://mysite.dev/',
 		});
 		devServer = await fixture.startDevServer();
@@ -49,6 +55,7 @@ describe('getStaticPaths - dev calls', () => {
 
 	afterEach(() => {
 		// reset the flag used by [...calledTwiceTest].astro between each test
+		// @ts-expect-error not typed
 		globalThis.isCalledOnce = false;
 	});
 
@@ -135,4 +142,60 @@ describe('getStaticPaths - dev calls', () => {
 		const res = await fixture.fetch('/pizza/parmesan-and-olives');
 		assert.equal(res.status, 200);
 	});
+
+	it('warns if Astro.generator or Astro.site is accessed', async () => {
+		const originalWarn = console.warn;
+		/** @type {Array<string>} */
+		const logs = [];
+		console.warn = (...args) => {
+			logs.push(...args);
+			return originalWarn(...args);
+		};
+		const res = await fixture.fetch('/food/tacos');
+		console.warn = originalWarn;
+		assert.equal(res.status, 200);
+		assert.deepStrictEqual(logs, [
+			'Astro.generator inside getStaticPaths is deprecated and will be removed in a future major version of Astro.',
+			'Astro.site inside getStaticPaths is deprecated and will be removed in a future major version of Astro. Use import.meta.env.SITE instead',
+		]);
+
+		const html = await res.text();
+		const $ = cheerio.load(html);
+
+		assert.equal($('#generator').text().startsWith('Astro v'), true);
+		// For some reason site is always undefined
+		assert.equal($('#site').text(), '');
+	});
+});
+
+describe('throws if an invalid Astro property is accessed', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root,
+			site: 'https://mysite.dev/',
+		});
+		await fixture.editFile(
+			'/src/pages/food/[name].astro',
+			(prev) => prev.replace('getStaticPaths() {', 'getStaticPaths() {\nAstro.getActionResult;'),
+			false,
+		);
+	});
+
+	after(async () => {
+		fixture.resetAllFiles();
+	});
+
+	it('does not build', async () => {
+		try {
+			await fixture.build({});
+			assert.fail();
+		} catch (err) {
+			assert.equal(err instanceof Error, true);
+			// @ts-ignore
+			assert.equal(err.title, 'Unavailable Astro global in getStaticPaths()');
+		}
+	});
 });
diff --git a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/food/[name].astro b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/food/[name].astro
index f0c68e681876..175af9ff1c2f 100644
--- a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/food/[name].astro
+++ b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/food/[name].astro
@@ -1,17 +1,26 @@
 ---
 export async function getStaticPaths() {
+	// Should cause warnings;
+	const { generator, site } = Astro;
 	return [
 		{
 			params: { name: 'tacos' },
+			props: { generator, site }
 		},
 		{
 			params: { name: 'potatoes' },
+			props: { generator, site }
 		},
 		{
-			params: { name: 'spaghetti' }
+			params: { name: 'spaghetti' },
+			props: { generator, site }
 		}
 	]
 }
+
+// Shouldn't cause warnings;
+Astro.site;
+Astro.generator;
 ---
 
 <html lang="en">
@@ -22,5 +31,7 @@ export async function getStaticPaths() {
 	</head>
 	<body>
 		<p id="url">{ Astro.url.pathname }</p>
+		<p id="generator">{Astro.props.generator}</p>
+		<p id="site">{Astro.props.site}</p>
 	</body>
 </html>
diff --git a/packages/astro/test/test-utils.js b/packages/astro/test/test-utils.js
index 30332c98ff0b..e2c88c4b378d 100644
--- a/packages/astro/test/test-utils.js
+++ b/packages/astro/test/test-utils.js
@@ -23,7 +23,7 @@ kleur.$.enabled = false;
 
 /**
  * @typedef {import('../src/core/dev/dev').DevServer} DevServer
- * @typedef {import('../src/types/public/config.js').AstroInlineConfig & { root?: string | URL }} AstroInlineConfig
+ * @typedef {Omit<import('../src/types/public/config.js').AstroInlineConfig, 'root'> & { root?: string | URL }} AstroInlineConfig
  * @typedef {import('../src/types/public/config.js').AstroConfig} AstroConfig
  * @typedef {import('../src/core/preview/index').PreviewServer} PreviewServer
  * @typedef {import('../src/core/app/index').App} App
@@ -39,7 +39,7 @@ kleur.$.enabled = false;
  * @property {(path: string) => Promise<boolean>} pathExists
  * @property {(url: string, opts?: Parameters<typeof fetch>[1]) => Promise<Response>} fetch
  * @property {(path: string) => Promise<string>} readFile
- * @property {(path: string, updater: (content: string) => string) => Promise<void>} editFile
+ * @property {(path: string, updater: (content: string) => string, waitForNextWrite = true) => Promise<() => void>} editFile
  * @property {(path: string) => Promise<string[]>} readdir
  * @property {(pattern: string) => Promise<string[]>} glob
  * @property {(inlineConfig?: Parameters<typeof dev>[0]) => ReturnType<typeof dev>} startDevServer
@@ -47,7 +47,6 @@ kleur.$.enabled = false;
  * @property {() => Promise<void>} clean
  * @property {() => Promise<App>} loadTestAdapterApp
  * @property {() => Promise<(req: NodeRequest, res: NodeResponse) => void>} loadNodeAdapterHandler
- * @property {() => Promise<void>} onNextChange
  * @property {(timeout?: number) => Promise<void>} onNextDataStoreChange
  * @property {typeof check} check
  * @property {typeof sync} sync
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 633ea9e64892..75f635edb82b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -470,8 +470,8 @@ importers:
   packages/astro:
     dependencies:
       '@astrojs/compiler':
-        specifier: ^2.12.2
-        version: 2.12.2
+        specifier: 0.0.0-next-result-create-astro-20250926081949
+        version: 0.0.0-next-result-create-astro-20250926081949
       '@astrojs/internal-helpers':
         specifier: workspace:*
         version: link:../internal-helpers
@@ -6497,6 +6497,9 @@ packages:
     resolution: {integrity: sha512-bVzyKzEpIwqjihBU/aUzt1LQckJuHK0agd3/ITdXhPUYculrc6K1/K7H+XG4rwjXtg+ikT3PM05V1MVYWiIvQw==}
     engines: {node: '>=18.14.1'}
 
+  '@astrojs/compiler@0.0.0-next-result-create-astro-20250926081949':
+    resolution: {integrity: sha512-iZAPYDe2R9fU1GA26epcy4iOvDgla3oWirzqOsc3nkKeSTcUYtY1rZq/D02oKCVHepAkFlRS1bS27+G+jIeX0Q==}
+
   '@astrojs/compiler@2.12.2':
     resolution: {integrity: sha512-w2zfvhjNCkNMmMMOn5b0J8+OmUaBL1o40ipMvqcG6NRpdC+lKxmTi48DT8Xw0SzJ3AfmeFLB45zXZXtmbsjcgw==}
 
@@ -6730,28 +6733,24 @@ packages:
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@biomejs/cli-linux-arm64@2.2.4':
     resolution: {integrity: sha512-M/Iz48p4NAzMXOuH+tsn5BvG/Jb07KOMTdSVwJpicmhN309BeEyRyQX+n1XDF0JVSlu28+hiTQ2L4rZPvu7nMw==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@biomejs/cli-linux-x64-musl@2.2.4':
     resolution: {integrity: sha512-m41nFDS0ksXK2gwXL6W6yZTYPMH0LughqbsxInSKetoH6morVj43szqKx79Iudkp8WRT5SxSh7qVb8KCUiewGg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@biomejs/cli-linux-x64@2.2.4':
     resolution: {integrity: sha512-orr3nnf2Dpb2ssl6aihQtvcKtLySLta4E2UcXdp7+RTa7mfJjBgIsbS0B9GC8gVu0hjOu021aU8b3/I1tn+pVQ==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@biomejs/cli-win32-arm64@2.2.4':
     resolution: {integrity: sha512-NXnfTeKHDFUWfxAefa57DiGmu9VyKi0cDqFpdI+1hJWQjGJhJutHPX0b5m+eXvTKOaf+brU+P0JrQAZMb5yYaQ==}
@@ -7950,170 +7949,144 @@ packages:
     resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-arm64@1.2.0':
     resolution: {integrity: sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-arm@1.0.5':
     resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-arm@1.2.0':
     resolution: {integrity: sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-ppc64@1.2.0':
     resolution: {integrity: sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==}
     cpu: [ppc64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-s390x@1.0.4':
     resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-s390x@1.2.0':
     resolution: {integrity: sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-x64@1.0.4':
     resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linux-x64@1.2.0':
     resolution: {integrity: sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
     resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-libvips-linuxmusl-arm64@1.2.0':
     resolution: {integrity: sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-libvips-linuxmusl-x64@1.0.4':
     resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-libvips-linuxmusl-x64@1.2.0':
     resolution: {integrity: sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-linux-arm64@0.33.5':
     resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-arm64@0.34.3':
     resolution: {integrity: sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-arm@0.33.5':
     resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-arm@0.34.3':
     resolution: {integrity: sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-ppc64@0.34.3':
     resolution: {integrity: sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ppc64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-s390x@0.33.5':
     resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-s390x@0.34.3':
     resolution: {integrity: sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-x64@0.33.5':
     resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linux-x64@0.34.3':
     resolution: {integrity: sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@img/sharp-linuxmusl-arm64@0.33.5':
     resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-linuxmusl-arm64@0.34.3':
     resolution: {integrity: sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-linuxmusl-x64@0.33.5':
     resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-linuxmusl-x64@0.34.3':
     resolution: {integrity: sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@img/sharp-wasm32@0.33.5':
     resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
@@ -8456,49 +8429,41 @@ packages:
     resolution: {integrity: sha512-ukHZp9Vm07AlxqdOLFf8Bj4inzpt+ISbbODvwwHxX32GfcMLWYYJGAYWc13IGhWoElvWnI7D1M9ifDGyTNRGzg==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@oxc-resolver/binding-linux-arm64-musl@11.7.1':
     resolution: {integrity: sha512-atkZ1OIt6t90kjQz1iqq6cN3OpfPG5zUJlO64Vd1ieYeqHRkOFeRgnWEobTePUHi34NlYr7mNZqIaAg7gjPUFg==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@oxc-resolver/binding-linux-ppc64-gnu@11.7.1':
     resolution: {integrity: sha512-HGgV4z3JwVF4Qvg2a1GhDnqn8mKLihy5Gp4rMfqNIAlERPSyIxo8oPQIL1XQKLYyyrkEEO99uwM+4cQGwhtbpQ==}
     cpu: [ppc64]
     os: [linux]
-    libc: [glibc]
 
   '@oxc-resolver/binding-linux-riscv64-gnu@11.7.1':
     resolution: {integrity: sha512-+vCO7iOR1s6VGefV02R2a702IASNWhSNm/MrR8RcWjKChmU0G+d1iC0oToUrGC4ovAEfstx2/O8EkROnfcLgrA==}
     cpu: [riscv64]
     os: [linux]
-    libc: [glibc]
 
   '@oxc-resolver/binding-linux-riscv64-musl@11.7.1':
     resolution: {integrity: sha512-3folNmS5gYNFy/9HYzLcdeThqAGvDJU0gQKrhHn7RPWQa58yZ0ZPpBMk6KRSSO61+wkchkL+0sdcLsoe5wZW8g==}
     cpu: [riscv64]
     os: [linux]
-    libc: [musl]
 
   '@oxc-resolver/binding-linux-s390x-gnu@11.7.1':
     resolution: {integrity: sha512-Ceo4z6g8vqPUKADROFL0b7MoyXlUdOBYCxTDu/fhd/5I3Ydk2S6bxkjJdzpBdlu+h2Z+eS9lTHFvkwkaORMPzw==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@oxc-resolver/binding-linux-x64-gnu@11.7.1':
     resolution: {integrity: sha512-QyFW5e43imQLxiBpCImhOiP4hY9coWGjroEm8elDqGNNaA7vXooaMQS2N3avMQawSaKhsb/3RemxaZ852XG38Q==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@oxc-resolver/binding-linux-x64-musl@11.7.1':
     resolution: {integrity: sha512-JhuCqCqktqQyQVc37V+eDiP3buCIuyCLpb92tUEyAP8nY3dy2b/ojMrH1ZNnJUlfY/67AqoZPL6nQGAB2WA3Sg==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@oxc-resolver/binding-wasm32-wasi@11.7.1':
     resolution: {integrity: sha512-sMXm5Z2rfBwkCUespZBJCPhCVbgh/fpYQ23BQs0PmnvWoXrGQHWvnvg1p/GYmleN+nwe8strBjfutirZFiC5lA==}
@@ -8549,42 +8514,36 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.1':
     resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
-    libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.1':
     resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.1':
     resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.1':
     resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.1':
     resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@parcel/watcher-wasm@2.5.1':
     resolution: {integrity: sha512-RJxlQQLkaMMIuWRozy+z2vEqbaQlCuaCgVZIUCzQLYggY22LZbP5Y1+ia+FD724Ids9e+XIyOLXLrLgQSHIthw==}
@@ -8724,67 +8683,56 @@ packages:
     resolution: {integrity: sha512-9VlPY/BN3AgbukfVHAB8zNFWB/lKEuvzRo1NKev0Po8sYFKx0i+AQlCYftgEjcL43F2h9Ui1ZSdVBc4En/sP2w==}
     cpu: [arm]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.50.2':
     resolution: {integrity: sha512-+GdKWOvsifaYNlIVf07QYan1J5F141+vGm5/Y8b9uCZnG/nxoGqgCmR24mv0koIWWuqvFYnbURRqw1lv7IBINw==}
     cpu: [arm]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.50.2':
     resolution: {integrity: sha512-df0Eou14ojtUdLQdPFnymEQteENwSJAdLf5KCDrmZNsy1c3YaCNaJvYsEUHnrg+/DLBH612/R0xd3dD03uz2dg==}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.50.2':
     resolution: {integrity: sha512-iPeouV0UIDtz8j1YFR4OJ/zf7evjauqv7jQ/EFs0ClIyL+by++hiaDAfFipjOgyz6y6xbDvJuiU4HwpVMpRFDQ==}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.50.2':
     resolution: {integrity: sha512-OL6KaNvBopLlj5fTa5D5bau4W82f+1TyTZRr2BdnfsrnQnmdxh4okMxR2DcDkJuh4KeoQZVuvHvzuD/lyLn2Kw==}
     cpu: [loong64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-gnu@4.50.2':
     resolution: {integrity: sha512-I21VJl1w6z/K5OTRl6aS9DDsqezEZ/yKpbqlvfHbW0CEF5IL8ATBMuUx6/mp683rKTK8thjs/0BaNrZLXetLag==}
     cpu: [ppc64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.50.2':
     resolution: {integrity: sha512-Hq6aQJT/qFFHrYMjS20nV+9SKrXL2lvFBENZoKfoTH2kKDOJqff5OSJr4x72ZaG/uUn+XmBnGhfr4lwMRrmqCQ==}
     cpu: [riscv64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.50.2':
     resolution: {integrity: sha512-82rBSEXRv5qtKyr0xZ/YMF531oj2AIpLZkeNYxmKNN6I2sVE9PGegN99tYDLK2fYHJITL1P2Lgb4ZXnv0PjQvw==}
     cpu: [riscv64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.50.2':
     resolution: {integrity: sha512-4Q3S3Hy7pC6uaRo9gtXUTJ+EKo9AKs3BXKc2jYypEcMQ49gDPFU2P1ariX9SEtBzE5egIX6fSUmbmGazwBVF9w==}
     cpu: [s390x]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.50.2':
     resolution: {integrity: sha512-9Jie/At6qk70dNIcopcL4p+1UirusEtznpNtcq/u/C5cC4HBX7qSGsYIcG6bdxj15EYWhHiu02YvmdPzylIZlA==}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.50.2':
     resolution: {integrity: sha512-HPNJwxPL3EmhzeAnsWQCM3DcoqOz3/IC6de9rWfGR8ZCuEHETi9km66bH/wG3YH0V3nyzyFEGUZeL5PKyy4xvw==}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@rollup/rollup-openharmony-arm64@4.50.2':
     resolution: {integrity: sha512-nMKvq6FRHSzYfKLHZ+cChowlEkR2lj/V0jYj9JnGUVPL2/mIeFGmVM2mLaFeNa5Jev7W7TovXqXIG2d39y1KYA==}
@@ -8900,28 +8848,24 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   '@tailwindcss/oxide-linux-arm64-musl@4.1.13':
     resolution: {integrity: sha512-hZQrmtLdhyqzXHB7mkXfq0IYbxegaqTmfa1p9MBj72WPoDD3oNOh1Lnxf6xZLY9C3OV6qiCYkO1i/LrzEdW2mg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   '@tailwindcss/oxide-linux-x64-gnu@4.1.13':
     resolution: {integrity: sha512-uaZTYWxSXyMWDJZNY1Ul7XkJTCBRFZ5Fo6wtjrgBKzZLoJNrG+WderJwAjPzuNZOnmdrVg260DKwXCFtJ/hWRQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   '@tailwindcss/oxide-linux-x64-musl@4.1.13':
     resolution: {integrity: sha512-oXiPj5mi4Hdn50v5RdnuuIms0PVPI/EG4fxAfFiIKQh5TgQgX7oSuDWntHW7WNIi/yVLAiS+CRGW4RkoGSSgVQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   '@tailwindcss/oxide-wasm32-wasi@4.1.13':
     resolution: {integrity: sha512-+LC2nNtPovtrDwBc/nqnIKYh/W2+R69FA0hgoeOn64BdCX522u19ryLh3Vf3F8W49XBcMIxSe665kwy21FkhvA==}
@@ -11448,28 +11392,24 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
-    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.30.1:
     resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
-    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.30.1:
     resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
-    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.30.1:
     resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
-    libc: [musl]
 
   lightningcss-win32-arm64-msvc@1.30.1:
     resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==}
@@ -14325,6 +14265,8 @@ snapshots:
       log-update: 5.0.1
       sisteransi: 1.0.5
 
+  '@astrojs/compiler@0.0.0-next-result-create-astro-20250926081949': {}
+
   '@astrojs/compiler@2.12.2': {}
 
   '@astrojs/internal-helpers@0.7.1': {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index c3c82fd1ae14..0009e9be1f44 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -14,4 +14,5 @@ overrides:
   # A later wrangler minor dropeed support for node 18
   'wrangler': '4.14.1'
 # Wait until three days after release to install new versions of packages
-minimumReleaseAge: 4320
+# TODO: uncomment before merging into main
+# minimumReleaseAge: 4320

From 117f22ee7ea2de727837c63c4650c91b7d5347df Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 29 Sep 2025 17:35:59 +0200
Subject: [PATCH 16/36] fix: deps

---
 pnpm-lock.yaml | 563 ++++++++++---------------------------------------
 1 file changed, 106 insertions(+), 457 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 497d1752dccf..e2880b365f71 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -594,7 +594,7 @@ importers:
         version: 7.7.2
       shiki:
         specifier: ^3.12.0
-        version: 3.12.2
+        version: 3.13.0
       smol-toml:
         specifier: ^1.4.2
         version: 1.4.2
@@ -624,10 +624,10 @@ importers:
         version: 6.0.3
       vite:
         specifier: ^7.1.7
-        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
       vitefu:
         specifier: ^1.1.1
-        version: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
+        version: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       xxhash-wasm:
         specifier: ^1.1.0
         version: 1.1.0
@@ -742,7 +742,7 @@ importers:
         version: 4.50.2
       sass:
         specifier: ^1.91.0
-        version: 1.92.1
+        version: 1.93.2
       typescript:
         specifier: ^5.9.2
         version: 5.9.2
@@ -754,7 +754,7 @@ importers:
         version: 11.0.5
       vitest:
         specifier: ^3.2.4
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
     optionalDependencies:
       sharp:
         specifier: ^0.34.0
@@ -892,7 +892,7 @@ importers:
         version: link:../../..
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/e2e/fixtures/client-idle-timeout:
     dependencies:
@@ -926,10 +926,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1032,7 +1032,7 @@ importers:
         version: link:../../..
       sass:
         specifier: ^1.91.0
-        version: 1.92.1
+        version: 1.93.2
 
   packages/astro/e2e/fixtures/errors:
     dependencies:
@@ -1065,16 +1065,16 @@ importers:
         version: 18.3.1(react@18.3.1)
       sass:
         specifier: ^1.91.0
-        version: 1.92.1
+        version: 1.93.2
       solid-js:
         specifier: ^1.9.9
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/e2e/fixtures/hmr:
     devDependencies:
@@ -1083,7 +1083,7 @@ importers:
         version: link:../../..
       sass:
         specifier: ^1.91.0
-        version: 1.92.1
+        version: 1.93.2
 
   packages/astro/e2e/fixtures/hydration-race:
     dependencies:
@@ -1128,10 +1128,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1184,10 +1184,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1224,10 +1224,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1264,10 +1264,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1304,10 +1304,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1344,10 +1344,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1384,10 +1384,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/preact':
         specifier: workspace:*
@@ -1580,7 +1580,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/e2e/fixtures/tailwindcss:
     dependencies:
@@ -1640,10 +1640,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/e2e/fixtures/vite-virtual-modules:
     dependencies:
@@ -1664,7 +1664,7 @@ importers:
         version: link:../../..
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/performance:
     devDependencies:
@@ -1784,10 +1784,10 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/actions:
     dependencies:
@@ -1805,7 +1805,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/alias-tsconfig:
     dependencies:
@@ -1820,7 +1820,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/alias-tsconfig-baseurl-only:
     dependencies:
@@ -1832,7 +1832,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/alias-tsconfig-no-baseurl:
     dependencies:
@@ -1963,10 +1963,10 @@ importers:
         version: 10.27.2
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/astro-class-list:
     dependencies:
@@ -1996,7 +1996,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/astro-client-only/pkg: {}
 
@@ -2088,7 +2088,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/astro-env:
     dependencies:
@@ -2130,7 +2130,7 @@ importers:
         version: link:../../..
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/astro-expr:
     dependencies:
@@ -2463,10 +2463,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/before-hydration:
     dependencies:
@@ -2553,7 +2553,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/component-library-shared:
     dependencies:
@@ -2611,7 +2611,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/content:
     dependencies:
@@ -2907,7 +2907,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/css-import-as-inline:
     dependencies:
@@ -3195,10 +3195,10 @@ importers:
         version: 10.27.2
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/fonts:
     dependencies:
@@ -3438,10 +3438,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       '@astrojs/mdx':
         specifier: workspace:*
@@ -3641,10 +3641,10 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
     devDependencies:
       postcss-preset-env:
         specifier: ^10.3.1
@@ -3886,7 +3886,7 @@ importers:
         version: link:../../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/server-islands/ssr:
     dependencies:
@@ -3901,7 +3901,7 @@ importers:
         version: link:../../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/sessions:
     dependencies:
@@ -3976,7 +3976,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/slots-vue:
     dependencies:
@@ -3991,7 +3991,7 @@ importers:
         version: link:../../..
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/solid-component:
     dependencies:
@@ -4322,7 +4322,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/astro/test/fixtures/svg-deduplication:
     dependencies:
@@ -4418,7 +4418,7 @@ importers:
         version: link:../../..
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/vue-jsx:
     dependencies:
@@ -4430,7 +4430,7 @@ importers:
         version: link:../../..
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/vue-with-multi-renderer:
     dependencies:
@@ -4445,10 +4445,10 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
       vue:
         specifier: ^3.5.20
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/astro/test/fixtures/with-endpoint-routes:
     dependencies:
@@ -4921,7 +4921,7 @@ importers:
         version: link:../../../../../astro
       svelte:
         specifier: ^5.38.10
-        version: 5.39.3
+        version: 5.39.6
 
   packages/integrations/cloudflare/test/fixtures/with-vue:
     dependencies:
@@ -4936,7 +4936,7 @@ importers:
         version: link:../../../../../astro
       vue:
         specifier: ^3.5.21
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/integrations/cloudflare/test/fixtures/wrangler-preview-platform:
     dependencies:
@@ -5223,7 +5223,7 @@ importers:
         version: 7.1.0
       rehype-pretty-code:
         specifier: ^0.14.1
-        version: 0.14.1(shiki@3.12.2)
+        version: 0.14.1(shiki@3.13.0)
       remark-math:
         specifier: ^6.0.0
         version: 6.0.0
@@ -5238,7 +5238,7 @@ importers:
         version: 9.0.0
       shiki:
         specifier: ^3.12.0
-        version: 3.12.2
+        version: 3.13.0
       unified:
         specifier: ^11.0.5
         version: 11.0.5
@@ -5811,7 +5811,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       vue:
         specifier: ^3.5.21
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/integrations/sitemap:
     dependencies:
@@ -5897,10 +5897,10 @@ importers:
     dependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^5.1.1
-        version: 5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
+        version: 5.1.1(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       svelte2tsx:
         specifier: ^0.7.42
-        version: 0.7.42(svelte@5.39.3)(typescript@5.9.2)
+        version: 0.7.42(svelte@5.39.6)(typescript@5.9.2)
       vite:
         specifier: ^7.1.7
         version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
@@ -5916,7 +5916,7 @@ importers:
         version: 1.1.2
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/integrations/svelte/test/fixtures/async-rendering:
     dependencies:
@@ -5928,7 +5928,7 @@ importers:
         version: link:../../../../../astro
       svelte:
         specifier: ^5.39.3
-        version: 5.39.3
+        version: 5.39.6
 
   packages/integrations/vercel:
     dependencies:
@@ -6151,19 +6151,19 @@ importers:
     dependencies:
       '@vitejs/plugin-vue':
         specifier: 5.2.1
-        version: 5.2.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 5.2.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))
       '@vitejs/plugin-vue-jsx':
         specifier: ^4.2.0
-        version: 4.2.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 4.2.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))
       '@vue/compiler-sfc':
         specifier: ^3.5.21
-        version: 3.5.21
+        version: 3.5.22
       vite:
         specifier: ^7.1.7
         version: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
       vite-plugin-vue-devtools:
         specifier: ^7.7.7
-        version: 7.7.7(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+        version: 7.7.7(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))
     devDependencies:
       astro:
         specifier: workspace:*
@@ -6179,7 +6179,7 @@ importers:
         version: 0.18.12
       vue:
         specifier: ^3.5.21
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/integrations/vue/test/fixtures/app-entrypoint:
     dependencies:
@@ -6191,10 +6191,10 @@ importers:
         version: link:../../../../../astro
       vite-svg-loader:
         specifier: 5.1.0
-        version: 5.1.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.1.0(vue@3.5.22(typescript@5.9.2))
       vue:
         specifier: ^3.5.21
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/integrations/vue/test/fixtures/app-entrypoint-async:
     dependencies:
@@ -6206,10 +6206,10 @@ importers:
         version: link:../../../../../astro
       vite-svg-loader:
         specifier: 5.1.0
-        version: 5.1.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.1.0(vue@3.5.22(typescript@5.9.2))
       vue:
         specifier: ^3.5.21
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/integrations/vue/test/fixtures/app-entrypoint-css:
     dependencies:
@@ -6230,10 +6230,10 @@ importers:
         version: link:../../../../../astro
       vite-svg-loader:
         specifier: 5.1.0
-        version: 5.1.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.1.0(vue@3.5.22(typescript@5.9.2))
       vue:
         specifier: ^3.5.21
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.2)
 
   packages/integrations/vue/test/fixtures/app-entrypoint-relative:
     dependencies:
@@ -8757,39 +8757,21 @@ packages:
   '@sec-ant/readable-stream@0.4.1':
     resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
 
-  '@shikijs/core@3.12.2':
-    resolution: {integrity: sha512-L1Safnhra3tX/oJK5kYHaWmLEBJi1irASwewzY3taX5ibyXyMkkSDZlq01qigjryOBwrXSdFgTiZ3ryzSNeu7Q==}
-
   '@shikijs/core@3.13.0':
     resolution: {integrity: sha512-3P8rGsg2Eh2qIHekwuQjzWhKI4jV97PhvYjYUzGqjvJfqdQPz+nMlfWahU24GZAyW1FxFI1sYjyhfh5CoLmIUA==}
 
-  '@shikijs/engine-javascript@3.12.2':
-    resolution: {integrity: sha512-Nm3/azSsaVS7hk6EwtHEnTythjQfwvrO5tKqMlaH9TwG1P+PNaR8M0EAKZ+GaH2DFwvcr4iSfTveyxMIvXEHMw==}
-
   '@shikijs/engine-javascript@3.13.0':
     resolution: {integrity: sha512-Ty7xv32XCp8u0eQt8rItpMs6rU9Ki6LJ1dQOW3V/56PKDcpvfHPnYFbsx5FFUP2Yim34m/UkazidamMNVR4vKg==}
 
-  '@shikijs/engine-oniguruma@3.12.2':
-    resolution: {integrity: sha512-hozwnFHsLvujK4/CPVHNo3Bcg2EsnG8krI/ZQ2FlBlCRpPZW4XAEQmEwqegJsypsTAN9ehu2tEYe30lYKSZW/w==}
-
   '@shikijs/engine-oniguruma@3.13.0':
     resolution: {integrity: sha512-O42rBGr4UDSlhT2ZFMxqM7QzIU+IcpoTMzb3W7AlziI1ZF7R8eS2M0yt5Ry35nnnTX/LTLXFPUjRFCIW+Operg==}
 
-  '@shikijs/langs@3.12.2':
-    resolution: {integrity: sha512-bVx5PfuZHDSHoBal+KzJZGheFuyH4qwwcwG/n+MsWno5cTlKmaNtTsGzJpHYQ8YPbB5BdEdKU1rga5/6JGY8ww==}
-
   '@shikijs/langs@3.13.0':
     resolution: {integrity: sha512-672c3WAETDYHwrRP0yLy3W1QYB89Hbpj+pO4KhxK6FzIrDI2FoEXNiNCut6BQmEApYLfuYfpgOZaqbY+E9b8wQ==}
 
-  '@shikijs/themes@3.12.2':
-    resolution: {integrity: sha512-fTR3QAgnwYpfGczpIbzPjlRnxyONJOerguQv1iwpyQZ9QXX4qy/XFQqXlf17XTsorxnHoJGbH/LXBvwtqDsF5A==}
-
   '@shikijs/themes@3.13.0':
     resolution: {integrity: sha512-Vxw1Nm1/Od8jyA7QuAenaV78BG2nSr3/gCGdBkLpfLscddCkzkL36Q5b67SrLLfvAJTOUzW39x4FHVCFriPVgg==}
 
-  '@shikijs/types@3.12.2':
-    resolution: {integrity: sha512-K5UIBzxCyv0YoxN3LMrKB9zuhp1bV+LgewxuVwHdl4Gz5oePoUFrr9EfgJlGlDeXCU1b/yhdnXeuRvAnz8HN8Q==}
-
   '@shikijs/types@3.13.0':
     resolution: {integrity: sha512-oM9P+NCFri/mmQ8LoFGVfVyemm5Hi27330zuOBp0annwJdKH1kOLndw3zCtAVDehPLg9fKqoEx3Ht/wNZxolfw==}
 
@@ -9133,12 +9115,6 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.43.0':
-    resolution: {integrity: sha512-htB/+D/BIGoNTQYffZw4uM4NzzuolCoaA/BusuSIcC8YjmBYQioew5VUZAYdAETPjeed0hqCaW7EHg+Robq8uw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.0.0'
-
   '@typescript-eslint/project-service@8.44.1':
     resolution: {integrity: sha512-ycSa60eGg8GWAkVsKV4E6Nz33h+HjTXbsDT4FILyL8Obk5/mx4tbvCNsLf9zret3ipSumAOG89UcCs/KRaKYrA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -9149,12 +9125,6 @@ packages:
     resolution: {integrity: sha512-NdhWHgmynpSvyhchGLXh+w12OMT308Gm25JoRIyTZqEbApiBiQHD/8xgb6LqCWCFcxFtWwaVdFsLPQI3jvhywg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.43.0':
-    resolution: {integrity: sha512-ALC2prjZcj2YqqL5X/bwWQmHA2em6/94GcbB/KKu5SX3EBDOsqztmmX1kMkvAJHzxk7TazKzJfFiEIagNV3qEA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.0.0'
-
   '@typescript-eslint/tsconfig-utils@8.44.1':
     resolution: {integrity: sha512-B5OyACouEjuIvof3o86lRMvyDsFwZm+4fBOqFHccIctYgBjqR3qT39FBYGN87khcgf0ExpdCBeGKpKRhSFTjKQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -9168,20 +9138,10 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/types@8.43.0':
-    resolution: {integrity: sha512-vQ2FZaxJpydjSZJKiSW/LJsabFFvV7KgLC5DiLhkBcykhQj8iK9BOaDmQt74nnKdLvceM5xmhaTF+pLekrxEkw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@typescript-eslint/types@8.44.1':
     resolution: {integrity: sha512-Lk7uj7y9uQUOEguiDIDLYLJOrYHQa7oBiURYVFqIpGxclAFQ78f6VUOM8lI2XEuNOKNB7XuvM2+2cMXAoq4ALQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.43.0':
-    resolution: {integrity: sha512-7Vv6zlAhPb+cvEpP06WXXy/ZByph9iL6BQRBDj4kmBsW98AqEeQHlj/13X+sZOrKSo9/rNKH4Ul4f6EICREFdw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.0.0'
-
   '@typescript-eslint/typescript-estree@8.44.1':
     resolution: {integrity: sha512-qnQJ+mVa7szevdEyvfItbO5Vo+GfZ4/GZWWDRRLjrxYPkhM+6zYB2vRYwCsoJLzqFCdZT4mEqyJoyzkunsZ96A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -9195,10 +9155,6 @@ packages:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/visitor-keys@8.43.0':
-    resolution: {integrity: sha512-T+S1KqRD4sg/bHfLwrpF/K3gQLBM1n7Rp7OjjikjTEssI2YJzQpi5WXoynOaQ93ERIuq3O8RBTOUYDKszUCEHw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
   '@typescript-eslint/visitor-keys@8.44.1':
     resolution: {integrity: sha512-576+u0QD+Jp3tZzvfRfxon0EA2lzcDt3lhUbsC6Lgzy9x2VR4E+JUiNyGHi5T8vk0TV+fpJ5GLG1JsJuWCaKhw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -9358,27 +9314,15 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@vue/compiler-core@3.5.21':
-    resolution: {integrity: sha512-8i+LZ0vf6ZgII5Z9XmUvrCyEzocvWT+TeR2VBUVlzIH6Tyv57E20mPZ1bCS+tbejgUgmjrEh7q/0F0bibskAmw==}
-
   '@vue/compiler-core@3.5.22':
     resolution: {integrity: sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==}
 
-  '@vue/compiler-dom@3.5.21':
-    resolution: {integrity: sha512-jNtbu/u97wiyEBJlJ9kmdw7tAr5Vy0Aj5CgQmo+6pxWNQhXZDPsRr1UWPN4v3Zf82s2H3kF51IbzZ4jMWAgPlQ==}
-
   '@vue/compiler-dom@3.5.22':
     resolution: {integrity: sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==}
 
-  '@vue/compiler-sfc@3.5.21':
-    resolution: {integrity: sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==}
-
   '@vue/compiler-sfc@3.5.22':
     resolution: {integrity: sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==}
 
-  '@vue/compiler-ssr@3.5.21':
-    resolution: {integrity: sha512-vKQ5olH5edFZdf5ZrlEgSO1j1DMA4u23TVK5XR1uMhvwnYvVdDF0nHXJUblL/GvzlShQbjhZZ2uvYmDlAbgo9w==}
-
   '@vue/compiler-ssr@3.5.22':
     resolution: {integrity: sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==}
 
@@ -9396,29 +9340,15 @@ packages:
   '@vue/reactivity@3.1.5':
     resolution: {integrity: sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg==}
 
-  '@vue/reactivity@3.5.21':
-    resolution: {integrity: sha512-3ah7sa+Cwr9iiYEERt9JfZKPw4A2UlbY8RbbnH2mGCE8NwHkhmlZt2VsH0oDA3P08X3jJd29ohBDtX+TbD9AsA==}
-
   '@vue/reactivity@3.5.22':
     resolution: {integrity: sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==}
 
-  '@vue/runtime-core@3.5.21':
-    resolution: {integrity: sha512-+DplQlRS4MXfIf9gfD1BOJpk5RSyGgGXD/R+cumhe8jdjUcq/qlxDawQlSI8hCKupBlvM+3eS1se5xW+SuNAwA==}
-
   '@vue/runtime-core@3.5.22':
     resolution: {integrity: sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==}
 
-  '@vue/runtime-dom@3.5.21':
-    resolution: {integrity: sha512-3M2DZsOFwM5qI15wrMmNF5RJe1+ARijt2HM3TbzBbPSuBHOQpoidE+Pa+XEaVN+czbHf81ETRoG1ltztP2em8w==}
-
   '@vue/runtime-dom@3.5.22':
     resolution: {integrity: sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==}
 
-  '@vue/server-renderer@3.5.21':
-    resolution: {integrity: sha512-qr8AqgD3DJPJcGvLcJKQo2tAc8OnXRcfxhOJCPF+fcfn5bBGz7VCcO7t+qETOPxpWK1mgysXvVT/j+xWaHeMWA==}
-    peerDependencies:
-      vue: 3.5.21
-
   '@vue/server-renderer@3.5.22':
     resolution: {integrity: sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==}
     peerDependencies:
@@ -9427,9 +9357,6 @@ packages:
   '@vue/shared@3.1.5':
     resolution: {integrity: sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA==}
 
-  '@vue/shared@3.5.21':
-    resolution: {integrity: sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==}
-
   '@vue/shared@3.5.22':
     resolution: {integrity: sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==}
 
@@ -12945,11 +12872,6 @@ packages:
   sass-formatter@0.7.9:
     resolution: {integrity: sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==}
 
-  sass@1.92.1:
-    resolution: {integrity: sha512-ffmsdbwqb3XeyR8jJR6KelIXARM9bFQe8A6Q3W4Klmwy5Ckd5gz7jgUNHo4UOqutU5Sk1DtKLbpDP0nLCg1xqQ==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
   sass@1.93.2:
     resolution: {integrity: sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==}
     engines: {node: '>=14.0.0'}
@@ -13032,9 +12954,6 @@ packages:
   shiki@0.10.1:
     resolution: {integrity: sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==}
 
-  shiki@3.12.2:
-    resolution: {integrity: sha512-uIrKI+f9IPz1zDT+GMz+0RjzKJiijVr6WDWm9Pe3NNY6QigKCfifCEv9v9R2mDASKKjzjQ2QpFLcxaR3iHSnMA==}
-
   shiki@3.13.0:
     resolution: {integrity: sha512-aZW4l8Og16CokuCLf8CF8kq+KK2yOygapU5m3+hoGw0Mdosc6fPitjM+ujYarppj5ZIKGyPDPP1vqmQhr+5/0g==}
 
@@ -13295,10 +13214,6 @@ packages:
       svelte: ^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0
       typescript: ^4.9.4 || ^5.0.0
 
-  svelte@5.39.3:
-    resolution: {integrity: sha512-7Jwus6iXviGZAvhqbeYu3NNHA6LGyQ8EbmjdAhJUDade5rrW6g9VnBbRhUuYX4pMZLHozijsFolt88zvKPfsbQ==}
-    engines: {node: '>=18'}
-
   svelte@5.39.6:
     resolution: {integrity: sha512-bOJXmuwLNaoqPCTWO8mPu/fwxI5peGE5Efe7oo6Cakpz/G60vsnVF6mxbGODaxMUFUKEnjm6XOwHEqOht6cbvw==}
     engines: {node: '>=18'}
@@ -14039,14 +13954,6 @@ packages:
   vscode-uri@3.1.0:
     resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==}
 
-  vue@3.5.21:
-    resolution: {integrity: sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
   vue@3.5.22:
     resolution: {integrity: sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==}
     peerDependencies:
@@ -16561,13 +16468,6 @@ snapshots:
 
   '@sec-ant/readable-stream@0.4.1': {}
 
-  '@shikijs/core@3.12.2':
-    dependencies:
-      '@shikijs/types': 3.12.2
-      '@shikijs/vscode-textmate': 10.0.2
-      '@types/hast': 3.0.4
-      hast-util-to-html: 9.0.5
-
   '@shikijs/core@3.13.0':
     dependencies:
       '@shikijs/types': 3.13.0
@@ -16575,49 +16475,25 @@ snapshots:
       '@types/hast': 3.0.4
       hast-util-to-html: 9.0.5
 
-  '@shikijs/engine-javascript@3.12.2':
-    dependencies:
-      '@shikijs/types': 3.12.2
-      '@shikijs/vscode-textmate': 10.0.2
-      oniguruma-to-es: 4.3.3
-
   '@shikijs/engine-javascript@3.13.0':
     dependencies:
       '@shikijs/types': 3.13.0
       '@shikijs/vscode-textmate': 10.0.2
       oniguruma-to-es: 4.3.3
 
-  '@shikijs/engine-oniguruma@3.12.2':
-    dependencies:
-      '@shikijs/types': 3.12.2
-      '@shikijs/vscode-textmate': 10.0.2
-
   '@shikijs/engine-oniguruma@3.13.0':
     dependencies:
       '@shikijs/types': 3.13.0
       '@shikijs/vscode-textmate': 10.0.2
 
-  '@shikijs/langs@3.12.2':
-    dependencies:
-      '@shikijs/types': 3.12.2
-
   '@shikijs/langs@3.13.0':
     dependencies:
       '@shikijs/types': 3.13.0
 
-  '@shikijs/themes@3.12.2':
-    dependencies:
-      '@shikijs/types': 3.12.2
-
   '@shikijs/themes@3.13.0':
     dependencies:
       '@shikijs/types': 3.13.0
 
-  '@shikijs/types@3.12.2':
-    dependencies:
-      '@shikijs/vscode-textmate': 10.0.2
-      '@types/hast': 3.0.4
-
   '@shikijs/types@3.13.0':
     dependencies:
       '@shikijs/vscode-textmate': 10.0.2
@@ -16635,23 +16511,23 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
-  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       debug: 4.4.3
-      svelte: 5.39.3
+      svelte: 5.39.6
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.3)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.6)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       debug: 4.4.3
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.19
-      svelte: 5.39.3
+      svelte: 5.39.6
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
       vitefu: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
     transitivePeerDependencies:
@@ -16959,15 +16835,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.43.0(typescript@5.9.2)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.43.0(typescript@5.9.2)
-      '@typescript-eslint/types': 8.43.0
-      debug: 4.4.3
-      typescript: 5.9.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/project-service@8.44.1(typescript@5.9.2)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.44.1(typescript@5.9.2)
@@ -16982,10 +16849,6 @@ snapshots:
       '@typescript-eslint/types': 8.44.1
       '@typescript-eslint/visitor-keys': 8.44.1
 
-  '@typescript-eslint/tsconfig-utils@8.43.0(typescript@5.9.2)':
-    dependencies:
-      typescript: 5.9.2
-
   '@typescript-eslint/tsconfig-utils@8.44.1(typescript@5.9.2)':
     dependencies:
       typescript: 5.9.2
@@ -17002,26 +16865,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.43.0': {}
-
   '@typescript-eslint/types@8.44.1': {}
 
-  '@typescript-eslint/typescript-estree@8.43.0(typescript@5.9.2)':
-    dependencies:
-      '@typescript-eslint/project-service': 8.43.0(typescript@5.9.2)
-      '@typescript-eslint/tsconfig-utils': 8.43.0(typescript@5.9.2)
-      '@typescript-eslint/types': 8.43.0
-      '@typescript-eslint/visitor-keys': 8.43.0
-      debug: 4.4.3
-      fast-glob: 3.3.3
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.7.2
-      ts-api-utils: 2.1.0(typescript@5.9.2)
-      typescript: 5.9.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@typescript-eslint/typescript-estree@8.44.1(typescript@5.9.2)':
     dependencies:
       '@typescript-eslint/project-service': 8.44.1(typescript@5.9.2)
@@ -17049,11 +16894,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.43.0':
-    dependencies:
-      '@typescript-eslint/types': 8.43.0
-      eslint-visitor-keys: 4.2.1
-
   '@typescript-eslint/visitor-keys@8.44.1':
     dependencies:
       '@typescript-eslint/types': 8.44.1
@@ -17165,21 +17005,21 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue-jsx@4.2.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue-jsx@4.2.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
       '@rolldown/pluginutils': 1.0.0-beta.36
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@5.2.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))':
     dependencies:
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.2)
 
   '@vitest/expect@3.2.4':
     dependencies:
@@ -17189,14 +17029,6 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))':
-    dependencies:
-      '@vitest/spy': 3.2.4
-      estree-walker: 3.0.3
-      magic-string: 0.30.19
-    optionalDependencies:
-      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-
   '@vitest/mocker@3.2.4(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
@@ -17293,7 +17125,7 @@ snapshots:
       '@babel/types': 7.28.4
       '@vue/babel-helper-vue-transform-on': 1.5.0
       '@vue/babel-plugin-resolve-type': 1.5.0(@babel/core@7.28.4)
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.22
     optionalDependencies:
       '@babel/core': 7.28.4
     transitivePeerDependencies:
@@ -17306,18 +17138,10 @@ snapshots:
       '@babel/helper-module-imports': 7.27.1
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/parser': 7.28.4
-      '@vue/compiler-sfc': 3.5.21
+      '@vue/compiler-sfc': 3.5.22
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/compiler-core@3.5.21':
-    dependencies:
-      '@babel/parser': 7.28.4
-      '@vue/shared': 3.5.21
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
   '@vue/compiler-core@3.5.22':
     dependencies:
       '@babel/parser': 7.28.4
@@ -17326,28 +17150,11 @@ snapshots:
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.21':
-    dependencies:
-      '@vue/compiler-core': 3.5.21
-      '@vue/shared': 3.5.21
-
   '@vue/compiler-dom@3.5.22':
     dependencies:
       '@vue/compiler-core': 3.5.22
       '@vue/shared': 3.5.22
 
-  '@vue/compiler-sfc@3.5.21':
-    dependencies:
-      '@babel/parser': 7.28.4
-      '@vue/compiler-core': 3.5.21
-      '@vue/compiler-dom': 3.5.21
-      '@vue/compiler-ssr': 3.5.21
-      '@vue/shared': 3.5.21
-      estree-walker: 2.0.2
-      magic-string: 0.30.19
-      postcss: 8.5.6
-      source-map-js: 1.2.1
-
   '@vue/compiler-sfc@3.5.22':
     dependencies:
       '@babel/parser': 7.28.4
@@ -17360,17 +17167,12 @@ snapshots:
       postcss: 8.5.6
       source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.21':
-    dependencies:
-      '@vue/compiler-dom': 3.5.21
-      '@vue/shared': 3.5.21
-
   '@vue/compiler-ssr@3.5.22':
     dependencies:
       '@vue/compiler-dom': 3.5.22
       '@vue/shared': 3.5.22
 
-  '@vue/devtools-core@7.7.7(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))':
+  '@vue/devtools-core@7.7.7(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))':
     dependencies:
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
@@ -17378,7 +17180,7 @@ snapshots:
       nanoid: 5.1.6
       pathe: 2.0.3
       vite-hot-client: 2.1.0(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.2)
     transitivePeerDependencies:
       - vite
 
@@ -17400,31 +17202,15 @@ snapshots:
     dependencies:
       '@vue/shared': 3.1.5
 
-  '@vue/reactivity@3.5.21':
-    dependencies:
-      '@vue/shared': 3.5.21
-
   '@vue/reactivity@3.5.22':
     dependencies:
       '@vue/shared': 3.5.22
 
-  '@vue/runtime-core@3.5.21':
-    dependencies:
-      '@vue/reactivity': 3.5.21
-      '@vue/shared': 3.5.21
-
   '@vue/runtime-core@3.5.22':
     dependencies:
       '@vue/reactivity': 3.5.22
       '@vue/shared': 3.5.22
 
-  '@vue/runtime-dom@3.5.21':
-    dependencies:
-      '@vue/reactivity': 3.5.21
-      '@vue/runtime-core': 3.5.21
-      '@vue/shared': 3.5.21
-      csstype: 3.1.3
-
   '@vue/runtime-dom@3.5.22':
     dependencies:
       '@vue/reactivity': 3.5.22
@@ -17432,12 +17218,6 @@ snapshots:
       '@vue/shared': 3.5.22
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.21(vue@3.5.21(typescript@5.9.2))':
-    dependencies:
-      '@vue/compiler-ssr': 3.5.21
-      '@vue/shared': 3.5.21
-      vue: 3.5.21(typescript@5.9.2)
-
   '@vue/server-renderer@3.5.22(vue@3.5.22(typescript@5.9.2))':
     dependencies:
       '@vue/compiler-ssr': 3.5.22
@@ -17446,8 +17226,6 @@ snapshots:
 
   '@vue/shared@3.1.5': {}
 
-  '@vue/shared@3.5.21': {}
-
   '@vue/shared@3.5.22': {}
 
   '@webcomponents/template-shadowroot@0.2.1': {}
@@ -18249,7 +18027,7 @@ snapshots:
 
   detective-typescript@14.0.0(typescript@5.9.2):
     dependencies:
-      '@typescript-eslint/typescript-estree': 8.43.0(typescript@5.9.2)
+      '@typescript-eslint/typescript-estree': 8.44.1(typescript@5.9.2)
       ast-module-types: 6.0.1
       node-source-walk: 7.0.1
       typescript: 5.9.2
@@ -18259,7 +18037,7 @@ snapshots:
   detective-vue2@2.2.0(typescript@5.9.2):
     dependencies:
       '@dependents/detective-less': 5.0.1
-      '@vue/compiler-sfc': 3.5.21
+      '@vue/compiler-sfc': 3.5.22
       detective-es6: 5.0.1
       detective-sass: 6.0.1
       detective-scss: 5.0.1
@@ -21310,13 +21088,13 @@ snapshots:
       hast-util-from-html: 2.0.3
       unified: 11.0.5
 
-  rehype-pretty-code@0.14.1(shiki@3.12.2):
+  rehype-pretty-code@0.14.1(shiki@3.13.0):
     dependencies:
       '@types/hast': 3.0.4
       hast-util-to-string: 3.0.1
       parse-numeric-range: 1.3.0
       rehype-parse: 9.0.1
-      shiki: 3.12.2
+      shiki: 3.13.0
       unified: 11.0.5
       unist-util-visit: 5.0.0
 
@@ -21557,14 +21335,6 @@ snapshots:
     dependencies:
       suf-log: 2.5.3
 
-  sass@1.92.1:
-    dependencies:
-      chokidar: 4.0.3
-      immutable: 5.1.3
-      source-map-js: 1.2.1
-    optionalDependencies:
-      '@parcel/watcher': 2.5.1
-
   sass@1.93.2:
     dependencies:
       chokidar: 4.0.3
@@ -21724,17 +21494,6 @@ snapshots:
       vscode-oniguruma: 1.7.0
       vscode-textmate: 5.2.0
 
-  shiki@3.12.2:
-    dependencies:
-      '@shikijs/core': 3.12.2
-      '@shikijs/engine-javascript': 3.12.2
-      '@shikijs/engine-oniguruma': 3.12.2
-      '@shikijs/langs': 3.12.2
-      '@shikijs/themes': 3.12.2
-      '@shikijs/types': 3.12.2
-      '@shikijs/vscode-textmate': 10.0.2
-      '@types/hast': 3.0.4
-
   shiki@3.13.0:
     dependencies:
       '@shikijs/core': 3.13.0
@@ -22007,30 +21766,13 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte2tsx@0.7.42(svelte@5.39.3)(typescript@5.9.2):
+  svelte2tsx@0.7.42(svelte@5.39.6)(typescript@5.9.2):
     dependencies:
       dedent-js: 1.0.1
       pascal-case: 3.1.2
-      svelte: 5.39.3
+      svelte: 5.39.6
       typescript: 5.9.2
 
-  svelte@5.39.3:
-    dependencies:
-      '@jridgewell/remapping': 2.3.5
-      '@jridgewell/sourcemap-codec': 1.5.5
-      '@sveltejs/acorn-typescript': 1.0.5(acorn@8.15.0)
-      '@types/estree': 1.0.8
-      acorn: 8.15.0
-      aria-query: 5.3.2
-      axobject-query: 4.1.0
-      clsx: 2.1.1
-      esm-env: 1.2.2
-      esrap: 2.1.0
-      is-reference: 3.0.3
-      locate-character: 3.0.0
-      magic-string: 0.30.19
-      zimmerframe: 1.1.2
-
   svelte@5.39.6:
     dependencies:
       '@jridgewell/remapping': 2.3.5
@@ -22450,27 +22192,6 @@ snapshots:
     dependencies:
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
 
-  vite-node@3.2.4(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1):
-    dependencies:
-      cac: 6.7.14
-      debug: 4.4.3
-      es-module-lexer: 1.7.0
-      pathe: 2.0.3
-      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-    transitivePeerDependencies:
-      - '@types/node'
-      - jiti
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vite-node@3.2.4(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
@@ -22521,9 +22242,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@7.7.7(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2)):
+  vite-plugin-vue-devtools@7.7.7(rollup@4.50.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2)):
     dependencies:
-      '@vue/devtools-core': 7.7.7(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.21(typescript@5.9.2))
+      '@vue/devtools-core': 7.7.7(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.2))
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       execa: 9.6.0
@@ -22545,7 +22266,7 @@ snapshots:
       '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.28.4)
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
-      '@vue/compiler-dom': 3.5.21
+      '@vue/compiler-dom': 3.5.22
       kolorist: 1.8.0
       magic-string: 0.30.19
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
@@ -22562,10 +22283,10 @@ snapshots:
       stack-trace: 1.0.0-pre2
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
 
-  vite-svg-loader@5.1.0(vue@3.5.21(typescript@5.9.2)):
+  vite-svg-loader@5.1.0(vue@3.5.22(typescript@5.9.2)):
     dependencies:
       svgo: 3.3.2
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.2)
 
   vite@6.3.6(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1):
     dependencies:
@@ -22583,22 +22304,6 @@ snapshots:
       sass: 1.93.2
       yaml: 2.8.1
 
-  vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1):
-    dependencies:
-      esbuild: 0.25.5
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
-      postcss: 8.5.6
-      rollup: 4.50.2
-      tinyglobby: 0.2.15
-    optionalDependencies:
-      '@types/node': 22.18.1
-      fsevents: 2.3.3
-      jiti: 2.5.1
-      lightningcss: 1.30.1
-      sass: 1.92.1
-      yaml: 2.8.1
-
   vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.5
@@ -22615,56 +22320,10 @@ snapshots:
       sass: 1.93.2
       yaml: 2.8.1
 
-  vitefu@1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)):
-    optionalDependencies:
-      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-
   vitefu@1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)):
     optionalDependencies:
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1):
-    dependencies:
-      '@types/chai': 5.2.2
-      '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1))
-      '@vitest/pretty-format': 3.2.4
-      '@vitest/runner': 3.2.4
-      '@vitest/snapshot': 3.2.4
-      '@vitest/spy': 3.2.4
-      '@vitest/utils': 3.2.4
-      chai: 5.3.3
-      debug: 4.4.3
-      expect-type: 1.2.2
-      magic-string: 0.30.19
-      pathe: 2.0.3
-      picomatch: 4.0.3
-      std-env: 3.9.0
-      tinybench: 2.9.0
-      tinyexec: 0.3.2
-      tinyglobby: 0.2.15
-      tinypool: 1.1.1
-      tinyrainbow: 2.0.0
-      vite: 7.1.7(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.92.1)(yaml@2.8.1)
-      why-is-node-running: 2.3.0
-    optionalDependencies:
-      '@types/debug': 4.1.12
-      '@types/node': 22.18.1
-    transitivePeerDependencies:
-      - jiti
-      - less
-      - lightningcss
-      - msw
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-      - tsx
-      - yaml
-
   vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.5.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
@@ -22821,16 +22480,6 @@ snapshots:
 
   vscode-uri@3.1.0: {}
 
-  vue@3.5.21(typescript@5.9.2):
-    dependencies:
-      '@vue/compiler-dom': 3.5.21
-      '@vue/compiler-sfc': 3.5.21
-      '@vue/runtime-dom': 3.5.21
-      '@vue/server-renderer': 3.5.21(vue@3.5.21(typescript@5.9.2))
-      '@vue/shared': 3.5.21
-    optionalDependencies:
-      typescript: 5.9.2
-
   vue@3.5.22(typescript@5.9.2):
     dependencies:
       '@vue/compiler-dom': 3.5.22

From 55a1a911aa4e0d38191f8cb9464ffd58f3eb7608 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Wed, 1 Oct 2025 18:23:25 +0200
Subject: [PATCH 17/36] feat: deprecate import.meta.env.ASSETS_PREFIX (#14461)

Co-authored-by: Matt Kane <m@mk.gg>
---
 .changeset/green-garlics-heal.md | 21 +++++++++++++++++++++
 packages/astro/client.d.ts       |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 .changeset/green-garlics-heal.md

diff --git a/.changeset/green-garlics-heal.md b/.changeset/green-garlics-heal.md
new file mode 100644
index 000000000000..ea916e1fed1c
--- /dev/null
+++ b/.changeset/green-garlics-heal.md
@@ -0,0 +1,21 @@
+---
+'astro': major
+---
+
+Deprecates `import.meta.env.ASSETS_PREFIX`
+
+In Astro 5.x, it was possible to access `build.assetsPrefix` in your Astro config via the built-in environment variable `import.meta.env.ASSETS_PREFIX`. However, Astro v5.7.0 introduced the `astro:config` virtual model to expose a non-exhaustive, serializable, type-safe version of the Astro configuration which included access to `build.assetsPrefix` directly. This became the preferred way to access the prefix for Astro-generated asset links when set, although the environment variable still existed.
+
+Astro 6.0 deprecates this variable in favor of `build.assetsPrefix` from the `astro:config/server` module.
+
+#### What should I do?
+
+Replace any occurances of `import.meta.env.ASSETS_PREFIX` with the `build.assetsPrefix` import from `astro:config/server`. This is a drop-in replacement to provide the existing value, and no other changes to your code should be necessary:
+
+```diff
+import { someLogic } from "./utils"
++import { build } from "astro:config/server"
+
+-someLogic(import.meta.env.ASSETS_PREFIX)
++someLogic(build.assetsPrefix)
+```
diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts
index 68dfc3530dcf..7e21a9e8e082 100644
--- a/packages/astro/client.d.ts
+++ b/packages/astro/client.d.ts
@@ -5,8 +5,10 @@
 /// <reference path="./types/fonts.d.ts" />
 
 interface ImportMetaEnv {
+	// TODO: remove in Astro 7
 	/**
 	 * The prefix for Astro-generated asset links if the build.assetsPrefix config option is set. This can be used to create asset links not handled by Astro.
+	 * @deprecated This will be removed in a future major version of Astro. Use `build.assetsPrefix` from `astro:config/server` instead.
 	 */
 	readonly ASSETS_PREFIX: string | Record<string, string>;
 	/**

From 049da87cb7ce1828f3025062ce079dbf132f5b86 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Wed, 1 Oct 2025 19:37:45 +0200
Subject: [PATCH 18/36] feat!: trailing slash never for endpoints with file
 extension (#14457)

* feat!: trailing slash never for endpoints with file extension

* Update giant-areas-press.md

* Update .changeset/giant-areas-press.md

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

---------

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/giant-areas-press.md                | 18 ++++++++++++++++++
 .../astro/src/core/routing/manifest/create.ts  |  3 +--
 .../test/units/routing/trailing-slash.test.js  |  7 ++++---
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/giant-areas-press.md

diff --git a/.changeset/giant-areas-press.md b/.changeset/giant-areas-press.md
new file mode 100644
index 000000000000..5fd666998f15
--- /dev/null
+++ b/.changeset/giant-areas-press.md
@@ -0,0 +1,18 @@
+---
+'astro': major
+---
+
+Updates trailing slash behavior of endpoint URLs.
+
+In Astro v5.0, custom endpoints whose URL ended in a file extension (e.g. `/src/pages/sitemap.xml.ts` ) could be accessed with a trailing slash (`/sitemap.xml/`) or without (`/sitemap.xml`), regardless of the value configured for `build.trailingSlash`.
+
+In Astro v6.0, these endpoints can only be accessed without a trailing slash. This is true regardless of your `build.trailingSlash` configuration.
+
+#### What should I do?
+
+Review your links to your custom endpoints that include a file extension in the URL and remove any trailing slashes:
+
+```diff
+-<a href="/sitemap.xml/">Sitemap</a>
++<a href="/sitemap.xml">Sitemap</a>
+```
diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts
index 032be21aee2b..7477c03d7fbe 100644
--- a/packages/astro/src/core/routing/manifest/create.ts
+++ b/packages/astro/src/core/routing/manifest/create.ts
@@ -255,12 +255,11 @@ function createFileBasedRoutes(
 }
 
 // Get trailing slash rule for a path, based on the config and whether the path has an extension.
-// TODO: in Astro 6, change endpoints with extentions to use 'never'
 const trailingSlashForPath = (
 	pathname: string | null,
 	config: AstroConfig,
 ): AstroConfig['trailingSlash'] =>
-	pathname && hasFileExtension(pathname) ? 'ignore' : config.trailingSlash;
+	pathname && hasFileExtension(pathname) ? 'never' : config.trailingSlash;
 
 function createInjectedRoutes({ settings, cwd }: CreateRouteManifestParams): RouteData[] {
 	const { config } = settings;
diff --git a/packages/astro/test/units/routing/trailing-slash.test.js b/packages/astro/test/units/routing/trailing-slash.test.js
index 3a1c99df0ec7..738e5ef3970b 100644
--- a/packages/astro/test/units/routing/trailing-slash.test.js
+++ b/packages/astro/test/units/routing/trailing-slash.test.js
@@ -171,14 +171,15 @@ describe('trailingSlash', () => {
 		assert.equal(json, '{"success":true}');
 	});
 
-	it('should match the API route when request has a trailing slash, with a file extension', async () => {
+	it('should NOT match the API route when request has a trailing slash, with a file extension', async () => {
 		const { req, res, text } = createRequestAndResponse({
 			method: 'GET',
 			url: '/dot.json/',
 		});
 		container.handle(req, res);
-		const json = await text();
-		assert.equal(json, '{"success":true}');
+		const html = await text();
+		assert.equal(html.includes(`<span class="statusMessage">Not found</span>`), true);
+		assert.equal(res.statusCode, 404);
 	});
 
 	it('should also match the API route when request lacks a trailing slash, with a file extension', async () => {

From 564ba76ebba9659e8796e6c1dfe23dda8dd73d8a Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 2 Oct 2025 13:52:28 +0200
Subject: [PATCH 19/36] feat: remove deprecated experimental errors (#14474)

---
 packages/astro/src/core/errors/errors-data.ts | 51 +------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index a0542effe3f5..9233cba12567 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -1427,7 +1427,8 @@ export const CspNotEnabled = {
 export const UnavailableAstroGlobal = {
 	name: 'UnavailableAstroGlobal',
 	title: 'Unavailable Astro global in getStaticPaths()',
-	message: (name: string) => `The Astro global is not available in this scope. Please remove "Astro.${name}" from your getStaticPaths() function.`,
+	message: (name: string) =>
+		`The Astro global is not available in this scope. Please remove "Astro.${name}" from your getStaticPaths() function.`,
 } satisfies ErrorData;
 
 /**
@@ -2087,54 +2088,6 @@ export const SessionStorageSaveError = {
 	hint: 'For more information, see https://docs.astro.build/en/guides/sessions/',
 } satisfies ErrorData;
 
-/**
- * @docs
- * @see
- * 	- [Sessions](https://docs.astro.build/en/guides/sessions/)
- * @deprecated This error was removed in Astro 5.7, when the Sessions feature stopped being experimental.
- * @description
- * Your adapter must support server output to use sessions.
- */
-export const SessionWithoutSupportedAdapterOutputError = {
-	name: 'SessionWithoutSupportedAdapterOutputError',
-	title: "Sessions cannot be used with an adapter that doesn't support server output.",
-	message:
-		'Sessions require an adapter that supports server output. The adapter must set `"server"` in the `buildOutput` adapter feature.',
-	hint: 'Ensure your adapter supports `buildOutput: "server"`: https://docs.astro.build/en/reference/adapter-reference/#building-an-adapter',
-} satisfies ErrorData;
-/**
- * @docs
- * @message The `experimental.session` flag was set to `true`, but no storage was configured. Either configure the storage manually or use an adapter that provides session storage.
- * @deprecated This error was removed in Astro 5.7, when the Sessions feature stopped being experimental.
- * @see
- * 	- [Sessions](https://docs.astro.build/en/guides/sessions/)
- * @description
- * Thrown when session storage is enabled but not configured.
- */
-export const SessionConfigMissingError = {
-	name: 'SessionConfigMissingError',
-	title: 'Session storage was enabled but not configured.',
-	message:
-		'The `experimental.session` flag was set to `true`, but no storage was configured. Either configure the storage manually or use an adapter that provides session storage',
-	hint: 'For more information, see https://docs.astro.build/en/guides/sessions/',
-} satisfies ErrorData;
-
-/**
- * @docs
- * @message Session config was provided without enabling the `experimental.session` flag
- * @deprecated This error was removed in Astro 5.7, when the Sessions feature stopped being experimental.
- * @see
- * 	- [Sessions](https://docs.astro.build/en/guides/sessions/)
- * @description
- * Thrown when session storage is configured but the `experimental.session` flag is not enabled.
- */
-export const SessionConfigWithoutFlagError = {
-	name: 'SessionConfigWithoutFlagError',
-	title: 'Session flag not set',
-	message: 'Session config was provided without enabling the `experimental.session` flag',
-	hint: 'For more information, see https://docs.astro.build/en/guides/sessions/',
-} satisfies ErrorData;
-
 /*
  * Adding an error? Follow these steps:
  * 1. Determine in which category it belongs (Astro, Vite, CSS, Content Collections etc.)

From 9fdfd4c620313827e65664632a9c9cb435ad07ca Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 2 Oct 2025 13:56:00 +0200
Subject: [PATCH 20/36] feat: clean deprecated APIs (#14462)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/cyan-crews-cross.md                | 19 ++++++++++++
 .changeset/dull-mangos-travel.md              | 20 +++++++++++++
 .changeset/pretty-forks-smash.md              | 29 +++++++++++++++++++
 packages/astro/components/ClientRouter.astro  |  5 ----
 .../fixtures/prefetch/src/pages/index.astro   |  2 +-
 packages/astro/src/content/data-store.ts      |  2 --
 .../astro/src/content/mutable-data-store.ts   | 15 +---------
 packages/astro/src/core/app/index.ts          | 21 +++++++-------
 packages/astro/src/core/app/node.ts           | 21 ++++----------
 packages/astro/src/prefetch/index.ts          | 15 +---------
 10 files changed, 86 insertions(+), 63 deletions(-)
 create mode 100644 .changeset/cyan-crews-cross.md
 create mode 100644 .changeset/dull-mangos-travel.md
 create mode 100644 .changeset/pretty-forks-smash.md

diff --git a/.changeset/cyan-crews-cross.md b/.changeset/cyan-crews-cross.md
new file mode 100644
index 000000000000..387e73e30529
--- /dev/null
+++ b/.changeset/cyan-crews-cross.md
@@ -0,0 +1,19 @@
+---
+'astro': major
+---
+
+Removes the old `app.render()` signature (Adapter API)
+
+In Astro 4.0, the `app.render()` signature that allowed passing `routeData` and `locals` as optional arguments was deprecated in favor of a single optional `renderOptions` argument.
+
+Astro 6.0 removes this signature entirely. Attempting to pass these separate arguments will now cause an error in your project.
+
+#### What should I do?
+
+Review your `app.render` calls and pass `routeData` and `locals` as properties of an object instead of as multiple independent arguments:
+
+```diff
+// my-adapter/entrypoint.ts
+-app.render(request, routeData, locals)
++app.render(request, { routeData, locals })
+```
diff --git a/.changeset/dull-mangos-travel.md b/.changeset/dull-mangos-travel.md
new file mode 100644
index 000000000000..7c33a7a2eba0
--- /dev/null
+++ b/.changeset/dull-mangos-travel.md
@@ -0,0 +1,20 @@
+---
+'astro': major
+---
+
+Removes `prefetch()` `with` option
+
+In Astro 4.8.4, the `with` option of the programmatic `prefetch()` function was deprecated in favor of a more sensible default behavior that no longer required specifying the priority of prefetching for each page.
+
+Astro 6.0 removes this option entirely and it is no longer possible to configure the priority of prefetching by passing the `with` option. Attempting to do so will now cause errors.
+
+By default, Astro's prefetching now uses an automatic approach that will always try to use `<link rel="prefetch>` if supported, or will fall back to `fetch()`.
+
+#### What should I do?
+
+Review your `prefetch()` calls and remove the `with` option if it still exists:
+
+```diff
+-prefetch('/about', { with: 'fetch' });
++prefetch('/about');
+```
diff --git a/.changeset/pretty-forks-smash.md b/.changeset/pretty-forks-smash.md
new file mode 100644
index 000000000000..68f1ca880a1c
--- /dev/null
+++ b/.changeset/pretty-forks-smash.md
@@ -0,0 +1,29 @@
+---
+'astro': major
+---
+
+Removes the `handleForms` prop for the `<ClientRouter />` component
+
+In Astro 4.0, the `handleForms` prop of the `<ClientRouter />` component was deprecated, as it was no longer necessary to opt in to handling `submit` events for `form` elements. This functionality has been built in by default and the property, if still included in your project, silently had no impact on form submission.
+
+Astro 6.0 removes this prop entirely and it now must be removed to avoid errors in your project.
+
+#### What should I do?
+
+Remove the `handleForms` property from your `<ClientRouter />` component if it exists. It has provided no additional functionality, and so removing it should not change any behavior in your project:
+
+```diff
+---
+// title="src/pages/index.astro
+import { ClientRouter } from "astro:transitions";
+---
+<html>
+  <head>
+-    <ClientRouter handleForms />
++    <ClientRouter />
+  </head>
+  <body>
+    <!-- stuff here -->
+  </body>
+</html>
+```
diff --git a/packages/astro/components/ClientRouter.astro b/packages/astro/components/ClientRouter.astro
index df7a37da3d79..87d3892da2a2 100644
--- a/packages/astro/components/ClientRouter.astro
+++ b/packages/astro/components/ClientRouter.astro
@@ -3,11 +3,6 @@ type Fallback = 'none' | 'animate' | 'swap';
 
 export interface Props {
 	fallback?: Fallback;
-	/** @deprecated handleForms is enabled by default in Astro 4.0
-	 *
-	 * Set `data-astro-reload` on your form to opt-out of the default behavior.
-	 */
-	handleForms?: boolean;
 }
 
 const { fallback = 'animate' } = Astro.props;
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro
index 63a30031ea8a..eb6cddf94e36 100644
--- a/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/index.astro
@@ -27,7 +27,7 @@
       // @ts-nocheck
       import { prefetch } from 'astro:prefetch'
       document.getElementById('prefetch-manual').addEventListener('click', () => {
-        prefetch('/prefetch-manual', { with: 'link' })
+        prefetch('/prefetch-manual')
       })
     </script>
   </body>
diff --git a/packages/astro/src/content/data-store.ts b/packages/astro/src/content/data-store.ts
index 82875b1ecdd2..57df3d521596 100644
--- a/packages/astro/src/content/data-store.ts
+++ b/packages/astro/src/content/data-store.ts
@@ -34,8 +34,6 @@ export interface DataEntry<TData extends Record<string, unknown> = Record<string
 	 */
 	deferredRender?: boolean;
 	assetImports?: Array<string>;
-	/** @deprecated */
-	legacyId?: string;
 }
 
 /**
diff --git a/packages/astro/src/content/mutable-data-store.ts b/packages/astro/src/content/mutable-data-store.ts
index b17960a00c7a..2dd68eb49bcb 100644
--- a/packages/astro/src/content/mutable-data-store.ts
+++ b/packages/astro/src/content/mutable-data-store.ts
@@ -291,17 +291,7 @@ export default new Map([\n${lines.join(',\n')}]);
 			entries: () => this.entries(collectionName),
 			values: () => this.values(collectionName),
 			keys: () => this.keys(collectionName),
-			set: ({
-				id: key,
-				data,
-				body,
-				filePath,
-				deferredRender,
-				digest,
-				rendered,
-				assetImports,
-				legacyId,
-			}) => {
+			set: ({ id: key, data, body, filePath, deferredRender, digest, rendered, assetImports }) => {
 				if (!key) {
 					throw new Error(`ID must be a non-empty string`);
 				}
@@ -348,9 +338,6 @@ export default new Map([\n${lines.join(',\n')}]);
 				if (rendered) {
 					entry.rendered = rendered;
 				}
-				if (legacyId) {
-					entry.legacyId = legacyId;
-				}
 				if (deferredRender) {
 					entry.deferredRender = deferredRender;
 					if (filePath) {
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index bd0ca485079c..122868affe9f 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -320,14 +320,18 @@ export class App {
 		return pathname;
 	}
 
-	async render(request: Request, renderOptions?: RenderOptions): Promise<Response> {
-		let routeData: RouteData | undefined;
-		let locals: object | undefined;
-		let clientAddress: string | undefined;
-		let addCookieHeader: boolean | undefined;
+	async render(
+		request: Request,
+		{
+			addCookieHeader,
+			clientAddress = Reflect.get(request, clientAddressSymbol),
+			locals,
+			prerenderedErrorPageFetch = fetch,
+			routeData,
+		}: RenderOptions = {},
+	): Promise<Response> {
 		const url = new URL(request.url);
 		const redirect = this.#redirectTrailingSlash(url.pathname);
-		const prerenderedErrorPageFetch = renderOptions?.prerenderedErrorPageFetch ?? fetch;
 
 		if (redirect !== url.pathname) {
 			const status = request.method === 'GET' ? 301 : 308;
@@ -347,11 +351,6 @@ export class App {
 			);
 		}
 
-		addCookieHeader = renderOptions?.addCookieHeader;
-		clientAddress = renderOptions?.clientAddress ?? Reflect.get(request, clientAddressSymbol);
-		routeData = renderOptions?.routeData;
-		locals = renderOptions?.locals;
-
 		if (routeData) {
 			this.#logger.debug(
 				'router',
diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts
index 78e0a95f4089..bfc2a5da74af 100644
--- a/packages/astro/src/core/app/node.ts
+++ b/packages/astro/src/core/app/node.ts
@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { Http2ServerResponse } from 'node:http2';
 import type { Socket } from 'node:net';
-import type { RouteData } from '../../types/public/internal.js';
 import { clientAddressSymbol, nodeRequestAbortControllerCleanupSymbol } from '../constants.js';
 import { deserializeManifest } from './common.js';
 import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders.js';
@@ -33,22 +32,12 @@ export class NodeApp extends App {
 		}
 		return super.match(req, allowPrerenderedRoutes);
 	}
-	render(request: NodeRequest | Request, options?: RenderOptions): Promise<Response>;
-	/**
-	 * @deprecated Instead of passing `RouteData` and locals individually, pass an object with `routeData` and `locals` properties.
-	 * See https://github.com/withastro/astro/pull/9199 for more information.
-	 */
-	render(request: NodeRequest | Request, routeData?: RouteData, locals?: object): Promise<Response>;
-	render(
-		req: NodeRequest | Request,
-		routeDataOrOptions?: RouteData | RenderOptions,
-		maybeLocals?: object,
-	) {
-		if (!(req instanceof Request)) {
-			req = NodeApp.createRequest(req);
+
+	render(request: NodeRequest | Request, options?: RenderOptions): Promise<Response> {
+		if (!(request instanceof Request)) {
+			request = NodeApp.createRequest(request);
 		}
-		// @ts-expect-error The call would have succeeded against the implementation, but implementation signatures of overloads are not externally visible.
-		return super.render(req, routeDataOrOptions, maybeLocals);
+		return super.render(request, options);
 	}
 
 	/**
diff --git a/packages/astro/src/prefetch/index.ts b/packages/astro/src/prefetch/index.ts
index 34d3b5363998..6dc003221159 100644
--- a/packages/astro/src/prefetch/index.ts
+++ b/packages/astro/src/prefetch/index.ts
@@ -186,16 +186,6 @@ function initLoadStrategy() {
 }
 
 export interface PrefetchOptions {
-	/**
-	 * How the prefetch should prioritize the URL. (default `'link'`)
-	 * - `'link'`: use `<link rel="prefetch">`.
-	 * - `'fetch'`: use `fetch()`.
-	 *
-	 * @deprecated It is recommended to not use this option, and let prefetch use `'link'` whenever it's supported,
-	 * or otherwise fall back to `'fetch'`. `'link'` works better if the URL doesn't set an appropriate cache header,
-	 * as the browser will continue to cache it as long as it's used subsequently.
-	 */
-	with?: 'link' | 'fetch';
 	/**
 	 * Should prefetch even on data saver mode or slow connection. (default `false`)
 	 */
@@ -236,10 +226,7 @@ export function prefetch(url: string, opts?: PrefetchOptions) {
 		appendSpeculationRules(url, opts?.eagerness ?? 'immediate');
 	}
 	// Prefetch with link if supported
-	else if (
-		document.createElement('link').relList?.supports?.('prefetch') &&
-		opts?.with !== 'fetch'
-	) {
+	else if (document.createElement('link').relList?.supports?.('prefetch')) {
 		debug?.(`[astro] Prefetching ${url} with <link rel="prefetch">`);
 		const link = document.createElement('link');
 		link.rel = 'prefetch';

From 36a461bf3f64c467bc52aecf511cd831d238e18b Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Fri, 3 Oct 2025 15:06:52 +0200
Subject: [PATCH 21/36] feat: stabilize experimental preserveScriptOrder option
 (#14480)

---
 .changeset/whole-geckos-think.md              | 51 +++++++++++++++++++
 packages/astro/package.json                   |  2 +-
 packages/astro/src/core/compile/compile.ts    |  1 -
 .../astro/src/core/config/schemas/base.ts     |  5 --
 packages/astro/src/types/public/config.ts     | 42 ---------------
 packages/astro/test/astro-directives.test.js  |  2 +-
 .../css-order-transparent/astro.config.mjs    |  6 +--
 pnpm-lock.yaml                                | 10 ++--
 8 files changed, 59 insertions(+), 60 deletions(-)
 create mode 100644 .changeset/whole-geckos-think.md

diff --git a/.changeset/whole-geckos-think.md b/.changeset/whole-geckos-think.md
new file mode 100644
index 000000000000..c9f6d2487cc5
--- /dev/null
+++ b/.changeset/whole-geckos-think.md
@@ -0,0 +1,51 @@
+---
+'astro': major
+---
+
+Updates `<script>` and `<style>` tags to render in the order they are defined
+
+In Astro v5.5, the `experimental.preserveScriptOrder` flag was introduced to render multiple `<style>` and `<script>` tags in the same order as they were declared in the source code. Astro 5.x reversed their order in your generated HTML output. This could give unexpected results, for example, CSS styles being overridden by earlier defined style tags when your site was built.
+
+Astro 6.0 removes this experimental flag and makes this the new default behavior in Astro: scripts and styles are now rendered in the order defined in your code.
+
+#### What should I do?
+
+If you were previously using this experimental feature, you must remove this experimental flag from your configuration as it no longer exists:
+
+```diff
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+  experimental: {
+-    preserveScriptOrder: true,
+  },
+})
+```
+
+Review your `<script>` and `<style>` tags to make sure they behave as desired. You may need to reverse their order:
+
+```diff
+<!-- src/components/MyComponent.astro -->
+<p>I am a component</p>
+<style>
+  body {
+-    background: red;
++    background: yellow;
+  }
+</style>
+<style>
+  body {
+-    background: yellow;
++    background: red;
+  }
+</style>
+<script>
+-    console.log("hello")
++    console.log("world")
+</script>
+<script>
+-    console.log("world!")
++    console.log("hello!")
+</script>
+```
diff --git a/packages/astro/package.json b/packages/astro/package.json
index fa499f8b496a..c2949bfee431 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -106,7 +106,7 @@
     "test:integration": "astro-scripts test \"test/*.test.js\""
   },
   "dependencies": {
-    "@astrojs/compiler": "0.0.0-next-result-create-astro-20250926081949",
+    "@astrojs/compiler": "0.0.0-script-order-20251002140654",
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/markdown-remark": "workspace:*",
     "@astrojs/telemetry": "workspace:*",
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index e3ade372851d..336eb210e182 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -62,7 +62,6 @@ export async function compile({
 				cssPartialCompileResults,
 				cssTransformErrors,
 			}),
-			experimentalScriptOrder: astroConfig.experimental.preserveScriptOrder ?? false,
 			async resolvePath(specifier) {
 				return resolvePath(specifier, filename);
 			},
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index ddba2f3f2ca6..b708001f55c7 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -97,7 +97,6 @@ export const ASTRO_CONFIG_DEFAULTS = {
 		clientPrerender: false,
 		contentIntellisense: false,
 		headingIdCompat: false,
-		preserveScriptOrder: false,
 		liveContentCollections: false,
 		csp: false,
 		staticImportMetaEnv: false,
@@ -468,10 +467,6 @@ export const AstroConfigSchema = z.object({
 				.boolean()
 				.optional()
 				.default(ASTRO_CONFIG_DEFAULTS.experimental.headingIdCompat),
-			preserveScriptOrder: z
-				.boolean()
-				.optional()
-				.default(ASTRO_CONFIG_DEFAULTS.experimental.preserveScriptOrder),
 			fonts: z.array(z.union([localFontFamilySchema, remoteFontFamilySchema])).optional(),
 			liveContentCollections: z
 				.boolean()
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index bd82172a645a..8c63821a2a43 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -2358,48 +2358,6 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
 					directives?: CspDirective[];
 			  };
 
-		/**
-		 * @name experimental.preserveScriptOrder
-		 * @type {boolean}
-		 * @default `false`
-		 * @version 5.5
-		 * @description
-		 *
-		 * When enabled, `<script>` and `<style>` tags are rendered in the same order as they are defined.
-		 *
-		 * ## Example
-		 *
-		 * Consider the following component:
-		 *
-		 * ```html
-		 * <p>I am a component</p>
-		 * <style>
-		 *   body {
-		 *     background: red;
-		 *   }
-		 * </style>
-		 * <style>
-		 *   body {
-		 *     background: yellow;
-		 *   }
-		 * </style>
-		 * ```
-		 *
-		 * By default, it will generate a CSS style where `red` will be applied:
-		 *
-		 * ```css
-		 * body {background:#ff0} body {background:red}
-		 * ```
-		 *
-		 * When this new option is set to `true`, the generated CSS style will apply `yellow`:
-		 *
-		 * ```css
-		 * body {background:red} body {background:#ff0}
-		 * ```
-		 *
-		 */
-		preserveScriptOrder?: boolean;
-
 		/**
 		 * @name experimental.liveContentCollections
 		 * @type {boolean}
diff --git a/packages/astro/test/astro-directives.test.js b/packages/astro/test/astro-directives.test.js
index 21feee339403..f33cab3d4b5b 100644
--- a/packages/astro/test/astro-directives.test.js
+++ b/packages/astro/test/astro-directives.test.js
@@ -70,7 +70,7 @@ describe('Directives', async () => {
 			$('#compound-style')
 				.attr('style')
 				.toString()
-				.includes('color:var(--fg);--fg: black;--bg: white;'),
+				.includes('color:var(--fg);--bg: white;--fg: black;'),
 			true,
 		);
 	});
diff --git a/packages/astro/test/fixtures/css-order-transparent/astro.config.mjs b/packages/astro/test/fixtures/css-order-transparent/astro.config.mjs
index 5ce5a4089f86..86dbfb924824 100644
--- a/packages/astro/test/fixtures/css-order-transparent/astro.config.mjs
+++ b/packages/astro/test/fixtures/css-order-transparent/astro.config.mjs
@@ -1,7 +1,3 @@
 import { defineConfig } from 'astro/config';
 
-export default defineConfig({
-	experimental: {
-		preserveScriptOrder: true,
-	}
-});
+export default defineConfig({});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 679e50a26b75..75008c93272d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -471,8 +471,8 @@ importers:
   packages/astro:
     dependencies:
       '@astrojs/compiler':
-        specifier: 0.0.0-next-result-create-astro-20250926081949
-        version: 0.0.0-next-result-create-astro-20250926081949
+        specifier: 0.0.0-script-order-20251002140654
+        version: 0.0.0-script-order-20251002140654
       '@astrojs/internal-helpers':
         specifier: workspace:*
         version: link:../internal-helpers
@@ -6498,8 +6498,8 @@ packages:
     resolution: {integrity: sha512-bVzyKzEpIwqjihBU/aUzt1LQckJuHK0agd3/ITdXhPUYculrc6K1/K7H+XG4rwjXtg+ikT3PM05V1MVYWiIvQw==}
     engines: {node: '>=18.14.1'}
 
-  '@astrojs/compiler@0.0.0-next-result-create-astro-20250926081949':
-    resolution: {integrity: sha512-iZAPYDe2R9fU1GA26epcy4iOvDgla3oWirzqOsc3nkKeSTcUYtY1rZq/D02oKCVHepAkFlRS1bS27+G+jIeX0Q==}
+  '@astrojs/compiler@0.0.0-script-order-20251002140654':
+    resolution: {integrity: sha512-6pR3ODwtdJt4wx+W8i0YUVIRonDu6+MILh25wALbcxhDlKDBt55iCQjwu7JLbDg6eln2CvscHvecTKu/uBnlWA==}
 
   '@astrojs/compiler@2.12.2':
     resolution: {integrity: sha512-w2zfvhjNCkNMmMMOn5b0J8+OmUaBL1o40ipMvqcG6NRpdC+lKxmTi48DT8Xw0SzJ3AfmeFLB45zXZXtmbsjcgw==}
@@ -14256,7 +14256,7 @@ snapshots:
       log-update: 5.0.1
       sisteransi: 1.0.5
 
-  '@astrojs/compiler@0.0.0-next-result-create-astro-20250926081949': {}
+  '@astrojs/compiler@0.0.0-script-order-20251002140654': {}
 
   '@astrojs/compiler@2.12.2': {}
 

From 805ebc9587b0f08fbfa902c728f681b0891ab91f Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Fri, 3 Oct 2025 15:10:42 +0200
Subject: [PATCH 22/36] feat: remove renderScript option (#14479)

---
 packages/astro/package.json                |  2 +-
 packages/astro/src/core/compile/compile.ts |  1 -
 pnpm-lock.yaml                             | 10 +++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/astro/package.json b/packages/astro/package.json
index c2949bfee431..efadbe7a6bda 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -106,7 +106,7 @@
     "test:integration": "astro-scripts test \"test/*.test.js\""
   },
   "dependencies": {
-    "@astrojs/compiler": "0.0.0-script-order-20251002140654",
+    "@astrojs/compiler": "0.0.0-render-script-20251003120459",
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/markdown-remark": "workspace:*",
     "@astrojs/telemetry": "workspace:*",
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index 336eb210e182..64479c07b184 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -55,7 +55,6 @@ export async function compile({
 				astroConfig.devToolbar &&
 				astroConfig.devToolbar.enabled &&
 				(await preferences.get('devToolbar.enabled')),
-			renderScript: true,
 			preprocessStyle: createStylePreprocessor({
 				filename,
 				viteConfig,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 75008c93272d..ec4fec9b509b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -471,8 +471,8 @@ importers:
   packages/astro:
     dependencies:
       '@astrojs/compiler':
-        specifier: 0.0.0-script-order-20251002140654
-        version: 0.0.0-script-order-20251002140654
+        specifier: 0.0.0-render-script-20251003120459
+        version: 0.0.0-render-script-20251003120459
       '@astrojs/internal-helpers':
         specifier: workspace:*
         version: link:../internal-helpers
@@ -6498,8 +6498,8 @@ packages:
     resolution: {integrity: sha512-bVzyKzEpIwqjihBU/aUzt1LQckJuHK0agd3/ITdXhPUYculrc6K1/K7H+XG4rwjXtg+ikT3PM05V1MVYWiIvQw==}
     engines: {node: '>=18.14.1'}
 
-  '@astrojs/compiler@0.0.0-script-order-20251002140654':
-    resolution: {integrity: sha512-6pR3ODwtdJt4wx+W8i0YUVIRonDu6+MILh25wALbcxhDlKDBt55iCQjwu7JLbDg6eln2CvscHvecTKu/uBnlWA==}
+  '@astrojs/compiler@0.0.0-render-script-20251003120459':
+    resolution: {integrity: sha512-HWimO47p1zcg/H7/OtiABemJtvFxXDJ7r551Xkwq6c+FIZTps2/sIN1/qAEiuW5UmGChqaI+ILPMcSzFOWidSA==}
 
   '@astrojs/compiler@2.12.2':
     resolution: {integrity: sha512-w2zfvhjNCkNMmMMOn5b0J8+OmUaBL1o40ipMvqcG6NRpdC+lKxmTi48DT8Xw0SzJ3AfmeFLB45zXZXtmbsjcgw==}
@@ -14256,7 +14256,7 @@ snapshots:
       log-update: 5.0.1
       sisteransi: 1.0.5
 
-  '@astrojs/compiler@0.0.0-script-order-20251002140654': {}
+  '@astrojs/compiler@0.0.0-render-script-20251003120459': {}
 
   '@astrojs/compiler@2.12.2': {}
 

From 25fe09396dbcda2e1008c01a982f4eb2d1f33ae6 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Fri, 3 Oct 2025 15:10:56 +0200
Subject: [PATCH 23/36] feat!: remove rewrite from action context (#14477)

---
 .changeset/six-women-visit.md               | 32 +++++++++++++++++++++
 packages/astro/src/actions/runtime/utils.ts | 12 ++------
 packages/astro/src/core/render-context.ts   | 10 +++----
 packages/astro/src/types/public/context.ts  |  2 +-
 4 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/six-women-visit.md

diff --git a/.changeset/six-women-visit.md b/.changeset/six-women-visit.md
new file mode 100644
index 000000000000..4a0049011988
--- /dev/null
+++ b/.changeset/six-women-visit.md
@@ -0,0 +1,32 @@
+---
+'astro': major
+---
+
+Removes `rewrite()` from Actions context
+
+In Astro 5.5.6, the `ActionAPIContext.rewrite` method was deprecated because custom endpoints should be used instead of rewrites.
+
+Astro 6.0 removes the `rewrite()` method from `ActionAPIContext` entirely and it may no longer be used.
+
+#### What should I do?
+
+Review your Actions handlers and remove any call to `rewrite()`:
+
+
+```diff
+// src/actions/index.ts
+import { defineAction } from 'astro:actions';
+import { z } from 'astro:schema';
+
+export const server = {
+  getGreeting: defineAction({
+    input: z.object({
+      // ...
+    }),
+    handler: async (input, context) => {
+-      context.rewrite('/')
+      // ...
+    }
+  })
+}
+```
diff --git a/packages/astro/src/actions/runtime/utils.ts b/packages/astro/src/actions/runtime/utils.ts
index 68e5a2e84439..6bfe8417f4f9 100644
--- a/packages/astro/src/actions/runtime/utils.ts
+++ b/packages/astro/src/actions/runtime/utils.ts
@@ -1,4 +1,4 @@
-import type { APIContext, AstroSharedContext } from '../../types/public/context.js';
+import type { APIContext } from '../../types/public/context.js';
 import type { SerializedActionResult } from './virtual/shared.js';
 
 export type ActionPayload = {
@@ -24,7 +24,6 @@ export function hasContentType(contentType: string, expected: string[]) {
 
 export type ActionAPIContext = Pick<
 	APIContext,
-	| 'rewrite'
 	| 'request'
 	| 'url'
 	| 'isPrerendered'
@@ -41,14 +40,7 @@ export type ActionAPIContext = Pick<
 	| 'originPathname'
 	| 'session'
 	| 'csp'
-> & {
-	// TODO: remove in Astro 6.0
-	/**
-	 * @deprecated
-	 * The use of `rewrite` in Actions is deprecated
-	 */
-	rewrite: AstroSharedContext['rewrite'];
-};
+>;
 
 export type MaybePromise<T> = T | Promise<T>;
 
diff --git a/packages/astro/src/core/render-context.ts b/packages/astro/src/core/render-context.ts
index 719feea66786..baca1fc3a0b8 100644
--- a/packages/astro/src/core/render-context.ts
+++ b/packages/astro/src/core/render-context.ts
@@ -308,11 +308,16 @@ export class RenderContext {
 		const redirect = (path: string, status = 302) =>
 			new Response(null, { status, headers: { Location: path } });
 
+		const rewrite = async (reroutePayload: RewritePayload) => {
+			return await this.#executeRewrite(reroutePayload);
+		};
+
 		Reflect.set(context, apiContextRoutesSymbol, this.pipeline);
 
 		return Object.assign(context, {
 			props,
 			redirect,
+			rewrite,
 			getActionResult: createGetActionResult(context.locals),
 			callAction: createCallAction(context),
 		});
@@ -380,10 +385,6 @@ export class RenderContext {
 		const renderContext = this;
 		const { params, pipeline, url } = this;
 
-		const rewrite = async (reroutePayload: RewritePayload) => {
-			return await this.#executeRewrite(reroutePayload);
-		};
-
 		return {
 			// Don't allow reassignment of cookies because it doesn't work
 			get cookies() {
@@ -411,7 +412,6 @@ export class RenderContext {
 			get preferredLocaleList() {
 				return renderContext.computePreferredLocaleList();
 			},
-			rewrite,
 			request: this.request,
 			site: pipeline.site,
 			url,
diff --git a/packages/astro/src/types/public/context.ts b/packages/astro/src/types/public/context.ts
index c1fd617641c8..f3ae6ff9703f 100644
--- a/packages/astro/src/types/public/context.ts
+++ b/packages/astro/src/types/public/context.ts
@@ -222,7 +222,7 @@ export interface AstroGlobal<
 }
 
 // Shared types between `Astro` global and API context object
-export interface AstroSharedContext<
+interface AstroSharedContext<
 	Props extends Record<string, any> = Record<string, any>,
 	RouteParams extends Record<string, string | undefined> = Record<string, string | undefined>,
 > {

From 6f67c6eef2647ef1a1eab78a65a906ab633974bb Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Fri, 3 Oct 2025 15:11:15 +0200
Subject: [PATCH 24/36] feat: stabilize static import meta env (#14485)

---
 .changeset/wet-suits-help.md                  | 66 +++++++++++++++++++
 .../astro/src/core/config/schemas/base.ts     |  5 --
 packages/astro/src/core/create-vite.ts        |  1 -
 packages/astro/src/env/env-loader.ts          | 26 +-------
 packages/astro/src/types/public/config.ts     | 18 -----
 packages/astro/test/astro-envs.test.js        |  4 +-
 .../test/fixtures/astro-envs/astro.config.mjs |  3 -
 7 files changed, 71 insertions(+), 52 deletions(-)
 create mode 100644 .changeset/wet-suits-help.md

diff --git a/.changeset/wet-suits-help.md b/.changeset/wet-suits-help.md
new file mode 100644
index 000000000000..3e5375b1fdd6
--- /dev/null
+++ b/.changeset/wet-suits-help.md
@@ -0,0 +1,66 @@
+---
+'astro': major
+---
+
+Updates `import.meta.env` values to always be inlined
+
+In Astro 5.13, the `experimental.staticImportMetaEnv` was introduced to update the behavior when accessing `import.meta.env` directly to align with [Vite's handling of environment variables](https://vite.dev/guide/env-and-mode.html#env-variables) and ensures that `import.meta.env` values are always inlined.
+
+In Astro 5.x, non-public environment variables were replaced by a reference to `process.env`. Additionally, Astro could also convert the value type of your environment variables used through `import.meta.env`, which could prevent access to some values such as the strings `"true"` (which was converted to a boolean value), and `"1"` (which was converted to a number).
+
+Astro 6 removes this experimental flag and makes this the new default behavior in Astro: `import.meta.env` values are always inlined and never coerced.
+
+#### What should I do?
+
+If you were previously using this experimental feature, you must remove this experimental flag from your configuration as it no longer exists:
+
+```diff
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+  experimental: {
+-    staticImportMetaEnv: true,
+  },
+})
+```
+
+If you were relying on coercion, you may need to update your project code to apply it manually:
+
+```diff
+// src/components/MyComponent.astro
+-const enabled: boolean = import.meta.env.ENABLED;
++const enabled: boolean = import.meta.env.ENABLED === "true";
+```
+
+If you were relying on the transformation into `process.env`, you may need to update your project code to apply it manually:
+
+```diff
+// src/components/MyComponent.astro
+-const enabled: boolean = import.meta.env.DB_PASSWORD;
++const enabled: boolean = process.env.DB_PASSWORD;
+```
+
+You may also need to update types:
+
+```diff
+// src/env.d.ts
+interface ImportMetaEnv {
+  readonly PUBLIC_POKEAPI: string;
+-  readonly DB_PASSWORD: string;
+-  readonly ENABLED: boolean;
++  readonly ENABLED: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
++namespace NodeJS {
++  interface ProcessEnv {
++    DB_PASSWORD: string;
++  }
++}
+```
+
+If you need more control over environment variables in Astro, we recommend you use `astro:env`.
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index b708001f55c7..c6707c6d8d1b 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -99,7 +99,6 @@ export const ASTRO_CONFIG_DEFAULTS = {
 		headingIdCompat: false,
 		liveContentCollections: false,
 		csp: false,
-		staticImportMetaEnv: false,
 		chromeDevtoolsWorkspace: false,
 		failOnPrerenderConflict: false,
 	},
@@ -495,10 +494,6 @@ export const AstroConfigSchema = z.object({
 				])
 				.optional()
 				.default(ASTRO_CONFIG_DEFAULTS.experimental.csp),
-			staticImportMetaEnv: z
-				.boolean()
-				.optional()
-				.default(ASTRO_CONFIG_DEFAULTS.experimental.staticImportMetaEnv),
 			chromeDevtoolsWorkspace: z
 				.boolean()
 				.optional()
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index eecbfa33070a..b1cab6b47ad2 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -127,7 +127,6 @@ export async function createVite(
 	const envLoader = createEnvLoader({
 		mode,
 		config: settings.config,
-		useStatic: settings.config.experimental.staticImportMetaEnv,
 	});
 
 	// Start with the Vite configuration that Astro core needs
diff --git a/packages/astro/src/env/env-loader.ts b/packages/astro/src/env/env-loader.ts
index f095c4e8e409..114a717e1fe1 100644
--- a/packages/astro/src/env/env-loader.ts
+++ b/packages/astro/src/env/env-loader.ts
@@ -13,11 +13,9 @@ const isValidIdentifierRe = /^[_$a-zA-Z][\w$]*$/;
 function getPrivateEnv({
 	fullEnv,
 	viteConfig,
-	useStatic,
 }: {
 	fullEnv: Record<string, string>;
 	viteConfig: AstroConfig['vite'];
-	useStatic: boolean;
 }): Record<string, string> {
 	let envPrefixes: string[] = ['PUBLIC_'];
 	if (viteConfig.envPrefix) {
@@ -32,24 +30,7 @@ function getPrivateEnv({
 		if (!isValidIdentifierRe.test(key) || envPrefixes.some((prefix) => key.startsWith(prefix))) {
 			continue;
 		}
-		// Only replace with process.env if not static
-		// TODO: make static the default and only way to do this in Astro 6
-		if (!useStatic && typeof process.env[key] !== 'undefined') {
-			let value = process.env[key];
-			// Replacements are always strings, so try to convert to strings here first
-			if (typeof value !== 'string') {
-				value = `${value}`;
-			}
-			// Boolean values should be inlined to support `export const prerender`
-			// We already know that these are NOT sensitive values, so inlining is safe
-			if (value === '0' || value === '1' || value === 'true' || value === 'false') {
-				privateEnv[key] = value;
-			} else {
-				privateEnv[key] = `process.env.${key}`;
-			}
-		} else {
-			privateEnv[key] = JSON.stringify(fullEnv[key]);
-		}
+		privateEnv[key] = JSON.stringify(fullEnv[key]);
 	}
 	return privateEnv;
 }
@@ -57,12 +38,11 @@ function getPrivateEnv({
 interface EnvLoaderOptions {
 	mode: string;
 	config: AstroConfig;
-	useStatic: boolean;
 }
 
-function getEnv({ mode, config, useStatic }: EnvLoaderOptions) {
+function getEnv({ mode, config }: EnvLoaderOptions) {
 	const loaded = loadEnv(mode, config.vite.envDir ?? fileURLToPath(config.root), '');
-	const privateEnv = getPrivateEnv({ fullEnv: loaded, viteConfig: config.vite, useStatic });
+	const privateEnv = getPrivateEnv({ fullEnv: loaded, viteConfig: config.vite });
 
 	return { loaded, privateEnv };
 }
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 8c63821a2a43..3672cb8b4a85 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -2369,24 +2369,6 @@ export interface ViteUserConfig extends OriginalViteUserConfig {
 		 */
 		liveContentCollections?: boolean;
 
-		/**
-		 * @name experimental.staticImportMetaEnv
-		 * @type {boolean}
-		 * @default `false`
-		 * @version 5.13
-		 * @description
-		 *
-		 * Disables replacement of `import.meta.env` values with `process.env` calls and their coercion
-		 *
-		 * Currently, non-public `import.meta.env` environment variables are replaced by a reference to `process.env`. Additionally, Astro may also convert the value type of your environment variables used through `import.meta.env`, which can prevent access to some values such as the strings `"true"` (which is converted to a boolean value), and `"1"` (which is converted to a number).
-		 *
-		 * The `experimental.staticImportMetaEnv` flag simplifies Astro's default behavior, making it easier to understand and use. Astro will no longer replace any `import.meta.env` environment variables with a `process.env` call, nor will it coerce values.
-		 *
-		 * This flag aligns `import.meta.env`'s behavior in Astro with [Vite](https://vite.dev/guide/env-and-mode.html#env-variables).
-		 *
-		 * See the [experimental static `import.meta.env` docs](https://docs.astro.build/en/reference/experimental-flags/static-import-meta-env/) for more information.
-		 */
-		staticImportMetaEnv?: boolean;
 		/**
 		 * @name experimental.chromeDevtoolsWorkspace
 		 * @type {boolean}
diff --git a/packages/astro/test/astro-envs.test.js b/packages/astro/test/astro-envs.test.js
index d053d852650c..4e2787798f1c 100644
--- a/packages/astro/test/astro-envs.test.js
+++ b/packages/astro/test/astro-envs.test.js
@@ -100,7 +100,7 @@ describe('Environment Variables', () => {
 			assert.equal(found, false, 'found the private env variable in the JS build');
 		});
 
-		it('does not coerce environment variable values when experimental.staticImportMetaEnv is true', async () => {
+		it('does not coerce environment variable values', async () => {
 			let indexHtml = await fixture.readFile('/index.html');
 			assert.equal(indexHtml.includes('typeof BOOLEAN_VAR is string'), true);
 			assert.equal(indexHtml.includes('typeof NUMBER_VAR is string'), true);
@@ -167,7 +167,7 @@ describe('Environment Variables', () => {
 			delete process.env.SECRET_PLACE;
 		});
 
-		it('does not turn import.meta.env into process.env when experimental.staticImportMetaEnv is true', async () => {
+		it('does not turn import.meta.env into process.env', async () => {
 			const request = new Request('http://example.com/');
 			const response = await app.render(request);
 			const html = await response.text();
diff --git a/packages/astro/test/fixtures/astro-envs/astro.config.mjs b/packages/astro/test/fixtures/astro-envs/astro.config.mjs
index bba74a981829..4b59505bc25c 100644
--- a/packages/astro/test/fixtures/astro-envs/astro.config.mjs
+++ b/packages/astro/test/fixtures/astro-envs/astro.config.mjs
@@ -20,7 +20,4 @@ export default defineConfig({
 			},
 		],
 	},
-	experimental: {
-		staticImportMetaEnv: true,
-	}
 });

From f135f5b18c12dd78dcae38465a857753cc88f0a2 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Mon, 13 Oct 2025 17:17:22 +0200
Subject: [PATCH 25/36] Update next (#14530)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
Co-authored-by: Matthew Phillips <matthewp@users.noreply.github.com>
Co-authored-by: Houston (Bot) <108291165+astrobot-houston@users.noreply.github.com>
Co-authored-by: Bartosz Kapciak <bartosz.kapciak@swmansion.com>
Co-authored-by: Bartosz Kapciak <martrapp@users.noreply.github.com>
Co-authored-by: Armand Philippot <git@armand.philippot.eu>
Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
Co-authored-by: Abdelrahman Abdelfattah <spices.digital@gmail.com>
Co-authored-by: Alasdair McLeay <penx@users.noreply.github.com>
Fix failing x-forwarded-host tests (#14505)
fix(prefetch): Fix "tap" prefetch strategy when view transitions are enabled (#14235)
fix `security.allowedDomains` version (#14509)
Fix compatibility with older Astro versions in @astrojs/node (#14514)
Fixes #14513
fix heading level in config reference docs (#14517)
fix(deps): update all non-major dependencies (#14522)
---
 .changeset/bumpy-walls-run.md                 |   5 -
 .changeset/calm-mammals-grow.md               |   5 -
 .changeset/eight-areas-vanish.md              |   5 -
 .changeset/fifty-boxes-shave.md               |   5 +
 .changeset/full-peas-do.md                    |   5 -
 .changeset/olive-papers-hide.md               |   5 -
 .changeset/shaggy-chairs-sing.md              |   5 -
 .changeset/shiny-suns-sip.md                  |   5 -
 .changeset/tangy-kings-fold.md                |   6 -
 .changeset/tangy-lamps-play.md                |   5 -
 .changeset/thick-bees-sneeze.md               |   7 -
 .changeset/true-jokes-throw.md                |   5 -
 .changeset/wide-cows-rest.md                  |   5 +
 .github/workflows/benchmark.yml               |   2 +-
 .github/workflows/check.yml                   |   2 +-
 .github/workflows/ci.yml                      |  10 +-
 .github/workflows/continuous_benchmark.yml    |   2 +-
 .github/workflows/preview-release.yml         |   2 +-
 .github/workflows/release.yml                 |   2 +-
 .github/workflows/scripts.yml                 |   2 +-
 .github/workflows/test-hosts.yml              |   2 +-
 .github/workflows/validate-changesets.yml     |   2 +-
 examples/basics/package.json                  |   2 +-
 examples/blog/package.json                    |   4 +-
 examples/component/package.json               |   2 +-
 examples/container-with-vitest/package.json   |   4 +-
 examples/framework-alpine/package.json        |   2 +-
 examples/framework-multiple/package.json      |   6 +-
 examples/framework-preact/package.json        |   4 +-
 examples/framework-react/package.json         |   4 +-
 examples/framework-solid/package.json         |   2 +-
 examples/framework-svelte/package.json        |   4 +-
 examples/framework-vue/package.json           |   2 +-
 examples/hackernews/package.json              |   4 +-
 examples/integration/package.json             |   2 +-
 examples/minimal/package.json                 |   2 +-
 examples/portfolio/package.json               |   2 +-
 examples/ssr/package.json                     |   6 +-
 examples/starlog/package.json                 |   2 +-
 examples/toolbar-app/package.json             |   2 +-
 examples/with-markdoc/package.json            |   4 +-
 examples/with-mdx/package.json                |   4 +-
 examples/with-nanostores/package.json         |   2 +-
 examples/with-tailwindcss/package.json        |   4 +-
 examples/with-vitest/package.json             |   2 +-
 package.json                                  |   6 +-
 packages/astro-rss/package.json               |   2 +-
 packages/astro/CHANGELOG.md                   |  71 +++
 packages/astro/components/Font.astro          |   2 +-
 .../components/ViewTransitionsLayout.astro    |  14 +
 .../src/pages/view-transitions/1.astro        |  10 +
 .../src/pages/view-transitions/2.astro        |   7 +
 .../src/pages/view-transitions/index.astro    |   8 +
 packages/astro/e2e/prefetch.test.js           |  90 +++
 packages/astro/package.json                   |   2 +-
 .../src/cli/create-key/core/create-key.ts     |  18 +
 .../astro/src/cli/create-key/definitions.ts   |   3 +
 packages/astro/src/cli/create-key/index.ts    |  32 -
 .../create-key/infra/crypto-key-generator.ts  |  12 +
 packages/astro/src/cli/index.ts               |  13 +-
 packages/astro/src/container/index.ts         |   2 +
 packages/astro/src/core/app/index.ts          |  47 +-
 packages/astro/src/core/app/node.ts           |  31 +-
 packages/astro/src/core/app/types.ts          |   2 +
 .../src/core/build/plugins/plugin-manifest.ts |   1 +
 .../astro/src/core/config/schemas/base.ts     |  11 +
 packages/astro/src/prefetch/index.ts          |   2 +-
 packages/astro/src/types/public/config.ts     |  44 +-
 packages/astro/test/cli.test.js               |   2 +-
 .../i18n-routing-subdomain/astro.config.mjs   |   7 +
 packages/astro/test/i18n-routing.test.js      |   7 +
 packages/astro/test/units/app/node.test.js    |  43 +-
 .../units/assets/fonts/orchestrate.test.js    |   3 +-
 .../astro/test/units/assets/fonts/utils.js    |  25 -
 .../astro/test/units/cli/create-key.test.js   |  26 +
 packages/astro/test/units/test-utils.js       |  38 +-
 packages/astro/types/content.d.ts             |   2 +-
 .../fixtures/ticketing-example/package.json   |   2 +-
 packages/integrations/alpinejs/package.json   |   2 +-
 packages/integrations/cloudflare/CHANGELOG.md |  10 +
 packages/integrations/cloudflare/package.json |   2 +-
 packages/integrations/markdoc/CHANGELOG.md    |   8 +
 packages/integrations/markdoc/package.json    |   2 +-
 packages/integrations/mdx/CHANGELOG.md        |   7 +
 packages/integrations/mdx/package.json        |   2 +-
 packages/integrations/netlify/CHANGELOG.md    |  10 +
 packages/integrations/netlify/package.json    |   2 +-
 packages/integrations/node/CHANGELOG.md       |  13 +
 packages/integrations/node/package.json       |   4 +-
 packages/integrations/node/src/serve-app.ts   |   4 +-
 .../node/test/fixtures/url/astro.config.mjs   |  14 +
 packages/integrations/node/test/url.test.js   |  44 ++
 packages/integrations/vercel/CHANGELOG.md     |   9 +
 packages/integrations/vercel/package.json     |   2 +-
 packages/internal-helpers/CHANGELOG.md        |   6 +
 packages/internal-helpers/package.json        |   2 +-
 packages/markdown/remark/CHANGELOG.md         |   7 +
 packages/markdown/remark/package.json         |   2 +-
 packages/telemetry/package.json               |   2 +-
 packages/upgrade/package.json                 |   4 +-
 pnpm-lock.yaml                                | 560 +++++++++---------
 101 files changed, 979 insertions(+), 490 deletions(-)
 delete mode 100644 .changeset/bumpy-walls-run.md
 delete mode 100644 .changeset/calm-mammals-grow.md
 delete mode 100644 .changeset/eight-areas-vanish.md
 create mode 100644 .changeset/fifty-boxes-shave.md
 delete mode 100644 .changeset/full-peas-do.md
 delete mode 100644 .changeset/olive-papers-hide.md
 delete mode 100644 .changeset/shaggy-chairs-sing.md
 delete mode 100644 .changeset/shiny-suns-sip.md
 delete mode 100644 .changeset/tangy-kings-fold.md
 delete mode 100644 .changeset/tangy-lamps-play.md
 delete mode 100644 .changeset/thick-bees-sneeze.md
 delete mode 100644 .changeset/true-jokes-throw.md
 create mode 100644 .changeset/wide-cows-rest.md
 create mode 100644 packages/astro/e2e/fixtures/prefetch/src/components/ViewTransitionsLayout.astro
 create mode 100644 packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/1.astro
 create mode 100644 packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/2.astro
 create mode 100644 packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/index.astro
 create mode 100644 packages/astro/src/cli/create-key/core/create-key.ts
 create mode 100644 packages/astro/src/cli/create-key/definitions.ts
 delete mode 100644 packages/astro/src/cli/create-key/index.ts
 create mode 100644 packages/astro/src/cli/create-key/infra/crypto-key-generator.ts
 create mode 100644 packages/astro/test/units/cli/create-key.test.js
 create mode 100644 packages/integrations/node/test/fixtures/url/astro.config.mjs

diff --git a/.changeset/bumpy-walls-run.md b/.changeset/bumpy-walls-run.md
deleted file mode 100644
index bef343d153db..000000000000
--- a/.changeset/bumpy-walls-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Improves font files URLs in development when using the experimental fonts API by showing the subset if present
diff --git a/.changeset/calm-mammals-grow.md b/.changeset/calm-mammals-grow.md
deleted file mode 100644
index dc4dc84c93d7..000000000000
--- a/.changeset/calm-mammals-grow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Aligns dev image server file base with Vite rules
diff --git a/.changeset/eight-areas-vanish.md b/.changeset/eight-areas-vanish.md
deleted file mode 100644
index 6a6fc3a67018..000000000000
--- a/.changeset/eight-areas-vanish.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Updates `tinyexec` dependency
diff --git a/.changeset/fifty-boxes-shave.md b/.changeset/fifty-boxes-shave.md
new file mode 100644
index 000000000000..8c7a49ad6857
--- /dev/null
+++ b/.changeset/fifty-boxes-shave.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes `defineLiveCollection()` types
diff --git a/.changeset/full-peas-do.md b/.changeset/full-peas-do.md
deleted file mode 100644
index f0a60bf22983..000000000000
--- a/.changeset/full-peas-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes a case where `astro:config/server` values typed as URLs would be serialized as strings
diff --git a/.changeset/olive-papers-hide.md b/.changeset/olive-papers-hide.md
deleted file mode 100644
index 5a79e36ad646..000000000000
--- a/.changeset/olive-papers-hide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes a bug in i18n, where Astro caused an infinite loop when a locale that doesn't have an index, and Astro falls back to the index of the default locale.
diff --git a/.changeset/shaggy-chairs-sing.md b/.changeset/shaggy-chairs-sing.md
deleted file mode 100644
index 5f8a681c812c..000000000000
--- a/.changeset/shaggy-chairs-sing.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"astro": patch
----
-
-Fixes a case where styles on the custom 500 error page would not be included
diff --git a/.changeset/shiny-suns-sip.md b/.changeset/shiny-suns-sip.md
deleted file mode 100644
index 8e19fb3a2b4f..000000000000
--- a/.changeset/shiny-suns-sip.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes a case where the URLs generated by the experimental Fonts API would be incorrect in dev
diff --git a/.changeset/tangy-kings-fold.md b/.changeset/tangy-kings-fold.md
deleted file mode 100644
index 63f8f2814982..000000000000
--- a/.changeset/tangy-kings-fold.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@astrojs/netlify': patch
-'@astrojs/vercel': patch
----
-
-Fixes a bug that caused too many files to be bundled in SSR
diff --git a/.changeset/tangy-lamps-play.md b/.changeset/tangy-lamps-play.md
deleted file mode 100644
index 11e1695147bb..000000000000
--- a/.changeset/tangy-lamps-play.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Warns if the font family name is not supported by the provider when using the experimental fonts API
diff --git a/.changeset/thick-bees-sneeze.md b/.changeset/thick-bees-sneeze.md
deleted file mode 100644
index e96ef3cf1a7e..000000000000
--- a/.changeset/thick-bees-sneeze.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@astrojs/cloudflare': patch
-'@astrojs/internal-helpers': patch
-'astro': patch
----
-
-Refactor remote path detection
diff --git a/.changeset/true-jokes-throw.md b/.changeset/true-jokes-throw.md
deleted file mode 100644
index 48a654c4519c..000000000000
--- a/.changeset/true-jokes-throw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Updates `@capsizecss/unpack` dependency
diff --git a/.changeset/wide-cows-rest.md b/.changeset/wide-cows-rest.md
new file mode 100644
index 000000000000..6a551ecd261e
--- /dev/null
+++ b/.changeset/wide-cows-rest.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Updates the `<Font />` component so that preload links are generated after the style tag, as recommended by capo.js
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 8dab6df96365..f518a4dd9e7f 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -34,7 +34,7 @@ jobs:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 602856272e32..3bf1da6e5f1e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 15b7b9ea222f..f9c149f244b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -81,7 +81,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -133,7 +133,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -170,7 +170,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
@@ -206,7 +206,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup node@${{ matrix.NODE_VERSION }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/continuous_benchmark.yml b/.github/workflows/continuous_benchmark.yml
index d780e2c579c7..33887a3de6da 100644
--- a/.github/workflows/continuous_benchmark.yml
+++ b/.github/workflows/continuous_benchmark.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/preview-release.yml b/.github/workflows/preview-release.yml
index b2134cc30bb4..76b815bb228a 100644
--- a/.github/workflows/preview-release.yml
+++ b/.github/workflows/preview-release.yml
@@ -43,7 +43,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7d1126b4c2a8..79345aacbdd8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
index 3d3d10298f9e..9133a4d21db7 100644
--- a/.github/workflows/scripts.yml
+++ b/.github/workflows/scripts.yml
@@ -33,7 +33,7 @@ jobs:
           path: main
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/test-hosts.yml b/.github/workflows/test-hosts.yml
index d2a6164c6d9b..9a6ddbb71e81 100644
--- a/.github/workflows/test-hosts.yml
+++ b/.github/workflows/test-hosts.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
 
       - name: Setup PNPM
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
diff --git a/.github/workflows/validate-changesets.yml b/.github/workflows/validate-changesets.yml
index 1307a550aed0..f879970493b7 100644
--- a/.github/workflows/validate-changesets.yml
+++ b/.github/workflows/validate-changesets.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
-          python-version: '3.13.7'
+          python-version: '3.14.0'
 
       - name: Install llm CLI
         run: |
diff --git a/examples/basics/package.json b/examples/basics/package.json
index e8e622b43e64..87d0641ea1e2 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 26dc349263ff..7079a761f3c4 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -10,10 +10,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.3.6",
+    "@astrojs/mdx": "^4.3.7",
     "@astrojs/rss": "^4.0.12",
     "@astrojs/sitemap": "^3.6.0",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "sharp": "^0.34.3"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index d7e2a741edd7..1f679f7b07ca 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   },
   "peerDependencies": {
     "astro": "^4.0.0 || ^5.0.0"
diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json
index 3fd9125255a8..d1415cc1748f 100644
--- a/examples/container-with-vitest/package.json
+++ b/examples/container-with-vitest/package.json
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@astrojs/react": "^4.4.0",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vitest": "^3.2.4"
   },
   "devDependencies": {
-    "@types/react": "^18.3.25",
+    "@types/react": "^18.3.26",
     "@types/react-dom": "^18.3.7"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 2cffb45babc7..dd785ea4b215 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -13,6 +13,6 @@
     "@astrojs/alpinejs": "^0.4.9",
     "@types/alpinejs": "^3.13.11",
     "alpinejs": "^3.15.0",
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 4e323ce280d5..1f428b6b7543 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -15,14 +15,14 @@
     "@astrojs/solid-js": "^5.1.1",
     "@astrojs/svelte": "^7.2.0",
     "@astrojs/vue": "^5.1.1",
-    "@types/react": "^18.3.25",
+    "@types/react": "^18.3.26",
     "@types/react-dom": "^18.3.7",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "preact": "^10.27.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "solid-js": "^1.9.9",
-    "svelte": "^5.39.8",
+    "svelte": "^5.39.11",
     "vue": "^3.5.22"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index d38fd8e180f4..14db165f5749 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@astrojs/preact": "^4.1.1",
-    "@preact/signals": "^2.3.1",
-    "astro": "^5.14.1",
+    "@preact/signals": "^2.3.2",
+    "astro": "^5.14.4",
     "preact": "^10.27.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 7a121d652eed..63b3f368f2bb 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@astrojs/react": "^4.4.0",
-    "@types/react": "^18.3.25",
+    "@types/react": "^18.3.26",
     "@types/react-dom": "^18.3.7",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index d146676284f7..94b0ac5f867f 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^5.1.1",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "solid-js": "^1.9.9"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 46b64da3d7f7..4ecbc005d7a7 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^7.2.0",
-    "astro": "^5.14.1",
-    "svelte": "^5.39.8"
+    "astro": "^5.14.4",
+    "svelte": "^5.39.11"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 3644f099ece7..583e127ba06a 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^5.1.1",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "vue": "^3.5.22"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 77cf9811ae7e..6053b2259ecb 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^9.4.4",
-    "astro": "^5.14.1"
+    "@astrojs/node": "^9.4.6",
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 51169ae04687..b9c4b8fab0e8 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   },
   "peerDependencies": {
     "astro": "^4.0.0"
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index d064ba89c4f5..d87e79d25846 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index 9b93d58342a0..85bc2a98c2da 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -10,6 +10,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index e78c4816c550..739379d70821 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -11,9 +11,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^9.4.4",
+    "@astrojs/node": "^9.4.6",
     "@astrojs/svelte": "^7.2.0",
-    "astro": "^5.14.1",
-    "svelte": "^5.39.8"
+    "astro": "^5.14.4",
+    "svelte": "^5.39.11"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
index c3fa203e9f37..df8d5283d244 100644
--- a/examples/starlog/package.json
+++ b/examples/starlog/package.json
@@ -9,7 +9,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "sass": "^1.93.2",
     "sharp": "^0.34.3"
   }
diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json
index eb26433ecd63..8822ceb13704 100644
--- a/examples/toolbar-app/package.json
+++ b/examples/toolbar-app/package.json
@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "@types/node": "^18.17.8",
-    "astro": "^5.14.1"
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index cde01a3db0dc..1c4a69d6bb20 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.15.7",
-    "astro": "^5.14.1"
+    "@astrojs/markdoc": "^0.15.8",
+    "astro": "^5.14.4"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 4899826f113a..deb3f9919c3b 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -10,9 +10,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.3.6",
+    "@astrojs/mdx": "^4.3.7",
     "@astrojs/preact": "^4.1.1",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "preact": "^10.27.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index f8ae96d9dcdd..31560a38606f 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@astrojs/preact": "^4.1.1",
     "@nanostores/preact": "^0.5.2",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "nanostores": "^0.11.4",
     "preact": "^10.27.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index ec005ea994d7..e7ce3bd9fade 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -10,10 +10,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^4.3.6",
+    "@astrojs/mdx": "^4.3.7",
     "@tailwindcss/vite": "^4.1.14",
     "@types/canvas-confetti": "^1.9.0",
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "canvas-confetti": "^1.9.3",
     "tailwindcss": "^4.1.14"
   }
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index a9f116d8acbf..fae0e2c32edb 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -11,7 +11,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^5.14.1",
+    "astro": "^5.14.4",
     "vitest": "^3.2.4"
   }
 }
diff --git a/package.json b/package.json
index 47533ff68210..733b2207c8de 100644
--- a/package.json
+++ b/package.json
@@ -63,17 +63,17 @@
     "@changesets/cli": "^2.29.7",
     "@types/node": "^18.19.115",
     "esbuild": "0.25.5",
-    "eslint": "^9.36.0",
+    "eslint": "^9.37.0",
     "eslint-plugin-regexp": "^2.10.0",
     "knip": "5.61.3",
     "only-allow": "^1.2.1",
     "prettier": "^3.6.2",
     "prettier-plugin-astro": "^0.14.1",
-    "publint": "^0.3.13",
+    "publint": "^0.3.14",
     "tinyglobby": "^0.2.15",
     "turbo": "^2.5.8",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.45.0"
+    "typescript-eslint": "^8.46.0"
   },
   "pnpm": {
     "peerDependencyRules": {
diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
index 8ccae7ec9495..14444b773047 100644
--- a/packages/astro-rss/package.json
+++ b/packages/astro-rss/package.json
@@ -33,7 +33,7 @@
     "xml2js": "0.6.2"
   },
   "dependencies": {
-    "fast-xml-parser": "^5.2.5",
+    "fast-xml-parser": "^5.3.0",
     "kleur": "^4.1.5"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index c4d653ba10f5..623f2ce0aea9 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,76 @@
 # astro
 
+## 5.14.4
+
+### Patch Changes
+
+- [#14509](https://github.com/withastro/astro/pull/14509) [`7e04caf`](https://github.com/withastro/astro/commit/7e04caf9a4a75c75f06c4207fae601a5fd251735) Thanks [@ArmandPhilippot](https://github.com/ArmandPhilippot)! - Fixes an error in the docs that specified an incorrect version for the `security.allowedDomains` release.
+
+## 5.14.3
+
+### Patch Changes
+
+- [#14505](https://github.com/withastro/astro/pull/14505) [`28b2a1d`](https://github.com/withastro/astro/commit/28b2a1db4f3f265632f280b0dbc4c5f241c387e2) Thanks [@matthewp](https://github.com/matthewp)! - Fixes `Cannot set property manifest` error in test utilities by adding a protected setter for the manifest property
+
+- [#14235](https://github.com/withastro/astro/pull/14235) [`c4d84bb`](https://github.com/withastro/astro/commit/c4d84bb654c9a5064b243e971c3b5b280e2b3791) Thanks [@toxeeec](https://github.com/toxeeec)! - Fixes a bug where the "tap" prefetch strategy worked only on the first clicked link with view transitions enabled
+
+## 5.14.2
+
+### Patch Changes
+
+- [#14459](https://github.com/withastro/astro/pull/14459) [`916f9c2`](https://github.com/withastro/astro/commit/916f9c2e094f19562cfe722ca0a5fafb0f313c2e) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Improves font files URLs in development when using the experimental fonts API by showing the subset if present
+
+- [`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7) Thanks [@ascorbic](https://github.com/ascorbic)! - Aligns dev image server file base with Vite rules
+
+- [#14469](https://github.com/withastro/astro/pull/14469) [`1c090b0`](https://github.com/withastro/astro/commit/1c090b00c1f5c3d8e938ac873fc63ab2f1ae37f1) Thanks [@delucis](https://github.com/delucis)! - Updates `tinyexec` dependency
+
+- [#14460](https://github.com/withastro/astro/pull/14460) [`008dc75`](https://github.com/withastro/astro/commit/008dc75d860eadbb394e86dac68c7f4962e40489) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a case where `astro:config/server` values typed as URLs would be serialized as strings
+
+- [#13730](https://github.com/withastro/astro/pull/13730) [`7260367`](https://github.com/withastro/astro/commit/72603676818d1c433ac2751843a8a9b0cc9b48c9) Thanks [@razonyang](https://github.com/razonyang)! - Fixes a bug in i18n, where Astro caused an infinite loop when a locale that doesn't have an index, and Astro falls back to the index of the default locale.
+
+- [`6ee63bf`](https://github.com/withastro/astro/commit/6ee63bfac4856f21b4d4633021b3d2ee059e553f) Thanks [@matthewp](https://github.com/matthewp)! - Adds `security.allowedDomains` configuration to validate `X-Forwarded-Host` headers in SSR
+
+  The `X-Forwarded-Host` header will now only be trusted if it matches one of the configured allowed host patterns. This prevents [host header injection attacks](https://owasp.org/www-project-web-security-testing-guide/latest/4-Web_Application_Security_Testing/07-Input_Validation_Testing/17-Testing_for_Host_Header_Injection) that can lead to cache poisoning and other security vulnerabilities.
+
+  Configure allowed host patterns to enable `X-Forwarded-Host` support:
+
+  ```js
+  // astro.config.mjs
+  export default defineConfig({
+    output: 'server',
+    adapter: node(),
+    security: {
+      allowedDomains: [
+        { hostname: 'example.com' },
+        { hostname: '*.example.com' },
+        { hostname: 'cdn.example.com', port: '443' },
+      ],
+    },
+  });
+  ```
+
+  The patterns support wildcards (`*` and `**`) for flexible hostname matching and can optionally specify protocol and port.
+
+  ### Breaking change
+
+  Previously, `Astro.url` would reflect the value of the `X-Forwarded-Host` header. While this header is commonly used by reverse proxies like Nginx to communicate the original host, it can be sent by any client, potentially allowing malicious actors to poison caches with incorrect URLs.
+
+  If you were relying on `X-Forwarded-Host` support, add `security.allowedDomains` to your configuration to restore this functionality securely. When `allowedDomains` is not configured, `X-Forwarded-Host` headers are now ignored by default.
+
+- [#14488](https://github.com/withastro/astro/pull/14488) [`badc929`](https://github.com/withastro/astro/commit/badc9292a702250430b9ba11d9b26d75bd441934) Thanks [@olcanebrem](https://github.com/olcanebrem)! - Fixes a case where styles on the custom 500 error page would not be included
+
+- [#14487](https://github.com/withastro/astro/pull/14487) [`1e5b72c`](https://github.com/withastro/astro/commit/1e5b72c8df709b8ab966ed1d0f74977758bbf445) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a case where the URLs generated by the experimental Fonts API would be incorrect in dev
+
+- [#14475](https://github.com/withastro/astro/pull/14475) [`ae034ae`](https://github.com/withastro/astro/commit/ae034ae38cf1fd4837acc2c7da0c35f298fa8035) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Warns if the font family name is not supported by the provider when using the experimental fonts API
+
+- [`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7) Thanks [@ascorbic](https://github.com/ascorbic)! - Refactor remote path detection
+
+- [#14468](https://github.com/withastro/astro/pull/14468) [`2f2a5da`](https://github.com/withastro/astro/commit/2f2a5da27e1ea6b27bfa244513a15922b726c6ac) Thanks [@delucis](https://github.com/delucis)! - Updates `@capsizecss/unpack` dependency
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+  - @astrojs/markdown-remark@6.3.8
+
 ## 5.14.1
 
 ### Patch Changes
diff --git a/packages/astro/components/Font.astro b/packages/astro/components/Font.astro
index 7bd6668955f5..c416a77ce3d5 100644
--- a/packages/astro/components/Font.astro
+++ b/packages/astro/components/Font.astro
@@ -25,10 +25,10 @@ if (!data) {
 }
 ---
 
+<style set:html={data.css}></style>
 {
 	preload &&
 		data.preloadData.map(({ url, type }) => (
 			<link rel="preload" href={url} as="font" type={`font/${type}`} crossorigin />
 		))
 }
-<style set:html={data.css}></style>
diff --git a/packages/astro/e2e/fixtures/prefetch/src/components/ViewTransitionsLayout.astro b/packages/astro/e2e/fixtures/prefetch/src/components/ViewTransitionsLayout.astro
new file mode 100644
index 000000000000..ceb6f8cb0023
--- /dev/null
+++ b/packages/astro/e2e/fixtures/prefetch/src/components/ViewTransitionsLayout.astro
@@ -0,0 +1,14 @@
+---
+import { ClientRouter } from 'astro:transitions';
+---
+
+<html>
+	<head>
+		<title>Testing</title>
+		<ClientRouter  />
+	</head>
+	<body>
+			<slot />
+	</body>
+</html>
+
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/1.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/1.astro
new file mode 100644
index 000000000000..aed64ab9c1d4
--- /dev/null
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/1.astro
@@ -0,0 +1,10 @@
+---
+import ViewTransitionsLayout from "../../components/ViewTransitionsLayout.astro";
+---
+
+<ViewTransitionsLayout>
+<h1>View Transitions 1</h1>
+	<br>
+	<br>
+<a href="/view-transitions/2">2</a>
+</ViewTransitionsLayout>
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/2.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/2.astro
new file mode 100644
index 000000000000..c9ffcc410cbf
--- /dev/null
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/2.astro
@@ -0,0 +1,7 @@
+---
+import ViewTransitionsLayout from "../../components/ViewTransitionsLayout.astro";
+---
+
+<ViewTransitionsLayout>
+<h1>View Transitions 2</h1>
+</ViewTransitionsLayout>
diff --git a/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/index.astro b/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/index.astro
new file mode 100644
index 000000000000..8ea5fd567ac1
--- /dev/null
+++ b/packages/astro/e2e/fixtures/prefetch/src/pages/view-transitions/index.astro
@@ -0,0 +1,8 @@
+---
+import ViewTransitionsLayout from "../../components/ViewTransitionsLayout.astro";
+---
+
+<ViewTransitionsLayout>
+<h1>View Transitions index</h1>
+<a href="/view-transitions/1">1</a>
+</ViewTransitionsLayout>
diff --git a/packages/astro/e2e/prefetch.test.js b/packages/astro/e2e/prefetch.test.js
index 2da44189a305..d43cb3b8186e 100644
--- a/packages/astro/e2e/prefetch.test.js
+++ b/packages/astro/e2e/prefetch.test.js
@@ -56,6 +56,24 @@ async function expectUrlNotPrefetched(url, page) {
 	expect(reqUrls).not.toContainEqual(url);
 }
 
+/**
+ * @param {import('@playwright/test').Page} page
+ * @param {string} selector
+ */
+async function mouseDown(page, selector) {
+	const box = await page.locator(selector).boundingBox();
+	await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2);
+	await page.mouse.down();
+}
+
+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function waitForPageLoad(page) {
+	await page.waitForEvent('response');
+	await new Promise((res) => setTimeout(res, 500)); // wait for transition to finish
+}
+
 test.describe('Prefetch (default)', () => {
 	let devServer;
 
@@ -393,3 +411,75 @@ test.describe('Prefetch (default), Experimental ({ clientPrerender: true })', ()
 		expect(await scriptIsInHead(page, 'prefetch-load')).toBeTruthy();
 	});
 });
+
+test.describe('Prefetch View Transitions', () => {
+	let devServer;
+
+	test.afterEach(async () => {
+		await devServer.stop();
+	});
+
+	test('"load" strategy', async ({ page, astro }) => {
+		devServer = await astro.startDevServer({
+			prefetch: {
+				defaultStrategy: 'load',
+			},
+		});
+		await page.goto(astro.resolveUrl('/view-transitions'));
+		await expectUrlPrefetched('/view-transitions/1', page);
+
+		await Promise.all([waitForPageLoad(page), page.click('a')]);
+		await expectUrlPrefetched('/view-transitions/2', page);
+	});
+
+	test('"viewport" strategy', async ({ page, astro }) => {
+		devServer = await astro.startDevServer({
+			prefetch: {
+				defaultStrategy: 'viewport',
+			},
+		});
+		await page.goto(astro.resolveUrl('/view-transitions'));
+		await expectUrlPrefetched('/view-transitions/1', page);
+
+		await Promise.all([waitForPageLoad(page), page.click('a')]);
+		await expectUrlPrefetched('/view-transitions/2', page);
+	});
+
+	test('"tap" strategy', async ({ page, astro }) => {
+		devServer = await astro.startDevServer({
+			prefetch: {
+				defaultStrategy: 'tap',
+			},
+		});
+		await page.goto(astro.resolveUrl('/view-transitions'));
+
+		await expectUrlNotPrefetched('/view-transitions/1', page);
+		await mouseDown(page, 'a');
+		await expectUrlPrefetched('/view-transitions/1', page);
+
+		await Promise.all([waitForPageLoad(page), page.mouse.up()]);
+
+		await expectUrlNotPrefetched('/view-transitions/2', page);
+		await mouseDown(page, 'a');
+		await expectUrlPrefetched('/view-transitions/2', page);
+	});
+
+	test('"hover" strategy', async ({ page, astro }) => {
+		devServer = await astro.startDevServer({
+			prefetch: {
+				defaultStrategy: 'hover',
+			},
+		});
+		await page.goto(astro.resolveUrl('/view-transitions'));
+
+		await expectUrlNotPrefetched('/view-transitions/1', page);
+		await page.locator('a').hover();
+		await expectUrlPrefetched('/view-transitions/1', page);
+
+		await Promise.all([waitForPageLoad(page), page.click('a')]);
+
+		await expectUrlNotPrefetched('/view-transitions/2', page);
+		await page.locator('a').hover();
+		await expectUrlPrefetched('/view-transitions/2', page);
+	});
+});
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 11a05e08aed8..a4bf1bd507ec 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "5.14.1",
+  "version": "5.14.4",
   "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/astro/src/cli/create-key/core/create-key.ts b/packages/astro/src/cli/create-key/core/create-key.ts
new file mode 100644
index 000000000000..50bfb594ead6
--- /dev/null
+++ b/packages/astro/src/cli/create-key/core/create-key.ts
@@ -0,0 +1,18 @@
+import type { Logger } from '../../../core/logger/core.js';
+import type { KeyGenerator } from '../definitions.js';
+
+interface CreateKeyOptions {
+	logger: Logger;
+	keyGenerator: KeyGenerator;
+}
+
+export async function createKey({ logger, keyGenerator }: CreateKeyOptions) {
+	const key = await keyGenerator.generate();
+
+	logger.info(
+		'crypto',
+		`Generated a key to encrypt props passed to server islands. To reuse the same key across builds, set this value as ASTRO_KEY in an environment variable on your build server.
+
+ASTRO_KEY=${key}`,
+	);
+}
diff --git a/packages/astro/src/cli/create-key/definitions.ts b/packages/astro/src/cli/create-key/definitions.ts
new file mode 100644
index 000000000000..f5ad451c9d4d
--- /dev/null
+++ b/packages/astro/src/cli/create-key/definitions.ts
@@ -0,0 +1,3 @@
+export interface KeyGenerator {
+	generate: () => Promise<string>;
+}
diff --git a/packages/astro/src/cli/create-key/index.ts b/packages/astro/src/cli/create-key/index.ts
deleted file mode 100644
index bc03c53572d0..000000000000
--- a/packages/astro/src/cli/create-key/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { createNodeLogger } from '../../core/config/logging.js';
-import { createKey as createCryptoKey, encodeKey } from '../../core/encryption.js';
-import { type Flags, flagsToAstroInlineConfig } from '../flags.js';
-
-interface CreateKeyOptions {
-	flags: Flags;
-}
-
-export async function createKey({ flags }: CreateKeyOptions): Promise<0 | 1> {
-	try {
-		const inlineConfig = flagsToAstroInlineConfig(flags);
-		const logger = createNodeLogger(inlineConfig);
-
-		const keyPromise = createCryptoKey();
-		const key = await keyPromise;
-		const encoded = await encodeKey(key);
-
-		logger.info(
-			'crypto',
-			`Generated a key to encrypt props passed to Server islands. To reuse the same key across builds, set this value as ASTRO_KEY in an environment variable on your build server.
-
-ASTRO_KEY=${encoded}`,
-		);
-	} catch (err: unknown) {
-		if (err != null) {
-			console.error(err.toString());
-		}
-		return 1;
-	}
-
-	return 0;
-}
diff --git a/packages/astro/src/cli/create-key/infra/crypto-key-generator.ts b/packages/astro/src/cli/create-key/infra/crypto-key-generator.ts
new file mode 100644
index 000000000000..97d8f415d9b8
--- /dev/null
+++ b/packages/astro/src/cli/create-key/infra/crypto-key-generator.ts
@@ -0,0 +1,12 @@
+import { createKey, encodeKey } from '../../../core/encryption.js';
+import type { KeyGenerator } from '../definitions.js';
+
+export function createCryptoKeyGenerator(): KeyGenerator {
+	return {
+		async generate() {
+			const key = await createKey();
+			const encoded = await encodeKey(key);
+			return encoded;
+		},
+	};
+}
diff --git a/packages/astro/src/cli/index.ts b/packages/astro/src/cli/index.ts
index 94c08d7b0cb7..9b84ee48bcdb 100644
--- a/packages/astro/src/cli/index.ts
+++ b/packages/astro/src/cli/index.ts
@@ -109,9 +109,16 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 			return;
 		}
 		case 'create-key': {
-			const { createKey } = await import('./create-key/index.js');
-			const exitCode = await createKey({ flags });
-			return process.exit(exitCode);
+			const [{ createKey }, { createLoggerFromFlags }, { createCryptoKeyGenerator }] =
+				await Promise.all([
+					import('./create-key/core/create-key.js'),
+					import('./flags.js'),
+					import('./create-key/infra/crypto-key-generator.js'),
+				]);
+			const logger = createLoggerFromFlags(flags);
+			const keyGenerator = createCryptoKeyGenerator();
+			await createKey({ logger, keyGenerator });
+			return;
 		}
 		case 'docs': {
 			const { docs } = await import('./docs/index.js');
diff --git a/packages/astro/src/container/index.ts b/packages/astro/src/container/index.ts
index 353fca4c4fa6..4f683edd1b40 100644
--- a/packages/astro/src/container/index.ts
+++ b/packages/astro/src/container/index.ts
@@ -157,6 +157,7 @@ function createManifest(
 		inlinedScripts: manifest?.inlinedScripts ?? new Map(),
 		i18n: manifest?.i18n,
 		checkOrigin: false,
+		allowedDomains: manifest?.allowedDomains ?? [],
 		middleware: manifest?.middleware ?? middlewareInstance,
 		key: createKey(),
 		csp: manifest?.csp,
@@ -246,6 +247,7 @@ type AstroContainerManifest = Pick<
 	| 'outDir'
 	| 'cacheDir'
 	| 'csp'
+	| 'allowedDomains'
 >;
 
 type AstroContainerConstructor = {
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index 122868affe9f..b9187c34400b 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -3,6 +3,7 @@ import {
 	hasFileExtension,
 	isInternalPath,
 } from '@astrojs/internal-helpers/path';
+import { matchPattern, type RemotePattern } from '../../assets/utils/remotePattern.js';
 import { normalizeTheLocale } from '../../i18n/index.js';
 import type { RoutesList } from '../../types/astro.js';
 import type { RouteData, SSRManifest } from '../../types/public/internal.js';
@@ -137,6 +138,42 @@ export class App {
 		return this.#adapterLogger;
 	}
 
+	getAllowedDomains() {
+		return this.#manifest.allowedDomains;
+	}
+
+	protected get manifest(): SSRManifest {
+		return this.#manifest;
+	}
+
+	protected set manifest(value: SSRManifest) {
+		this.#manifest = value;
+	}
+
+	protected matchesAllowedDomains(forwardedHost: string, protocol?: string): boolean {
+		return App.validateForwardedHost(forwardedHost, this.#manifest.allowedDomains, protocol);
+	}
+
+	static validateForwardedHost(
+		forwardedHost: string,
+		allowedDomains?: Partial<RemotePattern>[],
+		protocol?: string,
+	): boolean {
+		if (!allowedDomains || allowedDomains.length === 0) {
+			return false;
+		}
+
+		try {
+			const testUrl = new URL(`${protocol || 'https'}://${forwardedHost}`);
+			return allowedDomains.some((pattern) => {
+				return matchPattern(testUrl, pattern);
+			});
+		} catch {
+			// Invalid URL
+			return false;
+		}
+	}
+
 	/**
 	 * Creates a pipeline by reading the stored manifest
 	 *
@@ -235,7 +272,7 @@ export class App {
 				this.#manifest.i18n.strategy === 'domains-prefix-always-no-redirect')
 		) {
 			// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Host
-			let host = request.headers.get('X-Forwarded-Host');
+			let forwardedHost = request.headers.get('X-Forwarded-Host');
 			// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto
 			let protocol = request.headers.get('X-Forwarded-Proto');
 			if (protocol) {
@@ -245,6 +282,14 @@ export class App {
 				// we fall back to the protocol of the request
 				protocol = url.protocol;
 			}
+
+			// Validate X-Forwarded-Host against allowedDomains if configured
+			if (forwardedHost && !this.matchesAllowedDomains(forwardedHost, protocol?.replace(':', ''))) {
+				// If not allowed, ignore the X-Forwarded-Host header
+				forwardedHost = null;
+			}
+
+			let host = forwardedHost;
 			if (!host) {
 				// https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Host
 				host = request.headers.get('Host');
diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts
index bfc2a5da74af..0c90e33954d2 100644
--- a/packages/astro/src/core/app/node.ts
+++ b/packages/astro/src/core/app/node.ts
@@ -2,6 +2,8 @@ import fs from 'node:fs';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { Http2ServerResponse } from 'node:http2';
 import type { Socket } from 'node:net';
+// matchPattern is used in App.validateForwardedHost, no need to import here
+import type { RemotePattern } from '../../types/public/config.js';
 import { clientAddressSymbol, nodeRequestAbortControllerCleanupSymbol } from '../constants.js';
 import { deserializeManifest } from './common.js';
 import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders.js';
@@ -28,6 +30,7 @@ export class NodeApp extends App {
 		if (!(req instanceof Request)) {
 			req = NodeApp.createRequest(req, {
 				skipBody: true,
+				allowedDomains: this.manifest.allowedDomains,
 			});
 		}
 		return super.match(req, allowPrerenderedRoutes);
@@ -35,7 +38,9 @@ export class NodeApp extends App {
 
 	render(request: NodeRequest | Request, options?: RenderOptions): Promise<Response> {
 		if (!(request instanceof Request)) {
-			request = NodeApp.createRequest(request);
+			request = NodeApp.createRequest(request, {
+				allowedDomains: this.manifest.allowedDomains,
+			});
 		}
 		return super.render(request, options);
 	}
@@ -53,7 +58,13 @@ export class NodeApp extends App {
 	 * })
 	 * ```
 	 */
-	static createRequest(req: NodeRequest, { skipBody = false } = {}): Request {
+	static createRequest(
+		req: NodeRequest,
+		{
+			skipBody = false,
+			allowedDomains = [],
+		}: { skipBody?: boolean; allowedDomains?: Partial<RemotePattern>[] } = {},
+	): Request {
 		const controller = new AbortController();
 
 		const isEncrypted = 'encrypted' in req.socket && req.socket.encrypted;
@@ -75,8 +86,22 @@ export class NodeApp extends App {
 		const protocol = forwardedProtocol ?? providedProtocol;
 
 		// @example "example.com,www2.example.com" => "example.com"
-		const forwardedHostname = getFirstForwardedValue(req.headers['x-forwarded-host']);
+		let forwardedHostname = getFirstForwardedValue(req.headers['x-forwarded-host']);
 		const providedHostname = req.headers.host ?? req.headers[':authority'];
+
+		// Validate X-Forwarded-Host against allowedDomains if configured
+		if (
+			forwardedHostname &&
+			!App.validateForwardedHost(
+				forwardedHostname,
+				allowedDomains,
+				forwardedProtocol ?? providedProtocol,
+			)
+		) {
+			// If not allowed, ignore the X-Forwarded-Host header
+			forwardedHostname = undefined;
+		}
+
 		const hostname = forwardedHostname ?? providedHostname;
 
 		// @example "443,8080,80" => "443"
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
index c736eda5eb4b..268c53aa03ed 100644
--- a/packages/astro/src/core/app/types.ts
+++ b/packages/astro/src/core/app/types.ts
@@ -7,6 +7,7 @@ import type {
 	AstroConfig,
 	CspAlgorithm,
 	Locales,
+	RemotePattern,
 	ResolvedSessionConfig,
 } from '../../types/public/config.js';
 import type {
@@ -85,6 +86,7 @@ export type SSRManifest = {
 	middleware?: () => Promise<AstroMiddlewareInstance> | AstroMiddlewareInstance;
 	actions?: () => Promise<SSRActions> | SSRActions;
 	checkOrigin: boolean;
+	allowedDomains?: Partial<RemotePattern>[];
 	sessionConfig?: ResolvedSessionConfig<any>;
 	cacheDir: string | URL;
 	srcDir: string | URL;
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index b45e484c07ab..cc396343a4d1 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -365,6 +365,7 @@ async function buildManifest(
 		buildFormat: settings.config.build.format,
 		checkOrigin:
 			(settings.config.security?.checkOrigin && settings.buildOutput === 'server') ?? false,
+		allowedDomains: settings.config.security?.allowedDomains,
 		serverIslandNameMap: Array.from(settings.serverIslandNameMap),
 		key: encodedKey,
 		sessionConfig: settings.config.session,
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index c6707c6d8d1b..33f1518cdede 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -87,6 +87,7 @@ export const ASTRO_CONFIG_DEFAULTS = {
 	redirects: {},
 	security: {
 		checkOrigin: true,
+		allowedDomains: [],
 	},
 	env: {
 		schema: {},
@@ -417,6 +418,16 @@ export const AstroConfigSchema = z.object({
 	security: z
 		.object({
 			checkOrigin: z.boolean().default(ASTRO_CONFIG_DEFAULTS.security.checkOrigin),
+			allowedDomains: z
+				.array(
+					z.object({
+						hostname: z.string().optional(),
+						protocol: z.string().optional(),
+						port: z.string().optional(),
+					}),
+				)
+				.optional()
+				.default(ASTRO_CONFIG_DEFAULTS.security.allowedDomains),
 		})
 		.optional()
 		.default(ASTRO_CONFIG_DEFAULTS.security),
diff --git a/packages/astro/src/prefetch/index.ts b/packages/astro/src/prefetch/index.ts
index 6dc003221159..780bf1d26c8f 100644
--- a/packages/astro/src/prefetch/index.ts
+++ b/packages/astro/src/prefetch/index.ts
@@ -54,7 +54,7 @@ export function init(defaultOpts?: InitOptions) {
  */
 function initTapStrategy() {
 	for (const event of ['touchstart', 'mousedown']) {
-		document.body.addEventListener(
+		document.addEventListener(
 			event,
 			(e) => {
 				if (elMatchesStrategy(e.target, 'tap')) {
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 1959c38847ae..9d3ec11395b2 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -26,6 +26,8 @@ export type { AstroFontProvider as FontProvider };
 
 export type { CspAlgorithm };
 
+export type { RemotePattern };
+
 type NormalizeLocales<T extends Locales> = {
 	[K in keyof T]: T[K] extends string
 		? T[K]
@@ -589,6 +591,46 @@ export interface AstroUserConfig<
 		 */
 
 		checkOrigin?: boolean;
+
+		/**
+		 * @docs
+		 * @name security.allowedDomains
+		 * @kind h4
+		 * @type {RemotePattern[]}
+		 * @default `[]`
+		 * @version 5.14.2
+		 * @description
+		 *
+		 * Defines a list of permitted host patterns for incoming requests when using SSR. When configured, Astro will validate the `X-Forwarded-Host` header
+		 * against these patterns for security. If the header doesn't match any allowed pattern, the header is ignored and the request's original host is used instead.
+		 *
+		 * This prevents host header injection attacks where malicious actors can manipulate the `Astro.url` value by sending crafted `X-Forwarded-Host` headers.
+		 *
+		 * Each pattern can specify `protocol`, `hostname`, and `port`. All three are validated if provided.
+		 * The patterns support wildcards for flexible hostname matching:
+		 *
+		 * ```js
+		 * {
+		 *   security: {
+		 *     // Example: Allow any subdomain of example.com on https
+		 *     allowedDomains: [
+		 *       {
+		 *         hostname: '**.example.com',
+		 *         protocol: 'https'
+		 *       },
+		 *       {
+		 *         hostname: 'staging.myapp.com',
+		 *         protocol: 'https',
+		 *         port: '443'
+		 *       }
+		 *     ]
+		 *   }
+		 * }
+		 * ```
+		 *
+		 * When not configured, `X-Forwarded-Host` headers are not trusted and will be ignored.
+		 */
+		allowedDomains?: Partial<RemotePattern>[];
 	};
 
 	/**
@@ -1465,7 +1507,7 @@ export interface AstroUserConfig<
 		 * @default `{ type: 'shiki', excludeLangs: ['math'] }`
 		 * @description
 		 * Which syntax highlighter to use for Markdown code blocks (\`\`\`), if any. This determines the CSS classes that Astro will apply to your Markdown code blocks.
-	 	 * 
+	 	 *
 		 * - `shiki` - use the [Shiki](https://shiki.style) highlighter (`github-dark` theme configured by default)
 		 * - `prism` - use the [Prism](https://prismjs.com/) highlighter and [provide your own Prism stylesheet](https://docs.astro.build/en/guides/syntax-highlighting/#add-a-prism-stylesheet)
 		 * - `false` - do not apply syntax highlighting.
diff --git a/packages/astro/test/cli.test.js b/packages/astro/test/cli.test.js
index bf38a74b63ff..33effdcfce4d 100644
--- a/packages/astro/test/cli.test.js
+++ b/packages/astro/test/cli.test.js
@@ -162,7 +162,7 @@ describe('astro cli', () => {
 
 	it(
 		'astro info shows correct Vite and integration versions when using yarn',
-		{ skip: process.env.ECOSYSTEM_CI },
+		{ skip: true },
 		async () => {
 			const fixtureRootURL = new URL('./fixtures/astro-info-versions/', import.meta.url);
 			const testsRootURL = new URL('../', import.meta.url);
diff --git a/packages/astro/test/fixtures/i18n-routing-subdomain/astro.config.mjs b/packages/astro/test/fixtures/i18n-routing-subdomain/astro.config.mjs
index 2eae7dec9596..900676bbdbb5 100644
--- a/packages/astro/test/fixtures/i18n-routing-subdomain/astro.config.mjs
+++ b/packages/astro/test/fixtures/i18n-routing-subdomain/astro.config.mjs
@@ -18,4 +18,11 @@ export default defineConfig({
 		}
 	},
 	site: "https://example.com",
+	security: {
+		allowedDomains: [
+			{ hostname: 'example.pt' },
+			{ hostname: 'it.example.com' },
+			{ hostname: 'example.com' }
+		]
+	}
 })
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
index 6f74930535ca..8aaed4c26a91 100644
--- a/packages/astro/test/i18n-routing.test.js
+++ b/packages/astro/test/i18n-routing.test.js
@@ -2140,6 +2140,13 @@ describe('i18n routing does not break assets and endpoints', () => {
 				root: './fixtures/i18n-routing-subdomain/',
 				output: 'server',
 				adapter: testAdapter(),
+				security: {
+					allowedDomains: [
+						{ hostname: 'example.pt' },
+						{ hostname: 'it.example.com' },
+						{ hostname: 'example.com' },
+					],
+				},
 			});
 			await fixture.build();
 			app = await fixture.loadTestAdapterApp();
diff --git a/packages/astro/test/units/app/node.test.js b/packages/astro/test/units/app/node.test.js
index c71ccb78ef17..ad1ddf435b41 100644
--- a/packages/astro/test/units/app/node.test.js
+++ b/packages/astro/test/units/app/node.test.js
@@ -59,22 +59,28 @@ describe('NodeApp', () => {
 
 		describe('x-forwarded-host', () => {
 			it('parses host from single-value x-forwarded-host header', () => {
-				const result = NodeApp.createRequest({
-					...mockNodeRequest,
-					headers: {
-						'x-forwarded-host': 'www2.example.com',
+				const result = NodeApp.createRequest(
+					{
+						...mockNodeRequest,
+						headers: {
+							'x-forwarded-host': 'www2.example.com',
+						},
 					},
-				});
+					{ allowedDomains: [{ hostname: '**.example.com' }] },
+				);
 				assert.equal(result.url, 'https://www2.example.com/');
 			});
 
 			it('parses host from multi-value x-forwarded-host header', () => {
-				const result = NodeApp.createRequest({
-					...mockNodeRequest,
-					headers: {
-						'x-forwarded-host': 'www2.example.com,www3.example.com',
+				const result = NodeApp.createRequest(
+					{
+						...mockNodeRequest,
+						headers: {
+							'x-forwarded-host': 'www2.example.com,www3.example.com',
+						},
 					},
-				});
+					{ allowedDomains: [{ hostname: '**.example.com' }] },
+				);
 				assert.equal(result.url, 'https://www2.example.com/');
 			});
 
@@ -171,14 +177,17 @@ describe('NodeApp', () => {
 			});
 
 			it('prefers port from x-forwarded-host', () => {
-				const result = NodeApp.createRequest({
-					...mockNodeRequest,
-					headers: {
-						host: 'example.com:443',
-						'x-forwarded-host': 'example.com:3000',
-						'x-forwarded-port': '443',
+				const result = NodeApp.createRequest(
+					{
+						...mockNodeRequest,
+						headers: {
+							host: 'example.com:443',
+							'x-forwarded-host': 'example.com:3000',
+							'x-forwarded-port': '443',
+						},
 					},
-				});
+					{ allowedDomains: [{ hostname: 'example.com' }] },
+				);
 				assert.equal(result.url, 'https://example.com:3000/');
 			});
 		});
diff --git a/packages/astro/test/units/assets/fonts/orchestrate.test.js b/packages/astro/test/units/assets/fonts/orchestrate.test.js
index aeb785198148..3ff3abb2087c 100644
--- a/packages/astro/test/units/assets/fonts/orchestrate.test.js
+++ b/packages/astro/test/units/assets/fonts/orchestrate.test.js
@@ -20,9 +20,8 @@ import { createBuildUrlProxyHashResolver } from '../../../../dist/assets/fonts/i
 import { createDevUrlResolver } from '../../../../dist/assets/fonts/implementations/url-resolver.js';
 import { orchestrate } from '../../../../dist/assets/fonts/orchestrate.js';
 import { defineAstroFontProvider } from '../../../../dist/assets/fonts/providers/index.js';
-import { defaultLogger } from '../../test-utils.js';
+import { createSpyLogger, defaultLogger } from '../../test-utils.js';
 import {
-	createSpyLogger,
 	createSpyStorage,
 	fakeFontMetricsResolver,
 	fakeHasher,
diff --git a/packages/astro/test/units/assets/fonts/utils.js b/packages/astro/test/units/assets/fonts/utils.js
index a3211e293e18..9b1b8293929d 100644
--- a/packages/astro/test/units/assets/fonts/utils.js
+++ b/packages/astro/test/units/assets/fonts/utils.js
@@ -83,31 +83,6 @@ export const fakeFontMetricsResolver = {
 	},
 };
 
-export function createSpyLogger() {
-	/** @type {Array<{ type: string; label: string | null; message: string }>} */
-	const logs = [];
-
-	/** @type {import('../../../../dist/core/logger/core').Logger} */
-	const logger = {
-		debug: (label, ...messages) => {
-			logs.push(...messages.map((message) => ({ type: 'debug', label, message })));
-		},
-		error: (label, message) => {
-			logs.push({ type: 'error', label, message });
-		},
-		info: (label, message) => {
-			logs.push({ type: 'info', label, message });
-		},
-		warn: (label, message) => {
-			logs.push({ type: 'warn', label, message });
-		},
-	};
-	return {
-		logs,
-		logger,
-	};
-}
-
 /**
  * @param {string} input
  */
diff --git a/packages/astro/test/units/cli/create-key.test.js b/packages/astro/test/units/cli/create-key.test.js
new file mode 100644
index 000000000000..8d728c141cb4
--- /dev/null
+++ b/packages/astro/test/units/cli/create-key.test.js
@@ -0,0 +1,26 @@
+// @ts-check
+import assert from 'node:assert/strict';
+import { describe, it } from 'node:test';
+import { createKey } from '../../../dist/cli/create-key/core/create-key.js';
+import { createSpyLogger } from '../test-utils.js';
+
+describe('CLI create-key', () => {
+	describe('core', () => {
+		describe('create-key', () => {
+			it('logs the generated key', async () => {
+				const { logger, logs } = createSpyLogger();
+
+				await createKey({
+					logger,
+					keyGenerator: {
+						generate: async () => 'FOO',
+					},
+				});
+
+				assert.equal(logs[0].type, 'info');
+				assert.equal(logs[0].label, 'crypto');
+				assert.match(logs[0].message, /ASTRO_KEY=FOO/);
+			});
+		});
+	});
+});
diff --git a/packages/astro/test/units/test-utils.js b/packages/astro/test/units/test-utils.js
index 6132a2a4354d..bc64a0234b90 100644
--- a/packages/astro/test/units/test-utils.js
+++ b/packages/astro/test/units/test-utils.js
@@ -7,7 +7,7 @@ import { getDefaultClientDirectives } from '../../dist/core/client-directive/ind
 import { resolveConfig } from '../../dist/core/config/index.js';
 import { createBaseSettings } from '../../dist/core/config/settings.js';
 import { createContainer } from '../../dist/core/dev/container.js';
-import { Logger } from '../../dist/core/logger/core.js';
+import { AstroIntegrationLogger, Logger } from '../../dist/core/logger/core.js';
 import { nodeLogDestination } from '../../dist/core/logger/node.js';
 import { NOOP_MIDDLEWARE_FN } from '../../dist/core/middleware/noop-middleware.js';
 import { Pipeline } from '../../dist/core/render/index.js';
@@ -167,3 +167,39 @@ export async function runInContainer(options = {}, callback) {
 		await container.close();
 	}
 }
+
+export function createSpyLogger() {
+	/** @type {Array<{ type: string; label: string | null; message: string }>} */
+	const logs = [];
+
+	/** @type {import('../../dist/core/logger/core').Logger} */
+	const logger = {
+		debug: (label, ...messages) => {
+			logs.push(...messages.map((message) => ({ type: 'debug', label, message })));
+		},
+		error: (label, message) => {
+			logs.push({ type: 'error', label, message });
+		},
+		info: (label, message) => {
+			logs.push({ type: 'info', label, message });
+		},
+		warn: (label, message) => {
+			logs.push({ type: 'warn', label, message });
+		},
+		options: {
+			dest: {
+				write: () => true,
+			},
+			level: 'silent',
+		},
+		level: () => 'silent',
+		forkIntegrationLogger(label) {
+			return new AstroIntegrationLogger(this.options, label);
+		},
+	};
+
+	return {
+		logs,
+		logger,
+	};
+}
diff --git a/packages/astro/types/content.d.ts b/packages/astro/types/content.d.ts
index aae47d4ac380..cb5b6d7360b8 100644
--- a/packages/astro/types/content.d.ts
+++ b/packages/astro/types/content.d.ts
@@ -10,7 +10,7 @@ declare module 'astro:content' {
 	} from 'astro/content/config';
 
 	export function defineLiveCollection<
-		L extends import('astro/loader').LiveLoader,
+		L extends import('astro/loaders').LiveLoader,
 		S extends import('astro/content/config').BaseSchema | undefined = undefined,
 	>(
 		config: import('astro/content/config').LiveCollectionConfig<L, S>,
diff --git a/packages/db/test/fixtures/ticketing-example/package.json b/packages/db/test/fixtures/ticketing-example/package.json
index 60365ea0cde3..5e7ddea6c1b4 100644
--- a/packages/db/test/fixtures/ticketing-example/package.json
+++ b/packages/db/test/fixtures/ticketing-example/package.json
@@ -13,7 +13,7 @@
     "@astrojs/db": "workspace:*",
     "@astrojs/node": "workspace:*",
     "@astrojs/react": "workspace:*",
-    "@types/react": "^18.3.25",
+    "@types/react": "^18.3.26",
     "@types/react-dom": "^18.3.7",
     "astro": "workspace:*",
     "open-props": "^1.7.16",
diff --git a/packages/integrations/alpinejs/package.json b/packages/integrations/alpinejs/package.json
index 1dd0c34e2aac..2ff00aa9c79c 100644
--- a/packages/integrations/alpinejs/package.json
+++ b/packages/integrations/alpinejs/package.json
@@ -38,7 +38,7 @@
     "alpinejs": "^3.0.0"
   },
   "devDependencies": {
-    "@playwright/test": "1.55.1",
+    "@playwright/test": "1.56.0",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "vite": "^7.1.7"
diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md
index 590cece8babf..3fae4fe70ac7 100644
--- a/packages/integrations/cloudflare/CHANGELOG.md
+++ b/packages/integrations/cloudflare/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @astrojs/cloudflare
 
+## 12.6.10
+
+### Patch Changes
+
+- [`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7) Thanks [@ascorbic](https://github.com/ascorbic)! - Refactor remote path detection
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+  - @astrojs/underscore-redirects@1.0.0
+
 ## 12.6.9
 
 ### Patch Changes
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index de25a9145c27..02421659023d 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "12.6.9",
+  "version": "12.6.10",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index 5fdc0b956351..da287cc596d9 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @astrojs/markdoc
 
+## 0.15.8
+
+### Patch Changes
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+  - @astrojs/markdown-remark@6.3.8
+
 ## 0.15.7
 
 ### Patch Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index 223d3f20007f..b77de255d4e0 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.15.7",
+  "version": "0.15.8",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index b8cfc73bcd68..8b9160f3d63a 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @astrojs/mdx
 
+## 4.3.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @astrojs/markdown-remark@6.3.8
+
 ## 4.3.6
 
 ### Patch Changes
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index dc68136f4cac..26ae5b6f669c 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": "4.3.6",
+  "version": "4.3.7",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/netlify/CHANGELOG.md b/packages/integrations/netlify/CHANGELOG.md
index a192afef9ce4..620f1fe30ed3 100644
--- a/packages/integrations/netlify/CHANGELOG.md
+++ b/packages/integrations/netlify/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @astrojs/netlify
 
+## 6.5.12
+
+### Patch Changes
+
+- [#14473](https://github.com/withastro/astro/pull/14473) [`d9634d3`](https://github.com/withastro/astro/commit/d9634d31c47f3707e6092bed7938dfcfc0fb550b) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a bug that caused too many files to be bundled in SSR
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+  - @astrojs/underscore-redirects@1.0.0
+
 ## 6.5.11
 
 ### Patch Changes
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index 1cbbc62ee9ab..01b504dd7b3a 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/netlify",
   "description": "Deploy your site to Netlify",
-  "version": "6.5.11",
+  "version": "6.5.12",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md
index a61df05d46cc..1dd1cb288e06 100644
--- a/packages/integrations/node/CHANGELOG.md
+++ b/packages/integrations/node/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @astrojs/node
 
+## 9.4.6
+
+### Patch Changes
+
+- [#14514](https://github.com/withastro/astro/pull/14514) [`66a26d7`](https://github.com/withastro/astro/commit/66a26d7060de6acb709e169d00a8b2ce51b836fd) Thanks [@matthewp](https://github.com/matthewp)! - Fixes compatibility issue with older versions of Astro by making `getAllowedDomains()` call optional and updating peer dependency to require `astro@^5.14.3`
+
+## 9.4.5
+
+### Patch Changes
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+
 ## 9.4.4
 
 ### Patch Changes
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index ab78672c541a..0da5c447ba58 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": "9.4.4",
+  "version": "9.4.6",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -38,7 +38,7 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "^5.7.0"
+    "astro": "^5.14.3"
   },
   "devDependencies": {
     "@types/node": "^22.10.6",
diff --git a/packages/integrations/node/src/serve-app.ts b/packages/integrations/node/src/serve-app.ts
index 09473e50cc75..42d613b23607 100644
--- a/packages/integrations/node/src/serve-app.ts
+++ b/packages/integrations/node/src/serve-app.ts
@@ -36,7 +36,9 @@ export function createAppHandler(app: NodeApp, options: Options): RequestHandler
 	return async (req, res, next, locals) => {
 		let request: Request;
 		try {
-			request = NodeApp.createRequest(req);
+			request = NodeApp.createRequest(req, {
+				allowedDomains: app.getAllowedDomains?.() ?? [],
+			});
 		} catch (err) {
 			logger.error(`Could not render ${req.url}`);
 			console.error(err);
diff --git a/packages/integrations/node/test/fixtures/url/astro.config.mjs b/packages/integrations/node/test/fixtures/url/astro.config.mjs
new file mode 100644
index 000000000000..0f17f53877c0
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/url/astro.config.mjs
@@ -0,0 +1,14 @@
+import { defineConfig } from 'astro/config';
+import nodejs from '@astrojs/node';
+
+export default defineConfig({
+	output: 'server',
+	adapter: nodejs({ mode: 'standalone' }),
+	security: {
+		allowedDomains: [
+			{
+				hostname: 'abc.xyz'
+			}
+		]
+	}
+});
\ No newline at end of file
diff --git a/packages/integrations/node/test/url.test.js b/packages/integrations/node/test/url.test.js
index 81b357b71857..9295210e085b 100644
--- a/packages/integrations/node/test/url.test.js
+++ b/packages/integrations/node/test/url.test.js
@@ -80,6 +80,7 @@ describe('URL', () => {
 				'X-Forwarded-Proto': 'https',
 				'X-Forwarded-Host': 'abc.xyz',
 				'X-Forwarded-Port': '444',
+				Host: 'localhost:3000',
 			},
 			url: '/',
 		});
@@ -112,4 +113,47 @@ describe('URL', () => {
 
 		assert.equal($('body').text(), 'https://abc.xyz:444/');
 	});
+
+	it('ignores X-Forwarded-Host when no allowedDomains configured', async () => {
+		const { handler } = await import('./fixtures/url/dist/server/entry.mjs');
+		const { req, res, text } = createRequestAndResponse({
+			headers: {
+				'X-Forwarded-Proto': 'https',
+				'X-Forwarded-Host': 'malicious.example.com',
+				Host: 'legitimate.example.com',
+			},
+			url: '/',
+		});
+
+		handler(req, res);
+		req.send();
+
+		const html = await text();
+		const $ = cheerio.load(html);
+
+		// Should use the Host header, not X-Forwarded-Host when allowedDomains is not configured
+		assert.equal($('body').text(), 'https://legitimate.example.com/');
+	});
+
+	it('accepts any port when port not specified in allowedDomains', async () => {
+		const { handler } = await import('./fixtures/url/dist/server/entry.mjs');
+		const { req, res, text } = createRequestAndResponse({
+			headers: {
+				'X-Forwarded-Proto': 'https',
+				'X-Forwarded-Host': 'abc.xyz:8080',
+				Host: 'localhost:3000',
+			},
+			url: '/',
+		});
+
+		handler(req, res);
+		req.send();
+
+		const html = await text();
+		const $ = cheerio.load(html);
+
+		// When no port is specified in allowedDomains pattern, any port is accepted
+		// This validates that port validation works (it's checking and passing)
+		assert.equal($('body').text(), 'https://abc.xyz:8080/');
+	});
 });
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 53f157529640..5f26e9355ca7 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/vercel
 
+## 8.2.9
+
+### Patch Changes
+
+- [#14473](https://github.com/withastro/astro/pull/14473) [`d9634d3`](https://github.com/withastro/astro/commit/d9634d31c47f3707e6092bed7938dfcfc0fb550b) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes a bug that caused too many files to be bundled in SSR
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+
 ## 8.2.8
 
 ### Patch Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 59f24b35b96d..d96ce13f1fa4 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": "8.2.8",
+  "version": "8.2.9",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/internal-helpers/CHANGELOG.md b/packages/internal-helpers/CHANGELOG.md
index 7890a0c844bb..01d9b72e321a 100644
--- a/packages/internal-helpers/CHANGELOG.md
+++ b/packages/internal-helpers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/internal-helpers
 
+## 0.7.4
+
+### Patch Changes
+
+- [`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7) Thanks [@ascorbic](https://github.com/ascorbic)! - Refactor remote path detection
+
 ## 0.7.3
 
 ### Patch Changes
diff --git a/packages/internal-helpers/package.json b/packages/internal-helpers/package.json
index f18fff764322..ec5453f13204 100644
--- a/packages/internal-helpers/package.json
+++ b/packages/internal-helpers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/internal-helpers",
   "description": "Internal helpers used by core Astro packages.",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index 93727840ecf5..d180806fa201 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @astrojs/markdown-remark
 
+## 6.3.8
+
+### Patch Changes
+
+- Updated dependencies [[`b8ca69b`](https://github.com/withastro/astro/commit/b8ca69b97149becefaf89bf21853de9c905cdbb7)]:
+  - @astrojs/internal-helpers@0.7.4
+
 ## 6.3.7
 
 ### Patch Changes
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index afe675a3c5a0..4fd3648d330b 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "6.3.7",
+  "version": "6.3.8",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
index 4c4ebc6acd73..329892c5f8ee 100644
--- a/packages/telemetry/package.json
+++ b/packages/telemetry/package.json
@@ -29,7 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "ci-info": "^4.3.0",
+    "ci-info": "^4.3.1",
     "debug": "^4.4.3",
     "dlv": "^1.1.3",
     "dset": "^3.1.4",
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 13392388daf1..8149e865ff14 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -30,8 +30,8 @@
   "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
   "dependencies": {
     "@astrojs/cli-kit": "^0.4.1",
-    "package-manager-detector": "^1.3.0",
-    "semver": "^7.7.2",
+    "package-manager-detector": "^1.4.0",
+    "semver": "^7.7.3",
     "terminal-link": "^4.0.0"
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b462befc8a60..a70607d85816 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,11 +35,11 @@ importers:
         specifier: 0.25.5
         version: 0.25.5
       eslint:
-        specifier: ^9.36.0
-        version: 9.36.0(jiti@2.6.1)
+        specifier: ^9.37.0
+        version: 9.37.0(jiti@2.6.1)
       eslint-plugin-regexp:
         specifier: ^2.10.0
-        version: 2.10.0(eslint@9.36.0(jiti@2.6.1))
+        version: 2.10.0(eslint@9.37.0(jiti@2.6.1))
       knip:
         specifier: 5.61.3
         version: 5.61.3(@types/node@18.19.124)(typescript@5.9.3)
@@ -53,8 +53,8 @@ importers:
         specifier: ^0.14.1
         version: 0.14.1
       publint:
-        specifier: ^0.3.13
-        version: 0.3.13
+        specifier: ^0.3.14
+        version: 0.3.14
       tinyglobby:
         specifier: ^0.2.15
         version: 0.2.15
@@ -65,8 +65,8 @@ importers:
         specifier: ~5.9.3
         version: 5.9.3
       typescript-eslint:
-        specifier: ^8.45.0
-        version: 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
+        specifier: ^8.46.0
+        version: 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
 
   benchmark:
     dependencies:
@@ -149,13 +149,13 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/blog:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^4.3.6
+        specifier: ^4.3.7
         version: link:../../packages/integrations/mdx
       '@astrojs/rss':
         specifier: ^4.0.12
@@ -164,7 +164,7 @@ importers:
         specifier: ^3.6.0
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       sharp:
         specifier: ^0.34.3
@@ -173,7 +173,7 @@ importers:
   examples/component:
     devDependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/container-with-vitest:
@@ -182,7 +182,7 @@ importers:
         specifier: ^4.4.0
         version: link:../../packages/integrations/react
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       react:
         specifier: ^18.3.1
@@ -195,11 +195,11 @@ importers:
         version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
     devDependencies:
       '@types/react':
-        specifier: ^18.3.25
-        version: 18.3.25
+        specifier: ^18.3.26
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
 
   examples/framework-alpine:
     dependencies:
@@ -213,7 +213,7 @@ importers:
         specifier: ^3.15.0
         version: 3.15.0
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/framework-multiple:
@@ -234,13 +234,13 @@ importers:
         specifier: ^5.1.1
         version: link:../../packages/integrations/vue
       '@types/react':
-        specifier: ^18.3.25
-        version: 18.3.25
+        specifier: ^18.3.26
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.27.2
@@ -255,8 +255,8 @@ importers:
         specifier: ^1.9.9
         version: 1.9.9
       svelte:
-        specifier: ^5.39.8
-        version: 5.39.8
+        specifier: ^5.39.11
+        version: 5.39.11
       vue:
         specifier: ^3.5.22
         version: 3.5.22(typescript@5.9.3)
@@ -267,10 +267,10 @@ importers:
         specifier: ^4.1.1
         version: link:../../packages/integrations/preact
       '@preact/signals':
-        specifier: ^2.3.1
-        version: 2.3.1(preact@10.27.2)
+        specifier: ^2.3.2
+        version: 2.3.2(preact@10.27.2)
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.27.2
@@ -282,13 +282,13 @@ importers:
         specifier: ^4.4.0
         version: link:../../packages/integrations/react
       '@types/react':
-        specifier: ^18.3.25
-        version: 18.3.25
+        specifier: ^18.3.26
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       react:
         specifier: ^18.3.1
@@ -303,7 +303,7 @@ importers:
         specifier: ^5.1.1
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.9.9
@@ -315,11 +315,11 @@ importers:
         specifier: ^7.2.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       svelte:
-        specifier: ^5.39.8
-        version: 5.39.8
+        specifier: ^5.39.11
+        version: 5.39.11
 
   examples/framework-vue:
     dependencies:
@@ -327,7 +327,7 @@ importers:
         specifier: ^5.1.1
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       vue:
         specifier: ^3.5.22
@@ -336,49 +336,49 @@ importers:
   examples/hackernews:
     dependencies:
       '@astrojs/node':
-        specifier: ^9.4.4
+        specifier: ^9.4.6
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/ssr:
     dependencies:
       '@astrojs/node':
-        specifier: ^9.4.4
+        specifier: ^9.4.6
         version: link:../../packages/integrations/node
       '@astrojs/svelte':
         specifier: ^7.2.0
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       svelte:
-        specifier: ^5.39.8
-        version: 5.39.8
+        specifier: ^5.39.11
+        version: 5.39.11
 
   examples/starlog:
     dependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       sass:
         specifier: ^1.93.2
@@ -393,28 +393,28 @@ importers:
         specifier: ^18.17.8
         version: 18.19.124
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/with-markdoc:
     dependencies:
       '@astrojs/markdoc':
-        specifier: ^0.15.7
+        specifier: ^0.15.8
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
 
   examples/with-mdx:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^4.3.6
+        specifier: ^4.3.7
         version: link:../../packages/integrations/mdx
       '@astrojs/preact':
         specifier: ^4.1.1
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.27.2
@@ -429,7 +429,7 @@ importers:
         specifier: ^0.5.2
         version: 0.5.2(nanostores@0.11.4)(preact@10.27.2)
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.11.4
@@ -441,7 +441,7 @@ importers:
   examples/with-tailwindcss:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^4.3.6
+        specifier: ^4.3.7
         version: link:../../packages/integrations/mdx
       '@tailwindcss/vite':
         specifier: ^4.1.14
@@ -450,7 +450,7 @@ importers:
         specifier: ^1.9.0
         version: 1.9.0
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       canvas-confetti:
         specifier: ^1.9.3
@@ -462,7 +462,7 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^5.14.1
+        specifier: ^5.14.4
         version: link:../../packages/astro
       vitest:
         specifier: ^3.2.4
@@ -502,7 +502,7 @@ importers:
         version: 8.0.1
       ci-info:
         specifier: ^4.3.0
-        version: 4.3.0
+        version: 4.3.1
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -580,7 +580,7 @@ importers:
         version: 8.1.1
       package-manager-detector:
         specifier: ^1.3.0
-        version: 1.3.0
+        version: 1.4.0
       picomatch:
         specifier: ^4.0.3
         version: 4.0.3
@@ -592,7 +592,7 @@ importers:
         version: 13.0.2
       semver:
         specifier: ^7.7.2
-        version: 7.7.2
+        version: 7.7.3
       shiki:
         specifier: ^3.12.0
         version: 3.13.0
@@ -777,8 +777,8 @@ importers:
   packages/astro-rss:
     dependencies:
       fast-xml-parser:
-        specifier: ^5.2.5
-        version: 5.2.5
+        specifier: ^5.3.0
+        version: 5.3.0
       kleur:
         specifier: ^4.1.5
         version: 4.1.5
@@ -818,10 +818,10 @@ importers:
         version: link:../../../../integrations/react
       '@types/react':
         specifier: ^18.3.24
-        version: 18.3.25
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -927,7 +927,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1072,7 +1072,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1129,7 +1129,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1185,7 +1185,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1225,7 +1225,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1265,7 +1265,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1305,7 +1305,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1345,7 +1345,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1385,7 +1385,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1581,7 +1581,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/e2e/fixtures/tailwindcss:
     dependencies:
@@ -1641,7 +1641,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1683,10 +1683,10 @@ importers:
         version: link:../utils
       '@types/react':
         specifier: ^18.3.24
-        version: 18.3.25
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -1710,10 +1710,10 @@ importers:
         version: link:../utils
       '@types/react':
         specifier: ^18.3.24
-        version: 18.3.25
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -1737,10 +1737,10 @@ importers:
         version: link:../utils
       '@types/react':
         specifier: ^18.3.24
-        version: 18.3.25
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -1785,7 +1785,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1806,7 +1806,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/alias-tsconfig:
     dependencies:
@@ -1821,7 +1821,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/alias-tsconfig-baseurl-only:
     dependencies:
@@ -1833,7 +1833,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/alias-tsconfig-no-baseurl:
     dependencies:
@@ -1964,7 +1964,7 @@ importers:
         version: 10.27.2
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -1997,7 +1997,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/astro-client-only/pkg: {}
 
@@ -2089,7 +2089,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/astro-env:
     dependencies:
@@ -2464,7 +2464,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -2554,7 +2554,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/component-library-shared:
     dependencies:
@@ -2908,7 +2908,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/css-import-as-inline:
     dependencies:
@@ -3196,7 +3196,7 @@ importers:
         version: 10.27.2
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -3439,7 +3439,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -3642,7 +3642,7 @@ importers:
         version: 1.9.9
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -3887,7 +3887,7 @@ importers:
         version: link:../../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/server-islands/ssr:
     dependencies:
@@ -3902,7 +3902,7 @@ importers:
         version: link:../../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/sessions:
     dependencies:
@@ -3977,7 +3977,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/slots-vue:
     dependencies:
@@ -4151,10 +4151,10 @@ importers:
         version: link:deps/test-adapter
       '@types/react':
         specifier: ^18.3.24
-        version: 18.3.25
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../..
@@ -4323,7 +4323,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/astro/test/fixtures/svg-deduplication:
     dependencies:
@@ -4446,7 +4446,7 @@ importers:
         version: link:../../..
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
       vue:
         specifier: ^3.5.20
         version: 3.5.22(typescript@5.9.3)
@@ -4665,11 +4665,11 @@ importers:
         specifier: workspace:*
         version: link:../../../../integrations/react
       '@types/react':
-        specifier: ^18.3.25
-        version: 18.3.25
+        specifier: ^18.3.26
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../../../astro
@@ -4695,8 +4695,8 @@ importers:
   packages/integrations/alpinejs:
     devDependencies:
       '@playwright/test':
-        specifier: 1.55.1
-        version: 1.55.1
+        specifier: 1.56.0
+        version: 1.56.0
       astro:
         specifier: workspace:*
         version: link:../../astro
@@ -4922,7 +4922,7 @@ importers:
         version: link:../../../../../astro
       svelte:
         specifier: ^5.39.8
-        version: 5.39.8
+        version: 5.39.11
 
   packages/integrations/cloudflare/test/fixtures/with-vue:
     dependencies:
@@ -5744,7 +5744,7 @@ importers:
         version: 2.10.2(@babel/core@7.28.4)(preact@10.27.2)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       '@preact/signals':
         specifier: ^2.3.1
-        version: 2.3.1(preact@10.27.2)
+        version: 2.3.2(preact@10.27.2)
       preact-render-to-string:
         specifier: ^6.6.1
         version: 6.6.1(preact@10.27.2)
@@ -5776,10 +5776,10 @@ importers:
     devDependencies:
       '@types/react':
         specifier: ^18.3.24
-        version: 18.3.25
+        version: 18.3.26
       '@types/react-dom':
         specifier: ^18.3.7
-        version: 18.3.7(@types/react@18.3.25)
+        version: 18.3.7(@types/react@18.3.26)
       astro:
         specifier: workspace:*
         version: link:../../astro
@@ -5901,10 +5901,10 @@ importers:
     dependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^5.1.1
-        version: 5.1.1(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
+        version: 5.1.1(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       svelte2tsx:
         specifier: ^0.7.42
-        version: 0.7.42(svelte@5.39.8)(typescript@5.9.3)
+        version: 0.7.42(svelte@5.39.11)(typescript@5.9.3)
       vite:
         specifier: ^7.1.7
         version: 7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
@@ -5920,7 +5920,7 @@ importers:
         version: 1.1.2
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/integrations/svelte/test/fixtures/async-rendering:
     dependencies:
@@ -5932,7 +5932,7 @@ importers:
         version: link:../../../../../astro
       svelte:
         specifier: ^5.39.3
-        version: 5.39.8
+        version: 5.39.11
 
   packages/integrations/vercel:
     dependencies:
@@ -5941,7 +5941,7 @@ importers:
         version: link:../../internal-helpers
       '@vercel/analytics':
         specifier: ^1.5.0
-        version: 1.5.0(react@19.1.1)(svelte@5.39.8)(vue@3.5.22(typescript@5.9.3))
+        version: 1.5.0(react@19.1.1)(svelte@5.39.11)(vue@3.5.22(typescript@5.9.3))
       '@vercel/functions':
         specifier: ^2.2.13
         version: 2.2.13
@@ -6363,8 +6363,8 @@ importers:
   packages/telemetry:
     dependencies:
       ci-info:
-        specifier: ^4.3.0
-        version: 4.3.0
+        specifier: ^4.3.1
+        version: 4.3.1
       debug:
         specifier: ^4.4.3
         version: 4.4.3
@@ -6415,11 +6415,11 @@ importers:
         specifier: ^0.4.1
         version: 0.4.1
       package-manager-detector:
-        specifier: ^1.3.0
-        version: 1.3.0
+        specifier: ^1.4.0
+        version: 1.4.0
       semver:
-        specifier: ^7.7.2
-        version: 7.7.2
+        specifier: ^7.7.3
+        version: 7.7.3
       terminal-link:
         specifier: ^4.0.0
         version: 4.0.0
@@ -7843,28 +7843,28 @@ packages:
     resolution: {integrity: sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/config-helpers@0.3.1':
-    resolution: {integrity: sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==}
+  '@eslint/config-helpers@0.4.0':
+    resolution: {integrity: sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/core@0.15.2':
-    resolution: {integrity: sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==}
+  '@eslint/core@0.16.0':
+    resolution: {integrity: sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/eslintrc@3.3.1':
     resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@9.36.0':
-    resolution: {integrity: sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==}
+  '@eslint/js@9.37.0':
+    resolution: {integrity: sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/object-schema@2.1.6':
     resolution: {integrity: sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/plugin-kit@0.3.5':
-    resolution: {integrity: sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==}
+  '@eslint/plugin-kit@0.4.0':
+    resolution: {integrity: sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@fastify/accept-negotiator@2.0.1':
@@ -8587,8 +8587,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  '@playwright/test@1.55.1':
-    resolution: {integrity: sha512-IVAh/nOJaw6W9g+RJVlIQJ6gSiER+ae6mKQ5CX1bERzQgbC1VSeBlwdvczT7pxb0GWiyrxH4TGKbMfDb4Sq/ig==}
+  '@playwright/test@1.56.0':
+    resolution: {integrity: sha512-Tzh95Twig7hUwwNe381/K3PggZBZblKUe2wv25oIpzWLr6Z0m4KgV1ZVIjnR6GM9ANEqjZD7XsZEa6JL/7YEgg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -8609,6 +8609,11 @@ packages:
     peerDependencies:
       preact: '>= 10.25.0 || >=11.0.0-0'
 
+  '@preact/signals@2.3.2':
+    resolution: {integrity: sha512-Q22avIn4z0BQnmFeo6Y5HCnJTo8VufN84zN51OtqeNgZOVCYgdwEOcJKVX1x/IrjRVxUnOy6Ubn7H5aVFujXaQ==}
+    peerDependencies:
+      preact: '>= 10.25.0 || >=11.0.0-0'
+
   '@prefresh/babel-plugin@0.5.2':
     resolution: {integrity: sha512-AOl4HG6dAxWkJ5ndPHBgBa49oo/9bOiJuRDKHLSTyH+Fd9x00shTXpdiTj1W41l6oQIwUOAgJeHMn4QwIDpHkA==}
 
@@ -9059,8 +9064,8 @@ packages:
     peerDependencies:
       '@types/react': ^19.0.0
 
-  '@types/react@18.3.25':
-    resolution: {integrity: sha512-oSVZmGtDPmRZtVDqvdKUi/qgCsWp5IDY29wp8na8Bj4B3cc99hfNzvNhlMkVVxctkAOGUA3Km7MMpBHAnWfcIA==}
+  '@types/react@18.3.26':
+    resolution: {integrity: sha512-RFA/bURkcKzx/X9oumPG9Vp3D3JUgus/d0b67KB0t5S/raciymilkOa66olh78MUI92QLbEJevO7rvqU/kjwKA==}
 
   '@types/react@19.1.1':
     resolution: {integrity: sha512-ePapxDL7qrgqSF67s0h9m412d9DbXyC1n59O2st+9rjuuamWsZuD2w55rqY12CbzsZ7uVXb5Nw0gEp9Z8MMutQ==}
@@ -9110,63 +9115,63 @@ packages:
   '@types/yauzl@2.10.3':
     resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
 
-  '@typescript-eslint/eslint-plugin@8.45.0':
-    resolution: {integrity: sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg==}
+  '@typescript-eslint/eslint-plugin@8.46.0':
+    resolution: {integrity: sha512-hA8gxBq4ukonVXPy0OKhiaUh/68D0E88GSmtC1iAEnGaieuDi38LhS7jdCHRLi6ErJBNDGCzvh5EnzdPwUc0DA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.45.0
+      '@typescript-eslint/parser': ^8.46.0
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.45.0':
-    resolution: {integrity: sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==}
+  '@typescript-eslint/parser@8.46.0':
+    resolution: {integrity: sha512-n1H6IcDhmmUEG7TNVSspGmiHHutt7iVKtZwRppD7e04wha5MrkV1h3pti9xQLcCMt6YWsncpoT0HMjkH1FNwWQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.45.0':
-    resolution: {integrity: sha512-3pcVHwMG/iA8afdGLMuTibGR7pDsn9RjDev6CCB+naRsSYs2pns5QbinF4Xqw6YC/Sj3lMrm/Im0eMfaa61WUg==}
+  '@typescript-eslint/project-service@8.46.0':
+    resolution: {integrity: sha512-OEhec0mH+U5Je2NZOeK1AbVCdm0ChyapAyTeXVIYTPXDJ3F07+cu87PPXcGoYqZ7M9YJVvFnfpGg1UmCIqM+QQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/scope-manager@8.45.0':
-    resolution: {integrity: sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==}
+  '@typescript-eslint/scope-manager@8.46.0':
+    resolution: {integrity: sha512-lWETPa9XGcBes4jqAMYD9fW0j4n6hrPtTJwWDmtqgFO/4HF4jmdH/Q6wggTw5qIT5TXjKzbt7GsZUBnWoO3dqw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.45.0':
-    resolution: {integrity: sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==}
+  '@typescript-eslint/tsconfig-utils@8.46.0':
+    resolution: {integrity: sha512-WrYXKGAHY836/N7zoK/kzi6p8tXFhasHh8ocFL9VZSAkvH956gfeRfcnhs3xzRy8qQ/dq3q44v1jvQieMFg2cw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.45.0':
-    resolution: {integrity: sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==}
+  '@typescript-eslint/type-utils@8.46.0':
+    resolution: {integrity: sha512-hy+lvYV1lZpVs2jRaEYvgCblZxUoJiPyCemwbQZ+NGulWkQRy0HRPYAoef/CNSzaLt+MLvMptZsHXHlkEilaeg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/types@8.45.0':
-    resolution: {integrity: sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==}
+  '@typescript-eslint/types@8.46.0':
+    resolution: {integrity: sha512-bHGGJyVjSE4dJJIO5yyEWt/cHyNwga/zXGJbJJ8TiO01aVREK6gCTu3L+5wrkb1FbDkQ+TKjMNe9R/QQQP9+rA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/typescript-estree@8.45.0':
-    resolution: {integrity: sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==}
+  '@typescript-eslint/typescript-estree@8.46.0':
+    resolution: {integrity: sha512-ekDCUfVpAKWJbRfm8T1YRrCot1KFxZn21oV76v5Fj4tr7ELyk84OS+ouvYdcDAwZL89WpEkEj2DKQ+qg//+ucg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/utils@8.45.0':
-    resolution: {integrity: sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==}
+  '@typescript-eslint/utils@8.46.0':
+    resolution: {integrity: sha512-nD6yGWPj1xiOm4Gk0k6hLSZz2XkNXhuYmyIrOWcHoPuAhjT9i5bAG+xbWPgFeNR8HPHHtpNKdYUXJl/D3x7f5g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/visitor-keys@8.45.0':
-    resolution: {integrity: sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==}
+  '@typescript-eslint/visitor-keys@8.46.0':
+    resolution: {integrity: sha512-FrvMpAK+hTbFy7vH5j1+tMYHMSKLE6RzluFJlkFNKD0p9YsUT75JlBSmr5so3QRzvMwU5/bIEdeNrxm8du8l3Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript/twoslash@3.1.0':
@@ -9781,8 +9786,8 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
-  ci-info@4.3.0:
-    resolution: {integrity: sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==}
+  ci-info@4.3.1:
+    resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==}
     engines: {node: '>=8'}
 
   citty@0.1.6:
@@ -10509,8 +10514,8 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@9.36.0:
-    resolution: {integrity: sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==}
+  eslint@9.37.0:
+    resolution: {integrity: sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
     peerDependencies:
@@ -10649,8 +10654,8 @@ packages:
   fast-uri@3.1.0:
     resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
 
-  fast-xml-parser@5.2.5:
-    resolution: {integrity: sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==}
+  fast-xml-parser@5.3.0:
+    resolution: {integrity: sha512-gkWGshjYcQCF+6qtlrqBqELqNqnt4CxruY6UVAWWnqb3DQ6qaNFEIKqzYep1XzHLM/QtrHVCxyPOtTk4LTQ7Aw==}
     hasBin: true
 
   fastq@1.19.1:
@@ -12164,8 +12169,8 @@ packages:
   package-manager-detector@0.2.11:
     resolution: {integrity: sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==}
 
-  package-manager-detector@1.3.0:
-    resolution: {integrity: sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==}
+  package-manager-detector@1.4.0:
+    resolution: {integrity: sha512-rRZ+pR1Usc+ND9M2NkmCvE/LYJS+8ORVV9X0KuNSY/gFsp7RBHJM/ADh9LYq4Vvfq6QkKrW6/weuh8SMEtN5gw==}
 
   pako@0.2.9:
     resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
@@ -12306,8 +12311,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright-core@1.55.1:
-    resolution: {integrity: sha512-Z6Mh9mkwX+zxSlHqdr5AOcJnfp+xUWLCt9uKV18fhzA8eyxUd8NUWzAjxUh55RZKSYwDGX0cfaySdhZJGMoJ+w==}
+  playwright-core@1.56.0:
+    resolution: {integrity: sha512-1SXl7pMfemAMSDn5rkPeZljxOCYAmQnYLBTExuh6E8USHXGSX3dx6lYZN/xPpTz1vimXmPA9CDnILvmJaB8aSQ==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -12316,8 +12321,8 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright@1.55.1:
-    resolution: {integrity: sha512-cJW4Xd/G3v5ovXtJJ52MAOclqeac9S/aGGgRzLabuF8TnIb6xHvMzKIa6JmrRzUkeXJgfL1MhukP0NK6l39h3A==}
+  playwright@1.56.0:
+    resolution: {integrity: sha512-X5Q1b8lOdWIE4KAoHpW3SE8HvUB+ZZsUoN64ZhjnN8dOb1UpujxBtENGiZFE+9F/yhzJwYa+ca3u43FeLbboHA==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -12580,8 +12585,8 @@ packages:
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
-  publint@0.3.13:
-    resolution: {integrity: sha512-NC+lph09+BRO9LJgKlIy3WQXyu6/6WDQ0dCA60KALUwdKVf3PfGuC6fY8I+oKB/5kEPh50aOSUz+6yWy1n4EfA==}
+  publint@0.3.14:
+    resolution: {integrity: sha512-14/VNBvWsrBeqWNDw8c/DK5ERcZBUwL1rnkVx18cQnF3zadr3GfoYtvD8mxi1dhkWpaPHp8kfi92MDbjMeW3qw==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -12900,8 +12905,8 @@ packages:
     resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
-  semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -13220,8 +13225,8 @@ packages:
       svelte: ^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0
       typescript: ^4.9.4 || ^5.0.0
 
-  svelte@5.39.8:
-    resolution: {integrity: sha512-KfZ3hCITdxIXTOvrea4nFZX2o+47HPTChKeocgj9BwJQYqWrviVCcPj4boXHF5yf8+eBKqhHY8xii//XaakKXA==}
+  svelte@5.39.11:
+    resolution: {integrity: sha512-8MxWVm2+3YwrFbPaxOlT1bbMi6OTenrAgks6soZfiaS8Fptk4EVyRIFhJc3RpO264EeSNwgjWAdki0ufg4zkGw==}
     engines: {node: '>=18'}
 
   svgo@3.3.2:
@@ -13420,8 +13425,8 @@ packages:
   typescript-auto-import-cache@0.3.6:
     resolution: {integrity: sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ==}
 
-  typescript-eslint@8.45.0:
-    resolution: {integrity: sha512-qzDmZw/Z5beNLUrXfd0HIW6MzIaAV5WNDxmMs9/3ojGOpYavofgNAAD/nC6tGV2PczIi0iw8vot2eAe/sBn7zg==}
+  typescript-eslint@8.46.0:
+    resolution: {integrity: sha512-6+ZrB6y2bT2DX3K+Qd9vn7OFOJR+xSLDj+Aw/N3zBwUt27uTw2sw2TE2+UcY1RiyBZkaGbTkVg9SSdPNUG6aUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -14626,7 +14631,7 @@ snapshots:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/assemble-release-plan@6.0.9':
     dependencies:
@@ -14635,7 +14640,7 @@ snapshots:
       '@changesets/should-skip-package': 0.1.2
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/changelog-git@0.2.1':
     dependencies:
@@ -14676,7 +14681,7 @@ snapshots:
       package-manager-detector: 0.2.11
       picocolors: 1.1.1
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       spawndamnit: 3.0.1
       term-size: 2.2.1
     transitivePeerDependencies:
@@ -14701,7 +14706,7 @@ snapshots:
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       picocolors: 1.1.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/get-github-info@0.6.0':
     dependencies:
@@ -15472,9 +15477,9 @@ snapshots:
   '@esbuild/win32-x64@0.25.9':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.0(eslint@9.36.0(jiti@2.6.1))':
+  '@eslint-community/eslint-utils@4.9.0(eslint@9.37.0(jiti@2.6.1))':
     dependencies:
-      eslint: 9.36.0(jiti@2.6.1)
+      eslint: 9.37.0(jiti@2.6.1)
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.12.1': {}
@@ -15487,9 +15492,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/config-helpers@0.3.1': {}
+  '@eslint/config-helpers@0.4.0':
+    dependencies:
+      '@eslint/core': 0.16.0
 
-  '@eslint/core@0.15.2':
+  '@eslint/core@0.16.0':
     dependencies:
       '@types/json-schema': 7.0.15
 
@@ -15507,13 +15514,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@9.36.0': {}
+  '@eslint/js@9.37.0': {}
 
   '@eslint/object-schema@2.1.6': {}
 
-  '@eslint/plugin-kit@0.3.5':
+  '@eslint/plugin-kit@0.4.0':
     dependencies:
-      '@eslint/core': 0.15.2
+      '@eslint/core': 0.16.0
       levn: 0.4.1
 
   '@fastify/accept-negotiator@2.0.1': {}
@@ -15841,7 +15848,7 @@ snapshots:
       https-proxy-agent: 7.0.6
       node-fetch: 2.7.0
       nopt: 8.1.0
-      semver: 7.7.2
+      semver: 7.7.3
       tar: 7.5.1
     transitivePeerDependencies:
       - encoding
@@ -15956,7 +15963,7 @@ snapshots:
       image-size: 2.0.2
       js-image-generator: 1.0.4
       parse-gitignore: 2.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       tmp-promise: 3.0.3
       uuid: 11.1.0
       write-file-atomic: 5.0.1
@@ -16014,7 +16021,7 @@ snapshots:
       p-wait-for: 5.0.2
       parse-imports: 2.2.1
       path-key: 4.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       tar: 7.5.1
       tmp-promise: 3.0.3
       urlpattern-polyfill: 8.0.2
@@ -16178,7 +16185,7 @@ snapshots:
       precinct: 12.2.0
       require-package-name: 2.0.1
       resolve: 2.0.0-next.5
-      semver: 7.7.2
+      semver: 7.7.3
       tmp-promise: 3.0.3
       toml: 3.0.0
       unixify: 1.0.0
@@ -16335,9 +16342,9 @@ snapshots:
     dependencies:
       playwright: 1.51.1
 
-  '@playwright/test@1.55.1':
+  '@playwright/test@1.56.0':
     dependencies:
-      playwright: 1.55.1
+      playwright: 1.56.0
 
   '@polka/url@1.0.0-next.29': {}
 
@@ -16364,6 +16371,11 @@ snapshots:
       '@preact/signals-core': 1.12.1
       preact: 10.27.2
 
+  '@preact/signals@2.3.2(preact@10.27.2)':
+    dependencies:
+      '@preact/signals-core': 1.12.1
+      preact: 10.27.2
+
   '@prefresh/babel-plugin@0.5.2': {}
 
   '@prefresh/core@1.5.7(preact@10.27.2)':
@@ -16518,23 +16530,23 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
-  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte-inspector@4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 5.1.1(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       debug: 4.4.3
-      svelte: 5.39.8
+      svelte: 5.39.11
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.8)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte-inspector': 4.0.1(@sveltejs/vite-plugin-svelte@5.1.1(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)))(svelte@5.39.11)(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
       debug: 4.4.3
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.19
-      svelte: 5.39.8
+      svelte: 5.39.11
       vite: 7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1)
       vitefu: 1.1.1(vite@7.1.7(@types/node@22.18.1)(jiti@2.6.1)(lightningcss@1.30.1)(sass@1.93.2)(yaml@2.8.1))
     transitivePeerDependencies:
@@ -16752,15 +16764,15 @@ snapshots:
 
   '@types/prop-types@15.7.15': {}
 
-  '@types/react-dom@18.3.7(@types/react@18.3.25)':
+  '@types/react-dom@18.3.7(@types/react@18.3.26)':
     dependencies:
-      '@types/react': 18.3.25
+      '@types/react': 18.3.26
 
   '@types/react-dom@19.1.1(@types/react@19.1.1)':
     dependencies:
       '@types/react': 19.1.1
 
-  '@types/react@18.3.25':
+  '@types/react@18.3.26':
     dependencies:
       '@types/prop-types': 15.7.15
       csstype: 3.1.3
@@ -16813,15 +16825,15 @@ snapshots:
       '@types/node': 18.19.124
     optional: true
 
-  '@typescript-eslint/eslint-plugin@8.45.0(@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/eslint-plugin@8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/scope-manager': 8.45.0
-      '@typescript-eslint/type-utils': 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.45.0
-      eslint: 9.36.0(jiti@2.6.1)
+      '@typescript-eslint/parser': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/type-utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.46.0
+      eslint: 9.37.0(jiti@2.6.1)
       graphemer: 1.4.0
       ignore: 7.0.5
       natural-compare: 1.4.0
@@ -16830,80 +16842,80 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.45.0
-      '@typescript-eslint/types': 8.45.0
-      '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3)
-      '@typescript-eslint/visitor-keys': 8.45.0
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.46.0
       debug: 4.4.3
-      eslint: 9.36.0(jiti@2.6.1)
+      eslint: 9.37.0(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.45.0(typescript@5.9.3)':
+  '@typescript-eslint/project-service@8.46.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.45.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.45.0
+      '@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.46.0
       debug: 4.4.3
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/scope-manager@8.45.0':
+  '@typescript-eslint/scope-manager@8.46.0':
     dependencies:
-      '@typescript-eslint/types': 8.45.0
-      '@typescript-eslint/visitor-keys': 8.45.0
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/visitor-keys': 8.46.0
 
-  '@typescript-eslint/tsconfig-utils@8.45.0(typescript@5.9.3)':
+  '@typescript-eslint/tsconfig-utils@8.46.0(typescript@5.9.3)':
     dependencies:
       typescript: 5.9.3
 
-  '@typescript-eslint/type-utils@8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/type-utils@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/types': 8.45.0
-      '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
       debug: 4.4.3
-      eslint: 9.36.0(jiti@2.6.1)
+      eslint: 9.37.0(jiti@2.6.1)
       ts-api-utils: 2.1.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/types@8.45.0': {}
+  '@typescript-eslint/types@8.46.0': {}
 
-  '@typescript-eslint/typescript-estree@8.45.0(typescript@5.9.3)':
+  '@typescript-eslint/typescript-estree@8.46.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.45.0(typescript@5.9.3)
-      '@typescript-eslint/tsconfig-utils': 8.45.0(typescript@5.9.3)
-      '@typescript-eslint/types': 8.45.0
-      '@typescript-eslint/visitor-keys': 8.45.0
+      '@typescript-eslint/project-service': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/visitor-keys': 8.46.0
       debug: 4.4.3
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.7.2
+      semver: 7.7.3
       ts-api-utils: 2.1.0(typescript@5.9.3)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)':
+  '@typescript-eslint/utils@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.36.0(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.45.0
-      '@typescript-eslint/types': 8.45.0
-      '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3)
-      eslint: 9.36.0(jiti@2.6.1)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      eslint: 9.37.0(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/visitor-keys@8.45.0':
+  '@typescript-eslint/visitor-keys@8.46.0':
     dependencies:
-      '@typescript-eslint/types': 8.45.0
+      '@typescript-eslint/types': 8.46.0
       eslint-visitor-keys: 4.2.1
 
   '@typescript/twoslash@3.1.0':
@@ -16928,10 +16940,10 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vercel/analytics@1.5.0(react@19.1.1)(svelte@5.39.8)(vue@3.5.22(typescript@5.9.3))':
+  '@vercel/analytics@1.5.0(react@19.1.1)(svelte@5.39.11)(vue@3.5.22(typescript@5.9.3))':
     optionalDependencies:
       react: 19.1.1
-      svelte: 5.39.8
+      svelte: 5.39.11
       vue: 3.5.22(typescript@5.9.3)
 
   '@vercel/functions@2.2.13':
@@ -17429,7 +17441,7 @@ snapshots:
       progress: 2.0.3
       reinterval: 1.1.0
       retimer: 3.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       subarg: 1.0.0
       timestring: 6.0.0
 
@@ -17674,7 +17686,7 @@ snapshots:
 
   ci-info@3.9.0: {}
 
-  ci-info@4.3.0: {}
+  ci-info@4.3.1: {}
 
   citty@0.1.6:
     dependencies:
@@ -18009,7 +18021,7 @@ snapshots:
 
   detective-typescript@14.0.0(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
       ast-module-types: 6.0.1
       node-source-walk: 7.0.1
       typescript: 5.9.3
@@ -18312,12 +18324,12 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-plugin-regexp@2.10.0(eslint@9.36.0(jiti@2.6.1)):
+  eslint-plugin-regexp@2.10.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.36.0(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.1
       comment-parser: 1.4.1
-      eslint: 9.36.0(jiti@2.6.1)
+      eslint: 9.37.0(jiti@2.6.1)
       jsdoc-type-pratt-parser: 4.8.0
       refa: 0.12.1
       regexp-ast-analysis: 0.7.1
@@ -18332,16 +18344,16 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
-  eslint@9.36.0(jiti@2.6.1):
+  eslint@9.37.0(jiti@2.6.1):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.36.0(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.1
       '@eslint/config-array': 0.21.0
-      '@eslint/config-helpers': 0.3.1
-      '@eslint/core': 0.15.2
+      '@eslint/config-helpers': 0.4.0
+      '@eslint/core': 0.16.0
       '@eslint/eslintrc': 3.3.1
-      '@eslint/js': 9.36.0
-      '@eslint/plugin-kit': 0.3.5
+      '@eslint/js': 9.37.0
+      '@eslint/plugin-kit': 0.4.0
       '@humanfs/node': 0.16.7
       '@humanwhocodes/module-importer': 1.0.1
       '@humanwhocodes/retry': 0.4.3
@@ -18548,7 +18560,7 @@ snapshots:
 
   fast-uri@3.1.0: {}
 
-  fast-xml-parser@5.2.5:
+  fast-xml-parser@5.3.0:
     dependencies:
       strnum: 2.1.1
 
@@ -19290,7 +19302,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.2
+      semver: 7.7.3
 
   junk@4.0.1: {}
 
@@ -20257,7 +20269,7 @@ snapshots:
   normalize-package-data@6.0.2:
     dependencies:
       hosted-git-info: 7.0.2
-      semver: 7.7.2
+      semver: 7.7.3
       validate-npm-package-license: 3.0.4
 
   normalize-path@2.1.1:
@@ -20436,7 +20448,7 @@ snapshots:
     dependencies:
       quansync: 0.2.11
 
-  package-manager-detector@1.3.0: {}
+  package-manager-detector@1.4.0: {}
 
   pako@0.2.9: {}
 
@@ -20559,7 +20571,7 @@ snapshots:
 
   playwright-core@1.51.1: {}
 
-  playwright-core@1.55.1: {}
+  playwright-core@1.56.0: {}
 
   playwright@1.51.1:
     dependencies:
@@ -20567,9 +20579,9 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.2
 
-  playwright@1.55.1:
+  playwright@1.56.0:
     dependencies:
-      playwright-core: 1.55.1
+      playwright-core: 1.56.0
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -20887,10 +20899,10 @@ snapshots:
 
   proxy-from-env@1.1.0: {}
 
-  publint@0.3.13:
+  publint@0.3.14:
     dependencies:
       '@publint/pack': 0.1.2
-      package-manager-detector: 1.3.0
+      package-manager-detector: 1.4.0
       picocolors: 1.1.1
       sade: 1.8.1
 
@@ -21342,7 +21354,7 @@ snapshots:
 
   semver@6.3.1: {}
 
-  semver@7.7.2: {}
+  semver@7.7.3: {}
 
   send@0.19.0:
     dependencies:
@@ -21403,7 +21415,7 @@ snapshots:
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.4
-      semver: 7.7.2
+      semver: 7.7.3
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.33.5
       '@img/sharp-darwin-x64': 0.33.5
@@ -21430,7 +21442,7 @@ snapshots:
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.4
-      semver: 7.7.2
+      semver: 7.7.3
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.34.3
       '@img/sharp-darwin-x64': 0.34.3
@@ -21749,14 +21761,14 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte2tsx@0.7.42(svelte@5.39.8)(typescript@5.9.3):
+  svelte2tsx@0.7.42(svelte@5.39.11)(typescript@5.9.3):
     dependencies:
       dedent-js: 1.0.1
       pascal-case: 3.1.2
-      svelte: 5.39.8
+      svelte: 5.39.11
       typescript: 5.9.3
 
-  svelte@5.39.8:
+  svelte@5.39.11:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -21927,7 +21939,7 @@ snapshots:
 
   types-react-dom@19.0.0-alpha.3:
     dependencies:
-      '@types/react': 18.3.25
+      '@types/react': 18.3.26
 
   types-react@19.0.0-alpha.3:
     dependencies:
@@ -21937,15 +21949,15 @@ snapshots:
 
   typescript-auto-import-cache@0.3.6:
     dependencies:
-      semver: 7.7.2
+      semver: 7.7.3
 
-  typescript-eslint@8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3):
+  typescript-eslint@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.45.0(@typescript-eslint/parser@8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/parser': 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
-      '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3)
-      '@typescript-eslint/utils': 8.45.0(eslint@9.36.0(jiti@2.6.1))(typescript@5.9.3)
-      eslint: 9.36.0(jiti@2.6.1)
+      '@typescript-eslint/eslint-plugin': 8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.37.0(jiti@2.6.1)
       typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
@@ -22389,7 +22401,7 @@ snapshots:
   volar-service-typescript@0.0.62(@volar/language-service@2.4.23):
     dependencies:
       path-browserify: 1.0.1
-      semver: 7.7.2
+      semver: 7.7.3
       typescript-auto-import-cache: 0.3.6
       vscode-languageserver-textdocument: 1.0.12
       vscode-nls: 5.2.0

From 8d617770a86f6145c1a0b530ddc9653ac5b9342c Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 16 Oct 2025 14:23:02 +0200
Subject: [PATCH 26/36] fix: remove impossible i18n case (#14547)

---
 packages/astro/src/i18n/index.ts         |  5 ---
 packages/astro/test/i18n-routing.test.js | 44 ------------------------
 2 files changed, 49 deletions(-)

diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
index 52efa243df33..c71845173f9a 100644
--- a/packages/astro/src/i18n/index.ts
+++ b/packages/astro/src/i18n/index.ts
@@ -399,11 +399,6 @@ export function redirectToFallback({
 				if (pathFallbackLocale === defaultLocale && strategy === 'pathname-prefix-other-locales') {
 					if (context.url.pathname.includes(`${base}`)) {
 						newPathname = context.url.pathname.replace(`/${urlLocale}`, ``);
-						// Ensure the pathname are non-empty. Redirects like "/fr" => "" may create infinite loops,
-						// as the "Location" response header is empty.
-						if (newPathname === '') {
-							newPathname = '/';
-						}
 					} else {
 						newPathname = context.url.pathname.replace(`/${urlLocale}`, `/`);
 					}
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
index 8aaed4c26a91..29ccaafec29a 100644
--- a/packages/astro/test/i18n-routing.test.js
+++ b/packages/astro/test/i18n-routing.test.js
@@ -774,50 +774,6 @@ describe('[SSG] i18n routing', () => {
 		});
 	});
 
-	describe('i18n routing with routing strategy [prefix-other-locales] with root base', () => {
-		/** @type {import('./test-utils').Fixture} */
-		let fixture;
-		/** @type {import('./test-utils').DevServer} */
-		let devServer;
-
-		before(async () => {
-			fixture = await loadFixture({
-				root: './fixtures/i18n-routing-prefix-other-locales/',
-				output: 'server',
-				adapter: testAdapter(),
-				base: '/',
-				i18n: {
-					defaultLocale: 'en',
-					locales: ['en', 'pt', 'fr'],
-					fallback: {
-						fr: 'en',
-					},
-					routing: {
-						prefixDefaultLocale: false,
-						redirectToDefaultLocale: true,
-						fallbackType: 'redirect',
-					},
-				},
-			});
-			await fixture.build();
-			devServer = await fixture.startDevServer();
-		});
-
-		afterEach(async () => {
-			devServer.stop();
-		});
-
-		it('should redirect to English page', async () => {
-			const response = await fixture.fetch('/fr', { redirect: 'manual' });
-			assert.equal(response.headers.get('Location'), '/');
-			assert.equal(response.status, 302);
-
-			const followRedirectResponse = await fixture.fetch('/fr');
-			assert.equal(followRedirectResponse.status, 200);
-			assert.equal((await followRedirectResponse.text()).includes('Hello'), true);
-		});
-	});
-
 	describe('i18n routing with routing strategy [pathname-prefix-always-no-redirect]', () => {
 		/** @type {import('./test-utils').Fixture} */
 		let fixture;

From 727b0a205eb765f1c36f13a73dfc69e17e44df8f Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 16 Oct 2025 14:25:02 +0200
Subject: [PATCH 27/36] feat!: stabilize experimental.headingIdCompat (#14494)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---
 .changeset/good-camels-pull.md                | 24 +++++++++
 .../astro/src/core/config/schemas/base.ts     |  5 --
 packages/astro/src/types/public/config.ts     | 14 -----
 .../astro/src/vite-plugin-markdown/index.ts   |  1 -
 .../markdoc/src/content-entry-type.ts         |  7 +--
 .../integrations/markdoc/src/heading-ids.ts   | 24 +++------
 packages/integrations/markdoc/src/runtime.ts  | 12 ++---
 .../markdoc/test/headings.test.js             | 36 +------------
 packages/integrations/mdx/src/index.ts        |  1 -
 packages/integrations/mdx/src/plugins.ts      | 13 ++---
 .../integrations/mdx/src/vite-plugin-mdx.ts   |  2 -
 .../mdx/test/mdx-get-headings.test.js         | 51 +------------------
 packages/markdown/remark/src/index.ts         |  3 +-
 .../remark/src/rehype-collect-headings.ts     | 16 +-----
 packages/markdown/remark/src/types.ts         |  1 -
 15 files changed, 46 insertions(+), 164 deletions(-)
 create mode 100644 .changeset/good-camels-pull.md

diff --git a/.changeset/good-camels-pull.md b/.changeset/good-camels-pull.md
new file mode 100644
index 000000000000..2976d3f0f2a0
--- /dev/null
+++ b/.changeset/good-camels-pull.md
@@ -0,0 +1,24 @@
+---
+'@astrojs/markdoc': minor
+'@astrojs/mdx': major
+'@astrojs/markdown-remark': major
+'astro': major
+---
+
+Updates Markdown heading ID generation
+
+In Astro 5.x, an additional default processing step to Markdown stripped trailing hyphens from the end of IDs for section headings ending in special characters. This provided a cleaner `id` value, but could lead to incompatibilities rendering your Markdown across platforms.
+
+In Astro 5.5, the `experimental.headingIdCompat` flag was introduced to allow you to make the IDs generated by Astro for Markdown headings compatible with common platforms like GitHub and npm, using the popular [`github-slugger`](https://github.com/Flet/github-slugger) package.
+
+Astro 6.0 removes this experimental flag and makes this the new default behavior in Astro: trailing hyphens from the end of IDs for headings ending in special characters are no longer removed.
+
+#### What should I do?
+
+If you have manual links to headings, you may need to update some anchor link values with a new trailing hyphen. 
+
+If you were previously using this experimental feature, remove this experimental flag from your configuration.
+
+If you were previously using the `rehypeHeadingIds` plugin directly to enforce compatibility, remove the `headingIdCompat` option as it no longer exists.
+
+See the [Astro 6.0 upgrade guide](https://docs.astro.build/en/guides/upgrade-to/v6/#changed-markdown-heading-id-generation) for upgrade examples, and instructions to create a custom rehype plulgin if you want to keep the old ID generation for backward compatibility reasons.
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index 33f1518cdede..9aabc6b552bb 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -97,7 +97,6 @@ export const ASTRO_CONFIG_DEFAULTS = {
 	experimental: {
 		clientPrerender: false,
 		contentIntellisense: false,
-		headingIdCompat: false,
 		liveContentCollections: false,
 		csp: false,
 		chromeDevtoolsWorkspace: false,
@@ -473,10 +472,6 @@ export const AstroConfigSchema = z.object({
 				.boolean()
 				.optional()
 				.default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense),
-			headingIdCompat: z
-				.boolean()
-				.optional()
-				.default(ASTRO_CONFIG_DEFAULTS.experimental.headingIdCompat),
 			fonts: z.array(z.union([localFontFamilySchema, remoteFontFamilySchema])).optional(),
 			liveContentCollections: z
 				.boolean()
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 9d3ec11395b2..8543f00bfc60 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -2139,20 +2139,6 @@ export interface AstroUserConfig<
 		 */
 		fonts?: FontFamily[];
 
-		/**
-		 * @name experimental.headingIdCompat
-		 * @type {boolean}
-		 * @default `false`
-		 * @version 5.5.x
-		 * @description
-		 *
-		 * Enables full compatibility of Markdown headings IDs with common platforms such as GitHub and npm.
-		 *
-		 * When enabled, IDs for headings ending with non-alphanumeric characters, e.g. `<Picture />`, will
-		 * include a trailing `-`, matching standard behavior in other Markdown tooling.
-		 */
-		headingIdCompat?: boolean;
-
 		/**
 		 * @name experimental.csp
 		 * @type {boolean | object}
diff --git a/packages/astro/src/vite-plugin-markdown/index.ts b/packages/astro/src/vite-plugin-markdown/index.ts
index 0f09f927b00b..0e4bb7c2a5ed 100644
--- a/packages/astro/src/vite-plugin-markdown/index.ts
+++ b/packages/astro/src/vite-plugin-markdown/index.ts
@@ -62,7 +62,6 @@ export default function markdown({ settings, logger }: AstroPluginOptions): Plug
 				if (!processor) {
 					processor = createMarkdownProcessor({
 						image: settings.config.image,
-						experimentalHeadingIdCompat: settings.config.experimental.headingIdCompat,
 						...settings.config.markdown,
 					});
 				}
diff --git a/packages/integrations/markdoc/src/content-entry-type.ts b/packages/integrations/markdoc/src/content-entry-type.ts
index bcebff33af94..524171c40e9a 100644
--- a/packages/integrations/markdoc/src/content-entry-type.ts
+++ b/packages/integrations/markdoc/src/content-entry-type.ts
@@ -52,7 +52,6 @@ export async function getContentEntryType({
 			const markdocConfig = await setupConfig(
 				userMarkdocConfig,
 				options,
-				astroConfig.experimental.headingIdCompat,
 			);
 			const filePath = fileURLToPath(fileUrl);
 			raiseValidationErrors({
@@ -121,7 +120,6 @@ markdocConfig.nodes = { ...assetsConfig.nodes, ...markdocConfig.nodes };
 
 ${getStringifiedImports(componentConfigByTagMap, 'Tag', astroConfig.root)}
 ${getStringifiedImports(componentConfigByNodeMap, 'Node', astroConfig.root)}
-const experimentalHeadingIdCompat = ${JSON.stringify(astroConfig.experimental.headingIdCompat || false)}
 
 const tagComponentMap = ${getStringifiedMap(componentConfigByTagMap, 'Tag')};
 const nodeComponentMap = ${getStringifiedMap(componentConfigByNodeMap, 'Node')};
@@ -132,15 +130,14 @@ const stringifiedAst = ${JSON.stringify(
 				/* Double stringify to encode *as* stringified JSON */ JSON.stringify(ast),
 			)};
 
-export const getHeadings = createGetHeadings(stringifiedAst, markdocConfig, options, experimentalHeadingIdCompat);
+export const getHeadings = createGetHeadings(stringifiedAst, markdocConfig, options);
 export const Content = createContentComponent(
 	Renderer,
 	stringifiedAst,
 	markdocConfig,
-  options,
+	options,
 	tagComponentMap,
 	nodeComponentMap,
-	experimentalHeadingIdCompat,
 )`;
 			return { code: res };
 		},
diff --git a/packages/integrations/markdoc/src/heading-ids.ts b/packages/integrations/markdoc/src/heading-ids.ts
index 7242e0e16d21..0fb03eb954e8 100644
--- a/packages/integrations/markdoc/src/heading-ids.ts
+++ b/packages/integrations/markdoc/src/heading-ids.ts
@@ -11,23 +11,17 @@ function getSlug(
 	attributes: Record<string, any>,
 	children: RenderableTreeNode[],
 	headingSlugger: Slugger,
-	experimentalHeadingIdCompat: boolean,
 ): string {
 	if (attributes.id && typeof attributes.id === 'string') {
 		return attributes.id;
 	}
 	const textContent = attributes.content ?? getTextContent(children);
-	let slug = headingSlugger.slug(textContent);
-
-	if (!experimentalHeadingIdCompat) {
-		if (slug.endsWith('-')) slug = slug.slice(0, -1);
-	}
-	return slug;
+	return headingSlugger.slug(textContent);
 }
 
-type HeadingIdConfig = MarkdocConfig & {
-	ctx: { headingSlugger: Slugger; experimentalHeadingIdCompat: boolean };
-};
+interface HeadingIdConfig extends MarkdocConfig {
+	ctx: { headingSlugger: Slugger };
+}
 
 /*
 	Expose standalone node for users to import in their config.
@@ -50,12 +44,7 @@ export const heading: Schema = {
 					'Unexpected problem adding heading IDs to Markdoc file. Did you modify the `ctx.headingSlugger` property in your Markdoc config?',
 			});
 		}
-		const slug = getSlug(
-			attributes,
-			children,
-			config.ctx.headingSlugger,
-			config.ctx.experimentalHeadingIdCompat,
-		);
+		const slug = getSlug(attributes, children, config.ctx.headingSlugger);
 
 		const render = config.nodes?.heading?.render ?? `h${level}`;
 
@@ -72,12 +61,11 @@ export const heading: Schema = {
 };
 
 // Called internally to ensure `ctx` is generated per-file, instead of per-build.
-export function setupHeadingConfig(experimentalHeadingIdCompat: boolean): HeadingIdConfig {
+export function setupHeadingConfig(): HeadingIdConfig {
 	const headingSlugger = new Slugger();
 	return {
 		ctx: {
 			headingSlugger,
-			experimentalHeadingIdCompat,
 		},
 		nodes: {
 			heading,
diff --git a/packages/integrations/markdoc/src/runtime.ts b/packages/integrations/markdoc/src/runtime.ts
index 44c232b79d63..f62bcec1a57d 100644
--- a/packages/integrations/markdoc/src/runtime.ts
+++ b/packages/integrations/markdoc/src/runtime.ts
@@ -19,9 +19,8 @@ import type { MarkdocIntegrationOptions } from './options.js';
 export async function setupConfig(
 	userConfig: AstroMarkdocConfig = {},
 	options: MarkdocIntegrationOptions | undefined,
-	experimentalHeadingIdCompat: boolean,
 ): Promise<MergedConfig> {
-	let defaultConfig: AstroMarkdocConfig = setupHeadingConfig(experimentalHeadingIdCompat);
+	let defaultConfig: AstroMarkdocConfig = setupHeadingConfig();
 
 	if (userConfig.extends) {
 		for (let extension of userConfig.extends) {
@@ -46,9 +45,8 @@ export async function setupConfig(
 export function setupConfigSync(
 	userConfig: AstroMarkdocConfig = {},
 	options: MarkdocIntegrationOptions | undefined,
-	experimentalHeadingIdCompat: boolean,
 ): MergedConfig {
-	const defaultConfig: AstroMarkdocConfig = setupHeadingConfig(experimentalHeadingIdCompat);
+	const defaultConfig: AstroMarkdocConfig = setupHeadingConfig();
 
 	let merged = mergeConfig(defaultConfig, userConfig);
 
@@ -170,13 +168,12 @@ export function createGetHeadings(
 	stringifiedAst: string,
 	userConfig: AstroMarkdocConfig,
 	options: MarkdocIntegrationOptions | undefined,
-	experimentalHeadingIdCompat: boolean,
 ) {
 	return function getHeadings() {
 		/* Yes, we are transforming twice (once from `getHeadings()` and again from <Content /> in case of variables).
 			TODO: propose new `render()` API to allow Markdoc variable passing to `render()` itself,
 			instead of the Content component. Would remove double-transform and unlock variable resolution in heading slugs. */
-		const config = setupConfigSync(userConfig, options, experimentalHeadingIdCompat);
+		const config = setupConfigSync(userConfig, options);
 		const ast = Markdoc.Ast.fromJSON(stringifiedAst);
 		const content = Markdoc.transform(ast as Node, config as ConfigType);
 		let collectedHeadings: MarkdownHeading[] = [];
@@ -192,13 +189,12 @@ export function createContentComponent(
 	options: MarkdocIntegrationOptions | undefined,
 	tagComponentMap: Record<string, AstroInstance['default']>,
 	nodeComponentMap: Record<NodeType, AstroInstance['default']>,
-	experimentalHeadingIdCompat: boolean,
 ) {
 	return createComponent({
 		async factory(result: any, props: Record<string, any>) {
 			const withVariables = mergeConfig(userConfig, { variables: props });
 			const config = resolveComponentImports(
-				await setupConfig(withVariables, options, experimentalHeadingIdCompat),
+				await setupConfig(withVariables, options),
 				tagComponentMap,
 				nodeComponentMap,
 			);
diff --git a/packages/integrations/markdoc/test/headings.test.js b/packages/integrations/markdoc/test/headings.test.js
index 1a6061aa6b4d..b39fb9485b12 100644
--- a/packages/integrations/markdoc/test/headings.test.js
+++ b/packages/integrations/markdoc/test/headings.test.js
@@ -9,38 +9,6 @@ async function getFixture(name) {
 	});
 }
 
-describe('experimental.headingIdCompat', () => {
-	let fixture;
-
-	before(async () => {
-		fixture = await loadFixture({
-			root: new URL(`./fixtures/headings/`, import.meta.url),
-			experimental: { headingIdCompat: true },
-		});
-	});
-
-	describe('dev', () => {
-		let devServer;
-
-		before(async () => {
-			devServer = await fixture.startDevServer();
-		});
-
-		after(async () => {
-			await devServer.stop();
-		});
-
-		it('applies IDs to headings containing special characters', async () => {
-			const res = await fixture.fetch('/headings-with-special-characters');
-			const html = await res.text();
-			const { document } = parseHTML(html);
-
-			assert.equal(document.querySelector('h2')?.id, 'picture-');
-			assert.equal(document.querySelector('h3')?.id, '-sacrebleu--');
-		});
-	});
-});
-
 describe('Markdoc - Headings', () => {
 	let fixture;
 
@@ -72,8 +40,8 @@ describe('Markdoc - Headings', () => {
 			const html = await res.text();
 			const { document } = parseHTML(html);
 
-			assert.equal(document.querySelector('h2')?.id, 'picture');
-			assert.equal(document.querySelector('h3')?.id, '-sacrebleu-');
+			assert.equal(document.querySelector('h2')?.id, 'picture-');
+			assert.equal(document.querySelector('h3')?.id, '-sacrebleu--');
 		});
 
 		it('generates the same IDs for other documents with the same headings', async () => {
diff --git a/packages/integrations/mdx/src/index.ts b/packages/integrations/mdx/src/index.ts
index c3a99acb1bfc..ae042c9abbd3 100644
--- a/packages/integrations/mdx/src/index.ts
+++ b/packages/integrations/mdx/src/index.ts
@@ -101,7 +101,6 @@ export default function mdx(partialMdxOptions: Partial<MdxOptions> = {}): AstroI
 				Object.assign(vitePluginMdxOptions, {
 					mdxOptions: resolvedMdxOptions,
 					srcDir: config.srcDir,
-					experimentalHeadingIdCompat: config.experimental.headingIdCompat,
 				});
 				// @ts-expect-error After we assign, we don't need to reference `mdxOptions` in this context anymore.
 				// Re-assign it so that the garbage can be collected later.
diff --git a/packages/integrations/mdx/src/plugins.ts b/packages/integrations/mdx/src/plugins.ts
index c44c8fffdf7c..1907ec4cf65e 100644
--- a/packages/integrations/mdx/src/plugins.ts
+++ b/packages/integrations/mdx/src/plugins.ts
@@ -23,13 +23,12 @@ const isPerformanceBenchmark = Boolean(process.env.ASTRO_PERFORMANCE_BENCHMARK);
 
 interface MdxProcessorExtraOptions {
 	sourcemap: boolean;
-	experimentalHeadingIdCompat: boolean;
 }
 
 export function createMdxProcessor(mdxOptions: MdxOptions, extraOptions: MdxProcessorExtraOptions) {
 	return createProcessor({
 		remarkPlugins: getRemarkPlugins(mdxOptions),
-		rehypePlugins: getRehypePlugins(mdxOptions, extraOptions),
+		rehypePlugins: getRehypePlugins(mdxOptions),
 		recmaPlugins: mdxOptions.recmaPlugins,
 		remarkRehypeOptions: mdxOptions.remarkRehype,
 		jsxImportSource: 'astro',
@@ -58,10 +57,7 @@ function getRemarkPlugins(mdxOptions: MdxOptions): PluggableList {
 	return remarkPlugins;
 }
 
-function getRehypePlugins(
-	mdxOptions: MdxOptions,
-	{ experimentalHeadingIdCompat }: MdxProcessorExtraOptions,
-): PluggableList {
+function getRehypePlugins(mdxOptions: MdxOptions): PluggableList {
 	let rehypePlugins: PluggableList = [
 		// ensure `data.meta` is preserved in `properties.metastring` for rehype syntax highlighters
 		rehypeMetaString,
@@ -88,10 +84,7 @@ function getRehypePlugins(
 	if (!isPerformanceBenchmark) {
 		// getHeadings() is guaranteed by TS, so this must be included.
 		// We run `rehypeHeadingIds` _last_ to respect any custom IDs set by user plugins.
-		rehypePlugins.push(
-			[rehypeHeadingIds, { experimentalHeadingIdCompat }],
-			rehypeInjectHeadingsExport,
-		);
+		rehypePlugins.push([rehypeHeadingIds], rehypeInjectHeadingsExport);
 	}
 
 	rehypePlugins.push(
diff --git a/packages/integrations/mdx/src/vite-plugin-mdx.ts b/packages/integrations/mdx/src/vite-plugin-mdx.ts
index 7dda9d714e7c..910701afcd98 100644
--- a/packages/integrations/mdx/src/vite-plugin-mdx.ts
+++ b/packages/integrations/mdx/src/vite-plugin-mdx.ts
@@ -9,7 +9,6 @@ import { safeParseFrontmatter } from './utils.js';
 export interface VitePluginMdxOptions {
 	mdxOptions: MdxOptions;
 	srcDir: URL;
-	experimentalHeadingIdCompat: boolean;
 }
 
 // NOTE: Do not destructure `opts` as we're assigning a reference that will be mutated later
@@ -64,7 +63,6 @@ export function vitePluginMdx(opts: VitePluginMdxOptions): Plugin {
 			if (!processor) {
 				processor = createMdxProcessor(opts.mdxOptions, {
 					sourcemap: sourcemapEnabled,
-					experimentalHeadingIdCompat: opts.experimentalHeadingIdCompat,
 				});
 			}
 
diff --git a/packages/integrations/mdx/test/mdx-get-headings.test.js b/packages/integrations/mdx/test/mdx-get-headings.test.js
index dd74b6392a9e..2776cfc7c3d6 100644
--- a/packages/integrations/mdx/test/mdx-get-headings.test.js
+++ b/packages/integrations/mdx/test/mdx-get-headings.test.js
@@ -42,8 +42,8 @@ describe('MDX getHeadings', () => {
 				{ depth: 3, slug: 'subsection-1', text: 'Subsection 1' },
 				{ depth: 3, slug: 'subsection-2', text: 'Subsection 2' },
 				{ depth: 2, slug: 'section-2', text: 'Section 2' },
-				{ depth: 2, slug: 'picture', text: '<Picture />' },
-				{ depth: 3, slug: '-sacrebleu-', text: '« Sacrebleu ! »' },
+				{ depth: 2, slug: 'picture-', text: '<Picture />' },
+				{ depth: 3, slug: '-sacrebleu--', text: '« Sacrebleu ! »' },
 			]),
 		);
 	});
@@ -201,50 +201,3 @@ describe('MDX headings with frontmatter', () => {
 		);
 	});
 });
-
-describe('experimental.headingIdCompat', () => {
-	describe('MDX getHeadings', () => {
-		let fixture;
-
-		before(async () => {
-			fixture = await loadFixture({
-				root: new URL('./fixtures/mdx-get-headings/', import.meta.url),
-				integrations: [mdx()],
-				experimental: { headingIdCompat: true },
-			});
-
-			await fixture.build();
-		});
-
-		it('adds anchor IDs to headings', async () => {
-			const html = await fixture.readFile('/test/index.html');
-			const { document } = parseHTML(html);
-
-			const h2Ids = document.querySelectorAll('h2').map((el) => el?.id);
-			const h3Ids = document.querySelectorAll('h3').map((el) => el?.id);
-			assert.equal(document.querySelector('h1').id, 'heading-test');
-			assert.equal(h2Ids.includes('section-1'), true);
-			assert.equal(h2Ids.includes('section-2'), true);
-			assert.equal(h2Ids.includes('picture-'), true);
-			assert.equal(h3Ids.includes('subsection-1'), true);
-			assert.equal(h3Ids.includes('subsection-2'), true);
-			assert.equal(h3Ids.includes('-sacrebleu--'), true);
-		});
-
-		it('generates correct getHeadings() export', async () => {
-			const { headingsByPage } = JSON.parse(await fixture.readFile('/pages.json'));
-			assert.equal(
-				JSON.stringify(headingsByPage['./test.mdx']),
-				JSON.stringify([
-					{ depth: 1, slug: 'heading-test', text: 'Heading test' },
-					{ depth: 2, slug: 'section-1', text: 'Section 1' },
-					{ depth: 3, slug: 'subsection-1', text: 'Subsection 1' },
-					{ depth: 3, slug: 'subsection-2', text: 'Subsection 2' },
-					{ depth: 2, slug: 'section-2', text: 'Section 2' },
-					{ depth: 2, slug: 'picture-', text: '<Picture />' },
-					{ depth: 3, slug: '-sacrebleu--', text: '« Sacrebleu ! »' },
-				]),
-			);
-		});
-	});
-});
diff --git a/packages/markdown/remark/src/index.ts b/packages/markdown/remark/src/index.ts
index 051c9814ac15..634a883ebe98 100644
--- a/packages/markdown/remark/src/index.ts
+++ b/packages/markdown/remark/src/index.ts
@@ -78,7 +78,6 @@ export async function createMarkdownProcessor(
 		remarkRehype: remarkRehypeOptions = markdownConfigDefaults.remarkRehype,
 		gfm = markdownConfigDefaults.gfm,
 		smartypants = markdownConfigDefaults.smartypants,
-		experimentalHeadingIdCompat = false,
 	} = opts ?? {};
 
 	const loadedRemarkPlugins = await Promise.all(loadPlugins(remarkPlugins));
@@ -136,7 +135,7 @@ export async function createMarkdownProcessor(
 
 	// Headings
 	if (!isPerformanceBenchmark) {
-		parser.use(rehypeHeadingIds, { experimentalHeadingIdCompat });
+		parser.use(rehypeHeadingIds);
 	}
 
 	// Stringify to HTML
diff --git a/packages/markdown/remark/src/rehype-collect-headings.ts b/packages/markdown/remark/src/rehype-collect-headings.ts
index dd73940538d3..9c4242ffe95b 100644
--- a/packages/markdown/remark/src/rehype-collect-headings.ts
+++ b/packages/markdown/remark/src/rehype-collect-headings.ts
@@ -12,15 +12,9 @@ const codeTagNames = new Set(['code', 'pre']);
 /**
  * Rehype plugin that adds `id` attributes to headings based on their text content.
  *
- * @param options Optional configuration object for the plugin.
- *
  * @see https://docs.astro.build/en/guides/markdown-content/#heading-ids-and-plugins
  */
-export function rehypeHeadingIds({
-	experimentalHeadingIdCompat,
-}: {
-	experimentalHeadingIdCompat?: boolean;
-} = {}): ReturnType<RehypePlugin> {
+export function rehypeHeadingIds(): ReturnType<RehypePlugin> {
 	return function (tree, file) {
 		const headings: MarkdownHeading[] = [];
 		const frontmatter = file.data.astro?.frontmatter;
@@ -68,13 +62,7 @@ export function rehypeHeadingIds({
 
 			node.properties = node.properties || {};
 			if (typeof node.properties.id !== 'string') {
-				let slug = slugger.slug(text);
-
-				if (!experimentalHeadingIdCompat) {
-					if (slug.endsWith('-')) slug = slug.slice(0, -1);
-				}
-
-				node.properties.id = slug;
+				node.properties.id = slugger.slug(text);
 			}
 
 			headings.push({ depth, slug: node.properties.id, text });
diff --git a/packages/markdown/remark/src/types.ts b/packages/markdown/remark/src/types.ts
index 57d7ca77d406..a3efae62dc1a 100644
--- a/packages/markdown/remark/src/types.ts
+++ b/packages/markdown/remark/src/types.ts
@@ -69,7 +69,6 @@ export interface AstroMarkdownProcessorOptions extends AstroMarkdownOptions {
 		domains?: string[];
 		remotePatterns?: RemotePattern[];
 	};
-	experimentalHeadingIdCompat?: boolean;
 }
 
 export interface MarkdownProcessor {

From 82dbb56154196bf9a45293c1dd8226e3a8b1d73c Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Tue, 21 Oct 2025 11:29:28 +0200
Subject: [PATCH 28/36] fix: test

---
 packages/astro/test/astro-get-static-paths.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/astro/test/astro-get-static-paths.test.js b/packages/astro/test/astro-get-static-paths.test.js
index 0f0d35b57835..6c15a669ddf9 100644
--- a/packages/astro/test/astro-get-static-paths.test.js
+++ b/packages/astro/test/astro-get-static-paths.test.js
@@ -164,7 +164,7 @@ describe('getStaticPaths - dev calls', () => {
 
 		assert.equal($('#generator').text().startsWith('Astro v'), true);
 		// For some reason site is always undefined
-		assert.equal($('#site').text(), '');
+		assert.equal($('#site').text(), 'https://mysite.dev/');
 	});
 });
 

From 669ca5b0199d9933f54c76448de9ec5a9f13c430 Mon Sep 17 00:00:00 2001
From: ocavue <ocavue@users.noreply.github.com>
Date: Mon, 27 Oct 2025 21:09:30 +1100
Subject: [PATCH 29/36] fix!: disallow number in getStaticPaths params (#14586)

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
---
 .changeset/honest-deer-add.md                 | 15 +++++
 packages/astro/src/core/build/generate.ts     |  1 -
 packages/astro/src/core/errors/errors-data.ts | 13 ++--
 .../astro/src/core/render/params-and-props.ts |  1 -
 packages/astro/src/core/render/route-cache.ts |  4 +-
 packages/astro/src/core/routing/params.ts     | 14 ++---
 packages/astro/src/core/routing/validation.ts | 27 +--------
 packages/astro/src/types/astro.ts             |  4 +-
 packages/astro/src/types/public/common.ts     |  2 +-
 .../astro/test/astro-get-static-paths.test.js | 59 ++++++++++++++++---
 .../pages/[...invalidParamsTypeTest].astro    | 33 +++++++++++
 .../src/pages/blog/[year]/[slug].astro        |  1 -
 .../src/pages/posts/[page].astro              |  6 +-
 .../src/pages/blog/[year]/[slug].astro        | 19 ------
 .../src/pages/posts/[page].astro              |  6 +-
 .../src/pages/images/[image].svg.ts           |  2 +-
 .../ssr-prerender-get-static-paths.test.js    | 28 ---------
 17 files changed, 126 insertions(+), 109 deletions(-)
 create mode 100644 .changeset/honest-deer-add.md
 create mode 100644 packages/astro/test/fixtures/astro-get-static-paths/src/pages/[...invalidParamsTypeTest].astro
 delete mode 100644 packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/blog/[year]/[slug].astro

diff --git a/.changeset/honest-deer-add.md b/.changeset/honest-deer-add.md
new file mode 100644
index 000000000000..64bfe12e9133
--- /dev/null
+++ b/.changeset/honest-deer-add.md
@@ -0,0 +1,15 @@
+---
+'astro': major
+---
+
+Changes the values allowed in `params` returned by `getStaticPaths()`.
+
+In Astro 5.x, `getStaticPaths()` could return `params` of type number, which would always be stringified by Astro. However, that could be confusing because it conflicted with `Astro.params` types.
+
+Astro 6.0 removes this behavior: `getStaticPaths()` must now return string or undefined `params` values.
+
+#### What should I do?
+
+Review your dynamic routes using `getStaticPaths()` and convert any number params to strings.
+
+For more guidance, see [the v6 upgrade guide entry for this breaking change](https://docs.astro.build/en/guides/upgrade-to/v6/#changed-getstaticpaths-cannot-return-params-of-type-number).
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 36197100f0ff..63a12a866de5 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -362,7 +362,6 @@ async function getPathsForRoute(
 			mod,
 			route,
 			routeCache,
-			logger,
 			ssr: serverLike,
 			base: config.base,
 		}).catch((err) => {
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index 9233cba12567..578d70ae9170 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -324,8 +324,9 @@ export const GetStaticPathsExpectedParams = {
  * export async function getStaticPaths() {
  * 	return [
  * 		{ params: { id: '1' } } // Works
- * 		{ params: { id: 2 } } // Works
+ * 		{ params: { id: 2 } } // Does not work
  * 		{ params: { id: false } } // Does not work
+ * 		{ params: { id: [1, 2] } } // Does not work
  * 	];
  * }
  * ---
@@ -337,8 +338,8 @@ export const GetStaticPathsExpectedParams = {
  * ---
  * export async function getStaticPaths() {
  * 	return [
- * 		{ params: { id: 1 } } // /route/1
- * 		{ params: { id: 2 } } // /route/2
+ * 		{ params: { id: '1' } } // /route/1
+ * 		{ params: { id: '2' } } // /route/2
  * 		{ params: { id: undefined } } // /route/
  * 	];
  * }
@@ -347,9 +348,9 @@ export const GetStaticPathsExpectedParams = {
  */
 export const GetStaticPathsInvalidRouteParam = {
 	name: 'GetStaticPathsInvalidRouteParam',
-	title: 'Invalid value for `getStaticPaths` route parameter.',
-	message: (key: string, value: any, valueType: any) =>
-		`Invalid getStaticPaths route parameter for \`${key}\`. Expected undefined, a string or a number, received \`${valueType}\` (\`${value}\`)`,
+	title: 'Invalid route parameter returned by `getStaticPaths()`.',
+	message: (key: string, value: any, valueType: string) =>
+		`Invalid \`getStaticPaths()\` route parameter for \`${key}\`. Expected a string or undefined, received \`${valueType}\` (\`${value}\`)`,
 	hint: 'See https://docs.astro.build/en/reference/routing-reference/#getstaticpaths for more information on getStaticPaths.',
 } satisfies ErrorData;
 /**
diff --git a/packages/astro/src/core/render/params-and-props.ts b/packages/astro/src/core/render/params-and-props.ts
index 4fae3d01ada1..669782e4d354 100644
--- a/packages/astro/src/core/render/params-and-props.ts
+++ b/packages/astro/src/core/render/params-and-props.ts
@@ -42,7 +42,6 @@ export async function getProps(opts: GetParamsAndPropsOptions): Promise<Props> {
 		mod,
 		route,
 		routeCache,
-		logger,
 		ssr: serverLike,
 		base,
 	});
diff --git a/packages/astro/src/core/render/route-cache.ts b/packages/astro/src/core/render/route-cache.ts
index e9145bab6b15..b1e112a38621 100644
--- a/packages/astro/src/core/render/route-cache.ts
+++ b/packages/astro/src/core/render/route-cache.ts
@@ -18,7 +18,6 @@ interface CallGetStaticPathsOptions {
 	mod: ComponentInstance | undefined;
 	route: RouteData;
 	routeCache: RouteCache;
-	logger: Logger;
 	ssr: boolean;
 	base: AstroConfig['base'];
 }
@@ -27,7 +26,6 @@ export async function callGetStaticPaths({
 	mod,
 	route,
 	routeCache,
-	logger,
 	ssr,
 	base,
 }: CallGetStaticPathsOptions): Promise<GetStaticPathsResultKeyed> {
@@ -63,7 +61,7 @@ export async function callGetStaticPaths({
 		routePattern: route.route,
 	});
 
-	validateGetStaticPathsResult(staticPaths, logger, route);
+	validateGetStaticPathsResult(staticPaths, route);
 
 	const keyedStaticPaths = staticPaths as GetStaticPathsResultKeyed;
 	keyedStaticPaths.keyed = new Map<string, GetStaticPathsItem>();
diff --git a/packages/astro/src/core/routing/params.ts b/packages/astro/src/core/routing/params.ts
index 802c39cc5043..920408d63af0 100644
--- a/packages/astro/src/core/routing/params.ts
+++ b/packages/astro/src/core/routing/params.ts
@@ -1,4 +1,4 @@
-import type { GetStaticPathsItem, Params } from '../../types/public/common.js';
+import type { GetStaticPathsItem } from '../../types/public/common.js';
 import type { RouteData } from '../../types/public/internal.js';
 import { trimSlashes } from '../path.js';
 import { validateGetStaticPathsParameter } from './validation.js';
@@ -10,14 +10,12 @@ import { validateGetStaticPathsParameter } from './validation.js';
  */
 export function stringifyParams(params: GetStaticPathsItem['params'], route: RouteData) {
 	// validate parameter values then stringify each value
-	const validatedParams = Object.entries(params).reduce((acc, next) => {
-		validateGetStaticPathsParameter(next, route.component);
-		const [key, value] = next;
+	const validatedParams: Record<string, string> = {};
+	for (const [key, value] of Object.entries(params)) {
+		validateGetStaticPathsParameter([key, value], route.component);
 		if (value !== undefined) {
-			acc[key] = typeof value === 'string' ? trimSlashes(value) : value.toString();
+			validatedParams[key] = trimSlashes(value);
 		}
-		return acc;
-	}, {} as Params);
-
+	}
 	return route.generate(validatedParams);
 }
diff --git a/packages/astro/src/core/routing/validation.ts b/packages/astro/src/core/routing/validation.ts
index a2f9a25ba320..0e80211289cc 100644
--- a/packages/astro/src/core/routing/validation.ts
+++ b/packages/astro/src/core/routing/validation.ts
@@ -2,9 +2,8 @@ import type { ComponentInstance } from '../../types/astro.js';
 import type { GetStaticPathsResult } from '../../types/public/common.js';
 import type { RouteData } from '../../types/public/internal.js';
 import { AstroError, AstroErrorData } from '../errors/index.js';
-import type { Logger } from '../logger/core.js';
 
-const VALID_PARAM_TYPES = ['string', 'number', 'undefined'];
+const VALID_PARAM_TYPES = ['string', 'undefined'];
 
 /** Throws error for invalid parameter in getStaticPaths() response */
 export function validateGetStaticPathsParameter([key, value]: [string, any], route: string) {
@@ -39,11 +38,7 @@ export function validateDynamicRouteModule(
 }
 
 /** Throw error and log warnings for malformed getStaticPaths() response */
-export function validateGetStaticPathsResult(
-	result: GetStaticPathsResult,
-	logger: Logger,
-	route: RouteData,
-) {
+export function validateGetStaticPathsResult(result: GetStaticPathsResult, route: RouteData) {
 	if (!Array.isArray(result)) {
 		throw new AstroError({
 			...AstroErrorData.InvalidGetStaticPathsReturn,
@@ -76,23 +71,5 @@ export function validateGetStaticPathsResult(
 				},
 			});
 		}
-
-		// TODO: Replace those with errors? They technically don't crash the build, but users might miss the warning. - erika, 2022-11-07
-		for (const [key, val] of Object.entries(pathObject.params)) {
-			if (!(typeof val === 'undefined' || typeof val === 'string' || typeof val === 'number')) {
-				logger.warn(
-					'router',
-					`getStaticPaths() returned an invalid path param: "${key}". A string, number or undefined value was expected, but got \`${JSON.stringify(
-						val,
-					)}\`.`,
-				);
-			}
-			if (typeof val === 'string' && val === '') {
-				logger.warn(
-					'router',
-					`getStaticPaths() returned an invalid path param: "${key}". \`undefined\` expected for an optional param, but got empty string.`,
-				);
-			}
-		}
 	});
 }
diff --git a/packages/astro/src/types/astro.ts b/packages/astro/src/types/astro.ts
index a8eb60b6ea4a..f38a3b020bd1 100644
--- a/packages/astro/src/types/astro.ts
+++ b/packages/astro/src/types/astro.ts
@@ -4,7 +4,7 @@ import type { TSConfig } from '../core/config/tsconfig.js';
 import type { Logger } from '../core/logger/core.js';
 import type { AstroPreferences } from '../preferences/index.js';
 import type { AstroComponentFactory } from '../runtime/server/index.js';
-import type { GetStaticPathsOptions, GetStaticPathsResult } from './public/common.js';
+import type { GetStaticPaths } from './public/common.js';
 import type { AstroConfig } from './public/config.js';
 import type { ContentEntryType, DataEntryType } from './public/content.js';
 import type {
@@ -85,7 +85,7 @@ export interface ComponentInstance {
 	css?: string[];
 	partial?: boolean;
 	prerender?: boolean;
-	getStaticPaths?: (options: GetStaticPathsOptions) => GetStaticPathsResult;
+	getStaticPaths?: GetStaticPaths;
 }
 
 export interface RoutesList {
diff --git a/packages/astro/src/types/public/common.ts b/packages/astro/src/types/public/common.ts
index a2844b394f92..f70ca7cad43d 100644
--- a/packages/astro/src/types/public/common.ts
+++ b/packages/astro/src/types/public/common.ts
@@ -13,7 +13,7 @@ export interface GetStaticPathsOptions {
 }
 
 export type GetStaticPathsItem = {
-	params: { [K in keyof Params]: Params[K] | number };
+	params: Params;
 	props?: Props;
 };
 export type GetStaticPathsResult = GetStaticPathsItem[];
diff --git a/packages/astro/test/astro-get-static-paths.test.js b/packages/astro/test/astro-get-static-paths.test.js
index 6c15a669ddf9..fb385e91c0f3 100644
--- a/packages/astro/test/astro-get-static-paths.test.js
+++ b/packages/astro/test/astro-get-static-paths.test.js
@@ -6,6 +6,16 @@ import { loadFixture } from './test-utils.js';
 
 const root = new URL('./fixtures/astro-get-static-paths/', import.meta.url);
 
+function resetFlags() {
+	// reset the flag used by [...calledTwiceTest].astro between each test
+	// @ts-expect-error not typed
+	globalThis.isCalledOnce = false;
+
+	// reset the flag used by [...invalidParamsTypeTest].astro between each test
+	// @ts-expect-error not typed
+	globalThis.getStaticPathsParamsType = undefined;
+}
+
 describe('getStaticPaths - build calls', () => {
 	/** @type {import('./test-utils').Fixture} */
 	let fixture;
@@ -21,9 +31,7 @@ describe('getStaticPaths - build calls', () => {
 	});
 
 	afterEach(() => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		// @ts-expect-error not typed
-		globalThis.isCalledOnce = false;
+		resetFlags();
 	});
 
 	it('is only called once during build', () => {
@@ -54,9 +62,7 @@ describe('getStaticPaths - dev calls', () => {
 	});
 
 	afterEach(() => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		// @ts-expect-error not typed
-		globalThis.isCalledOnce = false;
+		resetFlags();
 	});
 
 	after(async () => {
@@ -104,7 +110,7 @@ describe('getStaticPaths - dev calls', () => {
 		});
 
 		it('resolves 200 on matching static path - numeric params', async () => {
-			// route provided with { params: { year: 2022, slug: "post-2" }}
+			// route provided with { params: { year: "2022", slug: "post-2" }}
 			const res = await fixture.fetch('/blog/2022/post-2');
 			assert.equal(res.status, 200);
 		});
@@ -199,3 +205,42 @@ describe('throws if an invalid Astro property is accessed', () => {
 		}
 	});
 });
+
+describe('throws if an invalid params type is returned', () => {
+	/**
+	 * @param type {string}
+	 */
+	const build = async (type) => {
+		try {
+			globalThis.getStaticPathsParamsType = type;
+			const fixture = await loadFixture({
+				root,
+				site: 'https://mysite.dev/',
+			});
+			await fixture.build({});
+		} catch (err) {
+			return err;
+		} finally {
+			resetFlags();
+		}
+	};
+
+	const validTypes = ['string', 'undefined'];
+	const invalidTypes = ['number', 'boolean', 'array', 'null', 'object', 'bigint', 'function'];
+
+	for (const type of validTypes) {
+		it(`does build for param type ${type}`, async () => {
+			const err = await build(type);
+			assert.equal(err, undefined);
+		});
+	}
+
+	for (const type of invalidTypes) {
+		it(`does not build for param type ${type}`, async () => {
+			const err = await build(type);
+			assert.equal(err instanceof Error, true);
+			// @ts-ignore
+			assert.equal(err.title, 'Invalid route parameter returned by `getStaticPaths()`.');
+		});
+	}
+});
diff --git a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/[...invalidParamsTypeTest].astro b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/[...invalidParamsTypeTest].astro
new file mode 100644
index 000000000000..5b8fac407435
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/[...invalidParamsTypeTest].astro
@@ -0,0 +1,33 @@
+---
+
+export function getStaticPaths ()  {
+	const map = {
+		// Valid types
+		string: "foo",
+		undefined: undefined,
+		
+		// Invalid types
+		number: 123,
+		boolean: false,
+		array: [1, 2, 3],
+		null: null,
+		object: {a: 1},
+		bigint: BigInt(123),
+		function: setTimeout
+	}
+	const type = globalThis.getStaticPathsParamsType || "string"
+	if (!map.hasOwnProperty(type)) {
+		throw new Error(`Invalid type: ${type}`);
+	}
+
+	return [{
+		params: {
+			invalidParamsTypeTest: map[type] 
+		}
+	}];
+};
+---
+
+<div>
+    <h1>Invalid Params Type Test</h1>
+</div>
diff --git a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/blog/[year]/[slug].astro b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/blog/[year]/[slug].astro
index 25e2fb84238e..275297fb989e 100644
--- a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/blog/[year]/[slug].astro
+++ b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/blog/[year]/[slug].astro
@@ -2,7 +2,6 @@
 export async function getStaticPaths({ routePattern }) {
 	return [
 		{ params: { year: '2022', slug: 'post-1' }, props: { routePattern } },
-		{ params: { year: 2022, slug: 'post-2' }, props: { routePattern } },
 		{ params: { slug: 'post-2', year: '2022' }, props: { routePattern } },
 	]
 }
diff --git a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro
index 8ec05bc7cd9f..d727cab1babc 100644
--- a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro
+++ b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro
@@ -2,13 +2,13 @@
 export async function getStaticPaths() {
 	return [
 		{
-			params: { page: 1 },
+			params: { page: "1" },
 		},
 		{
-			params: { page: 2 },
+			params: { page: "2" },
 		},
 		{
-			params: { page: 3 }
+			params: { page: "3" }
 		}
 	]
 };
diff --git a/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/blog/[year]/[slug].astro b/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/blog/[year]/[slug].astro
deleted file mode 100644
index 7e3edfb26fa5..000000000000
--- a/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/blog/[year]/[slug].astro
+++ /dev/null
@@ -1,19 +0,0 @@
----
-export async function getStaticPaths() {
-    return [
-        { params: { year: '2022', slug: 'post-1' } },
-        { params: { year: 2022, slug: 'post-2' } },
-        { params: { slug: 'post-2', year: '2022' } },
-    ]
-}
-
-export const prerender = true;
-const { year, slug } = Astro.params
----
-
-<html>
-  <head>
-    <title>{year} | {slug}</title>
-  </head>
-  <body></body>
-</html>
diff --git a/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/posts/[page].astro b/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/posts/[page].astro
index 46865e7f4dd8..8f7b5dd05ae3 100644
--- a/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/posts/[page].astro
+++ b/packages/astro/test/fixtures/ssr-prerender-get-static-paths/src/pages/posts/[page].astro
@@ -2,13 +2,13 @@
 export async function getStaticPaths() {
 	return [
 		{
-			params: { page: 1 },
+			params: { page: "1" },
 		},
 		{
-			params: { page: 2 },
+			params: { page: "2" },
 		},
 		{
-			params: { page: 3 }
+			params: { page: "3" }
 		}
 	]
 };
diff --git a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts
index cef9dd60855d..e80063105532 100644
--- a/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts
+++ b/packages/astro/test/fixtures/with-endpoint-routes/src/pages/images/[image].svg.ts
@@ -1,5 +1,5 @@
 export async function getStaticPaths() {
-	return [{ params: { image: 1 } }, { params: { image: 2 } }];
+	return [{ params: { image: "1" } }, { params: { image: "2" } }];
 }
 
 export async function GET({ params }) {
diff --git a/packages/astro/test/ssr-prerender-get-static-paths.test.js b/packages/astro/test/ssr-prerender-get-static-paths.test.js
index 8ac65899d04f..e34b65aba9ba 100644
--- a/packages/astro/test/ssr-prerender-get-static-paths.test.js
+++ b/packages/astro/test/ssr-prerender-get-static-paths.test.js
@@ -103,20 +103,6 @@ describe('Prerender', () => {
 				});
 			});
 
-			describe('route params type validation', () => {
-				it('resolves 200 on matching static path - string params', async () => {
-					// route provided with { params: { year: "2022", slug: "post-2" }}
-					const res = await fixture.fetch('/blog/blog/2022/post-1');
-					assert.equal(res.status, 200);
-				});
-
-				it('resolves 200 on matching static path - numeric params', async () => {
-					// route provided with { params: { year: 2022, slug: "post-2" }}
-					const res = await fixture.fetch('/blog/blog/2022/post-2');
-					assert.equal(res.status, 200);
-				});
-			});
-
 			it('resolves 200 on matching static paths', async () => {
 				// routes params provided for pages /posts/1, /posts/2, and /posts/3
 				for (const page of [1, 2, 3]) {
@@ -231,20 +217,6 @@ describe('Prerender', () => {
 				});
 			});
 
-			describe('route params type validation', () => {
-				it('resolves 200 on matching static path - string params', async () => {
-					// route provided with { params: { year: "2022", slug: "post-2" }}
-					const res = await fixture.fetch('/blog/blog/2022/post-1');
-					assert.equal(res.status, 200);
-				});
-
-				it('resolves 200 on matching static path - numeric params', async () => {
-					// route provided with { params: { year: 2022, slug: "post-2" }}
-					const res = await fixture.fetch('/blog/blog/2022/post-2');
-					assert.equal(res.status, 200);
-				});
-			});
-
 			it('resolves 200 on matching static paths', async () => {
 				// routes params provided for pages /posts/1, /posts/2, and /posts/3
 				for (const page of [1, 2, 3]) {

From dfb51d4ae9b1cc8deb8e81d26a6ea76692415d29 Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Fri, 31 Oct 2025 02:18:35 +0100
Subject: [PATCH 30/36] feat(assets): Always allow cropping and never upscale
 (#14629)

---
 packages/astro/src/assets/services/sharp.ts    | 17 +++++++----------
 packages/astro/test/core-image-service.test.js | 10 ++++------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/astro/src/assets/services/sharp.ts b/packages/astro/src/assets/services/sharp.ts
index 857d35442feb..ccc909b68f6c 100644
--- a/packages/astro/src/assets/services/sharp.ts
+++ b/packages/astro/src/assets/services/sharp.ts
@@ -71,32 +71,29 @@ const sharpService: LocalImageService<SharpImageServiceConfig> = {
 		// always call rotate to adjust for EXIF data orientation
 		result.rotate();
 
-		// If `fit` isn't set then use old behavior:
-		// - Do not use both width and height for resizing, and prioritize width over height
-		// - Allow enlarging images
+		if (transform.width && transform.height) {
+			const fit: keyof FitEnum | undefined = transform.fit
+				? (fitMap[transform.fit] ?? 'inside')
+				: undefined;
 
-		const withoutEnlargement = Boolean(transform.fit);
-		if (transform.width && transform.height && transform.fit) {
-			const fit: keyof FitEnum = fitMap[transform.fit] ?? 'inside';
 			result.resize({
 				width: Math.round(transform.width),
 				height: Math.round(transform.height),
 				fit,
 				position: transform.position,
-				withoutEnlargement,
+				withoutEnlargement: true,
 			});
 		} else if (transform.height && !transform.width) {
 			result.resize({
 				height: Math.round(transform.height),
-				withoutEnlargement,
+				withoutEnlargement: true,
 			});
 		} else if (transform.width) {
 			result.resize({
 				width: Math.round(transform.width),
-				withoutEnlargement,
+				withoutEnlargement: true,
 			});
 		}
-
 		if (transform.format) {
 			let quality: number | string | undefined = undefined;
 			if (transform.quality) {
diff --git a/packages/astro/test/core-image-service.test.js b/packages/astro/test/core-image-service.test.js
index 0c75ed484f69..60b04a1762ef 100644
--- a/packages/astro/test/core-image-service.test.js
+++ b/packages/astro/test/core-image-service.test.js
@@ -111,19 +111,17 @@ describe('astro image service', () => {
 				assert.equal(height, originalHeight);
 			});
 
-			// To match old behavior, we should upscale if the requested size is larger than the original
-			it('does upscale image if requested size is larger than original and fit is unset', async () => {
+			it('does not upscale image if requested size is larger than original and fit is unset', async () => {
 				const url = new URL(src);
 				url.searchParams.set('w', '3000');
 				url.searchParams.set('h', '2000');
 				url.searchParams.delete('fit');
 				const { width, height } = await getImageDimensionsFromFixture(fixture, url);
-				assert.equal(width, 3000);
-				assert.equal(height, 2000);
+				assert.equal(width, originalWidth);
+				assert.equal(height, originalHeight);
 			});
 
-			// To match old behavior, we should upscale if the requested size is larger than the original
-			it('does not upscale is only one dimension is provided and fit is set', async () => {
+			it('does not upscale if only one dimension is provided and fit is set', async () => {
 				const url = new URL(src);
 				url.searchParams.set('w', '3000');
 				url.searchParams.delete('h');

From 9c282b5e6d3f0d678bc478a863e883fa4765dd17 Mon Sep 17 00:00:00 2001
From: Matt Kane <m@mk.gg>
Date: Tue, 4 Nov 2025 21:32:38 +0000
Subject: [PATCH 31/36] Stabilize live collections (#14550)

* Stabilise live collections

* Apply suggestions from code review

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>
Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>

* Clarify changes needed for Astro 6 upgrade

Updated the note regarding changes required for Astro 6.

* Apply suggestions from code review

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>

---------

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>
Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 .changeset/stale-ads-see.md                   | 77 +++++++++++++++++++
 packages/astro/src/content/utils.ts           | 30 ++++----
 .../astro/src/core/config/schemas/base.ts     |  5 --
 packages/astro/src/types/public/config.ts     | 11 ---
 .../fixtures/live-loaders/astro.config.mjs    |  5 +-
 packages/integrations/sitemap/src/index.ts    |  2 +-
 6 files changed, 92 insertions(+), 38 deletions(-)
 create mode 100644 .changeset/stale-ads-see.md

diff --git a/.changeset/stale-ads-see.md b/.changeset/stale-ads-see.md
new file mode 100644
index 000000000000..b064b90d0376
--- /dev/null
+++ b/.changeset/stale-ads-see.md
@@ -0,0 +1,77 @@
+---
+'astro': minor
+---
+
+Adds support for live content collections
+
+Live content collections are a new type of [content collection](https://docs.astro.build/en/guides/content-collections/) that fetch their data at runtime rather than build time. This allows you to access frequently updated data from CMSs, APIs, databases, or other sources using a unified API, without needing to rebuild your site when the data changes.
+
+#### Live collections vs build-time collections
+
+In Astro 5.0, the content layer API added support for adding diverse content sources to content collections. You can create loaders that fetch data from any source at build time, and then access it inside a page via `getEntry()` and `getCollection()`. The data is cached between builds, giving fast access and updates. 
+
+However, there was no method for updating the data store between builds, meaning any updates to the data needed a full site deploy, even if the pages are rendered on demand. This meant that content collections were not suitable for pages that update frequently. Instead, these pages tended to access the APIs directly in the frontmatter. This worked, but it led to a lot of boilerplate, and meant users didn't benefit from the simple, unified API that content loaders offer. In most cases, users tended to individually create loader libraries shared between pages.
+
+Live content collections ([introduced experimentally in Astro 5.10](https://astro.build/blog/live-content-collections-deep-dive/)) solve this problem by allowing you to create loaders that fetch data at runtime, rather than build time. This means that the data is always up-to-date, without needing to rebuild the site. 
+
+#### How to use
+
+To use live collections, create a new `src/live.config.ts` file (alongside your `src/content.config.ts` if you have one) to define your live collections with a live content loader using the new `defineLiveCollection()` function from the `astro:content` module:
+
+```ts title="src/live.config.ts"
+import { defineLiveCollection } from 'astro:content';
+import { storeLoader } from '@mystore/astro-loader';
+
+const products = defineLiveCollection({
+  loader: storeLoader({
+    apiKey: process.env.STORE_API_KEY,
+    endpoint: 'https://api.mystore.com/v1',
+  }),
+});
+
+export const collections = { products };
+```
+
+You can then use the `getLiveCollection()` and `getLiveEntry()` functions to access your live data, along with error handling (since anything can happen when requesting live data!):
+
+```astro
+---
+import { getLiveCollection, getLiveEntry, render } from 'astro:content';
+// Get all products
+const { entries: allProducts, error } = await getLiveCollection('products');
+if (error) {
+  // Handle error appropriately
+  console.error(error.message);
+}
+
+// Get products with a filter (if supported by your loader)
+const { entries: electronics } = await getLiveCollection('products', { category: 'electronics' });
+
+// Get a single product by ID (string syntax)
+const { entry: product, error: productError } = await getLiveEntry('products', Astro.params.id);
+if (productError) {
+  return Astro.redirect('/404');
+}
+
+// Get a single product with a custom query (if supported by your loader) using a filter object
+const { entry: productBySlug } = await getLiveEntry('products', { slug: Astro.params.slug });
+const { Content } = await render(product);
+---
+<h1>{product.data.title}</h1>
+<Content />
+```
+
+#### Upgrading from experimental live collections
+
+If you were using the experimental feature, you must remove the `experimental.liveContentCollections` flag from your `astro.config.*` file:
+
+```diff
+ export default defineConfig({
+   // ...
+-  experimental: {
+-    liveContentCollections: true,
+-  },
+ });
+```
+
+No other changes to your project code are required as long as you have been keeping up with Astro 5.x patch releases, which contained breaking changes to this experimental feature. If you experience problems with your live collections after upgrading to Astro v6 and removing this flag, please review the [Astro CHANGELOG from 5.10.2](https://github.com/withastro/astro/blob/main/packages/astro/CHANGELOG.md#5102) onwards for any potential updates you might have missed, or follow the [current v6 documentation for live collections](https://docs.astro.build/en/guides/content-collections/).
diff --git a/packages/astro/src/content/utils.ts b/packages/astro/src/content/utils.ts
index 6d54b5e8d5d8..4ef2b399fded 100644
--- a/packages/astro/src/content/utils.ts
+++ b/packages/astro/src/content/utils.ts
@@ -511,19 +511,17 @@ async function loadContentConfig({
 		console.error(
 			`${colors.green('[content]')} There was a problem with your content config:\n\n${message}\n`,
 		);
-		if (settings.config.experimental.liveContentCollections) {
-			const liveCollections = Object.entries(unparsedConfig.collections ?? {}).filter(
-				([, collection]: [string, any]) => collection?.type === LIVE_CONTENT_TYPE,
-			);
-			if (liveCollections.length > 0) {
-				throw new AstroError({
-					...AstroErrorData.LiveContentConfigError,
-					message: AstroErrorData.LiveContentConfigError.message(
-						'Live collections must be defined in a `src/live.config.ts` file.',
-						path.relative(fileURLToPath(settings.config.root), configPathname),
-					),
-				});
-			}
+		const liveCollections = Object.entries(unparsedConfig.collections ?? {}).filter(
+			([, collection]: [string, any]) => collection?.type === LIVE_CONTENT_TYPE,
+		);
+		if (liveCollections.length > 0) {
+			throw new AstroError({
+				...AstroErrorData.LiveContentConfigError,
+				message: AstroErrorData.LiveContentConfigError.message(
+					'Live collections must be defined in a `src/live.config.ts` file.',
+					path.relative(fileURLToPath(settings.config.root), configPathname),
+				),
+			});
 		}
 		return undefined;
 	}
@@ -611,7 +609,7 @@ export type ContentPaths = {
 };
 
 export function getContentPaths(
-	{ srcDir, root, experimental }: Pick<AstroConfig, 'root' | 'srcDir' | 'experimental'>,
+	{ srcDir, root }: Pick<AstroConfig, 'root' | 'srcDir'>,
 	fs: typeof fsMod = fsMod,
 ): ContentPaths {
 	const configStats = searchConfig(fs, srcDir);
@@ -627,9 +625,7 @@ export function getContentPaths(
 		}
 	}
 
-	const liveConfigStats = experimental?.liveContentCollections
-		? searchLiveConfig(fs, srcDir)
-		: { exists: false, url: new URL('./', srcDir) };
+	const liveConfigStats = searchLiveConfig(fs, srcDir);
 	const pkgBase = new URL('../../', import.meta.url);
 	return {
 		root: new URL('./', root),
diff --git a/packages/astro/src/core/config/schemas/base.ts b/packages/astro/src/core/config/schemas/base.ts
index 9aabc6b552bb..c2f2a9923c0a 100644
--- a/packages/astro/src/core/config/schemas/base.ts
+++ b/packages/astro/src/core/config/schemas/base.ts
@@ -97,7 +97,6 @@ export const ASTRO_CONFIG_DEFAULTS = {
 	experimental: {
 		clientPrerender: false,
 		contentIntellisense: false,
-		liveContentCollections: false,
 		csp: false,
 		chromeDevtoolsWorkspace: false,
 		failOnPrerenderConflict: false,
@@ -473,10 +472,6 @@ export const AstroConfigSchema = z.object({
 				.optional()
 				.default(ASTRO_CONFIG_DEFAULTS.experimental.contentIntellisense),
 			fonts: z.array(z.union([localFontFamilySchema, remoteFontFamilySchema])).optional(),
-			liveContentCollections: z
-				.boolean()
-				.optional()
-				.default(ASTRO_CONFIG_DEFAULTS.experimental.liveContentCollections),
 			csp: z
 				.union([
 					z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.csp),
diff --git a/packages/astro/src/types/public/config.ts b/packages/astro/src/types/public/config.ts
index 8543f00bfc60..6cdb72983ed6 100644
--- a/packages/astro/src/types/public/config.ts
+++ b/packages/astro/src/types/public/config.ts
@@ -2386,17 +2386,6 @@ export interface AstroUserConfig<
 					directives?: CspDirective[];
 			  };
 
-		/**
-		 * @name experimental.liveContentCollections
-		 * @type {boolean}
-		 * @default `false`
-		 * @version 5.10
-		 * @description
-		 * Enables the use of live content collections.
-		 *
-		 */
-		liveContentCollections?: boolean;
-
 		/**
 		 * @name experimental.chromeDevtoolsWorkspace
 		 * @type {boolean}
diff --git a/packages/astro/test/fixtures/live-loaders/astro.config.mjs b/packages/astro/test/fixtures/live-loaders/astro.config.mjs
index 44512231b35f..1e7cd8c24e52 100644
--- a/packages/astro/test/fixtures/live-loaders/astro.config.mjs
+++ b/packages/astro/test/fixtures/live-loaders/astro.config.mjs
@@ -7,8 +7,5 @@ import node from '@astrojs/node';
 export default defineConfig({
   adapter: node({
     mode: 'standalone'
-  }),
-	experimental: {
-		liveContentCollections: true
-	}
+  })
 });
diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts
index c59c7f6eb24b..bb4c53e55c8d 100644
--- a/packages/integrations/sitemap/src/index.ts
+++ b/packages/integrations/sitemap/src/index.ts
@@ -76,7 +76,7 @@ const isStatusCodePage = (locales: string[]) => {
 	};
 };
 const createPlugin = (options?: SitemapOptions): AstroIntegration => {
-	let _routes: Array<IntegrationResolvedRoute>
+	let _routes: Array<IntegrationResolvedRoute>;
 	let config: AstroConfig;
 
 	return {

From 5a9d8a01db9b3cf17b9aa66ebfcbe7ea143c1882 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Wed, 5 Nov 2025 15:36:18 +0100
Subject: [PATCH 32/36] fix: rename config file

---
 .../test/fixture/src/{content/config.ts => content.config.ts}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packages/language-tools/language-server/test/fixture/src/{content/config.ts => content.config.ts} (100%)

diff --git a/packages/language-tools/language-server/test/fixture/src/content/config.ts b/packages/language-tools/language-server/test/fixture/src/content.config.ts
similarity index 100%
rename from packages/language-tools/language-server/test/fixture/src/content/config.ts
rename to packages/language-tools/language-server/test/fixture/src/content.config.ts

From a967dae9c6b84b1e90759a35bd54c1eb190119a3 Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Thu, 6 Nov 2025 19:09:04 +0100
Subject: [PATCH 33/36] fix: skip node version check in language tools tests
 (#14717)

* fix: skip node version check in language tools tests

* fix

* wip

* Discard changes to packages/astro/bin/astro.mjs

* Discard changes to packages/create-astro/create-astro.mjs

* Discard changes to packages/upgrade/upgrade.mjs

* wip

* wip

* fix: pattern

* fix: try a setup script

* fix: js

* fix: strange

---------

Co-authored-by: Princesseuh <3019731+Princesseuh@users.noreply.github.com>
---
 .../language-server/package.json              |   3 +-
 .../test/content-intellisense/caching.test.ts |  91 +++++-----
 .../content-intellisense/completions.test.ts  |  78 ++++----
 .../content-intellisense/definitions.test.ts  |  80 +++++----
 .../content-intellisense/diagnostics.test.ts  | 170 +++++++++---------
 .../test/content-intellisense/hover.test.ts   |  37 ++--
 .../test/fixture/caching/PathCompletion.astro |   0
 .../test/fixture/caching/toBeDeleted.astro    |   0
 .../test/fixture/src/content.config.ts        |   5 +-
 .../language-server/test/setup.js             |  21 +++
 scripts/cmd/test.js                           |   6 +-
 11 files changed, 276 insertions(+), 215 deletions(-)
 create mode 100644 packages/language-tools/language-server/test/fixture/caching/PathCompletion.astro
 create mode 100644 packages/language-tools/language-server/test/fixture/caching/toBeDeleted.astro
 create mode 100644 packages/language-tools/language-server/test/setup.js

diff --git a/packages/language-tools/language-server/package.json b/packages/language-tools/language-server/package.json
index 5899c61090fa..0223fc63b831 100644
--- a/packages/language-tools/language-server/package.json
+++ b/packages/language-tools/language-server/package.json
@@ -22,8 +22,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "sync-fixture": "pnpm --dir ./test/fixture sync",
-    "test": "pnpm sync-fixture && astro-scripts test \"**/*.test.ts\" --teardown-test ./test/misc/teardown.ts --tsx true",
+    "test": "astro-scripts test \"**/*.test.ts\" --teardown-test ./test/misc/teardown.ts --tsx true --setup ./test/setup.js",
     "test:match": "pnpm run test --match"
   },
   "dependencies": {
diff --git a/packages/language-tools/language-server/test/content-intellisense/caching.test.ts b/packages/language-tools/language-server/test/content-intellisense/caching.test.ts
index 8b21d576cac9..0f455b4f8b34 100644
--- a/packages/language-tools/language-server/test/content-intellisense/caching.test.ts
+++ b/packages/language-tools/language-server/test/content-intellisense/caching.test.ts
@@ -9,51 +9,60 @@ import { fixtureDir } from '../utils.ts';
 
 const contentSchemaPath = path.resolve(fixtureDir, '.astro', 'collections', 'caching.schema.json');
 
-describe('Content Intellisense - Caching', async () => {
-	let languageServer: LanguageServer;
+describe(
+	'Content Intellisense - Caching',
+	{ skip: parseInt(process.versions.node) === 20 },
+	async () => {
+		let languageServer: LanguageServer;
 
-	before(async () => (languageServer = await getLanguageServer()));
+		before(async () => {
+			languageServer = await getLanguageServer();
+		});
+
+		it('Properly updates the schema when they are updated', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'caching', 'caching.md'),
+				'markdown',
+			);
+
+			const hover = await languageServer.handle.sendHoverRequest(
+				document.uri,
+				Position.create(1, 1),
+			);
+
+			assert.deepStrictEqual(hover?.contents, {
+				kind: 'markdown',
+				value: 'I will be changed',
+			});
+
+			fs.writeFileSync(
+				contentSchemaPath,
+				fs.readFileSync(contentSchemaPath, 'utf-8').replaceAll('I will be changed', 'I am changed'),
+			);
 
-	it('Properly updates the schema when they are updated', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'caching', 'caching.md'),
-			'markdown',
-		);
+			await languageServer.handle.didChangeWatchedFiles([
+				{
+					uri: URI.file(contentSchemaPath).toString(),
+					type: 2,
+				},
+			]);
 
-		const hover = await languageServer.handle.sendHoverRequest(document.uri, Position.create(1, 1));
+			const hover2 = await languageServer.handle.sendHoverRequest(
+				document.uri,
+				Position.create(1, 1),
+			);
 
-		assert.deepStrictEqual(hover?.contents, {
-			kind: 'markdown',
-			value: 'I will be changed',
+			assert.deepStrictEqual(hover2?.contents, {
+				kind: 'markdown',
+				value: 'I am changed',
+			});
 		});
 
-		fs.writeFileSync(
-			contentSchemaPath,
-			fs.readFileSync(contentSchemaPath, 'utf-8').replaceAll('I will be changed', 'I am changed'),
-		);
-
-		await languageServer.handle.didChangeWatchedFiles([
-			{
-				uri: URI.file(contentSchemaPath).toString(),
-				type: 2,
-			},
-		]);
-
-		const hover2 = await languageServer.handle.sendHoverRequest(
-			document.uri,
-			Position.create(1, 1),
-		);
-
-		assert.deepStrictEqual(hover2?.contents, {
-			kind: 'markdown',
-			value: 'I am changed',
+		after(async () => {
+			fs.writeFileSync(
+				contentSchemaPath,
+				fs.readFileSync(contentSchemaPath, 'utf-8').replaceAll('I am changed', 'I will be changed'),
+			);
 		});
-	});
-
-	after(async () => {
-		fs.writeFileSync(
-			contentSchemaPath,
-			fs.readFileSync(contentSchemaPath, 'utf-8').replaceAll('I am changed', 'I will be changed'),
-		);
-	});
-});
+	},
+);
diff --git a/packages/language-tools/language-server/test/content-intellisense/completions.test.ts b/packages/language-tools/language-server/test/content-intellisense/completions.test.ts
index 9075a2046ff0..e69234aac17b 100644
--- a/packages/language-tools/language-server/test/content-intellisense/completions.test.ts
+++ b/packages/language-tools/language-server/test/content-intellisense/completions.test.ts
@@ -5,39 +5,45 @@ import { Position } from '@volar/language-server';
 import { getLanguageServer, type LanguageServer } from '../server.ts';
 import { fixtureDir } from '../utils.ts';
 
-describe('Content Intellisense - Completions', async () => {
-	let languageServer: LanguageServer;
-
-	before(async () => (languageServer = await getLanguageServer()));
-
-	it('Provide completions for collection properties', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'completions.md'),
-			'markdown',
-		);
-
-		const completions = await languageServer.handle.sendCompletionRequest(
-			document.uri,
-			Position.create(1, 1),
-		);
-
-		// We don't do any mapping ourselves here, so we'll just check if the labels are correct.
-		const labels = (completions?.items ?? []).map((item) => item.label);
-		['title', 'description', 'tags', 'type'].forEach((m) => assert.ok(labels.includes(m)));
-	});
-
-	it('Provide completions for collection property values', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'completions-values.md'),
-			'markdown',
-		);
-
-		const completions = await languageServer.handle.sendCompletionRequest(
-			document.uri,
-			Position.create(1, 7),
-		);
-
-		const labels = (completions?.items ?? []).map((item) => item.label);
-		['blog'].forEach((m) => assert.ok(labels.includes(m)));
-	});
-});
+describe(
+	'Content Intellisense - Completions',
+	{ skip: parseInt(process.versions.node) === 20 },
+	async () => {
+		let languageServer: LanguageServer;
+
+		before(async () => {
+			languageServer = await getLanguageServer();
+		});
+
+		it('Provide completions for collection properties', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'completions.md'),
+				'markdown',
+			);
+
+			const completions = await languageServer.handle.sendCompletionRequest(
+				document.uri,
+				Position.create(1, 1),
+			);
+
+			// We don't do any mapping ourselves here, so we'll just check if the labels are correct.
+			const labels = (completions?.items ?? []).map((item) => item.label);
+			['title', 'description', 'tags', 'type'].forEach((m) => assert.ok(labels.includes(m)));
+		});
+
+		it('Provide completions for collection property values', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'completions-values.md'),
+				'markdown',
+			);
+
+			const completions = await languageServer.handle.sendCompletionRequest(
+				document.uri,
+				Position.create(1, 7),
+			);
+
+			const labels = (completions?.items ?? []).map((item) => item.label);
+			['blog'].forEach((m) => assert.ok(labels.includes(m)));
+		});
+	},
+);
diff --git a/packages/language-tools/language-server/test/content-intellisense/definitions.test.ts b/packages/language-tools/language-server/test/content-intellisense/definitions.test.ts
index 73567e786f1e..f3184d69d011 100644
--- a/packages/language-tools/language-server/test/content-intellisense/definitions.test.ts
+++ b/packages/language-tools/language-server/test/content-intellisense/definitions.test.ts
@@ -6,43 +6,49 @@ import { Position } from '@volar/language-server';
 import { getLanguageServer, type LanguageServer } from '../server.ts';
 import { fixtureDir } from '../utils.ts';
 
-describe('Content Intellisense - Go To Everywhere', async () => {
-	let languageServer: LanguageServer;
-
-	before(async () => (languageServer = await getLanguageServer()));
-
-	it('Provide definitions for keys', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'definitions.md'),
-			'markdown',
-		);
-
-		const definitions = (await languageServer.handle.sendDefinitionRequest(
-			document.uri,
-			Position.create(1, 2),
-		)) as LocationLink[];
-
-		const targetUris = definitions?.map((definition) => definition.targetUri);
-		assert.strictEqual(
-			targetUris.every((uri) => uri.endsWith('config.ts')),
-			true,
-		);
-
-		const { targetRange, targetSelectionRange, originSelectionRange } = definitions[0];
-
-		assert.deepStrictEqual(targetRange, {
-			start: { line: 5, character: 2 },
-			end: { line: 5, character: 65 },
-		});
-
-		assert.deepStrictEqual(targetSelectionRange, {
-			start: { line: 5, character: 2 },
-			end: { line: 5, character: 7 },
+describe(
+	'Content Intellisense - Go To Everywhere',
+	{ skip: parseInt(process.versions.node) === 20 },
+	async () => {
+		let languageServer: LanguageServer;
+
+		before(async () => {
+			languageServer = await getLanguageServer();
 		});
 
-		assert.deepStrictEqual(originSelectionRange, {
-			start: { line: 1, character: 0 },
-			end: { line: 1, character: 5 },
+		it('Provide definitions for keys', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'definitions.md'),
+				'markdown',
+			);
+
+			const definitions = (await languageServer.handle.sendDefinitionRequest(
+				document.uri,
+				Position.create(1, 2),
+			)) as LocationLink[];
+
+			const targetUris = definitions?.map((definition) => definition.targetUri);
+			assert.strictEqual(
+				targetUris.every((uri) => uri.endsWith('config.ts')),
+				true,
+			);
+
+			const { targetRange, targetSelectionRange, originSelectionRange } = definitions[0];
+
+			assert.deepStrictEqual(targetRange, {
+				start: { line: 6, character: 2 },
+				end: { line: 6, character: 65 },
+			});
+
+			assert.deepStrictEqual(targetSelectionRange, {
+				start: { line: 6, character: 2 },
+				end: { line: 6, character: 7 },
+			});
+
+			assert.deepStrictEqual(originSelectionRange, {
+				start: { line: 1, character: 0 },
+				end: { line: 1, character: 5 },
+			});
 		});
-	});
-});
+	},
+);
diff --git a/packages/language-tools/language-server/test/content-intellisense/diagnostics.test.ts b/packages/language-tools/language-server/test/content-intellisense/diagnostics.test.ts
index 096653e77f52..0d942408b56e 100644
--- a/packages/language-tools/language-server/test/content-intellisense/diagnostics.test.ts
+++ b/packages/language-tools/language-server/test/content-intellisense/diagnostics.test.ts
@@ -7,88 +7,94 @@ import { getLanguageServer, type LanguageServer } from '../server.ts';
 import { fixtureDir } from '../utils.ts';
 
 // TODO: We can't sync the fixture with these mistakes at all, as such we can't run these tests.
-describe.skip('Content Intellisense - Diagnostics', async () => {
-	let languageServer: LanguageServer;
-
-	before(async () => (languageServer = await getLanguageServer()));
-
-	it('Report errors for missing entries in frontmatter', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'missing_property.md'),
-			'markdown',
-		);
-		const diagnostics = (await languageServer.handle.sendDocumentDiagnosticRequest(
-			document.uri,
-		)) as FullDocumentDiagnosticReport;
-
-		assert.strictEqual(diagnostics.items.length, 1);
-
-		const firstDiagnostic = diagnostics.items[0];
-
-		// The data is not super relevant to the test, so we'll throw it out.
-		delete firstDiagnostic.data;
-
-		assert.deepStrictEqual(firstDiagnostic, {
-			code: 0,
-			message: 'Missing property "description".',
-			range: {
-				start: Position.create(0, 0),
-				end: Position.create(2, 3),
-			},
-			severity: DiagnosticSeverity.Error,
-			source: 'astro',
+describe.skip(
+	'Content Intellisense - Diagnostics',
+	{ skip: parseInt(process.versions.node) === 20 },
+	async () => {
+		let languageServer: LanguageServer;
+
+		before(async () => {
+			languageServer = await getLanguageServer();
 		});
-	});
-
-	it('Report errors for invalid types in frontmatter', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'type_error.md'),
-			'markdown',
-		);
-		const diagnostics = (await languageServer.handle.sendDocumentDiagnosticRequest(
-			document.uri,
-		)) as FullDocumentDiagnosticReport;
-
-		assert.strictEqual(diagnostics.items.length, 1);
-
-		const firstDiagnostic = diagnostics.items[0];
-
-		delete firstDiagnostic.data;
-
-		assert.deepStrictEqual(firstDiagnostic, {
-			code: 0,
-			message: 'Incorrect type. Expected "string".',
-			range: {
-				start: Position.create(1, 7),
-				end: Position.create(1, 8),
-			},
-			severity: DiagnosticSeverity.Error,
-			source: 'astro',
+
+		it('Report errors for missing entries in frontmatter', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'missing_property.md'),
+				'markdown',
+			);
+			const diagnostics = (await languageServer.handle.sendDocumentDiagnosticRequest(
+				document.uri,
+			)) as FullDocumentDiagnosticReport;
+
+			assert.strictEqual(diagnostics.items.length, 1);
+
+			const firstDiagnostic = diagnostics.items[0];
+
+			// The data is not super relevant to the test, so we'll throw it out.
+			delete firstDiagnostic.data;
+
+			assert.deepStrictEqual(firstDiagnostic, {
+				code: 0,
+				message: 'Missing property "description".',
+				range: {
+					start: Position.create(0, 0),
+					end: Position.create(2, 3),
+				},
+				severity: DiagnosticSeverity.Error,
+				source: 'astro',
+			});
+		});
+
+		it('Report errors for invalid types in frontmatter', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'type_error.md'),
+				'markdown',
+			);
+			const diagnostics = (await languageServer.handle.sendDocumentDiagnosticRequest(
+				document.uri,
+			)) as FullDocumentDiagnosticReport;
+
+			assert.strictEqual(diagnostics.items.length, 1);
+
+			const firstDiagnostic = diagnostics.items[0];
+
+			delete firstDiagnostic.data;
+
+			assert.deepStrictEqual(firstDiagnostic, {
+				code: 0,
+				message: 'Incorrect type. Expected "string".',
+				range: {
+					start: Position.create(1, 7),
+					end: Position.create(1, 8),
+				},
+				severity: DiagnosticSeverity.Error,
+				source: 'astro',
+			});
 		});
-	});
-
-	it('Report error for missing frontmatter', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'no_frontmatter.md'),
-			'markdown',
-		);
-		const diagnostics = (await languageServer.handle.sendDocumentDiagnosticRequest(
-			document.uri,
-		)) as FullDocumentDiagnosticReport;
-
-		assert.strictEqual(diagnostics.items.length, 1);
-
-		const firstDiagnostic = diagnostics.items[0];
-
-		delete firstDiagnostic.data;
-
-		assert.deepStrictEqual(firstDiagnostic, {
-			message: 'Frontmatter is required for this file.',
-			range: {
-				start: Position.create(0, 0),
-				end: Position.create(0, 0),
-			},
-			severity: DiagnosticSeverity.Error,
+
+		it('Report error for missing frontmatter', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'no_frontmatter.md'),
+				'markdown',
+			);
+			const diagnostics = (await languageServer.handle.sendDocumentDiagnosticRequest(
+				document.uri,
+			)) as FullDocumentDiagnosticReport;
+
+			assert.strictEqual(diagnostics.items.length, 1);
+
+			const firstDiagnostic = diagnostics.items[0];
+
+			delete firstDiagnostic.data;
+
+			assert.deepStrictEqual(firstDiagnostic, {
+				message: 'Frontmatter is required for this file.',
+				range: {
+					start: Position.create(0, 0),
+					end: Position.create(0, 0),
+				},
+				severity: DiagnosticSeverity.Error,
+			});
 		});
-	});
-});
+	},
+);
diff --git a/packages/language-tools/language-server/test/content-intellisense/hover.test.ts b/packages/language-tools/language-server/test/content-intellisense/hover.test.ts
index 43a3170de274..882ae1e55240 100644
--- a/packages/language-tools/language-server/test/content-intellisense/hover.test.ts
+++ b/packages/language-tools/language-server/test/content-intellisense/hover.test.ts
@@ -5,22 +5,31 @@ import { Position } from '@volar/language-server';
 import { getLanguageServer, type LanguageServer } from '../server.ts';
 import { fixtureDir } from '../utils.ts';
 
-describe('Content Intellisense - Hover', async () => {
-	let languageServer: LanguageServer;
+describe(
+	'Content Intellisense - Hover',
+	{ skip: parseInt(process.versions.node) === 20 },
+	async () => {
+		let languageServer: LanguageServer;
 
-	before(async () => (languageServer = await getLanguageServer()));
+		before(async () => {
+			languageServer = await getLanguageServer();
+		});
 
-	it('Provide hover information for collection properties', async () => {
-		const document = await languageServer.handle.openTextDocument(
-			path.join(fixtureDir, 'src', 'content', 'blog', 'hover.md'),
-			'markdown',
-		);
+		it('Provide hover information for collection properties', async () => {
+			const document = await languageServer.handle.openTextDocument(
+				path.join(fixtureDir, 'src', 'content', 'blog', 'hover.md'),
+				'markdown',
+			);
 
-		const hover = await languageServer.handle.sendHoverRequest(document.uri, Position.create(1, 1));
+			const hover = await languageServer.handle.sendHoverRequest(
+				document.uri,
+				Position.create(1, 1),
+			);
 
-		assert.deepStrictEqual(hover?.contents, {
-			kind: 'markdown',
-			value: "The blog post's title.",
+			assert.deepStrictEqual(hover?.contents, {
+				kind: 'markdown',
+				value: "The blog post's title.",
+			});
 		});
-	});
-});
+	},
+);
diff --git a/packages/language-tools/language-server/test/fixture/caching/PathCompletion.astro b/packages/language-tools/language-server/test/fixture/caching/PathCompletion.astro
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/language-tools/language-server/test/fixture/caching/toBeDeleted.astro b/packages/language-tools/language-server/test/fixture/caching/toBeDeleted.astro
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/language-tools/language-server/test/fixture/src/content.config.ts b/packages/language-tools/language-server/test/fixture/src/content.config.ts
index 851f38016bfa..62d6a0d62501 100644
--- a/packages/language-tools/language-server/test/fixture/src/content.config.ts
+++ b/packages/language-tools/language-server/test/fixture/src/content.config.ts
@@ -1,7 +1,8 @@
+import { glob } from 'astro/loaders';
 import { defineCollection, z } from 'astro:content';
 
 const blog = defineCollection({
-	type: 'content',
+	loader: glob({ base: './src/content/blog', pattern: '**/[^_]*.md' }),
 	schema: z.object({
 		title: z.string().describe("The blog post's title.").optional(),
 		description: z.string().optional(),
@@ -11,7 +12,7 @@ const blog = defineCollection({
 });
 
 const caching = defineCollection({
-	type: 'content',
+	loader: glob({ base: './src/content/caching', pattern: '**/[^_]*.md' }),
 	schema: z.object({
 		title: z.string().describe('I will be changed'),
 	}),
diff --git a/packages/language-tools/language-server/test/setup.js b/packages/language-tools/language-server/test/setup.js
new file mode 100644
index 000000000000..7227245308c1
--- /dev/null
+++ b/packages/language-tools/language-server/test/setup.js
@@ -0,0 +1,21 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+// @ts-expect-error
+import { cli } from '../../../astro/test/test-utils.js';
+
+// Copied from utils.ts so we don't have to import TS code for Node 20
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const fixtureDir = path.join(__dirname, './fixture');
+
+export default async function setup() {
+	// We only run the tests that require sync on Node.js versions other than 20 because the language server supports
+	// a lower minimum version than Astro itself due to our lowest supported VS Code version, which mean we can't run Astro
+	if (parseInt(process.versions.node) !== 20) {
+		const res = await cli('sync', '--root', fixtureDir).getResult();
+		if (res.exitCode !== 0) {
+			throw new Error(res.stderr);
+		}
+	}
+}
diff --git a/scripts/cmd/test.js b/scripts/cmd/test.js
index 0ce1f6581012..1dd3f124aa29 100644
--- a/scripts/cmd/test.js
+++ b/scripts/cmd/test.js
@@ -78,6 +78,10 @@ export default async function test() {
 		? await import(pathToFileURL(path.resolve(args.values.teardown)).toString())
 		: undefined;
 
+	const setupModule = args.values.setup
+		? await import(pathToFileURL(path.resolve(args.values.setup)).toString())
+		: undefined;
+
 	// https://nodejs.org/api/test.html#runoptions
 	run({
 		files,
@@ -88,7 +92,7 @@ export default async function test() {
 			: undefined,
 		concurrency: args.values.parallel,
 		only: args.values.only,
-		setup: args.values.setup,
+		setup: setupModule?.default,
 		watch: args.values.watch,
 		timeout: args.values.timeout ? Number(args.values.timeout) : defaultTimeout, // Node.js defaults to Infinity, so set better fallback
 	})

From d23e6b47a329d6349d9e8c4bb3a8355b88c7e97e Mon Sep 17 00:00:00 2001
From: Florian Lefebvre <contact@florian-lefebvre.dev>
Date: Fri, 7 Nov 2025 14:32:22 +0100
Subject: [PATCH 34/36] feat(language-server)!: remove support for Astro.glob()
 (#14720)

---
 .changeset/kind-pears-behave.md               |  1 +
 .../language-server/src/check.ts              |  2 +-
 .../src/languageServerPlugin.ts               |  2 +-
 .../language-server/src/plugins/astro.ts      | 64 +------------------
 .../test/astro/codelens.test.ts               | 22 -------
 .../language-server/test/misc/init.test.ts    |  1 -
 6 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 packages/language-tools/language-server/test/astro/codelens.test.ts

diff --git a/.changeset/kind-pears-behave.md b/.changeset/kind-pears-behave.md
index d34012a6991e..3714bd4d60ac 100644
--- a/.changeset/kind-pears-behave.md
+++ b/.changeset/kind-pears-behave.md
@@ -1,5 +1,6 @@
 ---
 'astro': major
+'@astrojs/language-server': patch
 ---
 
 Removes `Astro.glob()`
diff --git a/packages/language-tools/language-server/src/check.ts b/packages/language-tools/language-server/src/check.ts
index 0eaa8687b111..5ff6a1c74146 100644
--- a/packages/language-tools/language-server/src/check.ts
+++ b/packages/language-tools/language-server/src/check.ts
@@ -141,7 +141,7 @@ export class AstroCheck {
 			getSvelteLanguagePlugin(),
 			getVueLanguagePlugin(),
 		];
-		const services = [...createTypeScriptServices(this.ts), createAstroService(this.ts)];
+		const services = [...createTypeScriptServices(this.ts), createAstroService()];
 
 		if (tsconfigPath) {
 			const includeProjectReference = false; // #920
diff --git a/packages/language-tools/language-server/src/languageServerPlugin.ts b/packages/language-tools/language-server/src/languageServerPlugin.ts
index 4b0dff85d9d6..82322afaa00e 100644
--- a/packages/language-tools/language-server/src/languageServerPlugin.ts
+++ b/packages/language-tools/language-server/src/languageServerPlugin.ts
@@ -48,7 +48,7 @@ export function getLanguageServicePlugins(
 		}),
 		createTypeScriptTwoSlashService(ts),
 		createTypescriptAddonsService(),
-		createAstroService(ts),
+		createAstroService(),
 		getPrettierService(),
 		createYAMLService(collectionConfig),
 	];
diff --git a/packages/language-tools/language-server/src/plugins/astro.ts b/packages/language-tools/language-server/src/plugins/astro.ts
index e6e820eda994..2346a092ebbe 100644
--- a/packages/language-tools/language-server/src/plugins/astro.ts
+++ b/packages/language-tools/language-server/src/plugins/astro.ts
@@ -1,7 +1,5 @@
-import { dirname } from 'node:path';
 import type { DiagnosticMessage } from '@astrojs/compiler/types';
 import type {
-	CodeLens,
 	CompletionItem,
 	Diagnostic,
 	LanguageServicePlugin,
@@ -14,14 +12,11 @@ import {
 	Range,
 	TextEdit,
 } from '@volar/language-server';
-import fg from 'fast-glob';
-import type { Provide } from 'volar-service-typescript';
 import type { TextDocument } from 'vscode-html-languageservice';
 import { URI } from 'vscode-uri';
 import { AstroVirtualCode } from '../core/index.js';
-import { isJSDocument } from './utils.js';
 
-export const create = (ts: typeof import('typescript')): LanguageServicePlugin => {
+export const create = (): LanguageServicePlugin => {
 	return {
 		capabilities: {
 			completionProvider: {
@@ -31,7 +26,6 @@ export const create = (ts: typeof import('typescript')): LanguageServicePlugin =
 				interFileDependencies: false,
 				workspaceDiagnostics: false,
 			},
-			codeLensProvider: {},
 		},
 		create(context): LanguageServicePluginInstance {
 			return {
@@ -76,67 +70,11 @@ export const create = (ts: typeof import('typescript')): LanguageServicePlugin =
 						};
 					}
 				},
-				provideCodeLenses(document, token) {
-					if (token.isCancellationRequested) return;
-					if (!isJSDocument(document.languageId)) return;
-
-					if (!context.project.typescript) return;
-
-					const { uriConverter } = context.project.typescript;
-					const languageService = context.inject<Provide, 'typescript/languageService'>(
-						'typescript/languageService',
-					);
-					if (!languageService) return;
-
-					const tsProgram = languageService.getProgram();
-					if (!tsProgram) return;
-
-					const decoded = context.decodeEmbeddedDocumentUri(URI.parse(document.uri));
-					if (!decoded) return;
-
-					const globcodeLens: CodeLens[] = [];
-					const sourceFile = tsProgram.getSourceFile(decoded[0].fsPath)!;
-
-					function walk() {
-						return ts.forEachChild(sourceFile, function cb(node): void {
-							if (ts.isCallExpression(node) && node.expression.getText() === 'Astro.glob') {
-								const globArgument = node.arguments.at(0);
-
-								if (globArgument && decoded) {
-									globcodeLens.push(
-										getGlobResultAsCodeLens(
-											globArgument.getText().slice(1, -1),
-											dirname(uriConverter.asFileName(decoded[0])),
-											document.positionAt(node.arguments.pos),
-										),
-									);
-								}
-							}
-							return ts.forEachChild(node, cb);
-						});
-					}
-
-					walk();
-
-					return globcodeLens;
-				},
 			};
 		},
 	};
 };
 
-function getGlobResultAsCodeLens(globText: string, dir: string, position: Position) {
-	const globResult = fg.sync(globText, {
-		cwd: dir,
-		onlyFiles: true,
-	});
-
-	return {
-		range: Range.create(position, position),
-		command: { title: `Matches ${globResult.length} files`, command: '' },
-	};
-}
-
 function getFrontmatterCompletion(
 	file: AstroVirtualCode,
 	document: TextDocument,
diff --git a/packages/language-tools/language-server/test/astro/codelens.test.ts b/packages/language-tools/language-server/test/astro/codelens.test.ts
deleted file mode 100644
index d6c82f09c91f..000000000000
--- a/packages/language-tools/language-server/test/astro/codelens.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import assert from 'node:assert';
-import { before, describe, it } from 'node:test';
-import * as _ from '@volar/language-server/node.js';
-import type { LanguageServer } from '../server.ts';
-import { getLanguageServer } from '../server.ts';
-
-describe('Astro - Code Lens', () => {
-	let languageServer: LanguageServer;
-
-	before(async () => (languageServer = await getLanguageServer()));
-
-	it('Can provide a codelens for Astro.glob', async () => {
-		const document = await languageServer.openFakeDocument('---\nAstro.glob(".");\n---\n', 'astro');
-
-		const codeLens = await languageServer.handle.connection.sendRequest(_.CodeLensRequest.type, {
-			textDocument: { uri: document.uri },
-		});
-
-		assert.ok(codeLens);
-		assert.strictEqual(codeLens.length, 1);
-	});
-});
diff --git a/packages/language-tools/language-server/test/misc/init.test.ts b/packages/language-tools/language-server/test/misc/init.test.ts
index 2d804dc575d0..c423264829a2 100644
--- a/packages/language-tools/language-server/test/misc/init.test.ts
+++ b/packages/language-tools/language-server/test/misc/init.test.ts
@@ -31,7 +31,6 @@ describe('Initialize', async () => {
 				],
 				resolveProvider: true,
 			},
-			codeLensProvider: {},
 			colorProvider: true,
 			completionProvider: {
 				resolveProvider: true,

From 631e0fb0a1940766787a64c112acb601f57f0399 Mon Sep 17 00:00:00 2001
From: Erika <3019731+Princesseuh@users.noreply.github.com>
Date: Fri, 7 Nov 2025 14:44:55 +0100
Subject: [PATCH 35/36] feat: run release workflow on next branch (#14718)

* fix: run release workflow on next branch

* fix: change pre tag
---
 .changeset/pre.json           | 2 +-
 .github/workflows/release.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index f67a865e0787..f3efcc3d9276 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,6 +1,6 @@
 {
   "mode": "pre",
-  "tag": "next",
+  "tag": "alpha",
   "initialVersions": {
     "astro": "5.13.7",
     "@astrojs/prism": "3.3.0",
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9225c5aa1c10..c48ab3f2d680 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - next
       - "1-legacy"
       - "2-legacy"
       - "3-legacy"

From 1a1bd9b302d3ac2620413c01b5f22240e17781cf Mon Sep 17 00:00:00 2001
From: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
Date: Fri, 7 Nov 2025 13:46:55 -0400
Subject: [PATCH 36/36] Shortens changesets for alpha release (#14731)

Co-authored-by: Armand Philippot <git@armand.philippot.eu>
Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
---
 .changeset/beige-clowns-read.md   | 24 +-----------
 .changeset/busy-olives-chew.md    | 19 +---------
 .changeset/cuddly-worlds-beam.md  | 37 +-----------------
 .changeset/cyan-crews-cross.md    | 16 +-------
 .changeset/dull-mangos-travel.md  | 17 +--------
 .changeset/fast-bushes-fall.md    | 24 +-----------
 .changeset/giant-areas-press.md   | 15 +-------
 .changeset/good-camels-pull.md    | 18 +--------
 .changeset/green-garlics-heal.md  | 18 +--------
 .changeset/honest-deer-add.md     | 12 +-----
 .changeset/kind-pears-behave.md   | 21 +----------
 .changeset/pretty-forks-smash.md  | 26 +------------
 .changeset/puny-poems-create.md   | 25 +-----------
 .changeset/rich-horses-begin.md   | 23 +----------
 .changeset/sad-lines-hear.md      | 24 +-----------
 .changeset/six-women-visit.md     | 29 +-------------
 .changeset/tricky-donkeys-camp.md |  8 +---
 .changeset/wet-suits-help.md      | 63 +------------------------------
 .changeset/whole-geckos-think.md  | 48 +----------------------
 .changeset/young-banks-camp.md    | 15 +-------
 20 files changed, 20 insertions(+), 462 deletions(-)

diff --git a/.changeset/beige-clowns-read.md b/.changeset/beige-clowns-read.md
index 826fc9d7c747..1a69030fdb55 100644
--- a/.changeset/beige-clowns-read.md
+++ b/.changeset/beige-clowns-read.md
@@ -2,26 +2,4 @@
 'astro': major
 ---
 
-Removes `entryPoints` on `astro:build:ssr` hook (Integration API)
-
-In Astro 5.0, `functionPerRoute` was deprecated. That meant that `entryPoints` on the `astro:build:ssr` hook was always empty. Astro integrations may have continued to work, even while `entryPoints` was not providing any useful data.
-
-Astro 6.0 removes the `entryPoints` map passed to this hook entirely. Integrations may no longer include `entryPoints`.
-
-#### What should I do?
-
-Remove any instance of `entryPoints` passed to `astro:build:ssr`. This should be safe to remove because this logic was not providing any useful data, but you may need to restructure your code accordingly for its removal:
-
-```diff
-// my-integration.mjs
-const integration = () => {
-    return {
-        name: 'my-integration',
-        hooks: {
-            'astro:build:ssr': (params) => {
--                someLogic(params.entryPoints)
-            },
-        }
-    }
-}
-```
+Removes `entryPoints` on `astro:build:ssr` hook (Integration API) - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-entrypoints-on-astrobuildssr-hook-integration-api))
\ No newline at end of file
diff --git a/.changeset/busy-olives-chew.md b/.changeset/busy-olives-chew.md
index 060a5d8f03f6..415f4a54a10b 100644
--- a/.changeset/busy-olives-chew.md
+++ b/.changeset/busy-olives-chew.md
@@ -2,21 +2,4 @@
 'astro': major
 ---
 
-Removes the deprecated `emitESMImage()` function
-
-In Astro 5.6.2, the `emitESMImage()` function was deprecated in favor of `emitImageMetadata()`, which removes two deprecated arguments that were not meant to be exposed for public use: `_watchMode` and `experimentalSvgEnabled`.
-
-Astro 6.0 removes `emitESMImage()` entirely. Update to `emitImageMetadata()` to keep your current behavior.
-
-#### What should I do?
-
-Replace all occurrences of the `emitESMImage()` with `emitImageMetadata()` and remove unused arguments:
-
-```diff
--import { emitESMImage } from 'astro/assets/utils';
-+import { emitImageMetadata } from 'astro/assets/utils';
-
-const imageId = '/images/photo.jpg';
--const result = await emitESMImage(imageId, false, false);
-+const result = await emitImageMetadata(imageId);
-```
+Removes the deprecated `emitESMImage()` function - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-emitesmimage))
\ No newline at end of file
diff --git a/.changeset/cuddly-worlds-beam.md b/.changeset/cuddly-worlds-beam.md
index 133173256d90..60107b2b056d 100644
--- a/.changeset/cuddly-worlds-beam.md
+++ b/.changeset/cuddly-worlds-beam.md
@@ -2,39 +2,4 @@
 'astro': major
 ---
 
-Removes `routes` on `astro:build:done` hook (Integration API)
-
-In Astro 5.0, accessing `routes` on the `astro:build:done` hook was deprecated in favour of a new `astro:routes:resolved` hook. However, Astro integrations may have continued to function using the `routes` array.
-
-Astro 6.0 removes the `routes` array passed to this hook entirely. Instead, the `astro:routes:resolved` hook must be used. 
-
-#### What should I do?
-
-Remove any instance of `routes` passed to `astro:build:done` in your Astro integration and replace it with the new `astro:routes:resolved` hook. You can access `distURL` on the newly exposed `assets` map:
-
-```diff
-// my-integration.mjs
-const integration = () => {
-+   let routes
-    return {
-        name: 'my-integration',
-        hooks: {
-+           'astro:routes:resolved': (params) => {
-+               routes = params.routes
-+           },
-            'astro:build:done': ({
--               routes
-+               assets
-            }) => {
-+               for (const route of routes) {
-+                   const distURL = assets.get(route.pattern)
-+                   if (distURL) {
-+                       Object.assign(route, { distURL })
-+                   }
-+               }
-                console.log(routes)
-            }
-        }
-    }
-}
-```
+Removes `routes` on `astro:build:done` hook (Integration API) - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-routes-on-astrobuilddone-hook-integration-api))
\ No newline at end of file
diff --git a/.changeset/cyan-crews-cross.md b/.changeset/cyan-crews-cross.md
index 387e73e30529..638a0e46a6c7 100644
--- a/.changeset/cyan-crews-cross.md
+++ b/.changeset/cyan-crews-cross.md
@@ -2,18 +2,4 @@
 'astro': major
 ---
 
-Removes the old `app.render()` signature (Adapter API)
-
-In Astro 4.0, the `app.render()` signature that allowed passing `routeData` and `locals` as optional arguments was deprecated in favor of a single optional `renderOptions` argument.
-
-Astro 6.0 removes this signature entirely. Attempting to pass these separate arguments will now cause an error in your project.
-
-#### What should I do?
-
-Review your `app.render` calls and pass `routeData` and `locals` as properties of an object instead of as multiple independent arguments:
-
-```diff
-// my-adapter/entrypoint.ts
--app.render(request, routeData, locals)
-+app.render(request, { routeData, locals })
-```
+Removes the old `app.render()` signature (Adapter API) - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-old-apprender-signature-adapter-api))
\ No newline at end of file
diff --git a/.changeset/dull-mangos-travel.md b/.changeset/dull-mangos-travel.md
index 7c33a7a2eba0..54cfb58040a4 100644
--- a/.changeset/dull-mangos-travel.md
+++ b/.changeset/dull-mangos-travel.md
@@ -2,19 +2,4 @@
 'astro': major
 ---
 
-Removes `prefetch()` `with` option
-
-In Astro 4.8.4, the `with` option of the programmatic `prefetch()` function was deprecated in favor of a more sensible default behavior that no longer required specifying the priority of prefetching for each page.
-
-Astro 6.0 removes this option entirely and it is no longer possible to configure the priority of prefetching by passing the `with` option. Attempting to do so will now cause errors.
-
-By default, Astro's prefetching now uses an automatic approach that will always try to use `<link rel="prefetch>` if supported, or will fall back to `fetch()`.
-
-#### What should I do?
-
-Review your `prefetch()` calls and remove the `with` option if it still exists:
-
-```diff
--prefetch('/about', { with: 'fetch' });
-+prefetch('/about');
-```
+Removes `prefetch()` `with` option - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-prefetch-with-option))
\ No newline at end of file
diff --git a/.changeset/fast-bushes-fall.md b/.changeset/fast-bushes-fall.md
index 56b7ca615a15..c62e0e7cb294 100644
--- a/.changeset/fast-bushes-fall.md
+++ b/.changeset/fast-bushes-fall.md
@@ -2,26 +2,4 @@
 'astro': major
 ---
 
-Deprecates `Astro` in `getStaticPaths()`
-
-In Astro 5.x, it was possible to access an `Astro` object inside `getStaticPaths()`. However, despite being typed the same as the `Astro` object accessible in the frontmatter, this object only had `site` and `generator` properties. This could lead to confusion about which `Astro` object properties were available inside `getStaticPaths()`.
-
-Astro 6.0 deprecates this object for `getStaticPaths()` to avoid confusion and improves error handling when attempting to access `Astro` values that are unavailable. Using `Astro.site` or `Astro.generator` within `getStaticPaths()` will now log a deprecation warning, and accessing any other property will throw a specific error with a helpful message. In a future major version, this object will be removed entirely, and accessing `Astro.site` or `Astro.generator` will also throw an error.
-
-#### What should I do?
-
-Update your `getStaticPaths()` function if you were attempting to access any `Astro` properties inside its scope. Remove `Astro.generator` entirely, and replace all occurrences of `Astro.site()` with `import.meta.env.SITE`:
-
-```diff
----
-// src/pages/blog/[slug].astro
-import { getPages } from "../../../utils/data";
-
-export async function getStaticPaths() {
--    console.log(Astro.generator);
--    return getPages(Astro.site);
-+    return getPages(import.meta.env.SITE);
-}
----
-```
-
+Deprecates `Astro` in `getStaticPaths()` - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#deprecated-astro-in-getstaticpaths))
\ No newline at end of file
diff --git a/.changeset/giant-areas-press.md b/.changeset/giant-areas-press.md
index 5fd666998f15..c6a28e6240fa 100644
--- a/.changeset/giant-areas-press.md
+++ b/.changeset/giant-areas-press.md
@@ -2,17 +2,4 @@
 'astro': major
 ---
 
-Updates trailing slash behavior of endpoint URLs.
-
-In Astro v5.0, custom endpoints whose URL ended in a file extension (e.g. `/src/pages/sitemap.xml.ts` ) could be accessed with a trailing slash (`/sitemap.xml/`) or without (`/sitemap.xml`), regardless of the value configured for `build.trailingSlash`.
-
-In Astro v6.0, these endpoints can only be accessed without a trailing slash. This is true regardless of your `build.trailingSlash` configuration.
-
-#### What should I do?
-
-Review your links to your custom endpoints that include a file extension in the URL and remove any trailing slashes:
-
-```diff
--<a href="/sitemap.xml/">Sitemap</a>
-+<a href="/sitemap.xml">Sitemap</a>
-```
+Updates trailing slash behavior of endpoint URLs - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#changed-endpoints-with-a-file-extension-cannot-be-accessed-with-a-trailing-slash))
\ No newline at end of file
diff --git a/.changeset/good-camels-pull.md b/.changeset/good-camels-pull.md
index 2976d3f0f2a0..5ddb7fb22910 100644
--- a/.changeset/good-camels-pull.md
+++ b/.changeset/good-camels-pull.md
@@ -5,20 +5,4 @@
 'astro': major
 ---
 
-Updates Markdown heading ID generation
-
-In Astro 5.x, an additional default processing step to Markdown stripped trailing hyphens from the end of IDs for section headings ending in special characters. This provided a cleaner `id` value, but could lead to incompatibilities rendering your Markdown across platforms.
-
-In Astro 5.5, the `experimental.headingIdCompat` flag was introduced to allow you to make the IDs generated by Astro for Markdown headings compatible with common platforms like GitHub and npm, using the popular [`github-slugger`](https://github.com/Flet/github-slugger) package.
-
-Astro 6.0 removes this experimental flag and makes this the new default behavior in Astro: trailing hyphens from the end of IDs for headings ending in special characters are no longer removed.
-
-#### What should I do?
-
-If you have manual links to headings, you may need to update some anchor link values with a new trailing hyphen. 
-
-If you were previously using this experimental feature, remove this experimental flag from your configuration.
-
-If you were previously using the `rehypeHeadingIds` plugin directly to enforce compatibility, remove the `headingIdCompat` option as it no longer exists.
-
-See the [Astro 6.0 upgrade guide](https://docs.astro.build/en/guides/upgrade-to/v6/#changed-markdown-heading-id-generation) for upgrade examples, and instructions to create a custom rehype plulgin if you want to keep the old ID generation for backward compatibility reasons.
+Updates Markdown heading ID generation - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#changed-markdown-heading-id-generation))
\ No newline at end of file
diff --git a/.changeset/green-garlics-heal.md b/.changeset/green-garlics-heal.md
index ea916e1fed1c..b975a6dc1253 100644
--- a/.changeset/green-garlics-heal.md
+++ b/.changeset/green-garlics-heal.md
@@ -2,20 +2,4 @@
 'astro': major
 ---
 
-Deprecates `import.meta.env.ASSETS_PREFIX`
-
-In Astro 5.x, it was possible to access `build.assetsPrefix` in your Astro config via the built-in environment variable `import.meta.env.ASSETS_PREFIX`. However, Astro v5.7.0 introduced the `astro:config` virtual model to expose a non-exhaustive, serializable, type-safe version of the Astro configuration which included access to `build.assetsPrefix` directly. This became the preferred way to access the prefix for Astro-generated asset links when set, although the environment variable still existed.
-
-Astro 6.0 deprecates this variable in favor of `build.assetsPrefix` from the `astro:config/server` module.
-
-#### What should I do?
-
-Replace any occurances of `import.meta.env.ASSETS_PREFIX` with the `build.assetsPrefix` import from `astro:config/server`. This is a drop-in replacement to provide the existing value, and no other changes to your code should be necessary:
-
-```diff
-import { someLogic } from "./utils"
-+import { build } from "astro:config/server"
-
--someLogic(import.meta.env.ASSETS_PREFIX)
-+someLogic(build.assetsPrefix)
-```
+Deprecates `import.meta.env.ASSETS_PREFIX` - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#deprecated-importmetaenvassets_prefix))
\ No newline at end of file
diff --git a/.changeset/honest-deer-add.md b/.changeset/honest-deer-add.md
index 64bfe12e9133..1c6b9a3eb204 100644
--- a/.changeset/honest-deer-add.md
+++ b/.changeset/honest-deer-add.md
@@ -2,14 +2,4 @@
 'astro': major
 ---
 
-Changes the values allowed in `params` returned by `getStaticPaths()`.
-
-In Astro 5.x, `getStaticPaths()` could return `params` of type number, which would always be stringified by Astro. However, that could be confusing because it conflicted with `Astro.params` types.
-
-Astro 6.0 removes this behavior: `getStaticPaths()` must now return string or undefined `params` values.
-
-#### What should I do?
-
-Review your dynamic routes using `getStaticPaths()` and convert any number params to strings.
-
-For more guidance, see [the v6 upgrade guide entry for this breaking change](https://docs.astro.build/en/guides/upgrade-to/v6/#changed-getstaticpaths-cannot-return-params-of-type-number).
+Changes the values allowed in `params` returned by `getStaticPaths()` - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#changed-getstaticpaths-cannot-return-params-of-type-number))
\ No newline at end of file
diff --git a/.changeset/kind-pears-behave.md b/.changeset/kind-pears-behave.md
index 3714bd4d60ac..a59653cb8c0b 100644
--- a/.changeset/kind-pears-behave.md
+++ b/.changeset/kind-pears-behave.md
@@ -3,23 +3,4 @@
 '@astrojs/language-server': patch
 ---
 
-Removes `Astro.glob()`
-
-In Astro 5.0, `Astro.glob()` was deprecated in favor of using `getCollection()` to query your collections, and `import.meta.glob()` to query other source files in your project.
-
-Astro 6.0 removes `Astro.glob()` entirely. Update to `import.meta.glob()` to keep your current behavior.
-
-#### What should I do?
-
-Replace all use of `Astro.glob()` with `import.meta.glob()`. Note that `import.meta.glob()` no longer returns a `Promise`, so you may have to update your code accordingly. You should not require any updates to your glob patterns.
-
-```astro
----
-// src/pages/blog.astro
--const posts = await Astro.glob('./posts/*.md');
-+const posts = Object.values(import.meta.glob('./posts/*.md', { eager: true }));
----
-{posts.map((post) => <li><a href={post.url}>{post.frontmatter.title}</a></li>)}
-```
-
-Where appropriate, consider using content collections to organize your content, which has its own newer, more performant querying functions.
+Removes the previously deprecated `Astro.glob()` - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-astroglob))
\ No newline at end of file
diff --git a/.changeset/pretty-forks-smash.md b/.changeset/pretty-forks-smash.md
index 68f1ca880a1c..629aaafdb1f2 100644
--- a/.changeset/pretty-forks-smash.md
+++ b/.changeset/pretty-forks-smash.md
@@ -2,28 +2,4 @@
 'astro': major
 ---
 
-Removes the `handleForms` prop for the `<ClientRouter />` component
-
-In Astro 4.0, the `handleForms` prop of the `<ClientRouter />` component was deprecated, as it was no longer necessary to opt in to handling `submit` events for `form` elements. This functionality has been built in by default and the property, if still included in your project, silently had no impact on form submission.
-
-Astro 6.0 removes this prop entirely and it now must be removed to avoid errors in your project.
-
-#### What should I do?
-
-Remove the `handleForms` property from your `<ClientRouter />` component if it exists. It has provided no additional functionality, and so removing it should not change any behavior in your project:
-
-```diff
----
-// title="src/pages/index.astro
-import { ClientRouter } from "astro:transitions";
----
-<html>
-  <head>
--    <ClientRouter handleForms />
-+    <ClientRouter />
-  </head>
-  <body>
-    <!-- stuff here -->
-  </body>
-</html>
-```
+Removes the `handleForms` prop for the `<ClientRouter />` component - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-handleforms-prop-for-the-clientrouter--component))
\ No newline at end of file
diff --git a/.changeset/puny-poems-create.md b/.changeset/puny-poems-create.md
index 06fa9c230a48..b79970d26540 100644
--- a/.changeset/puny-poems-create.md
+++ b/.changeset/puny-poems-create.md
@@ -11,27 +11,4 @@
 'astro': major
 ---
 
-Increases minimum Node.js version to 22.12.0
-
-Node 18 reached its End of Life in March 2025 and Node 20 is scheduled to reach its End of Life in April 2026.
-
-Astro v6.0 drops Node 18 and Node 20 support entirely so that all Astro users can take advantage of Node's more modern features.
-
-#### What should I do?
-
-Check that both your development environment and your deployment environment are using **Node `22.12.0` or higher**.
-
-1. Check your local version of Node using:
-
-  ```sh
-  node -v
-  ```
-
-2. Check your deployment environment's own documentation to verify that they support Node 22.
-
-  You can specify Node `22.12.0` for your Astro project either in a dashboard configuration setting or a `.nvmrc` file.
-
-  ```bash
-  # .nvmrc
-  22.12.0
-  ```
+Increases minimum Node.js version to 22.12.0 - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#node-22))
\ No newline at end of file
diff --git a/.changeset/rich-horses-begin.md b/.changeset/rich-horses-begin.md
index 580a90ef933a..4cc9f04c1aff 100644
--- a/.changeset/rich-horses-begin.md
+++ b/.changeset/rich-horses-begin.md
@@ -2,25 +2,4 @@
 'astro': major
 ---
 
-Removes the deprecated `<ViewTransitions />` component
-
-In Astro 5.0, the `<ViewTransitions />` component was renamed to `<ClientRouter />` to clarify the role of the component. The new name makes it more clear that the features you get from Astro's `<ClientRouter />` routing component are slightly different from the native CSS-based MPA router. However, a deprecated version of the `<ViewTransitions />` component still existed and may have functioned in Astro 5.x.
-	
-Astro 6.0 removes the `<ViewTransitions />` component entirely and it can no longer be used in your project. Update to the `<ClientRouter />` component to continue to use these features.
-
-#### What should I do?
-
-Replace all occurrences of the `ViewTransitions` import and component with `ClientRouter`:
-
-```diff
-// src/layouts/MyLayout.astro"
-- import { ViewTransitions } from 'astro:transitions';
-+ import { ClientRouter } from 'astro:transitions';
-<html>
-  <head>
-    ...
--    <ViewTransitions />
-+    <ClientRouter />
-  </head>
-</html>
-```
+Removes the deprecated `<ViewTransitions />` component - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-viewtransitions--component))
\ No newline at end of file
diff --git a/.changeset/sad-lines-hear.md b/.changeset/sad-lines-hear.md
index 91cd76e4edf2..1b1110fa0052 100644
--- a/.changeset/sad-lines-hear.md
+++ b/.changeset/sad-lines-hear.md
@@ -2,26 +2,4 @@
 'astro': major
 ---
 
-Changes the default routing configuration value of `i18n.routing.redirectToDefaultLocale` from `true` to `false`.
-
-In Astro v5.0, `i18n.routing.redirectToDefaultLocale` was `true` by default. When combined with the `i18n.routing.prefixDefaultLocale` default value of `false`, the resulting redirects could cause infinite loops.
-
-In Astro v6.0, `i18n.routing.redirectToDefaultLocale` now defaults to `false`. Additionally, it can now only be used if `i18n.routing.prefixDefaultLocale` is set to `true`.
-
-#### What should I do?
-
-Review your Astro `i18n` config as you may now need to explicitly set values for `redirectToDefaultLocale` and `prefixDefaultLocale` to recreate your project's previous behavior.
-
-```diff
-// astro.config.mjs
-import { defineConfig } from 'astro/config';
-
-export default defineConfig({
-  i18n: {
-    routing: {
-      prefixDefaultLocale: true,
-+      redirectToDefaultLocale: true
-    }
-  }
-})
-```
+Changes the default routing configuration value of `i18n.routing.redirectToDefaultLocale` from `true` to `false` - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#changed-i18nroutingredirecttodefaultlocale-default-value))
\ No newline at end of file
diff --git a/.changeset/six-women-visit.md b/.changeset/six-women-visit.md
index 4a0049011988..7c0761274a9f 100644
--- a/.changeset/six-women-visit.md
+++ b/.changeset/six-women-visit.md
@@ -2,31 +2,4 @@
 'astro': major
 ---
 
-Removes `rewrite()` from Actions context
-
-In Astro 5.5.6, the `ActionAPIContext.rewrite` method was deprecated because custom endpoints should be used instead of rewrites.
-
-Astro 6.0 removes the `rewrite()` method from `ActionAPIContext` entirely and it may no longer be used.
-
-#### What should I do?
-
-Review your Actions handlers and remove any call to `rewrite()`:
-
-
-```diff
-// src/actions/index.ts
-import { defineAction } from 'astro:actions';
-import { z } from 'astro:schema';
-
-export const server = {
-  getGreeting: defineAction({
-    input: z.object({
-      // ...
-    }),
-    handler: async (input, context) => {
--      context.rewrite('/')
-      // ...
-    }
-  })
-}
-```
+Removes `rewrite()` from Actions context - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-rewrite-from-actions-context))
\ No newline at end of file
diff --git a/.changeset/tricky-donkeys-camp.md b/.changeset/tricky-donkeys-camp.md
index 5de13325cf6f..34ba1f225319 100644
--- a/.changeset/tricky-donkeys-camp.md
+++ b/.changeset/tricky-donkeys-camp.md
@@ -13,10 +13,4 @@
 '@astrojs/db': minor
 ---
 
-Updates Vite to 7.0
-
-Astro v6.0 upgrades to Vite v7.0 as the development server and production bundler.
-
-#### What should I do?
-
-If you are using Vite-specific plugins, configuration, or APIs, check the [Vite migration guide](https://vite.dev/guide/migration) for their breaking changes and upgrade your project as needed.
+Astro v6.0 upgrades to Vite v7.0 as the development server and production bundler - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#vite-70))
\ No newline at end of file
diff --git a/.changeset/wet-suits-help.md b/.changeset/wet-suits-help.md
index 3e5375b1fdd6..cbe7257c02fb 100644
--- a/.changeset/wet-suits-help.md
+++ b/.changeset/wet-suits-help.md
@@ -2,65 +2,4 @@
 'astro': major
 ---
 
-Updates `import.meta.env` values to always be inlined
-
-In Astro 5.13, the `experimental.staticImportMetaEnv` was introduced to update the behavior when accessing `import.meta.env` directly to align with [Vite's handling of environment variables](https://vite.dev/guide/env-and-mode.html#env-variables) and ensures that `import.meta.env` values are always inlined.
-
-In Astro 5.x, non-public environment variables were replaced by a reference to `process.env`. Additionally, Astro could also convert the value type of your environment variables used through `import.meta.env`, which could prevent access to some values such as the strings `"true"` (which was converted to a boolean value), and `"1"` (which was converted to a number).
-
-Astro 6 removes this experimental flag and makes this the new default behavior in Astro: `import.meta.env` values are always inlined and never coerced.
-
-#### What should I do?
-
-If you were previously using this experimental feature, you must remove this experimental flag from your configuration as it no longer exists:
-
-```diff
-// astro.config.mjs
-import { defineConfig } from 'astro/config';
-
-export default defineConfig({
-  experimental: {
--    staticImportMetaEnv: true,
-  },
-})
-```
-
-If you were relying on coercion, you may need to update your project code to apply it manually:
-
-```diff
-// src/components/MyComponent.astro
--const enabled: boolean = import.meta.env.ENABLED;
-+const enabled: boolean = import.meta.env.ENABLED === "true";
-```
-
-If you were relying on the transformation into `process.env`, you may need to update your project code to apply it manually:
-
-```diff
-// src/components/MyComponent.astro
--const enabled: boolean = import.meta.env.DB_PASSWORD;
-+const enabled: boolean = process.env.DB_PASSWORD;
-```
-
-You may also need to update types:
-
-```diff
-// src/env.d.ts
-interface ImportMetaEnv {
-  readonly PUBLIC_POKEAPI: string;
--  readonly DB_PASSWORD: string;
--  readonly ENABLED: boolean;
-+  readonly ENABLED: string;
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-+namespace NodeJS {
-+  interface ProcessEnv {
-+    DB_PASSWORD: string;
-+  }
-+}
-```
-
-If you need more control over environment variables in Astro, we recommend you use `astro:env`.
+Updates `import.meta.env` values to always be inlined - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#changed-importmetaenv-values-are-always-inlined))
\ No newline at end of file
diff --git a/.changeset/whole-geckos-think.md b/.changeset/whole-geckos-think.md
index c9f6d2487cc5..4645c8d31d3a 100644
--- a/.changeset/whole-geckos-think.md
+++ b/.changeset/whole-geckos-think.md
@@ -2,50 +2,4 @@
 'astro': major
 ---
 
-Updates `<script>` and `<style>` tags to render in the order they are defined
-
-In Astro v5.5, the `experimental.preserveScriptOrder` flag was introduced to render multiple `<style>` and `<script>` tags in the same order as they were declared in the source code. Astro 5.x reversed their order in your generated HTML output. This could give unexpected results, for example, CSS styles being overridden by earlier defined style tags when your site was built.
-
-Astro 6.0 removes this experimental flag and makes this the new default behavior in Astro: scripts and styles are now rendered in the order defined in your code.
-
-#### What should I do?
-
-If you were previously using this experimental feature, you must remove this experimental flag from your configuration as it no longer exists:
-
-```diff
-// astro.config.mjs
-import { defineConfig } from 'astro/config';
-
-export default defineConfig({
-  experimental: {
--    preserveScriptOrder: true,
-  },
-})
-```
-
-Review your `<script>` and `<style>` tags to make sure they behave as desired. You may need to reverse their order:
-
-```diff
-<!-- src/components/MyComponent.astro -->
-<p>I am a component</p>
-<style>
-  body {
--    background: red;
-+    background: yellow;
-  }
-</style>
-<style>
-  body {
--    background: yellow;
-+    background: red;
-  }
-</style>
-<script>
--    console.log("hello")
-+    console.log("world")
-</script>
-<script>
--    console.log("world!")
-+    console.log("hello!")
-</script>
-```
+Updates `<script>` and `<style>` tags to render in the order they are defined - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#changed-script-and-style-tags-are-rendered-in-the-order-they-are-defined))
\ No newline at end of file
diff --git a/.changeset/young-banks-camp.md b/.changeset/young-banks-camp.md
index 7a7f95f4de06..d0dcd45669c4 100644
--- a/.changeset/young-banks-camp.md
+++ b/.changeset/young-banks-camp.md
@@ -2,17 +2,4 @@
 'astro': major
 ---
 
-Removes legacy content collection support.
-
-This PR removes a number of APIs and options related to legacy content collections that were deprecated in Astro 5, including:
-
-- The `legacy.collections` option, which was added in Astro 5 and caused the old content collections system to be used instead of the new one.
-- Deprecated functions from `astro:content`: `getEntryBySlug` and `getDataEntryById` are both replaced by `getEntry()`, which is a drop-in replacement for both.
-- Support for the old `src/content/config.*` file location. You must now use `src/content.config.*`.
-- Automatically generating collections when a `src/content/` directory is present and no content config file exists. You must now explicitly define collections in `src/content.config.*`.
-- Support for collections without a loader. You must now use the `glob()` loader to create collections from filesystem content. This will also mean that generated entries use the new entry format:
-  - The `id` field is now a slug, not a filename. You can access the filename via `entry.filePath`, which is the path relative to the site root.
-  - There is no longer a `slug` field – use `id` instead.
-  - You can no longer call `entry.render()` on content entries. Use `render(entry)` instead, imported from `astro:content`.
-
-For full details, see [the Astro 6 upgrade guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections).
+Removes legacy content collection support - ([v6 upgrade guidance](https://deploy-preview-12322--astro-docs-2.netlify.app/en/guides/upgrade-to/v6/#removed-legacy-content-collections))
\ No newline at end of file