diff --git a/.changeset/chatty-dolls-visit.md b/.changeset/chatty-dolls-visit.md
new file mode 100644
index 000000000..6b9e53e88
--- /dev/null
+++ b/.changeset/chatty-dolls-visit.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/sitemap': minor
+---
+
+Adds support to SSR routes to sitemap generation.
diff --git a/.changeset/friendly-fishes-sing.md b/.changeset/friendly-fishes-sing.md
new file mode 100644
index 000000000..9da10e6bf
--- /dev/null
+++ b/.changeset/friendly-fishes-sing.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+Implement Inline Stylesheets RFC as experimental
diff --git a/.changeset/green-cups-hammer.md b/.changeset/green-cups-hammer.md
new file mode 100644
index 000000000..1492f8d3c
--- /dev/null
+++ b/.changeset/green-cups-hammer.md
@@ -0,0 +1,21 @@
+---
+'astro': minor
+---
+
+Implements a new class-based scoping strategy
+
+This implements the [Scoping RFC](https://github.com/withastro/roadmap/pull/543), providing a way to opt in to increased style specificity for Astro component styles.
+
+This prevents bugs where global styles override Astro component styles due to CSS ordering and the use of element selectors.
+
+To enable class-based scoping, you can set it in your config:
+
+```js
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+  scopedStyleStrategy: 'class'
+});
+```
+
+Note that the 0-specificity `:where` pseudo-selector is still the default strategy. The intent is to change `'class'` to be the default in 3.0.
diff --git a/.changeset/nine-geckos-act.md b/.changeset/nine-geckos-act.md
new file mode 100644
index 000000000..164dbbfd5
--- /dev/null
+++ b/.changeset/nine-geckos-act.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+Support `<Code inline />` to output inline code HTML (no `pre` tag)
diff --git a/.changeset/polite-pears-kneel.md b/.changeset/polite-pears-kneel.md
deleted file mode 100644
index 2469620ec..000000000
--- a/.changeset/polite-pears-kneel.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@astrojs/telemetry': patch
-'@astrojs/webapi': patch
----
-
-Upgrade undici to v5.22.0
diff --git a/.changeset/pretty-bears-deliver.md b/.changeset/pretty-bears-deliver.md
new file mode 100644
index 000000000..2b8bfc818
--- /dev/null
+++ b/.changeset/pretty-bears-deliver.md
@@ -0,0 +1,5 @@
+---
+'astro': minor
+---
+
+New middleware API
diff --git a/.changeset/smooth-cows-jog.md b/.changeset/smooth-cows-jog.md
new file mode 100644
index 000000000..8c6d4563c
--- /dev/null
+++ b/.changeset/smooth-cows-jog.md
@@ -0,0 +1,8 @@
+---
+'@astrojs/markdoc': patch
+'@astrojs/mdx': patch
+'@astrojs/markdown-remark': minor
+'astro': minor
+---
+
+Upgrade shiki to v0.14.1. This updates the shiki theme colors and adds the theme name to the `pre` tag, e.g. `<pre class="astro-code github-dark">`.
diff --git a/.changeset/tall-news-hang.md b/.changeset/tall-news-hang.md
deleted file mode 100644
index 0887bbec1..000000000
--- a/.changeset/tall-news-hang.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Update `experimental.assets`'s `image.service` configuration to allow for a config option in addition to an entrypoint
diff --git a/.changeset/tidy-singers-thank.md b/.changeset/tidy-singers-thank.md
deleted file mode 100644
index 415679383..000000000
--- a/.changeset/tidy-singers-thank.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@astrojs/cloudflare": patch
----
-
-Fix missing code language in Cloudflare README
diff --git a/.changeset/twelve-feet-switch.md b/.changeset/twelve-feet-switch.md
new file mode 100644
index 000000000..b581fb4c3
--- /dev/null
+++ b/.changeset/twelve-feet-switch.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Ensure multiple cookies set in dev result in multiple set-cookie headers
diff --git a/.changeset/wise-steaks-wash.md b/.changeset/wise-steaks-wash.md
deleted file mode 100644
index 598059ca0..000000000
--- a/.changeset/wise-steaks-wash.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@astrojs/tailwind': patch
-'@astrojs/svelte': patch
----
-
-Update dependencies
diff --git a/.github/workflows/check-merge.yml b/.github/workflows/check-merge.yml
index 14d1900e3..e31c09bf4 100644
--- a/.github/workflows/check-merge.yml
+++ b/.github/workflows/check-merge.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Get changed files in the .changeset folder
         id: changed-files
-        uses: tj-actions/changed-files@v29
+        uses: tj-actions/changed-files@v35
         if: steps.set-blocks.outputs.blocks == ''
         with:
           files: |
@@ -87,5 +87,5 @@ jobs:
           --url https://api.github.com/repos/${{github.repository}}/pulls/${{github.event.number}}/reviews \
           --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
           --header 'content-type: application/json' \
-          -d '{"event":"REQUEST_CHANGES"}'
+          -d '{"event":"REQUEST_CHANGES", body: ""}'
 
diff --git a/examples/framework-lit/src/pages/index.astro b/examples/framework-lit/src/pages/index.astro
index 1c7b45ce8..a351b8248 100644
--- a/examples/framework-lit/src/pages/index.astro
+++ b/examples/framework-lit/src/pages/index.astro
@@ -21,12 +21,15 @@ import { MyCounter } from '../components/my-counter.js';
 		<Lorem />
 
 		{
-			/**
-			 * Our VS Code extension does not currently properly typecheck attributes on Lit components
-			 * As such, the following code will result in a TypeScript error inside the editor, nonetheless, it works in Astro!
-			 */
+			(
+				/**
+				 * Our editor tooling does not currently properly typecheck attributes on imported Lit components. As such, without a
+				 * pragma directive telling TypeScript to ignore the error, the line below will result in an error in the editor.
+				 * Nonetheless, this code works in Astro itself!
+				 */
+				// @ts-expect-error
+				<CalcAdd num={0} />
+			)
 		}
-		{/** @ts-expect-error */}
-		<CalcAdd num={0} />
 	</body>
 </html>
diff --git a/examples/middleware/astro.config.mjs b/examples/middleware/astro.config.mjs
new file mode 100644
index 000000000..1d4662423
--- /dev/null
+++ b/examples/middleware/astro.config.mjs
@@ -0,0 +1,13 @@
+import { defineConfig } from 'astro/config';
+import node from '@astrojs/node';
+
+// https://astro.build/config
+export default defineConfig({
+	output: 'server',
+	adapter: node({
+		mode: 'standalone',
+	}),
+	experimental: {
+		middleware: true,
+	},
+});
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
new file mode 100644
index 000000000..0a62e221e
--- /dev/null
+++ b/examples/middleware/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@example/middleware",
+  "type": "module",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "dev": "astro dev",
+    "start": "astro dev",
+    "build": "astro build",
+    "preview": "astro preview",
+    "astro": "astro",
+    "server": "node dist/server/entry.mjs"
+  },
+  "dependencies": {
+    "astro": "workspace:*",
+    "svelte": "^3.48.0",
+    "@astrojs/node": "workspace:*",
+    "concurrently": "^7.2.1",
+    "unocss": "^0.15.6",
+    "vite-imagetools": "^4.0.4",
+    "html-minifier": "^4.0.0"
+  }
+}
diff --git a/examples/middleware/src/components/Card.astro b/examples/middleware/src/components/Card.astro
new file mode 100644
index 000000000..c68fa2ab3
--- /dev/null
+++ b/examples/middleware/src/components/Card.astro
@@ -0,0 +1,63 @@
+---
+export interface Props {
+	title: string;
+	body: string;
+	href: string;
+}
+
+const { href, title, body } = Astro.props;
+---
+
+<li class="link-card">
+	<a href={href}>
+		<h2>
+			{title}
+			<span>&rarr;</span>
+		</h2>
+		<p>
+			{body}
+		</p>
+	</a>
+</li>
+<style>
+	.link-card {
+		list-style: none;
+		display: flex;
+		padding: 0.25rem;
+		background-color: white;
+		background-image: none;
+		background-size: 400%;
+		border-radius: 0.6rem;
+		background-position: 100%;
+		transition: background-position 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+		box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
+	}
+
+	.link-card > a {
+		width: 100%;
+		text-decoration: none;
+		line-height: 1.4;
+		padding: 1rem 1.3rem;
+		border-radius: 0.35rem;
+		color: #111;
+		background-color: white;
+		opacity: 0.8;
+	}
+	h2 {
+		margin: 0;
+		font-size: 1.25rem;
+		transition: color 0.6s cubic-bezier(0.22, 1, 0.36, 1);
+	}
+	p {
+		margin-top: 0.5rem;
+		margin-bottom: 0;
+		color: #444;
+	}
+	.link-card:is(:hover, :focus-within) {
+		background-position: 0;
+		background-image: var(--accent-gradient);
+	}
+	.link-card:is(:hover, :focus-within) h2 {
+		color: rgb(var(--accent));
+	}
+</style>
diff --git a/examples/middleware/src/env.d.ts b/examples/middleware/src/env.d.ts
new file mode 100644
index 000000000..f2de6d45d
--- /dev/null
+++ b/examples/middleware/src/env.d.ts
@@ -0,0 +1,13 @@
+/// <reference types="astro/client" />
+declare global {
+	namespace AstroMiddleware {
+		interface Locals {
+			user: {
+				name: string;
+				surname: string;
+			};
+		}
+	}
+}
+
+export {};
diff --git a/examples/middleware/src/layouts/Layout.astro b/examples/middleware/src/layouts/Layout.astro
new file mode 100644
index 000000000..22100824e
--- /dev/null
+++ b/examples/middleware/src/layouts/Layout.astro
@@ -0,0 +1,35 @@
+---
+export interface Props {
+	title: string;
+}
+
+const { title } = Astro.props;
+---
+
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<meta name="generator" content={Astro.generator} />
+		<title>{title}</title>
+	</head>
+	<body>
+		<slot />
+	</body>
+</html>
+<style is:global>
+	:root {
+		--accent: 124, 58, 237;
+		--accent-gradient: linear-gradient(45deg, rgb(var(--accent)), #da62c4 30%, white 60%);
+	}
+	html {
+		font-family: system-ui, sans-serif;
+		background-color: #f6f6f6;
+	}
+	code {
+		font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+			Bitstream Vera Sans Mono, Courier New, monospace;
+	}
+</style>
diff --git a/examples/middleware/src/middleware.ts b/examples/middleware/src/middleware.ts
new file mode 100644
index 000000000..1c0bd855f
--- /dev/null
+++ b/examples/middleware/src/middleware.ts
@@ -0,0 +1,71 @@
+import { defineMiddleware, sequence } from 'astro/middleware';
+import htmlMinifier from 'html-minifier';
+
+const limit = 50;
+
+const loginInfo = {
+	token: undefined,
+	currentTime: undefined,
+};
+
+export const minifier = defineMiddleware(async (context, next) => {
+	const response = await next();
+	// check if the response is returning some HTML
+	if (response.headers.get('content-type') === 'text/html') {
+		let headers = response.headers;
+		let html = await response.text();
+		let newHtml = htmlMinifier.minify(html, {
+			removeAttributeQuotes: true,
+			collapseWhitespace: true,
+		});
+		return new Response(newHtml, {
+			status: 200,
+			headers,
+		});
+	}
+	return response;
+});
+
+const validation = defineMiddleware(async (context, next) => {
+	if (context.request.url.endsWith('/admin')) {
+		if (loginInfo.currentTime) {
+			const difference = new Date().getTime() - loginInfo.currentTime;
+			if (difference > limit) {
+				console.log('hit threshold');
+				loginInfo.token = undefined;
+				loginInfo.currentTime = undefined;
+				return context.redirect('/login');
+			}
+		}
+		// we naively check if we have a token
+		if (loginInfo.token && loginInfo.token === 'loggedIn') {
+			// we fill the locals with user-facing information
+			context.locals.user = {
+				name: 'AstroUser',
+				surname: 'AstroSurname',
+			};
+			return await next();
+		} else {
+			loginInfo.token = undefined;
+			loginInfo.currentTime = undefined;
+			return context.redirect('/login');
+		}
+	} else if (context.request.url.endsWith('/api/login')) {
+		const response = await next();
+		// the login endpoint will return to us a JSON with username and password
+		const data = await response.json();
+		// we naively check if username and password are equals to some string
+		if (data.username === 'astro' && data.password === 'astro') {
+			// we store the token somewhere outside of locals because the `locals` object is attached to the request
+			// and when doing a redirect, we lose that information
+			loginInfo.token = 'loggedIn';
+			loginInfo.currentTime = new Date().getTime();
+			return context.redirect('/admin');
+		}
+	}
+	// we don't really care about awaiting the response in this case
+	next();
+	return;
+});
+
+export const onRequest = sequence(validation, minifier);
diff --git a/examples/middleware/src/pages/admin.astro b/examples/middleware/src/pages/admin.astro
new file mode 100644
index 000000000..028fd6b08
--- /dev/null
+++ b/examples/middleware/src/pages/admin.astro
@@ -0,0 +1,55 @@
+---
+import Layout from '../layouts/Layout.astro';
+const user = Astro.locals.user;
+---
+
+<Layout title="Welcome back!!">
+	<main>
+		<h1>Welcome back <span class="text-gradient">{user.name} {user.surname}</span></h1>
+	</main>
+</Layout>
+
+<style>
+	main {
+		margin: auto;
+		padding: 1.5rem;
+		max-width: 60ch;
+	}
+	h1 {
+		font-size: 3rem;
+		font-weight: 800;
+		margin: 0;
+	}
+	.text-gradient {
+		background-image: var(--accent-gradient);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-size: 400%;
+		background-position: 0%;
+	}
+	.instructions {
+		line-height: 1.6;
+		margin: 1rem 0;
+		border: 1px solid rgba(var(--accent), 25%);
+		background-color: white;
+		padding: 1rem;
+		border-radius: 0.4rem;
+	}
+	.instructions code {
+		font-size: 0.875em;
+		font-weight: bold;
+		background: rgba(var(--accent), 12%);
+		color: rgb(var(--accent));
+		border-radius: 4px;
+		padding: 0.3em 0.45em;
+	}
+	.instructions strong {
+		color: rgb(var(--accent));
+	}
+	.link-card-grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
+		gap: 1rem;
+		padding: 0;
+	}
+</style>
diff --git a/examples/middleware/src/pages/api/login.ts b/examples/middleware/src/pages/api/login.ts
new file mode 100644
index 000000000..fa3f7b59b
--- /dev/null
+++ b/examples/middleware/src/pages/api/login.ts
@@ -0,0 +1,18 @@
+import { APIRoute } from 'astro';
+
+export const post: APIRoute = async ({ request }) => {
+	const data = await request.formData();
+	const username = data.get('username');
+	const password = data.get('password');
+	return new Response(
+		JSON.stringify({
+			username,
+			password,
+		}),
+		{
+			headers: {
+				'content-type': 'application/json',
+			},
+		}
+	);
+};
diff --git a/examples/middleware/src/pages/index.astro b/examples/middleware/src/pages/index.astro
new file mode 100644
index 000000000..ff77d4a15
--- /dev/null
+++ b/examples/middleware/src/pages/index.astro
@@ -0,0 +1,63 @@
+---
+import Layout from '../layouts/Layout.astro';
+import Card from '../components/Card.astro';
+---
+
+<Layout title="Welcome to Astro.">
+	<main>
+		<h1>Welcome to <span class="text-gradient">Astro</span></h1>
+		<p class="instructions">
+			To get started, open the directory <code>src/pages</code> in your project.<br />
+			<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
+		</p>
+		{}
+		<ul role="list" class="link-card-grid">
+			<Card href="/login" title="Login" body="Try the login" />
+		</ul>
+	</main>
+</Layout>
+
+<style>
+	main {
+		margin: auto;
+		padding: 1.5rem;
+		max-width: 60ch;
+	}
+	h1 {
+		font-size: 3rem;
+		font-weight: 800;
+		margin: 0;
+	}
+	.text-gradient {
+		background-image: var(--accent-gradient);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-size: 400%;
+		background-position: 0%;
+	}
+	.instructions {
+		line-height: 1.6;
+		margin: 1rem 0;
+		border: 1px solid rgba(var(--accent), 25%);
+		background-color: white;
+		padding: 1rem;
+		border-radius: 0.4rem;
+	}
+	.instructions code {
+		font-size: 0.875em;
+		font-weight: bold;
+		background: rgba(var(--accent), 12%);
+		color: rgb(var(--accent));
+		border-radius: 4px;
+		padding: 0.3em 0.45em;
+	}
+	.instructions strong {
+		color: rgb(var(--accent));
+	}
+	.link-card-grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
+		gap: 1rem;
+		padding: 0;
+	}
+</style>
diff --git a/examples/middleware/src/pages/login.astro b/examples/middleware/src/pages/login.astro
new file mode 100644
index 000000000..99cf4cc94
--- /dev/null
+++ b/examples/middleware/src/pages/login.astro
@@ -0,0 +1,75 @@
+---
+import Layout from '../layouts/Layout.astro';
+
+const status = Astro.response.status;
+let redirectMessage;
+if (status === 301) {
+	redirectMessage = 'Your session is finished, please login again';
+}
+---
+
+<Layout title="Welcome to Astro.">
+	<main>
+		<h1>Welcome to <span class="text-gradient">Astro</span></h1>
+		<p class="instructions">
+			To get started, open the directory <code>src/pages</code> in your project.<br />
+			<strong>Code Challenge:</strong> Tweak the "Welcome to Astro" message above.
+		</p>
+		{redirectMessage}
+		<form action="/api/login" method="POST">
+			<label>
+				Username: <input type="text" minlength="1" id="username" name="username" />
+			</label>
+			<label>
+				Password: <input type="password" minlength="1" id="password" name="password" />
+			</label>
+
+			<button>Submit</button>
+		</form>
+	</main>
+</Layout>
+
+<style>
+	main {
+		margin: auto;
+		padding: 1.5rem;
+		max-width: 60ch;
+	}
+	h1 {
+		font-size: 3rem;
+		font-weight: 800;
+		margin: 0;
+	}
+	.text-gradient {
+		background-image: var(--accent-gradient);
+		-webkit-background-clip: text;
+		-webkit-text-fill-color: transparent;
+		background-size: 400%;
+		background-position: 0%;
+	}
+	.instructions {
+		line-height: 1.6;
+		margin: 1rem 0;
+		border: 1px solid rgba(var(--accent), 25%);
+		background-color: white;
+		padding: 1rem;
+		border-radius: 0.4rem;
+	}
+	.instructions code {
+		font-size: 0.875em;
+		font-weight: bold;
+		background: rgba(var(--accent), 12%);
+		color: rgb(var(--accent));
+		border-radius: 4px;
+		padding: 0.3em 0.45em;
+	}
+	.instructions strong {
+		color: rgb(var(--accent));
+	}
+	.link-card-grid {
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(24ch, 1fr));
+		gap: 1rem;
+		padding: 0;
+	}
+</style>
diff --git a/examples/middleware/tsconfig.json b/examples/middleware/tsconfig.json
new file mode 100644
index 000000000..d78f81ec4
--- /dev/null
+++ b/examples/middleware/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "astro/tsconfigs/base"
+}
diff --git a/package.json b/package.json
index fabf01b44..2ce081cdc 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "only-allow": "^1.1.1",
     "organize-imports-cli": "^0.10.0",
-    "prettier": "^2.8.7",
+    "prettier": "^2.8.8",
     "prettier-plugin-astro": "^0.8.0",
     "tiny-glob": "^0.2.9",
     "turbo": "^1.9.3",
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
index cdbf24098..20c712dfa 100644
--- a/packages/astro-rss/CHANGELOG.md
+++ b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 2.4.1
+
+### Patch Changes
+
+- [#6970](https://github.com/withastro/astro/pull/6970) [`b5482cee2`](https://github.com/withastro/astro/commit/b5482cee2387149ff397447e546130ba3dea58db) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: remove accidental stripping of trailing `/1/` on canonical URLs
+
 ## 2.4.0
 
 ### Minor Changes
diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
index 21b07e2fb..52051b32d 100644
--- a/packages/astro-rss/package.json
+++ b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/astro-rss/src/util.ts b/packages/astro-rss/src/util.ts
index 63a8c5568..e40301a4c 100644
--- a/packages/astro-rss/src/util.ts
+++ b/packages/astro-rss/src/util.ts
@@ -8,7 +8,6 @@ export function createCanonicalURL(
 	base?: string
 ): URL {
 	let pathname = url.replace(/\/index.html$/, ''); // index.html is not canonical
-	pathname = pathname.replace(/\/1\/?$/, ''); // neither is a trailing /1/ (impl. detail of collections)
 	if (trailingSlash === false) {
 		// remove the trailing slash
 		pathname = pathname.replace(/(\/+)?$/, '');
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index ab0dc88b2..0ce75e341 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,39 @@
 # astro
 
+## 2.3.4
+
+### Patch Changes
+
+- [#6967](https://github.com/withastro/astro/pull/6967) [`a8a319aef`](https://github.com/withastro/astro/commit/a8a319aef744a64647ee16c7d558d74de6864c6c) Thanks [@bluwy](https://github.com/bluwy)! - Fix `astro-entry` error on build with multiple JSX frameworks
+
+- [#6961](https://github.com/withastro/astro/pull/6961) [`a695e44ae`](https://github.com/withastro/astro/commit/a695e44aed6e2f5d32cb950d4237be6e5657ba98) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix getImage type
+
+- [#6956](https://github.com/withastro/astro/pull/6956) [`367e61776`](https://github.com/withastro/astro/commit/367e61776196a17d61c28daa4dfbabb6244e040c) Thanks [@lilnasy](https://github.com/lilnasy)! - Changed where various parts of the build pipeline look to decide if a page should be prerendered. They now exclusively consider PageBuildData, allowing integrations to participate in the decision.
+
+- [#6969](https://github.com/withastro/astro/pull/6969) [`77270cc2c`](https://github.com/withastro/astro/commit/77270cc2cd06c942d7abf1d882e36d9163edafa5) Thanks [@bluwy](https://github.com/bluwy)! - Avoid removing leading slash for `build.assetsPrefix` value in the build output
+
+- [#6910](https://github.com/withastro/astro/pull/6910) [`895fa07d8`](https://github.com/withastro/astro/commit/895fa07d8b4b8359984e048daca5437e40f44390) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Inline `process.env` boolean values (`0`, `1`, `true`, `false`) during the build. This helps with DCE and allows for better `export const prerender` detection.
+
+- [#6958](https://github.com/withastro/astro/pull/6958) [`72c6bf01f`](https://github.com/withastro/astro/commit/72c6bf01fe49b331ca8ad9206a7506b15caf5b8d) Thanks [@bluwy](https://github.com/bluwy)! - Fix content render imports flow
+
+- [#6952](https://github.com/withastro/astro/pull/6952) [`e5bd084c0`](https://github.com/withastro/astro/commit/e5bd084c01e4f60a157969b50c05ce002f7b63d2) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Update allowed Sharp versions to support 0.32.0
+
+## 2.3.3
+
+### Patch Changes
+
+- [#6940](https://github.com/withastro/astro/pull/6940) [`a98df9374`](https://github.com/withastro/astro/commit/a98df9374dec65c678fa47319cb1481b1af123e2) Thanks [@delucis](https://github.com/delucis)! - Support custom 404s added via `injectRoute` or as `src/pages/404.html`
+
+- [#6948](https://github.com/withastro/astro/pull/6948) [`50975f2ea`](https://github.com/withastro/astro/commit/50975f2ea3a59f9e023cc631a9372c0c7986eec9) Thanks [@imchell](https://github.com/imchell)! - Placeholders for slots are cleaned in HTML String that is rendered
+
+- [#6848](https://github.com/withastro/astro/pull/6848) [`ebae1eaf8`](https://github.com/withastro/astro/commit/ebae1eaf87f49399036033c673b513338f7d9c42) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Update `experimental.assets`'s `image.service` configuration to allow for a config option in addition to an entrypoint
+
+- [#6953](https://github.com/withastro/astro/pull/6953) [`dc062f669`](https://github.com/withastro/astro/commit/dc062f6695ce577dc569781fc0678c903012c336) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Update `astro check` to use version 1.0.0 of the Astro language server
+
+- Updated dependencies [[`ac57b5549`](https://github.com/withastro/astro/commit/ac57b5549f828a17bdbebdaca7ace075307a3c9d)]:
+  - @astrojs/telemetry@2.1.1
+  - @astrojs/webapi@2.1.1
+
 ## 2.3.2
 
 ### Patch Changes
diff --git a/packages/astro/client-base.d.ts b/packages/astro/client-base.d.ts
index 52bd5870f..6e37b60c7 100644
--- a/packages/astro/client-base.d.ts
+++ b/packages/astro/client-base.d.ts
@@ -3,7 +3,26 @@
 declare module 'astro:assets' {
 	// Exporting things one by one is a bit cumbersome, not sure if there's a better way - erika, 2023-02-03
 	type AstroAssets = {
-		getImage: typeof import('./dist/assets/index.js').getImage;
+		// getImage's type here is different from the internal function since the Vite module implicitly pass the service config
+		/**
+		 * Get an optimized image and the necessary attributes to render it.
+		 *
+		 * **Example**
+		 * ```astro
+		 * ---
+		 * import { getImage } from 'astro:assets';
+		 * import originalImage from '../assets/image.png';
+		 *
+		 * const optimizedImage = await getImage({src: originalImage, width: 1280 });
+		 * ---
+		 * <img src={optimizedImage.src} {...optimizedImage.attributes} />
+		 * ```
+		 *
+		 * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
+		 */
+		getImage: (
+			options: import('./dist/assets/types.js').ImageTransform
+		) => Promise<import('./dist/assets/types.js').GetImageResult>;
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		Image: typeof import('./components/Image.astro').default;
 	};
@@ -368,3 +387,9 @@ declare module '*?inline' {
 	const src: string;
 	export default src;
 }
+
+// eslint-disable-next-line  @typescript-eslint/no-namespace
+export namespace App {
+	// eslint-disable-next-line  @typescript-eslint/no-empty-interface
+	export interface Locals {}
+}
diff --git a/packages/astro/components/Code.astro b/packages/astro/components/Code.astro
index 0c5f946af..40f99bcd1 100644
--- a/packages/astro/components/Code.astro
+++ b/packages/astro/components/Code.astro
@@ -1,5 +1,6 @@
 ---
 import type * as shiki from 'shiki';
+import { renderToHtml } from 'shiki';
 import { getHighlighter } from './Shiki.js';
 
 export interface Props {
@@ -30,36 +31,60 @@ export interface Props {
 	 * @default false
 	 */
 	wrap?: boolean | null;
+	/**
+	 * Generate inline code element only, without the pre element wrapper.
+	 *
+	 * @default false
+	 */
+	inline?: boolean;
 }
 
-const { code, lang = 'plaintext', theme = 'github-dark', wrap = false } = Astro.props;
-
-/** Replace the shiki class name with a custom astro class name. */
-function repairShikiTheme(html: string): string {
-	// Replace "shiki" class naming with "astro"
-	html = html.replace(/<pre class="(.*?)shiki(.*?)"/, '<pre class="$1astro-code$2"');
-	// Handle code wrapping
-	// if wrap=null, do nothing.
-	if (wrap === false) {
-		html = html.replace(/style="(.*?)"/, 'style="$1; overflow-x: auto;"');
-	} else if (wrap === true) {
-		html = html.replace(
-			/style="(.*?)"/,
-			'style="$1; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"'
-		);
-	}
-	return html;
-}
+const {
+	code,
+	lang = 'plaintext',
+	theme = 'github-dark',
+	wrap = false,
+	inline = false,
+} = Astro.props;
 
+// 1. Get the shiki syntax highlighter
 const highlighter = await getHighlighter({
 	theme,
 	// Load custom lang if passed an object, otherwise load the default
 	langs: typeof lang !== 'string' ? [lang] : undefined,
 });
-const _html = highlighter.codeToHtml(code, {
-	lang: typeof lang === 'string' ? lang : lang.id,
+
+// 2. Turn code into shiki theme tokens
+const tokens = highlighter.codeToThemedTokens(code, typeof lang === 'string' ? lang : lang.id);
+
+// 3. Get shiki theme object
+const _theme = highlighter.getTheme();
+
+// 4. Render the theme tokens as html
+const html = renderToHtml(tokens, {
+	themeName: _theme.name,
+	fg: _theme.fg,
+	bg: _theme.bg,
+	elements: {
+		pre({ className, style, children }) {
+			// Swap to `code` tag if inline
+			const tag = inline ? 'code' : 'pre';
+			// Replace "shiki" class naming with "astro-code"
+			className = className.replace(/shiki/g, 'astro-code');
+			// Handle code wrapping
+			// if wrap=null, do nothing.
+			if (wrap === false) {
+				style += '; overflow-x: auto;"';
+			} else if (wrap === true) {
+				style += '; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"';
+			}
+			return `<${tag} class="${className}" style="${style}" tabindex="0">${children}</${tag}>`;
+		},
+		code({ children }) {
+			return inline ? children : `<code>${children}</code>`;
+		},
+	},
 });
-const html = repairShikiTheme(_html);
 ---
 
 <Fragment set:html={html} />
diff --git a/packages/astro/components/shiki-languages.js b/packages/astro/components/shiki-languages.js
index 4bb3d4498..2fcbc407a 100644
--- a/packages/astro/components/shiki-languages.js
+++ b/packages/astro/components/shiki-languages.js
@@ -1,2020 +1,176 @@
+/**
+ * This file is prebuilt from packages/astro/scripts/shiki-gen-languages.mjs
+ * Do not edit this directly, but instead edit that file and rerun it to generate this file.
+ */
+
 import { BUNDLED_LANGUAGES } from 'shiki';
 
+function handleLang(grammar, language) {
+	const lang = BUNDLED_LANGUAGES.find((l) => l.id === language);
+	if (lang) {
+		return {
+			...lang,
+			grammar,
+		};
+	} else {
+		return undefined;
+	}
+}
+
+// prettier-ignore
 export const languages = {
-	abap: () =>
-		import('shiki/languages/abap.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'abap');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'actionscript-3': () =>
-		import('shiki/languages/actionscript-3.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'actionscript-3');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	ada: () =>
-		import('shiki/languages/ada.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'ada');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	apache: () =>
-		import('shiki/languages/apache.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'apache');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	apex: () =>
-		import('shiki/languages/apex.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'apex');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	apl: () =>
-		import('shiki/languages/apl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'apl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	applescript: () =>
-		import('shiki/languages/applescript.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'applescript');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	asm: () =>
-		import('shiki/languages/asm.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'asm');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	astro: () =>
-		import('shiki/languages/astro.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'astro');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	awk: () =>
-		import('shiki/languages/awk.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'awk');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	ballerina: () =>
-		import('shiki/languages/ballerina.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'ballerina');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	bat: () =>
-		import('shiki/languages/bat.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'bat');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	berry: () =>
-		import('shiki/languages/berry.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'berry');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	bibtex: () =>
-		import('shiki/languages/bibtex.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'bibtex');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	bicep: () =>
-		import('shiki/languages/bicep.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'bicep');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	blade: () =>
-		import('shiki/languages/blade.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'blade');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	c: () =>
-		import('shiki/languages/c.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'c');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	cadence: () =>
-		import('shiki/languages/cadence.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'cadence');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	clarity: () =>
-		import('shiki/languages/clarity.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'clarity');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	clojure: () =>
-		import('shiki/languages/clojure.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'clojure');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	cmake: () =>
-		import('shiki/languages/cmake.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'cmake');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	cobol: () =>
-		import('shiki/languages/cobol.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'cobol');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	codeql: () =>
-		import('shiki/languages/codeql.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'codeql');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	coffee: () =>
-		import('shiki/languages/coffee.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'coffee');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'cpp-macro': () =>
-		import('shiki/languages/cpp-macro.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'cpp-macro');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	cpp: () =>
-		import('shiki/languages/cpp.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'cpp');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	crystal: () =>
-		import('shiki/languages/crystal.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'crystal');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	csharp: () =>
-		import('shiki/languages/csharp.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'csharp');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	css: () =>
-		import('shiki/languages/css.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'css');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	cue: () =>
-		import('shiki/languages/cue.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'cue');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	d: () =>
-		import('shiki/languages/d.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'd');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	dart: () =>
-		import('shiki/languages/dart.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'dart');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	diff: () =>
-		import('shiki/languages/diff.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'diff');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	docker: () =>
-		import('shiki/languages/docker.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'docker');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'dream-maker': () =>
-		import('shiki/languages/dream-maker.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'dream-maker');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	elixir: () =>
-		import('shiki/languages/elixir.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'elixir');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	elm: () =>
-		import('shiki/languages/elm.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'elm');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	erb: () =>
-		import('shiki/languages/erb.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'erb');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	erlang: () =>
-		import('shiki/languages/erlang.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'erlang');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	fish: () =>
-		import('shiki/languages/fish.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'fish');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	fsharp: () =>
-		import('shiki/languages/fsharp.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'fsharp');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	gherkin: () =>
-		import('shiki/languages/gherkin.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'gherkin');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'git-commit': () =>
-		import('shiki/languages/git-commit.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'git-commit');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'git-rebase': () =>
-		import('shiki/languages/git-rebase.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'git-rebase');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	glsl: () =>
-		import('shiki/languages/glsl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'glsl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	gnuplot: () =>
-		import('shiki/languages/gnuplot.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'gnuplot');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	go: () =>
-		import('shiki/languages/go.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'go');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	graphql: () =>
-		import('shiki/languages/graphql.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'graphql');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	groovy: () =>
-		import('shiki/languages/groovy.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'groovy');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	hack: () =>
-		import('shiki/languages/hack.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'hack');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	haml: () =>
-		import('shiki/languages/haml.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'haml');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	handlebars: () =>
-		import('shiki/languages/handlebars.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'handlebars');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	haskell: () =>
-		import('shiki/languages/haskell.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'haskell');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	hcl: () =>
-		import('shiki/languages/hcl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'hcl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	hlsl: () =>
-		import('shiki/languages/hlsl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'hlsl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	html: () =>
-		import('shiki/languages/html.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'html');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	ini: () =>
-		import('shiki/languages/ini.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'ini');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	java: () =>
-		import('shiki/languages/java.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'java');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	javascript: () =>
-		import('shiki/languages/javascript.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'javascript');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'jinja-html': () =>
-		import('shiki/languages/jinja-html.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'jinja-html');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	jinja: () =>
-		import('shiki/languages/jinja.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'jinja');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	json: () =>
-		import('shiki/languages/json.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'json');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	jsonc: () =>
-		import('shiki/languages/jsonc.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'jsonc');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	jsonnet: () =>
-		import('shiki/languages/jsonnet.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'jsonnet');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	jssm: () =>
-		import('shiki/languages/jssm.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'jssm');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	jsx: () =>
-		import('shiki/languages/jsx.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'jsx');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	julia: () =>
-		import('shiki/languages/julia.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'julia');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	kotlin: () =>
-		import('shiki/languages/kotlin.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'kotlin');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	latex: () =>
-		import('shiki/languages/latex.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'latex');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	less: () =>
-		import('shiki/languages/less.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'less');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	liquid: () =>
-		import('shiki/languages/liquid.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'liquid');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	lisp: () =>
-		import('shiki/languages/lisp.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'lisp');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	logo: () =>
-		import('shiki/languages/logo.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'logo');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	lua: () =>
-		import('shiki/languages/lua.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'lua');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	make: () =>
-		import('shiki/languages/make.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'make');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	markdown: () =>
-		import('shiki/languages/markdown.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'markdown');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	marko: () =>
-		import('shiki/languages/marko.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'marko');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	matlab: () =>
-		import('shiki/languages/matlab.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'matlab');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	mdx: () =>
-		import('shiki/languages/mdx.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'mdx');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	mermaid: () =>
-		import('shiki/languages/mermaid.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'mermaid');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	nginx: () =>
-		import('shiki/languages/nginx.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'nginx');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	nim: () =>
-		import('shiki/languages/nim.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'nim');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	nix: () =>
-		import('shiki/languages/nix.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'nix');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'objective-c': () =>
-		import('shiki/languages/objective-c.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'objective-c');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'objective-cpp': () =>
-		import('shiki/languages/objective-cpp.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'objective-cpp');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	ocaml: () =>
-		import('shiki/languages/ocaml.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'ocaml');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	pascal: () =>
-		import('shiki/languages/pascal.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'pascal');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	perl: () =>
-		import('shiki/languages/perl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'perl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'php-html': () =>
-		import('shiki/languages/php-html.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'php-html');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	php: () =>
-		import('shiki/languages/php.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'php');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	plsql: () =>
-		import('shiki/languages/plsql.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'plsql');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	postcss: () =>
-		import('shiki/languages/postcss.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'postcss');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	powershell: () =>
-		import('shiki/languages/powershell.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'powershell');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	prisma: () =>
-		import('shiki/languages/prisma.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'prisma');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	prolog: () =>
-		import('shiki/languages/prolog.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'prolog');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	pug: () =>
-		import('shiki/languages/pug.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'pug');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	puppet: () =>
-		import('shiki/languages/puppet.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'puppet');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	purescript: () =>
-		import('shiki/languages/purescript.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'purescript');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	python: () =>
-		import('shiki/languages/python.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'python');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	r: () =>
-		import('shiki/languages/r.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'r');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	raku: () =>
-		import('shiki/languages/raku.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'raku');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	razor: () =>
-		import('shiki/languages/razor.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'razor');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	rel: () =>
-		import('shiki/languages/rel.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'rel');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	riscv: () =>
-		import('shiki/languages/riscv.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'riscv');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	rst: () =>
-		import('shiki/languages/rst.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'rst');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	ruby: () =>
-		import('shiki/languages/ruby.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'ruby');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	rust: () =>
-		import('shiki/languages/rust.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'rust');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	sas: () =>
-		import('shiki/languages/sas.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'sas');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	sass: () =>
-		import('shiki/languages/sass.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'sass');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	scala: () =>
-		import('shiki/languages/scala.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'scala');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	scheme: () =>
-		import('shiki/languages/scheme.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'scheme');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	scss: () =>
-		import('shiki/languages/scss.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'scss');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	shaderlab: () =>
-		import('shiki/languages/shaderlab.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'shaderlab');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	shellscript: () =>
-		import('shiki/languages/shellscript.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'shellscript');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	smalltalk: () =>
-		import('shiki/languages/smalltalk.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'smalltalk');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	solidity: () =>
-		import('shiki/languages/solidity.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'solidity');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	sparql: () =>
-		import('shiki/languages/sparql.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'sparql');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	sql: () =>
-		import('shiki/languages/sql.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'sql');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'ssh-config': () =>
-		import('shiki/languages/ssh-config.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'ssh-config');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	stata: () =>
-		import('shiki/languages/stata.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'stata');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	stylus: () =>
-		import('shiki/languages/stylus.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'stylus');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	svelte: () =>
-		import('shiki/languages/svelte.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'svelte');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	swift: () =>
-		import('shiki/languages/swift.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'swift');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'system-verilog': () =>
-		import('shiki/languages/system-verilog.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'system-verilog');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	tasl: () =>
-		import('shiki/languages/tasl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'tasl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	tcl: () =>
-		import('shiki/languages/tcl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'tcl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	tex: () =>
-		import('shiki/languages/tex.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'tex');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	toml: () =>
-		import('shiki/languages/toml.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'toml');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	tsx: () =>
-		import('shiki/languages/tsx.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'tsx');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	turtle: () =>
-		import('shiki/languages/turtle.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'turtle');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	twig: () =>
-		import('shiki/languages/twig.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'twig');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	typescript: () =>
-		import('shiki/languages/typescript.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'typescript');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	vb: () =>
-		import('shiki/languages/vb.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'vb');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	verilog: () =>
-		import('shiki/languages/verilog.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'verilog');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	vhdl: () =>
-		import('shiki/languages/vhdl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'vhdl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	viml: () =>
-		import('shiki/languages/viml.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'viml');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	'vue-html': () =>
-		import('shiki/languages/vue-html.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'vue-html');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	vue: () =>
-		import('shiki/languages/vue.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'vue');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	wasm: () =>
-		import('shiki/languages/wasm.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'wasm');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	wenyan: () =>
-		import('shiki/languages/wenyan.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'wenyan');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	xml: () =>
-		import('shiki/languages/xml.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'xml');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	xsl: () =>
-		import('shiki/languages/xsl.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'xsl');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	yaml: () =>
-		import('shiki/languages/yaml.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'yaml');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
-	zenscript: () =>
-		import('shiki/languages/zenscript.tmLanguage.json')
-			.then((mod) => mod.default)
-			.then((grammar) => {
-				const lang = BUNDLED_LANGUAGES.find((l) => l.id === 'zenscript');
-				if (lang) {
-					return {
-						...lang,
-						grammar,
-					};
-				} else {
-					return undefined;
-				}
-			}),
+	'abap': () => import('shiki/languages/abap.tmLanguage.json').then((mod) => handleLang(mod.default, 'abap')),
+	'actionscript-3': () => import('shiki/languages/actionscript-3.tmLanguage.json').then((mod) => handleLang(mod.default, 'actionscript-3')),
+	'ada': () => import('shiki/languages/ada.tmLanguage.json').then((mod) => handleLang(mod.default, 'ada')),
+	'apache': () => import('shiki/languages/apache.tmLanguage.json').then((mod) => handleLang(mod.default, 'apache')),
+	'apex': () => import('shiki/languages/apex.tmLanguage.json').then((mod) => handleLang(mod.default, 'apex')),
+	'apl': () => import('shiki/languages/apl.tmLanguage.json').then((mod) => handleLang(mod.default, 'apl')),
+	'applescript': () => import('shiki/languages/applescript.tmLanguage.json').then((mod) => handleLang(mod.default, 'applescript')),
+	'ara': () => import('shiki/languages/ara.tmLanguage.json').then((mod) => handleLang(mod.default, 'ara')),
+	'asm': () => import('shiki/languages/asm.tmLanguage.json').then((mod) => handleLang(mod.default, 'asm')),
+	'astro': () => import('shiki/languages/astro.tmLanguage.json').then((mod) => handleLang(mod.default, 'astro')),
+	'awk': () => import('shiki/languages/awk.tmLanguage.json').then((mod) => handleLang(mod.default, 'awk')),
+	'ballerina': () => import('shiki/languages/ballerina.tmLanguage.json').then((mod) => handleLang(mod.default, 'ballerina')),
+	'bat': () => import('shiki/languages/bat.tmLanguage.json').then((mod) => handleLang(mod.default, 'bat')),
+	'berry': () => import('shiki/languages/berry.tmLanguage.json').then((mod) => handleLang(mod.default, 'berry')),
+	'bibtex': () => import('shiki/languages/bibtex.tmLanguage.json').then((mod) => handleLang(mod.default, 'bibtex')),
+	'bicep': () => import('shiki/languages/bicep.tmLanguage.json').then((mod) => handleLang(mod.default, 'bicep')),
+	'blade': () => import('shiki/languages/blade.tmLanguage.json').then((mod) => handleLang(mod.default, 'blade')),
+	'c': () => import('shiki/languages/c.tmLanguage.json').then((mod) => handleLang(mod.default, 'c')),
+	'cadence': () => import('shiki/languages/cadence.tmLanguage.json').then((mod) => handleLang(mod.default, 'cadence')),
+	'clarity': () => import('shiki/languages/clarity.tmLanguage.json').then((mod) => handleLang(mod.default, 'clarity')),
+	'clojure': () => import('shiki/languages/clojure.tmLanguage.json').then((mod) => handleLang(mod.default, 'clojure')),
+	'cmake': () => import('shiki/languages/cmake.tmLanguage.json').then((mod) => handleLang(mod.default, 'cmake')),
+	'cobol': () => import('shiki/languages/cobol.tmLanguage.json').then((mod) => handleLang(mod.default, 'cobol')),
+	'codeql': () => import('shiki/languages/codeql.tmLanguage.json').then((mod) => handleLang(mod.default, 'codeql')),
+	'coffee': () => import('shiki/languages/coffee.tmLanguage.json').then((mod) => handleLang(mod.default, 'coffee')),
+	'cpp-macro': () => import('shiki/languages/cpp-macro.tmLanguage.json').then((mod) => handleLang(mod.default, 'cpp-macro')),
+	'cpp': () => import('shiki/languages/cpp.tmLanguage.json').then((mod) => handleLang(mod.default, 'cpp')),
+	'crystal': () => import('shiki/languages/crystal.tmLanguage.json').then((mod) => handleLang(mod.default, 'crystal')),
+	'csharp': () => import('shiki/languages/csharp.tmLanguage.json').then((mod) => handleLang(mod.default, 'csharp')),
+	'css': () => import('shiki/languages/css.tmLanguage.json').then((mod) => handleLang(mod.default, 'css')),
+	'cue': () => import('shiki/languages/cue.tmLanguage.json').then((mod) => handleLang(mod.default, 'cue')),
+	'd': () => import('shiki/languages/d.tmLanguage.json').then((mod) => handleLang(mod.default, 'd')),
+	'dart': () => import('shiki/languages/dart.tmLanguage.json').then((mod) => handleLang(mod.default, 'dart')),
+	'dax': () => import('shiki/languages/dax.tmLanguage.json').then((mod) => handleLang(mod.default, 'dax')),
+	'diff': () => import('shiki/languages/diff.tmLanguage.json').then((mod) => handleLang(mod.default, 'diff')),
+	'docker': () => import('shiki/languages/docker.tmLanguage.json').then((mod) => handleLang(mod.default, 'docker')),
+	'dream-maker': () => import('shiki/languages/dream-maker.tmLanguage.json').then((mod) => handleLang(mod.default, 'dream-maker')),
+	'elixir': () => import('shiki/languages/elixir.tmLanguage.json').then((mod) => handleLang(mod.default, 'elixir')),
+	'elm': () => import('shiki/languages/elm.tmLanguage.json').then((mod) => handleLang(mod.default, 'elm')),
+	'erb': () => import('shiki/languages/erb.tmLanguage.json').then((mod) => handleLang(mod.default, 'erb')),
+	'erlang': () => import('shiki/languages/erlang.tmLanguage.json').then((mod) => handleLang(mod.default, 'erlang')),
+	'fish': () => import('shiki/languages/fish.tmLanguage.json').then((mod) => handleLang(mod.default, 'fish')),
+	'fsharp': () => import('shiki/languages/fsharp.tmLanguage.json').then((mod) => handleLang(mod.default, 'fsharp')),
+	'gherkin': () => import('shiki/languages/gherkin.tmLanguage.json').then((mod) => handleLang(mod.default, 'gherkin')),
+	'git-commit': () => import('shiki/languages/git-commit.tmLanguage.json').then((mod) => handleLang(mod.default, 'git-commit')),
+	'git-rebase': () => import('shiki/languages/git-rebase.tmLanguage.json').then((mod) => handleLang(mod.default, 'git-rebase')),
+	'glsl': () => import('shiki/languages/glsl.tmLanguage.json').then((mod) => handleLang(mod.default, 'glsl')),
+	'gnuplot': () => import('shiki/languages/gnuplot.tmLanguage.json').then((mod) => handleLang(mod.default, 'gnuplot')),
+	'go': () => import('shiki/languages/go.tmLanguage.json').then((mod) => handleLang(mod.default, 'go')),
+	'graphql': () => import('shiki/languages/graphql.tmLanguage.json').then((mod) => handleLang(mod.default, 'graphql')),
+	'groovy': () => import('shiki/languages/groovy.tmLanguage.json').then((mod) => handleLang(mod.default, 'groovy')),
+	'hack': () => import('shiki/languages/hack.tmLanguage.json').then((mod) => handleLang(mod.default, 'hack')),
+	'haml': () => import('shiki/languages/haml.tmLanguage.json').then((mod) => handleLang(mod.default, 'haml')),
+	'handlebars': () => import('shiki/languages/handlebars.tmLanguage.json').then((mod) => handleLang(mod.default, 'handlebars')),
+	'haskell': () => import('shiki/languages/haskell.tmLanguage.json').then((mod) => handleLang(mod.default, 'haskell')),
+	'hcl': () => import('shiki/languages/hcl.tmLanguage.json').then((mod) => handleLang(mod.default, 'hcl')),
+	'hlsl': () => import('shiki/languages/hlsl.tmLanguage.json').then((mod) => handleLang(mod.default, 'hlsl')),
+	'html': () => import('shiki/languages/html.tmLanguage.json').then((mod) => handleLang(mod.default, 'html')),
+	'http': () => import('shiki/languages/http.tmLanguage.json').then((mod) => handleLang(mod.default, 'http')),
+	'imba': () => import('shiki/languages/imba.tmLanguage.json').then((mod) => handleLang(mod.default, 'imba')),
+	'ini': () => import('shiki/languages/ini.tmLanguage.json').then((mod) => handleLang(mod.default, 'ini')),
+	'java': () => import('shiki/languages/java.tmLanguage.json').then((mod) => handleLang(mod.default, 'java')),
+	'javascript': () => import('shiki/languages/javascript.tmLanguage.json').then((mod) => handleLang(mod.default, 'javascript')),
+	'jinja-html': () => import('shiki/languages/jinja-html.tmLanguage.json').then((mod) => handleLang(mod.default, 'jinja-html')),
+	'jinja': () => import('shiki/languages/jinja.tmLanguage.json').then((mod) => handleLang(mod.default, 'jinja')),
+	'jison': () => import('shiki/languages/jison.tmLanguage.json').then((mod) => handleLang(mod.default, 'jison')),
+	'json': () => import('shiki/languages/json.tmLanguage.json').then((mod) => handleLang(mod.default, 'json')),
+	'json5': () => import('shiki/languages/json5.tmLanguage.json').then((mod) => handleLang(mod.default, 'json5')),
+	'jsonc': () => import('shiki/languages/jsonc.tmLanguage.json').then((mod) => handleLang(mod.default, 'jsonc')),
+	'jsonnet': () => import('shiki/languages/jsonnet.tmLanguage.json').then((mod) => handleLang(mod.default, 'jsonnet')),
+	'jssm': () => import('shiki/languages/jssm.tmLanguage.json').then((mod) => handleLang(mod.default, 'jssm')),
+	'jsx': () => import('shiki/languages/jsx.tmLanguage.json').then((mod) => handleLang(mod.default, 'jsx')),
+	'julia': () => import('shiki/languages/julia.tmLanguage.json').then((mod) => handleLang(mod.default, 'julia')),
+	'kotlin': () => import('shiki/languages/kotlin.tmLanguage.json').then((mod) => handleLang(mod.default, 'kotlin')),
+	'latex': () => import('shiki/languages/latex.tmLanguage.json').then((mod) => handleLang(mod.default, 'latex')),
+	'less': () => import('shiki/languages/less.tmLanguage.json').then((mod) => handleLang(mod.default, 'less')),
+	'liquid': () => import('shiki/languages/liquid.tmLanguage.json').then((mod) => handleLang(mod.default, 'liquid')),
+	'lisp': () => import('shiki/languages/lisp.tmLanguage.json').then((mod) => handleLang(mod.default, 'lisp')),
+	'logo': () => import('shiki/languages/logo.tmLanguage.json').then((mod) => handleLang(mod.default, 'logo')),
+	'lua': () => import('shiki/languages/lua.tmLanguage.json').then((mod) => handleLang(mod.default, 'lua')),
+	'make': () => import('shiki/languages/make.tmLanguage.json').then((mod) => handleLang(mod.default, 'make')),
+	'markdown': () => import('shiki/languages/markdown.tmLanguage.json').then((mod) => handleLang(mod.default, 'markdown')),
+	'marko': () => import('shiki/languages/marko.tmLanguage.json').then((mod) => handleLang(mod.default, 'marko')),
+	'matlab': () => import('shiki/languages/matlab.tmLanguage.json').then((mod) => handleLang(mod.default, 'matlab')),
+	'mdx': () => import('shiki/languages/mdx.tmLanguage.json').then((mod) => handleLang(mod.default, 'mdx')),
+	'mermaid': () => import('shiki/languages/mermaid.tmLanguage.json').then((mod) => handleLang(mod.default, 'mermaid')),
+	'nginx': () => import('shiki/languages/nginx.tmLanguage.json').then((mod) => handleLang(mod.default, 'nginx')),
+	'nim': () => import('shiki/languages/nim.tmLanguage.json').then((mod) => handleLang(mod.default, 'nim')),
+	'nix': () => import('shiki/languages/nix.tmLanguage.json').then((mod) => handleLang(mod.default, 'nix')),
+	'objective-c': () => import('shiki/languages/objective-c.tmLanguage.json').then((mod) => handleLang(mod.default, 'objective-c')),
+	'objective-cpp': () => import('shiki/languages/objective-cpp.tmLanguage.json').then((mod) => handleLang(mod.default, 'objective-cpp')),
+	'ocaml': () => import('shiki/languages/ocaml.tmLanguage.json').then((mod) => handleLang(mod.default, 'ocaml')),
+	'pascal': () => import('shiki/languages/pascal.tmLanguage.json').then((mod) => handleLang(mod.default, 'pascal')),
+	'perl': () => import('shiki/languages/perl.tmLanguage.json').then((mod) => handleLang(mod.default, 'perl')),
+	'php-html': () => import('shiki/languages/php-html.tmLanguage.json').then((mod) => handleLang(mod.default, 'php-html')),
+	'php': () => import('shiki/languages/php.tmLanguage.json').then((mod) => handleLang(mod.default, 'php')),
+	'plsql': () => import('shiki/languages/plsql.tmLanguage.json').then((mod) => handleLang(mod.default, 'plsql')),
+	'postcss': () => import('shiki/languages/postcss.tmLanguage.json').then((mod) => handleLang(mod.default, 'postcss')),
+	'powerquery': () => import('shiki/languages/powerquery.tmLanguage.json').then((mod) => handleLang(mod.default, 'powerquery')),
+	'powershell': () => import('shiki/languages/powershell.tmLanguage.json').then((mod) => handleLang(mod.default, 'powershell')),
+	'prisma': () => import('shiki/languages/prisma.tmLanguage.json').then((mod) => handleLang(mod.default, 'prisma')),
+	'prolog': () => import('shiki/languages/prolog.tmLanguage.json').then((mod) => handleLang(mod.default, 'prolog')),
+	'proto': () => import('shiki/languages/proto.tmLanguage.json').then((mod) => handleLang(mod.default, 'proto')),
+	'pug': () => import('shiki/languages/pug.tmLanguage.json').then((mod) => handleLang(mod.default, 'pug')),
+	'puppet': () => import('shiki/languages/puppet.tmLanguage.json').then((mod) => handleLang(mod.default, 'puppet')),
+	'purescript': () => import('shiki/languages/purescript.tmLanguage.json').then((mod) => handleLang(mod.default, 'purescript')),
+	'python': () => import('shiki/languages/python.tmLanguage.json').then((mod) => handleLang(mod.default, 'python')),
+	'r': () => import('shiki/languages/r.tmLanguage.json').then((mod) => handleLang(mod.default, 'r')),
+	'raku': () => import('shiki/languages/raku.tmLanguage.json').then((mod) => handleLang(mod.default, 'raku')),
+	'razor': () => import('shiki/languages/razor.tmLanguage.json').then((mod) => handleLang(mod.default, 'razor')),
+	'rel': () => import('shiki/languages/rel.tmLanguage.json').then((mod) => handleLang(mod.default, 'rel')),
+	'riscv': () => import('shiki/languages/riscv.tmLanguage.json').then((mod) => handleLang(mod.default, 'riscv')),
+	'rst': () => import('shiki/languages/rst.tmLanguage.json').then((mod) => handleLang(mod.default, 'rst')),
+	'ruby': () => import('shiki/languages/ruby.tmLanguage.json').then((mod) => handleLang(mod.default, 'ruby')),
+	'rust': () => import('shiki/languages/rust.tmLanguage.json').then((mod) => handleLang(mod.default, 'rust')),
+	'sas': () => import('shiki/languages/sas.tmLanguage.json').then((mod) => handleLang(mod.default, 'sas')),
+	'sass': () => import('shiki/languages/sass.tmLanguage.json').then((mod) => handleLang(mod.default, 'sass')),
+	'scala': () => import('shiki/languages/scala.tmLanguage.json').then((mod) => handleLang(mod.default, 'scala')),
+	'scheme': () => import('shiki/languages/scheme.tmLanguage.json').then((mod) => handleLang(mod.default, 'scheme')),
+	'scss': () => import('shiki/languages/scss.tmLanguage.json').then((mod) => handleLang(mod.default, 'scss')),
+	'shaderlab': () => import('shiki/languages/shaderlab.tmLanguage.json').then((mod) => handleLang(mod.default, 'shaderlab')),
+	'shellscript': () => import('shiki/languages/shellscript.tmLanguage.json').then((mod) => handleLang(mod.default, 'shellscript')),
+	'smalltalk': () => import('shiki/languages/smalltalk.tmLanguage.json').then((mod) => handleLang(mod.default, 'smalltalk')),
+	'solidity': () => import('shiki/languages/solidity.tmLanguage.json').then((mod) => handleLang(mod.default, 'solidity')),
+	'sparql': () => import('shiki/languages/sparql.tmLanguage.json').then((mod) => handleLang(mod.default, 'sparql')),
+	'sql': () => import('shiki/languages/sql.tmLanguage.json').then((mod) => handleLang(mod.default, 'sql')),
+	'ssh-config': () => import('shiki/languages/ssh-config.tmLanguage.json').then((mod) => handleLang(mod.default, 'ssh-config')),
+	'stata': () => import('shiki/languages/stata.tmLanguage.json').then((mod) => handleLang(mod.default, 'stata')),
+	'stylus': () => import('shiki/languages/stylus.tmLanguage.json').then((mod) => handleLang(mod.default, 'stylus')),
+	'svelte': () => import('shiki/languages/svelte.tmLanguage.json').then((mod) => handleLang(mod.default, 'svelte')),
+	'swift': () => import('shiki/languages/swift.tmLanguage.json').then((mod) => handleLang(mod.default, 'swift')),
+	'system-verilog': () => import('shiki/languages/system-verilog.tmLanguage.json').then((mod) => handleLang(mod.default, 'system-verilog')),
+	'tasl': () => import('shiki/languages/tasl.tmLanguage.json').then((mod) => handleLang(mod.default, 'tasl')),
+	'tcl': () => import('shiki/languages/tcl.tmLanguage.json').then((mod) => handleLang(mod.default, 'tcl')),
+	'tex': () => import('shiki/languages/tex.tmLanguage.json').then((mod) => handleLang(mod.default, 'tex')),
+	'toml': () => import('shiki/languages/toml.tmLanguage.json').then((mod) => handleLang(mod.default, 'toml')),
+	'tsx': () => import('shiki/languages/tsx.tmLanguage.json').then((mod) => handleLang(mod.default, 'tsx')),
+	'turtle': () => import('shiki/languages/turtle.tmLanguage.json').then((mod) => handleLang(mod.default, 'turtle')),
+	'twig': () => import('shiki/languages/twig.tmLanguage.json').then((mod) => handleLang(mod.default, 'twig')),
+	'typescript': () => import('shiki/languages/typescript.tmLanguage.json').then((mod) => handleLang(mod.default, 'typescript')),
+	'v': () => import('shiki/languages/v.tmLanguage.json').then((mod) => handleLang(mod.default, 'v')),
+	'vb': () => import('shiki/languages/vb.tmLanguage.json').then((mod) => handleLang(mod.default, 'vb')),
+	'verilog': () => import('shiki/languages/verilog.tmLanguage.json').then((mod) => handleLang(mod.default, 'verilog')),
+	'vhdl': () => import('shiki/languages/vhdl.tmLanguage.json').then((mod) => handleLang(mod.default, 'vhdl')),
+	'viml': () => import('shiki/languages/viml.tmLanguage.json').then((mod) => handleLang(mod.default, 'viml')),
+	'vue-html': () => import('shiki/languages/vue-html.tmLanguage.json').then((mod) => handleLang(mod.default, 'vue-html')),
+	'vue': () => import('shiki/languages/vue.tmLanguage.json').then((mod) => handleLang(mod.default, 'vue')),
+	'wasm': () => import('shiki/languages/wasm.tmLanguage.json').then((mod) => handleLang(mod.default, 'wasm')),
+	'wenyan': () => import('shiki/languages/wenyan.tmLanguage.json').then((mod) => handleLang(mod.default, 'wenyan')),
+	'wgsl': () => import('shiki/languages/wgsl.tmLanguage.json').then((mod) => handleLang(mod.default, 'wgsl')),
+	'xml': () => import('shiki/languages/xml.tmLanguage.json').then((mod) => handleLang(mod.default, 'xml')),
+	'xsl': () => import('shiki/languages/xsl.tmLanguage.json').then((mod) => handleLang(mod.default, 'xsl')),
+	'yaml': () => import('shiki/languages/yaml.tmLanguage.json').then((mod) => handleLang(mod.default, 'yaml')),
+	'zenscript': () => import('shiki/languages/zenscript.tmLanguage.json').then((mod) => handleLang(mod.default, 'zenscript')),
 };
diff --git a/packages/astro/components/shiki-themes.js b/packages/astro/components/shiki-themes.js
index 68c36f4cd..7f07d2417 100644
--- a/packages/astro/components/shiki-themes.js
+++ b/packages/astro/components/shiki-themes.js
@@ -1,33 +1,43 @@
+/**
+ * This file is prebuilt from packages/astro/scripts/shiki-gen-themes.mjs
+ * Do not edit this directly, but instead edit that file and rerun it to generate this file.
+ */
+
+// prettier-ignore
 export const themes = {
-	'css-variables': () => import('shiki/themes/css-variables.json').then((mod) => mod.default),
-	'dark-plus': () => import('shiki/themes/dark-plus.json').then((mod) => mod.default),
-	'dracula-soft': () => import('shiki/themes/dracula-soft.json').then((mod) => mod.default),
-	dracula: () => import('shiki/themes/dracula.json').then((mod) => mod.default),
-	'github-dark-dimmed': () =>
-		import('shiki/themes/github-dark-dimmed.json').then((mod) => mod.default),
-	'github-dark': () => import('shiki/themes/github-dark.json').then((mod) => mod.default),
-	'github-light': () => import('shiki/themes/github-light.json').then((mod) => mod.default),
-	hc_light: () => import('shiki/themes/hc_light.json').then((mod) => mod.default),
-	'light-plus': () => import('shiki/themes/light-plus.json').then((mod) => mod.default),
-	'material-darker': () => import('shiki/themes/material-darker.json').then((mod) => mod.default),
-	'material-default': () => import('shiki/themes/material-default.json').then((mod) => mod.default),
-	'material-lighter': () => import('shiki/themes/material-lighter.json').then((mod) => mod.default),
-	'material-ocean': () => import('shiki/themes/material-ocean.json').then((mod) => mod.default),
-	'material-palenight': () =>
-		import('shiki/themes/material-palenight.json').then((mod) => mod.default),
-	'min-dark': () => import('shiki/themes/min-dark.json').then((mod) => mod.default),
-	'min-light': () => import('shiki/themes/min-light.json').then((mod) => mod.default),
-	monokai: () => import('shiki/themes/monokai.json').then((mod) => mod.default),
-	nord: () => import('shiki/themes/nord.json').then((mod) => mod.default),
-	'one-dark-pro': () => import('shiki/themes/one-dark-pro.json').then((mod) => mod.default),
-	poimandres: () => import('shiki/themes/poimandres.json').then((mod) => mod.default),
-	'rose-pine-dawn': () => import('shiki/themes/rose-pine-dawn.json').then((mod) => mod.default),
-	'rose-pine-moon': () => import('shiki/themes/rose-pine-moon.json').then((mod) => mod.default),
-	'rose-pine': () => import('shiki/themes/rose-pine.json').then((mod) => mod.default),
-	'slack-dark': () => import('shiki/themes/slack-dark.json').then((mod) => mod.default),
-	'slack-ochin': () => import('shiki/themes/slack-ochin.json').then((mod) => mod.default),
-	'solarized-dark': () => import('shiki/themes/solarized-dark.json').then((mod) => mod.default),
-	'solarized-light': () => import('shiki/themes/solarized-light.json').then((mod) => mod.default),
-	'vitesse-dark': () => import('shiki/themes/vitesse-dark.json').then((mod) => mod.default),
-	'vitesse-light': () => import('shiki/themes/vitesse-light.json').then((mod) => mod.default),
+	'css-variables': () => import('shiki/themes/css-variables.json').then(mod => mod.default),
+	'dark-plus': () => import('shiki/themes/dark-plus.json').then(mod => mod.default),
+	'dracula-soft': () => import('shiki/themes/dracula-soft.json').then(mod => mod.default),
+	'dracula': () => import('shiki/themes/dracula.json').then(mod => mod.default),
+	'github-dark-dimmed': () => import('shiki/themes/github-dark-dimmed.json').then(mod => mod.default),
+	'github-dark': () => import('shiki/themes/github-dark.json').then(mod => mod.default),
+	'github-light': () => import('shiki/themes/github-light.json').then(mod => mod.default),
+	'hc_light': () => import('shiki/themes/hc_light.json').then(mod => mod.default),
+	'light-plus': () => import('shiki/themes/light-plus.json').then(mod => mod.default),
+	'material-theme-darker': () => import('shiki/themes/material-theme-darker.json').then(mod => mod.default),
+	'material-theme-lighter': () => import('shiki/themes/material-theme-lighter.json').then(mod => mod.default),
+	'material-theme-ocean': () => import('shiki/themes/material-theme-ocean.json').then(mod => mod.default),
+	'material-theme-palenight': () => import('shiki/themes/material-theme-palenight.json').then(mod => mod.default),
+	'material-theme': () => import('shiki/themes/material-theme.json').then(mod => mod.default),
+	'min-dark': () => import('shiki/themes/min-dark.json').then(mod => mod.default),
+	'min-light': () => import('shiki/themes/min-light.json').then(mod => mod.default),
+	'monokai': () => import('shiki/themes/monokai.json').then(mod => mod.default),
+	'nord': () => import('shiki/themes/nord.json').then(mod => mod.default),
+	'one-dark-pro': () => import('shiki/themes/one-dark-pro.json').then(mod => mod.default),
+	'poimandres': () => import('shiki/themes/poimandres.json').then(mod => mod.default),
+	'rose-pine-dawn': () => import('shiki/themes/rose-pine-dawn.json').then(mod => mod.default),
+	'rose-pine-moon': () => import('shiki/themes/rose-pine-moon.json').then(mod => mod.default),
+	'rose-pine': () => import('shiki/themes/rose-pine.json').then(mod => mod.default),
+	'slack-dark': () => import('shiki/themes/slack-dark.json').then(mod => mod.default),
+	'slack-ochin': () => import('shiki/themes/slack-ochin.json').then(mod => mod.default),
+	'solarized-dark': () => import('shiki/themes/solarized-dark.json').then(mod => mod.default),
+	'solarized-light': () => import('shiki/themes/solarized-light.json').then(mod => mod.default),
+	'vitesse-dark': () => import('shiki/themes/vitesse-dark.json').then(mod => mod.default),
+	'vitesse-light': () => import('shiki/themes/vitesse-light.json').then(mod => mod.default),
+	// old theme names for compat
+	'material-darker': () => import('shiki/themes/material-theme-darker').then(mod => mod.default),
+	'material-default': () => import('shiki/themes/material-theme').then(mod => mod.default),
+	'material-lighter': () => import('shiki/themes/material-theme-lighter').then(mod => mod.default),
+	'material-ocean': () => import('shiki/themes/material-theme-ocean').then(mod => mod.default),
+	'material-palenight': () => import('shiki/themes/material-theme-palenight').then(mod => mod.default),
 };
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 0c1cc0e32..08ee274a6 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -64,6 +64,10 @@
     "./zod": {
       "types": "./zod.d.ts",
       "default": "./zod.mjs"
+    },
+    "./middleware": {
+      "types": "./dist/core/middleware/index.d.ts",
+      "default": "./dist/core/middleware/index.js"
     }
   },
   "imports": {
@@ -106,11 +110,11 @@
     "test:e2e:match": "playwright test -g"
   },
   "dependencies": {
-    "@astrojs/compiler": "^1.3.1",
-    "@astrojs/language-server": "^0.28.3",
+    "@astrojs/compiler": "^1.4.0",
+    "@astrojs/language-server": "^1.0.0",
     "@astrojs/markdown-remark": "^2.1.4",
-    "@astrojs/telemetry": "^2.1.0",
-    "@astrojs/webapi": "^2.1.0",
+    "@astrojs/telemetry": "^2.1.1",
+    "@astrojs/webapi": "^2.1.1",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -119,7 +123,7 @@
     "@babel/types": "^7.18.4",
     "@types/babel__core": "^7.1.19",
     "@types/yargs-parser": "^21.0.0",
-    "acorn": "^8.8.1",
+    "acorn": "^8.8.2",
     "boxen": "^6.2.1",
     "chokidar": "^3.5.3",
     "ci-info": "^3.3.1",
@@ -130,7 +134,7 @@
     "devalue": "^4.2.0",
     "diff": "^5.1.0",
     "es-module-lexer": "^1.1.0",
-    "estree-walker": "^3.0.1",
+    "estree-walker": "3.0.0",
     "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
     "github-slugger": "^2.0.0",
@@ -146,7 +150,7 @@
     "rehype": "^12.0.1",
     "semver": "^7.3.8",
     "server-destroy": "^1.0.1",
-    "shiki": "^0.11.1",
+    "shiki": "^0.14.1",
     "slash": "^4.0.0",
     "string-width": "^5.1.2",
     "strip-ansi": "^7.0.1",
@@ -181,7 +185,6 @@
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/server-destroy": "^1.0.1",
-    "@types/sharp": "^0.31.1",
     "@types/unist": "^2.0.6",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
@@ -196,13 +199,13 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
-    "sharp": "^0.31.3",
+    "sharp": "^0.32.1",
     "srcset-parse": "^1.1.0",
     "undici": "^5.22.0",
     "unified": "^10.1.2"
   },
   "peerDependencies": {
-    "sharp": "^0.31.3"
+    "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
     "sharp": {
diff --git a/packages/astro/scripts/shiki-gen-languages.mjs b/packages/astro/scripts/shiki-gen-languages.mjs
index 9a497f6e9..29cdca413 100644
--- a/packages/astro/scripts/shiki-gen-languages.mjs
+++ b/packages/astro/scripts/shiki-gen-languages.mjs
@@ -4,31 +4,34 @@ const dir = await fs.promises.readdir('packages/astro/node_modules/shiki/languag
 
 const langImports = dir.map((f) => {
 	const key = f.slice(0, f.indexOf('.tmLanguage.json'));
-	return [
-		key,
-		`import('shiki/languages/${f}').then(mod => mod.default).then(grammar => {
-	const lang = BUNDLED_LANGUAGES.find(l => l.id === '${key}');
-	if(lang) {
+	return [key, `import('shiki/languages/${f}').then((mod) => handleLang(mod.default, '${key}'))`];
+});
+
+let code = `\
+/**
+ * This file is prebuilt from packages/astro/scripts/shiki-gen-languages.mjs
+ * Do not edit this directly, but instead edit that file and rerun it to generate this file.
+ */
+
+import { BUNDLED_LANGUAGES } from 'shiki';
+
+function handleLang(grammar, language) {
+	const lang = BUNDLED_LANGUAGES.find((l) => l.id === language);
+	if (lang) {
 		return {
 			...lang,
-			grammar
+			grammar,
 		};
 	} else {
 		return undefined;
 	}
-})`,
-	];
-});
-let code = `import { BUNDLED_LANGUAGES } from 'shiki';
+}
 
+// prettier-ignore
 export const languages = {`;
-let i = 0;
+
 for (const [key, imp] of langImports) {
-	if (i > 0) {
-		code += ',';
-	}
-	code += `\n\t'${key}': () => ${imp}`;
-	i++;
+	code += `\n\t'${key}': () => ${imp},`;
 }
 code += '\n};';
 
diff --git a/packages/astro/scripts/shiki-gen-themes.mjs b/packages/astro/scripts/shiki-gen-themes.mjs
index 756be8349..4d400c850 100644
--- a/packages/astro/scripts/shiki-gen-themes.mjs
+++ b/packages/astro/scripts/shiki-gen-themes.mjs
@@ -2,18 +2,36 @@ import fs from 'fs';
 
 const dir = await fs.promises.readdir('packages/astro/node_modules/shiki/themes/');
 
+const toThemeImport = (theme) => `import('shiki/themes/${theme}').then(mod => mod.default)`;
+
 const themeImports = dir.map((f) => {
-	return [f.slice(0, f.indexOf('.json')), `import('shiki/themes/${f}').then(mod => mod.default)`];
+	return [f.slice(0, f.indexOf('.json')), toThemeImport(f)];
 });
 
-let code = `export const themes = {`;
-let i = 0;
+// Map of old theme names to new names to preserve compatibility when we upgrade shiki
+const compatThemes = {
+	'material-darker': 'material-theme-darker',
+	'material-default': 'material-theme',
+	'material-lighter': 'material-theme-lighter',
+	'material-ocean': 'material-theme-ocean',
+	'material-palenight': 'material-theme-palenight',
+};
+
+let code = `\
+/**
+ * This file is prebuilt from packages/astro/scripts/shiki-gen-themes.mjs
+ * Do not edit this directly, but instead edit that file and rerun it to generate this file.
+ */
+
+// prettier-ignore
+export const themes = {`;
+
 for (const [key, imp] of themeImports) {
-	if (i > 0) {
-		code += ',';
-	}
-	code += `\n\t'${key}': () => ${imp}`;
-	i++;
+	code += `\n\t'${key}': () => ${imp},`;
+}
+code += `\n\t// old theme names for compat`;
+for (const oldName in compatThemes) {
+	code += `\n\t'${oldName}': () => ${toThemeImport(compatThemes[oldName])},`;
 }
 code += '\n};';
 
diff --git a/packages/astro/src/@types/app.d.ts b/packages/astro/src/@types/app.d.ts
new file mode 100644
index 000000000..1c0908bb8
--- /dev/null
+++ b/packages/astro/src/@types/app.d.ts
@@ -0,0 +1,9 @@
+/**
+ * Shared interfaces throughout the application that can be overridden by the user.
+ */
+declare namespace App {
+	/**
+	 * Used by middlewares to store information, that can be read by the user via the global `Astro.locals`
+	 */
+	interface Locals {}
+}
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 7ec333613..f3738d53c 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -103,6 +103,7 @@ export interface CLIFlags {
 	drafts?: boolean;
 	open?: boolean;
 	experimentalAssets?: boolean;
+	experimentalMiddleware?: boolean;
 }
 
 export interface BuildConfig {
@@ -511,6 +512,23 @@ export interface AstroUserConfig {
 	 */
 	trailingSlash?: 'always' | 'never' | 'ignore';
 
+	/**
+	 * @docs
+	 * @name scopedStyleStrategy
+	 * @type {('where' | 'class')}
+	 * @default `'where'`
+	 * @description
+	 * @version 2.4
+	 *
+	 * Specify the strategy used for scoping styles within Astro components. Choose from:
+	 *   - `'where'` - Use `:where` selectors, causing no specifity increase.
+	 *   - `'class'` - Use class-based selectors, causing a +1 specifity increase.
+	 *
+	 * Using `'class'` is helpful when you want to ensure that element selectors within an Astro component override global style defaults (e.g. from a global stylesheet).
+	 * Using `'where'` gives you more control over specifity, but requires that you use higher-specifity selectors, layers, and other tools to control which selectors are applied.
+	 */
+	scopedStyleStrategy?: 'where' | 'class';
+
 	/**
 	 * @docs
 	 * @name adapter
@@ -1034,6 +1052,46 @@ export interface AstroUserConfig {
 		 * }
 		 */
 		assets?: boolean;
+
+		/**
+		 * @docs
+		 * @name experimental.inlineStylesheets
+		 * @type {('always' | 'auto' | 'never')}
+		 * @default `never`
+		 * @description
+		 * Control whether styles are sent to the browser in a separate css file or inlined into <style> tags. Choose from the following options:
+		 *  - `'always'` - all styles are inlined into <style> tags
+		 *  - `'auto'` - only stylesheets smaller than `ViteConfig.build.assetsInlineLimit` (default: 4kb) are inlined. Otherwise, styles are sent in external stylesheets.
+		 *  - `'never'` - all styles are sent in external stylesheets
+		 *
+		 * ```js
+		 * {
+		 * 	experimental: {
+		 *		inlineStylesheets: `auto`,
+		 * 	},
+		 * }
+		 */
+		inlineStylesheets?: 'always' | 'auto' | 'never';
+
+		/**
+		 * @docs
+		 * @name experimental.middleware
+		 * @type {boolean}
+		 * @default `false`
+		 * @version 2.4.0
+		 * @description
+		 * Enable experimental support for Astro middleware.
+		 *
+		 * To enable this feature, set `experimental.middleware` to `true` in your Astro config:
+		 *
+		 * ```js
+		 * {
+		 * 	experimental: {
+		 *		middleware: true,
+		 * 	},
+		 * }
+		 */
+		middleware?: boolean;
 	};
 
 	// Legacy options to be removed
@@ -1431,6 +1489,11 @@ interface AstroSharedContext<Props extends Record<string, any> = Record<string,
 	 * Redirect to another page (**SSR Only**).
 	 */
 	redirect(path: string, status?: 301 | 302 | 303 | 307 | 308): Response;
+
+	/**
+	 * Object accessed via Astro middleware
+	 */
+	locals: App.Locals;
 }
 
 export interface APIContext<Props extends Record<string, any> = Record<string, any>>
@@ -1464,7 +1527,7 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
 	 * }
 	 * ```
 	 *
-	 * [context reference](https://docs.astro.build/en/guides/api-reference/#contextparams)
+	 * [context reference](https://docs.astro.build/en/reference/api-reference/#contextparams)
 	 */
 	params: AstroSharedContext['params'];
 	/**
@@ -1504,6 +1567,31 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
 	 * [context reference](https://docs.astro.build/en/guides/api-reference/#contextredirect)
 	 */
 	redirect: AstroSharedContext['redirect'];
+
+	/**
+	 * Object accessed via Astro middleware.
+	 *
+	 * Example usage:
+	 *
+	 * ```ts
+	 * // src/middleware.ts
+	 * import {defineMiddleware} from "astro/middleware";
+	 *
+	 * export const onRequest = defineMiddleware((context, next) => {
+	 *   context.locals.greeting = "Hello!";
+	 *   next();
+	 * });
+	 * ```
+	 * Inside a `.astro` file:
+	 * ```astro
+	 * ---
+	 * // src/pages/index.astro
+	 * const greeting = Astro.locals.greeting;
+	 * ---
+	 * <h1>{greeting}</h1>
+	 * ```
+	 */
+	locals: App.Locals;
 }
 
 export type Props = Record<string, unknown>;
@@ -1592,6 +1680,22 @@ export interface AstroIntegration {
 	};
 }
 
+export type MiddlewareNext<R> = () => Promise<R>;
+export type MiddlewareHandler<R> = (
+	context: APIContext,
+	next: MiddlewareNext<R>
+) => Promise<R> | Promise<void> | void;
+
+export type MiddlewareResponseHandler = MiddlewareHandler<Response>;
+export type MiddlewareEndpointHandler = MiddlewareHandler<Response | EndpointOutput>;
+export type MiddlewareNextResponse = MiddlewareNext<Response>;
+
+// NOTE: when updating this file with other functions,
+// remember to update `plugin-page.ts` too, to add that function as a no-op function.
+export type AstroMiddlewareInstance<R> = {
+	onRequest?: MiddlewareHandler<R>;
+};
+
 export interface AstroPluginOptions {
 	settings: AstroSettings;
 	logging: LogOptions;
diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts
index 945b5a3e8..c4b8ca751 100644
--- a/packages/astro/src/assets/internal.ts
+++ b/packages/astro/src/assets/internal.ts
@@ -29,22 +29,6 @@ export async function getConfiguredImageService(): Promise<ImageService> {
 	return globalThis.astroAsset.imageService;
 }
 
-/**
- * Get an optimized image and the necessary attributes to render it.
- *
- * **Example**
- * ```astro
- * ---
- * import { getImage } from 'astro:assets';
- * import originalImage from '../assets/image.png';
- *
- * const optimizedImage = await getImage({src: originalImage, width: 1280 });
- * ---
- * <img src={optimizedImage.src} {...optimizedImage.attributes} />
- * ```
- *
- * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
- */
 export async function getImage(
 	options: ImageTransform,
 	serviceConfig: Record<string, any>
diff --git a/packages/astro/src/content/runtime.ts b/packages/astro/src/content/runtime.ts
index b97133dde..c0fddde09 100644
--- a/packages/astro/src/content/runtime.ts
+++ b/packages/astro/src/content/runtime.ts
@@ -6,7 +6,6 @@ import {
 	createHeadAndContent,
 	renderComponent,
 	renderScriptElement,
-	renderStyleElement,
 	renderTemplate,
 	renderUniqueStylesheet,
 	unescapeHTML,
@@ -152,13 +151,21 @@ async function render({
 				links = '',
 				scripts = '';
 			if (Array.isArray(collectedStyles)) {
-				styles = collectedStyles.map((style: any) => renderStyleElement(style)).join('');
+				styles = collectedStyles
+					.map((style: any) => {
+						return renderUniqueStylesheet(result, {
+							type: 'inline',
+							content: style,
+						});
+					})
+					.join('');
 			}
 			if (Array.isArray(collectedLinks)) {
 				links = collectedLinks
 					.map((link: any) => {
 						return renderUniqueStylesheet(result, {
-							href: prependForwardSlash(link),
+							type: 'external',
+							src: prependForwardSlash(link),
 						});
 					})
 					.join('');
diff --git a/packages/astro/src/content/vite-plugin-content-assets.ts b/packages/astro/src/content/vite-plugin-content-assets.ts
index 09fb6dbee..efce94e9c 100644
--- a/packages/astro/src/content/vite-plugin-content-assets.ts
+++ b/packages/astro/src/content/vite-plugin-content-assets.ts
@@ -123,7 +123,8 @@ export function astroConfigBuildPlugin(
 						chunk.type === 'chunk' &&
 						(chunk.code.includes(LINKS_PLACEHOLDER) || chunk.code.includes(SCRIPTS_PLACEHOLDER))
 					) {
-						let entryCSS = new Set<string>();
+						let entryStyles = new Set<string>();
+						let entryLinks = new Set<string>();
 						let entryScripts = new Set<string>();
 
 						for (const id of Object.keys(chunk.modules)) {
@@ -137,7 +138,8 @@ export function astroConfigBuildPlugin(
 									const _entryScripts = pageData.propagatedScripts?.get(id);
 									if (_entryCss) {
 										for (const value of _entryCss) {
-											entryCSS.add(value);
+											if (value.type === 'inline') entryStyles.add(value.content);
+											if (value.type === 'external') entryLinks.add(value.src);
 										}
 									}
 									if (_entryScripts) {
@@ -150,10 +152,16 @@ export function astroConfigBuildPlugin(
 						}
 
 						let newCode = chunk.code;
-						if (entryCSS.size) {
+						if (entryStyles.size) {
+							newCode = newCode.replace(
+								JSON.stringify(STYLES_PLACEHOLDER),
+								JSON.stringify(Array.from(entryStyles))
+							);
+						}
+						if (entryLinks.size) {
 							newCode = newCode.replace(
 								JSON.stringify(LINKS_PLACEHOLDER),
-								JSON.stringify(Array.from(entryCSS).map(prependBase))
+								JSON.stringify(Array.from(entryLinks).map(prependBase))
 							);
 						}
 						if (entryScripts.size) {
diff --git a/packages/astro/src/content/vite-plugin-content-imports.ts b/packages/astro/src/content/vite-plugin-content-imports.ts
index 1c7a80b91..67fb45bcd 100644
--- a/packages/astro/src/content/vite-plugin-content-imports.ts
+++ b/packages/astro/src/content/vite-plugin-content-imports.ts
@@ -119,7 +119,7 @@ export function astroContentImportPlugin({
 	if (settings.contentEntryTypes.some((t) => t.getRenderModule)) {
 		plugins.push({
 			name: 'astro:content-render-imports',
-			async load(viteId) {
+			async transform(_, viteId) {
 				const contentRenderer = getContentRendererByViteId(viteId, settings);
 				if (!contentRenderer) return;
 
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index a1d19ee92..b657e4943 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -2,6 +2,7 @@ import type {
 	ComponentInstance,
 	EndpointHandler,
 	ManifestData,
+	MiddlewareResponseHandler,
 	RouteData,
 	SSRElement,
 } from '../../@types/astro';
@@ -9,9 +10,10 @@ import type { RouteInfo, SSRManifest as Manifest } from './types';
 
 import mime from 'mime';
 import { attachToResponse, getSetCookiesFromResponse } from '../cookies/index.js';
-import { call as callEndpoint } from '../endpoint/index.js';
+import { call as callEndpoint, createAPIContext } from '../endpoint/index.js';
 import { consoleLogDestination } from '../logger/console.js';
 import { error, type LogOptions } from '../logger/core.js';
+import { callMiddleware } from '../middleware/callMiddleware.js';
 import { removeTrailingForwardSlash } from '../path.js';
 import {
 	createEnvironment,
@@ -22,12 +24,14 @@ import {
 import { RouteCache } from '../render/route-cache.js';
 import {
 	createAssetLink,
-	createLinkStylesheetElementSet,
 	createModuleScriptElement,
+	createStylesheetElementSet,
 } from '../render/ssr-element.js';
 import { matchRoute } from '../routing/match.js';
 export { deserializeManifest } from './common.js';
 
+const clientLocalsSymbol = Symbol.for('astro.locals');
+
 export const pagesVirtualModuleId = '@astrojs-pages-virtual-entry';
 export const resolvedPagesVirtualModuleId = '\0' + pagesVirtualModuleId;
 const responseSentSymbol = Symbol.for('astro.responseSent');
@@ -127,6 +131,8 @@ export class App {
 			}
 		}
 
+		Reflect.set(request, clientLocalsSymbol, {});
+
 		// Use the 404 status code for 404.astro components
 		if (routeData.route === '/404') {
 			defaultStatus = 404;
@@ -174,7 +180,9 @@ export class App {
 		const url = new URL(request.url);
 		const pathname = '/' + this.removeBase(url.pathname);
 		const info = this.#routeDataToRouteInfo.get(routeData!)!;
-		const links = createLinkStylesheetElementSet(info.links);
+		// may be used in the future for handling rel=modulepreload, rel=icon, rel=manifest etc.
+		const links = new Set<never>();
+		const styles = createStylesheetElementSet(info.styles);
 
 		let scripts = new Set<SSRElement>();
 		for (const script of info.scripts) {
@@ -191,18 +199,45 @@ export class App {
 		}
 
 		try {
-			const ctx = createRenderContext({
+			const renderContext = await createRenderContext({
 				request,
 				origin: url.origin,
 				pathname,
 				componentMetadata: this.#manifest.componentMetadata,
 				scripts,
+				styles,
 				links,
 				route: routeData,
 				status,
+				mod: mod as any,
+				env: this.#env,
 			});
 
-			const response = await renderPage(mod, ctx, this.#env);
+			const apiContext = createAPIContext({
+				request: renderContext.request,
+				params: renderContext.params,
+				props: renderContext.props,
+				site: this.#env.site,
+				adapterName: this.#env.adapterName,
+			});
+			const onRequest = this.#manifest.middleware?.onRequest;
+			let response;
+			if (onRequest) {
+				response = await callMiddleware<Response>(
+					onRequest as MiddlewareResponseHandler,
+					apiContext,
+					() => {
+						return renderPage({ mod, renderContext, env: this.#env, apiContext });
+					}
+				);
+			} else {
+				response = await renderPage({
+					mod,
+					renderContext,
+					env: this.#env,
+					apiContext,
+				});
+			}
 			Reflect.set(request, responseSentSymbol, true);
 			return response;
 		} catch (err: any) {
@@ -224,15 +259,23 @@ export class App {
 		const pathname = '/' + this.removeBase(url.pathname);
 		const handler = mod as unknown as EndpointHandler;
 
-		const ctx = createRenderContext({
+		const ctx = await createRenderContext({
 			request,
 			origin: url.origin,
 			pathname,
 			route: routeData,
 			status,
+			env: this.#env,
+			mod: handler as any,
 		});
 
-		const result = await callEndpoint(handler, this.#env, ctx, this.#logging);
+		const result = await callEndpoint(
+			handler,
+			this.#env,
+			ctx,
+			this.#logging,
+			this.#manifest.middleware
+		);
 
 		if (result.type === 'response') {
 			if (result.response.headers.get('X-Astro-Response') === 'Not-Found') {
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
index ab91c13ca..ab6a50b9c 100644
--- a/packages/astro/src/core/app/types.ts
+++ b/packages/astro/src/core/app/types.ts
@@ -1,5 +1,6 @@
 import type { MarkdownRenderingOptions } from '@astrojs/markdown-remark';
 import type {
+	AstroMiddlewareInstance,
 	ComponentInstance,
 	RouteData,
 	SerializedRouteData,
@@ -10,6 +11,10 @@ import type {
 
 export type ComponentPath = string;
 
+export type StylesheetAsset =
+	| { type: 'inline'; content: string }
+	| { type: 'external'; src: string };
+
 export interface RouteInfo {
 	routeData: RouteData;
 	file: string;
@@ -20,6 +25,7 @@ export interface RouteInfo {
 		// Hoisted
 		| { type: 'inline' | 'external'; value: string }
 	)[];
+	styles: StylesheetAsset[];
 }
 
 export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
@@ -38,6 +44,7 @@ export interface SSRManifest {
 	entryModules: Record<string, string>;
 	assets: Set<string>;
 	componentMetadata: SSRResult['componentMetadata'];
+	middleware?: AstroMiddlewareInstance<unknown>;
 }
 
 export type SerializedSSRManifest = Omit<SSRManifest, 'routes' | 'assets' | 'componentMetadata'> & {
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index 812ae673f..7d1f85211 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -5,10 +5,13 @@ import type { OutputAsset, OutputChunk } from 'rollup';
 import { fileURLToPath } from 'url';
 import type {
 	AstroConfig,
+	AstroMiddlewareInstance,
 	AstroSettings,
 	ComponentInstance,
 	EndpointHandler,
+	EndpointOutput,
 	ImageTransform,
+	MiddlewareResponseHandler,
 	RouteType,
 	SSRError,
 	SSRLoadedRenderer,
@@ -25,27 +28,32 @@ import {
 } from '../../core/path.js';
 import { runHookBuildGenerated } from '../../integrations/index.js';
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from '../../vite-plugin-scripts/index.js';
-import { call as callEndpoint, throwIfRedirectNotAllowed } from '../endpoint/index.js';
+import {
+	call as callEndpoint,
+	createAPIContext,
+	throwIfRedirectNotAllowed,
+} from '../endpoint/index.js';
 import { AstroError } from '../errors/index.js';
 import { debug, info } from '../logger/core.js';
+import { callMiddleware } from '../middleware/callMiddleware.js';
 import { createEnvironment, createRenderContext, renderPage } from '../render/index.js';
 import { callGetStaticPaths } from '../render/route-cache.js';
 import {
 	createAssetLink,
-	createLinkStylesheetElementSet,
 	createModuleScriptsSet,
+	createStylesheetElementSet,
 } from '../render/ssr-element.js';
 import { createRequest } from '../request.js';
 import { matchRoute } from '../routing/match.js';
 import { getOutputFilename } from '../util.js';
 import { getOutDirWithinCwd, getOutFile, getOutFolder } from './common.js';
-import {
-	eachPageData,
-	eachPrerenderedPageData,
-	getPageDataByComponent,
-	sortedCSS,
-} from './internal.js';
-import type { PageBuildData, SingleFileBuiltModule, StaticBuildOptions } from './types';
+import { cssOrder, eachPageData, getPageDataByComponent, mergeInlineCss } from './internal.js';
+import type {
+	PageBuildData,
+	SingleFileBuiltModule,
+	StaticBuildOptions,
+	StylesheetAsset,
+} from './types';
 import { getTimeStat } from './util.js';
 
 function shouldSkipDraft(pageModule: ComponentInstance, settings: AstroSettings): boolean {
@@ -99,8 +107,9 @@ export async function generatePages(opts: StaticBuildOptions, internals: BuildIn
 	const builtPaths = new Set<string>();
 
 	if (ssr) {
-		for (const pageData of eachPrerenderedPageData(internals)) {
-			await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
+		for (const pageData of eachPageData(internals)) {
+			if (pageData.route.prerender)
+				await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
 		}
 	} else {
 		for (const pageData of eachPageData(internals)) {
@@ -157,10 +166,17 @@ async function generatePage(
 	const renderers = ssrEntry.renderers;
 
 	const pageInfo = getPageDataByComponent(internals, pageData.route.component);
-	const linkIds: string[] = sortedCSS(pageData);
+
+	// may be used in the future for handling rel=modulepreload, rel=icon, rel=manifest etc.
+	const linkIds: [] = [];
 	const scripts = pageInfo?.hoistedScript ?? null;
+	const styles = pageData.styles
+		.sort(cssOrder)
+		.map(({ sheet }) => sheet)
+		.reduce(mergeInlineCss, []);
 
 	const pageModule = ssrEntry.pageMap?.get(pageData.component);
+	const middleware = ssrEntry.middleware;
 
 	if (!pageModule) {
 		throw new Error(
@@ -178,6 +194,7 @@ async function generatePage(
 		internals,
 		linkIds,
 		scripts,
+		styles,
 		mod: pageModule,
 		renderers,
 	};
@@ -190,7 +207,7 @@ async function generatePage(
 
 	for (let i = 0; i < paths.length; i++) {
 		const path = paths[i];
-		await generatePath(path, opts, generationOptions);
+		await generatePath(path, opts, generationOptions, middleware);
 		const timeEnd = performance.now();
 		const timeChange = getTimeStat(timeStart, timeEnd);
 		const timeIncrease = `(+${timeChange})`;
@@ -268,6 +285,7 @@ interface GeneratePathOptions {
 	internals: BuildInternals;
 	linkIds: string[];
 	scripts: { type: 'inline' | 'external'; value: string } | null;
+	styles: StylesheetAsset[];
 	mod: ComponentInstance;
 	renderers: SSRLoadedRenderer[];
 }
@@ -332,10 +350,19 @@ function getUrlForPath(
 async function generatePath(
 	pathname: string,
 	opts: StaticBuildOptions,
-	gopts: GeneratePathOptions
+	gopts: GeneratePathOptions,
+	middleware?: AstroMiddlewareInstance<unknown>
 ) {
 	const { settings, logging, origin, routeCache } = opts;
-	const { mod, internals, linkIds, scripts: hoistedScripts, pageData, renderers } = gopts;
+	const {
+		mod,
+		internals,
+		linkIds,
+		scripts: hoistedScripts,
+		styles: _styles,
+		pageData,
+		renderers,
+	} = gopts;
 
 	// This adds the page name to the array so it can be shown as part of stats.
 	if (pageData.route.type === 'page') {
@@ -344,13 +371,15 @@ async function generatePath(
 
 	debug('build', `Generating: ${pathname}`);
 
-	const links = createLinkStylesheetElementSet(
-		linkIds,
+	// may be used in the future for handling rel=modulepreload, rel=icon, rel=manifest etc.
+	const links = new Set<never>();
+	const scripts = createModuleScriptsSet(
+		hoistedScripts ? [hoistedScripts] : [],
 		settings.config.base,
 		settings.config.build.assetsPrefix
 	);
-	const scripts = createModuleScriptsSet(
-		hoistedScripts ? [hoistedScripts] : [],
+	const styles = createStylesheetElementSet(
+		_styles,
 		settings.config.base,
 		settings.config.build.assetsPrefix
 	);
@@ -418,21 +447,32 @@ async function generatePath(
 		ssr,
 		streaming: true,
 	});
-	const ctx = createRenderContext({
+
+	const renderContext = await createRenderContext({
 		origin,
 		pathname,
 		request: createRequest({ url, headers: new Headers(), logging, ssr }),
 		componentMetadata: internals.componentMetadata,
 		scripts,
+		styles,
 		links,
 		route: pageData.route,
+		env,
+		mod,
 	});
 
 	let body: string | Uint8Array;
 	let encoding: BufferEncoding | undefined;
 	if (pageData.route.type === 'endpoint') {
 		const endpointHandler = mod as unknown as EndpointHandler;
-		const result = await callEndpoint(endpointHandler, env, ctx, logging);
+
+		const result = await callEndpoint(
+			endpointHandler,
+			env,
+			renderContext,
+			logging,
+			middleware as AstroMiddlewareInstance<Response | EndpointOutput>
+		);
 
 		if (result.type === 'response') {
 			throwIfRedirectNotAllowed(result.response, opts.settings.config);
@@ -447,7 +487,26 @@ async function generatePath(
 	} else {
 		let response: Response;
 		try {
-			response = await renderPage(mod, ctx, env);
+			const apiContext = createAPIContext({
+				request: renderContext.request,
+				params: renderContext.params,
+				props: renderContext.props,
+				site: env.site,
+				adapterName: env.adapterName,
+			});
+
+			const onRequest = middleware?.onRequest;
+			if (onRequest) {
+				response = await callMiddleware<Response>(
+					onRequest as MiddlewareResponseHandler,
+					apiContext,
+					() => {
+						return renderPage({ mod, renderContext, env, apiContext });
+					}
+				);
+			} else {
+				response = await renderPage({ mod, renderContext, env, apiContext });
+			}
 		} catch (err) {
 			if (!AstroError.is(err) && !(err as SSRError).id && typeof err === 'object') {
 				(err as SSRError).id = pageData.component;
diff --git a/packages/astro/src/core/build/internal.ts b/packages/astro/src/core/build/internal.ts
index e54405724..1d69849c9 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 { PageBuildData, ViteID } from './types';
+import type { PageBuildData, StylesheetAsset, ViteID } from './types';
 
 import type { SSRResult } from '../../@types/astro';
 import type { PageOptions } from '../../vite-plugin-astro/types';
@@ -216,63 +216,64 @@ export function* eachPageData(internals: BuildInternals) {
 }
 
 export function hasPrerenderedPages(internals: BuildInternals) {
-	for (const id of internals.pagesByViteID.keys()) {
-		if (internals.pageOptionsByPage.get(id)?.prerender) {
+	for (const pageData of eachPageData(internals)) {
+		if (pageData.route.prerender) {
 			return true;
 		}
 	}
 	return false;
 }
 
-export function* eachPrerenderedPageData(internals: BuildInternals) {
-	for (const [id, pageData] of internals.pagesByViteID.entries()) {
-		if (internals.pageOptionsByPage.get(id)?.prerender) {
-			yield pageData;
-		}
-	}
-}
-
-export function* eachServerPageData(internals: BuildInternals) {
-	for (const [id, pageData] of internals.pagesByViteID.entries()) {
-		if (!internals.pageOptionsByPage.get(id)?.prerender) {
-			yield pageData;
-		}
-	}
+interface OrderInfo {
+	depth: number;
+	order: number;
 }
 
 /**
  * Sort a page's CSS by depth. A higher depth means that the CSS comes from shared subcomponents.
  * A lower depth means it comes directly from the top-level page.
- * The return of this function is an array of CSS paths, with shared CSS on top
- * and page-level CSS on bottom.
+ * Can be used to sort stylesheets so that shared rules come first
+ * and page-specific rules come after.
  */
-export function sortedCSS(pageData: PageBuildData) {
-	return Array.from(pageData.css)
-		.sort((a, b) => {
-			let depthA = a[1].depth,
-				depthB = b[1].depth,
-				orderA = a[1].order,
-				orderB = b[1].order;
+export function cssOrder(a: OrderInfo, b: OrderInfo) {
+	let depthA = a.depth,
+		depthB = b.depth,
+		orderA = a.order,
+		orderB = b.order;
 
-			if (orderA === -1 && orderB >= 0) {
-				return 1;
-			} else if (orderB === -1 && orderA >= 0) {
-				return -1;
-			} else if (orderA > orderB) {
-				return 1;
-			} else if (orderA < orderB) {
-				return -1;
-			} else {
-				if (depthA === -1) {
-					return -1;
-				} else if (depthB === -1) {
-					return 1;
-				} else {
-					return depthA > depthB ? -1 : 1;
-				}
-			}
-		})
-		.map(([id]) => id);
+	if (orderA === -1 && orderB >= 0) {
+		return 1;
+	} else if (orderB === -1 && orderA >= 0) {
+		return -1;
+	} else if (orderA > orderB) {
+		return 1;
+	} else if (orderA < orderB) {
+		return -1;
+	} else {
+		if (depthA === -1) {
+			return -1;
+		} else if (depthB === -1) {
+			return 1;
+		} else {
+			return depthA > depthB ? -1 : 1;
+		}
+	}
+}
+
+export function mergeInlineCss(
+	acc: Array<StylesheetAsset>,
+	current: StylesheetAsset
+): Array<StylesheetAsset> {
+	const lastAdded = acc.at(acc.length - 1);
+	const lastWasInline = lastAdded?.type === 'inline';
+	const currentIsInline = current?.type === 'inline';
+	if (lastWasInline && currentIsInline) {
+		const merged = { type: 'inline' as const, content: lastAdded.content + current.content };
+		acc[acc.length - 1] = merged;
+		return acc;
+	}
+	acc.push(current);
+	return acc;
 }
 
 export function isHoistedScript(internals: BuildInternals, id: string): boolean {
diff --git a/packages/astro/src/core/build/page-data.ts b/packages/astro/src/core/build/page-data.ts
index 71de5da4b..0a53745c5 100644
--- a/packages/astro/src/core/build/page-data.ts
+++ b/packages/astro/src/core/build/page-data.ts
@@ -53,7 +53,7 @@ export async function collectPagesData(
 				component: route.component,
 				route,
 				moduleSpecifier: '',
-				css: new Map(),
+				styles: [],
 				propagatedStyles: new Map(),
 				propagatedScripts: new Map(),
 				hoistedScript: undefined,
@@ -76,7 +76,7 @@ export async function collectPagesData(
 			component: route.component,
 			route,
 			moduleSpecifier: '',
-			css: new Map(),
+			styles: [],
 			propagatedStyles: new Map(),
 			propagatedScripts: new Map(),
 			hoistedScript: undefined,
diff --git a/packages/astro/src/core/build/plugins/plugin-component-entry.ts b/packages/astro/src/core/build/plugins/plugin-component-entry.ts
index 441bd4eb2..444aa6a19 100644
--- a/packages/astro/src/core/build/plugins/plugin-component-entry.ts
+++ b/packages/astro/src/core/build/plugins/plugin-component-entry.ts
@@ -2,7 +2,7 @@ import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
 
-const astroEntryPrefix = '\0astro-entry:';
+export const astroEntryPrefix = '\0astro-entry:';
 
 /**
  * When adding hydrated or client:only components as Rollup inputs, sometimes we're not using all
diff --git a/packages/astro/src/core/build/plugins/plugin-css.ts b/packages/astro/src/core/build/plugins/plugin-css.ts
index 2df111487..a5bdb70f1 100644
--- a/packages/astro/src/core/build/plugins/plugin-css.ts
+++ b/packages/astro/src/core/build/plugins/plugin-css.ts
@@ -5,7 +5,7 @@ import { type Plugin as VitePlugin, type ResolvedConfig } from 'vite';
 import { isBuildableCSSRequest } from '../../render/dev/util.js';
 import type { BuildInternals } from '../internal';
 import type { AstroBuildPlugin } from '../plugin';
-import type { PageBuildData, StaticBuildOptions } from '../types';
+import type { PageBuildData, StaticBuildOptions, StylesheetAsset } from '../types';
 
 import { PROPAGATED_ASSET_FLAG } from '../../../content/consts.js';
 import * as assetName from '../css-asset-name.js';
@@ -25,217 +25,7 @@ interface PluginOptions {
 	target: 'client' | 'server';
 }
 
-export function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
-	const { internals, buildOptions } = options;
-	const { settings } = buildOptions;
-
-	let resolvedConfig: ResolvedConfig;
-
-	function createNameHash(baseId: string, hashIds: string[]): string {
-		const baseName = baseId ? npath.parse(baseId).name : 'index';
-		const hash = crypto.createHash('sha256');
-		for (const id of hashIds) {
-			hash.update(id, 'utf-8');
-		}
-		const h = hash.digest('hex').slice(0, 8);
-		const proposedName = baseName + '.' + h;
-		return proposedName;
-	}
-
-	function* getParentClientOnlys(
-		id: string,
-		ctx: { getModuleInfo: GetModuleInfo }
-	): Generator<PageBuildData, void, unknown> {
-		for (const [info] of walkParentInfos(id, ctx)) {
-			yield* getPageDatasByClientOnlyID(internals, info.id);
-		}
-	}
-
-	return [
-		{
-			name: 'astro:rollup-plugin-build-css',
-
-			transform(_, id) {
-				// In the SSR build, styles that are bundled are tracked in `internals.cssChunkModuleIds`.
-				// In the client build, if we're also bundling the same style, return an empty string to
-				// deduplicate the final CSS output.
-				if (options.target === 'client' && internals.cssChunkModuleIds.has(id)) {
-					return '';
-				}
-			},
-
-			outputOptions(outputOptions) {
-				// Skip in client builds as its module graph doesn't have reference to Astro pages
-				// to be able to chunk based on it's related top-level pages.
-				if (options.target === 'client') return;
-
-				const assetFileNames = outputOptions.assetFileNames;
-				const namingIncludesHash = assetFileNames?.toString().includes('[hash]');
-				const createNameForParentPages = namingIncludesHash
-					? assetName.shortHashedName
-					: assetName.createSlugger(settings);
-
-				extendManualChunks(outputOptions, {
-					after(id, meta) {
-						// For CSS, create a hash of all of the pages that use it.
-						// This causes CSS to be built into shared chunks when used by multiple pages.
-						if (isBuildableCSSRequest(id)) {
-							for (const [pageInfo] of walkParentInfos(id, {
-								getModuleInfo: meta.getModuleInfo,
-							})) {
-								if (new URL(pageInfo.id, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG)) {
-									// Split delayed assets to separate modules
-									// so they can be injected where needed
-									return createNameHash(id, [id]);
-								}
-							}
-							return createNameForParentPages(id, meta);
-						}
-					},
-				});
-			},
-
-			async generateBundle(_outputOptions, bundle) {
-				type ViteMetadata = {
-					importedAssets: Set<string>;
-					importedCss: Set<string>;
-				};
-
-				const appendCSSToPage = (
-					pageData: PageBuildData,
-					meta: ViteMetadata,
-					depth: number,
-					order: number
-				) => {
-					for (const importedCssImport of meta.importedCss) {
-						// CSS is prioritized based on depth. Shared CSS has a higher depth due to being imported by multiple pages.
-						// Depth info is used when sorting the links on the page.
-						if (pageData?.css.has(importedCssImport)) {
-							// eslint-disable-next-line
-							const cssInfo = pageData?.css.get(importedCssImport)!;
-							if (depth < cssInfo.depth) {
-								cssInfo.depth = depth;
-							}
-
-							// Update the order, preferring the lowest order we have.
-							if (cssInfo.order === -1) {
-								cssInfo.order = order;
-							} else if (order < cssInfo.order && order > -1) {
-								cssInfo.order = order;
-							}
-						} else {
-							pageData?.css.set(importedCssImport, { depth, order });
-						}
-					}
-				};
-
-				for (const [_, chunk] of Object.entries(bundle)) {
-					if (chunk.type === 'chunk') {
-						const c = chunk;
-
-						if ('viteMetadata' in chunk) {
-							const meta = chunk['viteMetadata'] as ViteMetadata;
-
-							// Chunks that have the viteMetadata.importedCss are CSS chunks
-							if (meta.importedCss.size) {
-								// In the SSR build, keep track of all CSS chunks' modules as the client build may
-								// duplicate them, e.g. for `client:load` components that render in SSR and client
-								// for hydation.
-								if (options.target === 'server') {
-									for (const id of Object.keys(c.modules)) {
-										internals.cssChunkModuleIds.add(id);
-									}
-								}
-
-								// For the client build, client:only styles need to be mapped
-								// over to their page. For this chunk, determine if it's a child of a
-								// client:only component and if so, add its CSS to the page it belongs to.
-								if (options.target === 'client') {
-									for (const id of Object.keys(c.modules)) {
-										for (const pageData of getParentClientOnlys(id, this)) {
-											for (const importedCssImport of meta.importedCss) {
-												pageData.css.set(importedCssImport, { depth: -1, order: -1 });
-											}
-										}
-									}
-								}
-
-								// For this CSS chunk, walk parents until you find a page. Add the CSS to that page.
-								for (const id of Object.keys(c.modules)) {
-									for (const [pageInfo, depth, order] of walkParentInfos(
-										id,
-										this,
-										function until(importer) {
-											return new URL(importer, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG);
-										}
-									)) {
-										if (new URL(pageInfo.id, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG)) {
-											for (const parent of walkParentInfos(id, this)) {
-												const parentInfo = parent[0];
-												if (moduleIsTopLevelPage(parentInfo)) {
-													const pageViteID = parentInfo.id;
-													const pageData = getPageDataByViteID(internals, pageViteID);
-													if (pageData) {
-														for (const css of meta.importedCss) {
-															const existingCss =
-																pageData.propagatedStyles.get(pageInfo.id) ?? new Set();
-															pageData.propagatedStyles.set(
-																pageInfo.id,
-																new Set([...existingCss, css])
-															);
-														}
-													}
-												}
-											}
-										} else if (moduleIsTopLevelPage(pageInfo)) {
-											const pageViteID = pageInfo.id;
-											const pageData = getPageDataByViteID(internals, pageViteID);
-											if (pageData) {
-												appendCSSToPage(pageData, meta, depth, order);
-											}
-										} else if (
-											options.target === 'client' &&
-											isHoistedScript(internals, pageInfo.id)
-										) {
-											for (const pageData of getPageDatasByHoistedScriptId(
-												internals,
-												pageInfo.id
-											)) {
-												appendCSSToPage(pageData, meta, -1, order);
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			},
-		},
-		{
-			name: 'astro:rollup-plugin-single-css',
-			enforce: 'post',
-			configResolved(config) {
-				resolvedConfig = config;
-			},
-			generateBundle(_, bundle) {
-				// If user disable css code-splitting, search for Vite's hardcoded
-				// `style.css` and add it as css for each page.
-				// Ref: https://github.com/vitejs/vite/blob/b2c0ee04d4db4a0ef5a084c50f49782c5f88587c/packages/vite/src/node/plugins/html.ts#L690-L705
-				if (!resolvedConfig.build.cssCodeSplit) {
-					const cssChunk = Object.values(bundle).find(
-						(chunk) => chunk.type === 'asset' && chunk.name === 'style.css'
-					);
-					if (cssChunk) {
-						for (const pageData of eachPageData(internals)) {
-							pageData.css.set(cssChunk.fileName, { depth: -1, order: -1 });
-						}
-					}
-				}
-			},
-		},
-	];
-}
+/***** ASTRO PLUGIN *****/
 
 export function pluginCSS(
 	options: StaticBuildOptions,
@@ -258,3 +48,272 @@ export function pluginCSS(
 		},
 	};
 }
+
+/***** ROLLUP SUB-PLUGINS *****/
+
+function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin[] {
+	const { internals, buildOptions } = options;
+	const { settings } = buildOptions;
+
+	let resolvedConfig: ResolvedConfig;
+
+	// stylesheet filenames are kept in here until "post", when they are rendered and ready to be inlined
+	const pagesToCss: Record<string, Record<string, { order: number; depth: number }>> = {};
+	const pagesToPropagatedCss: Record<string, Record<string, Set<string>>> = {};
+
+	const cssBuildPlugin: VitePlugin = {
+		name: 'astro:rollup-plugin-build-css',
+
+		transform(_, id) {
+			// In the SSR build, styles that are bundled are tracked in `internals.cssChunkModuleIds`.
+			// In the client build, if we're also bundling the same style, return an empty string to
+			// deduplicate the final CSS output.
+			if (options.target === 'client' && internals.cssChunkModuleIds.has(id)) {
+				return '';
+			}
+		},
+
+		outputOptions(outputOptions) {
+			// Skip in client builds as its module graph doesn't have reference to Astro pages
+			// to be able to chunk based on it's related top-level pages.
+			if (options.target === 'client') return;
+
+			const assetFileNames = outputOptions.assetFileNames;
+			const namingIncludesHash = assetFileNames?.toString().includes('[hash]');
+			const createNameForParentPages = namingIncludesHash
+				? assetName.shortHashedName
+				: assetName.createSlugger(settings);
+
+			extendManualChunks(outputOptions, {
+				after(id, meta) {
+					// For CSS, create a hash of all of the pages that use it.
+					// This causes CSS to be built into shared chunks when used by multiple pages.
+					if (isBuildableCSSRequest(id)) {
+						for (const [pageInfo] of walkParentInfos(id, {
+							getModuleInfo: meta.getModuleInfo,
+						})) {
+							if (new URL(pageInfo.id, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG)) {
+								// Split delayed assets to separate modules
+								// so they can be injected where needed
+								return createNameHash(id, [id]);
+							}
+						}
+						return createNameForParentPages(id, meta);
+					}
+				},
+			});
+		},
+
+		async generateBundle(_outputOptions, bundle) {
+			for (const [_, chunk] of Object.entries(bundle)) {
+				if (chunk.type !== 'chunk') continue;
+				if ('viteMetadata' in chunk === false) continue;
+				const meta = chunk.viteMetadata as ViteMetadata;
+
+				// Skip if the chunk has no CSS, we want to handle CSS chunks only
+				if (meta.importedCss.size < 1) continue;
+
+				// In the SSR build, keep track of all CSS chunks' modules as the client build may
+				// duplicate them, e.g. for `client:load` components that render in SSR and client
+				// for hydation.
+				if (options.target === 'server') {
+					for (const id of Object.keys(chunk.modules)) {
+						internals.cssChunkModuleIds.add(id);
+					}
+				}
+
+				// For the client build, client:only styles need to be mapped
+				// over to their page. For this chunk, determine if it's a child of a
+				// client:only component and if so, add its CSS to the page it belongs to.
+				if (options.target === 'client') {
+					for (const id of Object.keys(chunk.modules)) {
+						for (const pageData of getParentClientOnlys(id, this, internals)) {
+							for (const importedCssImport of meta.importedCss) {
+								const cssToInfoRecord = (pagesToCss[pageData.moduleSpecifier] ??= {});
+								cssToInfoRecord[importedCssImport] = { depth: -1, order: -1 };
+							}
+						}
+					}
+				}
+
+				// For this CSS chunk, walk parents until you find a page. Add the CSS to that page.
+				for (const id of Object.keys(chunk.modules)) {
+					for (const [pageInfo, depth, order] of walkParentInfos(
+						id,
+						this,
+						function until(importer) {
+							return new URL(importer, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG);
+						}
+					)) {
+						if (new URL(pageInfo.id, 'file://').searchParams.has(PROPAGATED_ASSET_FLAG)) {
+							for (const parent of walkParentInfos(id, this)) {
+								const parentInfo = parent[0];
+								if (moduleIsTopLevelPage(parentInfo) === false) continue;
+
+								const pageViteID = parentInfo.id;
+								const pageData = getPageDataByViteID(internals, pageViteID);
+								if (pageData === undefined) continue;
+
+								for (const css of meta.importedCss) {
+									const propagatedStyles = (pagesToPropagatedCss[pageData.moduleSpecifier] ??= {});
+									const existingCss = (propagatedStyles[pageInfo.id] ??= new Set());
+
+									existingCss.add(css);
+								}
+							}
+						} else if (moduleIsTopLevelPage(pageInfo)) {
+							const pageViteID = pageInfo.id;
+							const pageData = getPageDataByViteID(internals, pageViteID);
+							if (pageData) {
+								appendCSSToPage(pageData, meta, pagesToCss, depth, order);
+							}
+						} else if (options.target === 'client' && isHoistedScript(internals, pageInfo.id)) {
+							for (const pageData of getPageDatasByHoistedScriptId(internals, pageInfo.id)) {
+								appendCSSToPage(pageData, meta, pagesToCss, -1, order);
+							}
+						}
+					}
+				}
+			}
+		},
+	};
+
+	const singleCssPlugin: VitePlugin = {
+		name: 'astro:rollup-plugin-single-css',
+		enforce: 'post',
+		configResolved(config) {
+			resolvedConfig = config;
+		},
+		generateBundle(_, bundle) {
+			// If user disable css code-splitting, search for Vite's hardcoded
+			// `style.css` and add it as css for each page.
+			// Ref: https://github.com/vitejs/vite/blob/b2c0ee04d4db4a0ef5a084c50f49782c5f88587c/packages/vite/src/node/plugins/html.ts#L690-L705
+			if (resolvedConfig.build.cssCodeSplit) return;
+			const cssChunk = Object.values(bundle).find(
+				(chunk) => chunk.type === 'asset' && chunk.name === 'style.css'
+			);
+			if (cssChunk === undefined) return;
+			for (const pageData of eachPageData(internals)) {
+				const cssToInfoMap = (pagesToCss[pageData.moduleSpecifier] ??= {});
+				cssToInfoMap[cssChunk.fileName] = { depth: -1, order: -1 };
+			}
+		},
+	};
+
+	const inlineStylesheetsPlugin: VitePlugin = {
+		name: 'astro:rollup-plugin-inline-stylesheets',
+		enforce: 'post',
+		async generateBundle(_outputOptions, bundle) {
+			const inlineConfig = settings.config.experimental.inlineStylesheets;
+			const { assetsInlineLimit = 4096 } = settings.config.vite?.build ?? {};
+
+			Object.entries(bundle).forEach(([id, stylesheet]) => {
+				if (
+					stylesheet.type !== 'asset' ||
+					stylesheet.name?.endsWith('.css') !== true ||
+					typeof stylesheet.source !== 'string'
+				)
+					return;
+
+				const assetSize = new TextEncoder().encode(stylesheet.source).byteLength;
+
+				const toBeInlined =
+					inlineConfig === 'always'
+						? true
+						: inlineConfig === 'never'
+						? false
+						: assetSize <= assetsInlineLimit;
+
+				if (toBeInlined) delete bundle[id];
+
+				// there should be a single js object for each stylesheet,
+				// allowing the single reference to be shared and checked for duplicates
+				const sheet: StylesheetAsset = toBeInlined
+					? { type: 'inline', content: stylesheet.source }
+					: { type: 'external', src: stylesheet.fileName };
+
+				const pages = Array.from(eachPageData(internals));
+
+				pages.forEach((pageData) => {
+					const orderingInfo = pagesToCss[pageData.moduleSpecifier]?.[stylesheet.fileName];
+					if (orderingInfo !== undefined) return pageData.styles.push({ ...orderingInfo, sheet });
+
+					const propagatedPaths = pagesToPropagatedCss[pageData.moduleSpecifier];
+					if (propagatedPaths === undefined) return;
+					Object.entries(propagatedPaths).forEach(([pageInfoId, css]) => {
+						// return early if sheet does not need to be propagated
+						if (css.has(stylesheet.fileName) !== true) return;
+
+						// return early if the stylesheet needing propagation has already been included
+						if (pageData.styles.some((s) => s.sheet === sheet)) return;
+
+						const propagatedStyles =
+							pageData.propagatedStyles.get(pageInfoId) ??
+							pageData.propagatedStyles.set(pageInfoId, new Set()).get(pageInfoId)!;
+
+						propagatedStyles.add(sheet);
+					});
+				});
+			});
+		},
+	};
+
+	return [cssBuildPlugin, singleCssPlugin, inlineStylesheetsPlugin];
+}
+
+/***** UTILITY FUNCTIONS *****/
+
+function createNameHash(baseId: string, hashIds: string[]): string {
+	const baseName = baseId ? npath.parse(baseId).name : 'index';
+	const hash = crypto.createHash('sha256');
+	for (const id of hashIds) {
+		hash.update(id, 'utf-8');
+	}
+	const h = hash.digest('hex').slice(0, 8);
+	const proposedName = baseName + '.' + h;
+	return proposedName;
+}
+
+function* getParentClientOnlys(
+	id: string,
+	ctx: { getModuleInfo: GetModuleInfo },
+	internals: BuildInternals
+): Generator<PageBuildData, void, unknown> {
+	for (const [info] of walkParentInfos(id, ctx)) {
+		yield* getPageDatasByClientOnlyID(internals, info.id);
+	}
+}
+
+type ViteMetadata = {
+	importedAssets: Set<string>;
+	importedCss: Set<string>;
+};
+
+function appendCSSToPage(
+	pageData: PageBuildData,
+	meta: ViteMetadata,
+	pagesToCss: Record<string, Record<string, { order: number; depth: number }>>,
+	depth: number,
+	order: number
+) {
+	for (const importedCssImport of meta.importedCss) {
+		// CSS is prioritized based on depth. Shared CSS has a higher depth due to being imported by multiple pages.
+		// Depth info is used when sorting the links on the page.
+		const cssInfo = pagesToCss[pageData.moduleSpecifier]?.[importedCssImport];
+		if (cssInfo !== undefined) {
+			if (depth < cssInfo.depth) {
+				cssInfo.depth = depth;
+			}
+
+			// Update the order, preferring the lowest order we have.
+			if (cssInfo.order === -1) {
+				cssInfo.order = order;
+			} else if (order < cssInfo.order && order > -1) {
+				cssInfo.order = order;
+			}
+		} else {
+			const cssToInfoRecord = (pagesToCss[pageData.moduleSpecifier] ??= {});
+			cssToInfoRecord[importedCssImport] = { depth, order };
+		}
+	}
+}
diff --git a/packages/astro/src/core/build/plugins/plugin-pages.ts b/packages/astro/src/core/build/plugins/plugin-pages.ts
index 5bb070978..132d03cf8 100644
--- a/packages/astro/src/core/build/plugins/plugin-pages.ts
+++ b/packages/astro/src/core/build/plugins/plugin-pages.ts
@@ -1,10 +1,10 @@
 import type { Plugin as VitePlugin } from 'vite';
-import type { AstroBuildPlugin } from '../plugin';
-import type { StaticBuildOptions } from '../types';
-
 import { pagesVirtualModuleId, resolvedPagesVirtualModuleId } from '../../app/index.js';
+import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../../constants.js';
 import { addRollupInput } from '../add-rollup-input.js';
 import { eachPageData, hasPrerenderedPages, type BuildInternals } from '../internal.js';
+import type { AstroBuildPlugin } from '../plugin';
+import type { StaticBuildOptions } from '../types';
 
 export function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin {
 	return {
@@ -22,8 +22,15 @@ export function vitePluginPages(opts: StaticBuildOptions, internals: BuildIntern
 			}
 		},
 
-		load(id) {
+		async load(id) {
 			if (id === resolvedPagesVirtualModuleId) {
+				let middlewareId = null;
+				if (opts.settings.config.experimental.middleware) {
+					middlewareId = await this.resolve(
+						`${opts.settings.config.srcDir.pathname}/${MIDDLEWARE_PATH_SEGMENT_NAME}`
+					);
+				}
+
 				let importMap = '';
 				let imports = [];
 				let i = 0;
@@ -47,8 +54,12 @@ export function vitePluginPages(opts: StaticBuildOptions, internals: BuildIntern
 
 				const def = `${imports.join('\n')}
 
+${middlewareId ? `import * as _middleware from "${middlewareId.id}";` : ''}
+
 export const pageMap = new Map([${importMap}]);
-export const renderers = [${rendererItems}];`;
+export const renderers = [${rendererItems}];
+${middlewareId ? `export const middleware = _middleware;` : ''}
+`;
 
 				return def;
 			}
diff --git a/packages/astro/src/core/build/plugins/plugin-ssr.ts b/packages/astro/src/core/build/plugins/plugin-ssr.ts
index 1133fc8e0..8259e5e15 100644
--- a/packages/astro/src/core/build/plugins/plugin-ssr.ts
+++ b/packages/astro/src/core/build/plugins/plugin-ssr.ts
@@ -1,5 +1,5 @@
 import type { Plugin as VitePlugin } from 'vite';
-import type { AstroAdapter } from '../../../@types/astro';
+import type { AstroAdapter, AstroConfig } from '../../../@types/astro';
 import type { SerializedRouteInfo, SerializedSSRManifest } from '../../app/types';
 import type { BuildInternals } from '../internal.js';
 import type { StaticBuildOptions } from '../types';
@@ -13,7 +13,7 @@ import { joinPaths, prependForwardSlash } from '../../path.js';
 import { serializeRouteData } from '../../routing/index.js';
 import { addRollupInput } from '../add-rollup-input.js';
 import { getOutFile, getOutFolder } from '../common.js';
-import { eachPrerenderedPageData, eachServerPageData, sortedCSS } from '../internal.js';
+import { cssOrder, eachPageData, mergeInlineCss } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin';
 
 export const virtualModuleId = '@astrojs-ssr-virtual-entry';
@@ -21,7 +21,11 @@ const resolvedVirtualModuleId = '\0' + virtualModuleId;
 const manifestReplace = '@@ASTRO_MANIFEST_REPLACE@@';
 const replaceExp = new RegExp(`['"](${manifestReplace})['"]`, 'g');
 
-export function vitePluginSSR(internals: BuildInternals, adapter: AstroAdapter): VitePlugin {
+export function vitePluginSSR(
+	internals: BuildInternals,
+	adapter: AstroAdapter,
+	config: AstroConfig
+): VitePlugin {
 	return {
 		name: '@astrojs/vite-plugin-astro-ssr',
 		enforce: 'post',
@@ -35,13 +39,18 @@ export function vitePluginSSR(internals: BuildInternals, adapter: AstroAdapter):
 		},
 		load(id) {
 			if (id === resolvedVirtualModuleId) {
+				let middleware = '';
+				if (config.experimental?.middleware === true) {
+					middleware = 'middleware: _main.middleware';
+				}
 				return `import * as adapter from '${adapter.serverEntrypoint}';
 import * as _main from '${pagesVirtualModuleId}';
 import { deserializeManifest as _deserializeManifest } from 'astro/app';
 import { _privateSetManifestDontUseThis } from 'astro:ssr-manifest';
 const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 	pageMap: _main.pageMap,
-	renderers: _main.renderers
+	renderers: _main.renderers,
+	${middleware}
 });
 _privateSetManifestDontUseThis(_manifest);
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : 'undefined'};
@@ -142,7 +151,8 @@ function buildManifest(
 		}
 	};
 
-	for (const pageData of eachPrerenderedPageData(internals)) {
+	for (const pageData of eachPageData(internals)) {
+		if (!pageData.route.prerender) continue;
 		if (!pageData.route.pathname) continue;
 
 		const outFolder = getOutFolder(
@@ -161,12 +171,14 @@ function buildManifest(
 			file,
 			links: [],
 			scripts: [],
+			styles: [],
 			routeData: serializeRouteData(pageData.route, settings.config.trailingSlash),
 		});
 		staticFiles.push(file);
 	}
 
-	for (const pageData of eachServerPageData(internals)) {
+	for (const pageData of eachPageData(internals)) {
+		if (pageData.route.prerender) continue;
 		const scripts: SerializedRouteInfo['scripts'] = [];
 		if (pageData.hoistedScript) {
 			const hoistedValue = pageData.hoistedScript.value;
@@ -186,7 +198,14 @@ function buildManifest(
 			});
 		}
 
-		const links = sortedCSS(pageData).map((pth) => prefixAssetPath(pth));
+		// may be used in the future for handling rel=modulepreload, rel=icon, rel=manifest etc.
+		const links: [] = [];
+
+		const styles = pageData.styles
+			.sort(cssOrder)
+			.map(({ sheet }) => sheet)
+			.map((s) => (s.type === 'external' ? { ...s, src: prefixAssetPath(s.src) } : s))
+			.reduce(mergeInlineCss, []);
 
 		routes.push({
 			file: '',
@@ -197,6 +216,7 @@ function buildManifest(
 					.filter((script) => script.stage === 'head-inline')
 					.map(({ stage, content }) => ({ stage, children: content })),
 			],
+			styles,
 			routeData: serializeRouteData(pageData.route, settings.config.trailingSlash),
 		});
 	}
@@ -233,7 +253,9 @@ export function pluginSSR(
 		build: 'ssr',
 		hooks: {
 			'build:before': () => {
-				let vitePlugin = ssr ? vitePluginSSR(internals, options.settings.adapter!) : undefined;
+				let vitePlugin = ssr
+					? vitePluginSSR(internals, options.settings.adapter!, options.settings.config)
+					: undefined;
 
 				return {
 					enforce: 'after-user-plugins',
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
index 1ef57d787..ff71e80b8 100644
--- a/packages/astro/src/core/build/static-build.ts
+++ b/packages/astro/src/core/build/static-build.ts
@@ -8,7 +8,7 @@ import { fileURLToPath } from 'url';
 import * as vite from 'vite';
 import {
 	createBuildInternals,
-	eachPrerenderedPageData,
+	eachPageData,
 	type BuildInternals,
 } from '../../core/build/internal.js';
 import { emptyDir, removeEmptyDirs } from '../../core/fs/index.js';
@@ -290,8 +290,9 @@ async function runPostBuildHooks(
  */
 async function cleanStaticOutput(opts: StaticBuildOptions, internals: BuildInternals) {
 	const allStaticFiles = new Set();
-	for (const pageData of eachPrerenderedPageData(internals)) {
-		allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
+	for (const pageData of eachPageData(internals)) {
+		if (pageData.route.prerender)
+			allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
 	}
 	const ssr = opts.settings.config.output === 'server';
 	const out = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);
diff --git a/packages/astro/src/core/build/types.ts b/packages/astro/src/core/build/types.ts
index 02f5618d8..d04f7476c 100644
--- a/packages/astro/src/core/build/types.ts
+++ b/packages/astro/src/core/build/types.ts
@@ -1,6 +1,7 @@
 import type { default as vite, InlineConfig } from 'vite';
 import type {
 	AstroConfig,
+	AstroMiddlewareInstance,
 	AstroSettings,
 	BuildConfig,
 	ComponentInstance,
@@ -16,14 +17,18 @@ export type ComponentPath = string;
 export type ViteID = string;
 export type PageOutput = AstroConfig['output'];
 
+export type StylesheetAsset =
+	| { type: 'inline'; content: string }
+	| { type: 'external'; src: string };
+
 export interface PageBuildData {
 	component: ComponentPath;
 	route: RouteData;
 	moduleSpecifier: string;
-	css: Map<string, { depth: number; order: number }>;
-	propagatedStyles: Map<string, Set<string>>;
+	propagatedStyles: Map<string, Set<StylesheetAsset>>;
 	propagatedScripts: Map<string, Set<string>>;
 	hoistedScript: { type: 'inline' | 'external'; value: string } | undefined;
+	styles: Array<{ depth: number; order: number; sheet: StylesheetAsset }>;
 }
 export type AllPagesData = Record<ComponentPath, PageBuildData>;
 
@@ -44,6 +49,7 @@ export interface StaticBuildOptions {
 
 export interface SingleFileBuiltModule {
 	pageMap: Map<ComponentPath, ComponentInstance>;
+	middleware: AstroMiddlewareInstance<unknown>;
 	renderers: SSRLoadedRenderer[];
 }
 
diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
index 423dd75e0..4c76c4c65 100644
--- a/packages/astro/src/core/compile/compile.ts
+++ b/packages/astro/src/core/compile/compile.ts
@@ -43,6 +43,7 @@ export async function compile({
 			sourcemap: 'both',
 			internalURL: 'astro/server/index.js',
 			astroGlobalArgs: JSON.stringify(astroConfig.site),
+			scopedStyleStrategy: astroConfig.scopedStyleStrategy,
 			resultScopedSlot: true,
 			preprocessStyle: createStylePreprocessor({
 				filename,
diff --git a/packages/astro/src/core/config/config.ts b/packages/astro/src/core/config/config.ts
index 9c09a934f..9915ed162 100644
--- a/packages/astro/src/core/config/config.ts
+++ b/packages/astro/src/core/config/config.ts
@@ -103,6 +103,8 @@ export function resolveFlags(flags: Partial<Flags>): CLIFlags {
 		drafts: typeof flags.drafts === 'boolean' ? flags.drafts : undefined,
 		experimentalAssets:
 			typeof flags.experimentalAssets === 'boolean' ? flags.experimentalAssets : undefined,
+		experimentalMiddleware:
+			typeof flags.experimentalMiddleware === 'boolean' ? flags.experimentalMiddleware : undefined,
 	};
 }
 
@@ -136,6 +138,9 @@ function mergeCLIFlags(astroConfig: AstroUserConfig, flags: CLIFlags) {
 		// TODO: Come back here and refactor to remove this expected error.
 		astroConfig.server.open = flags.open;
 	}
+	if (typeof flags.experimentalMiddleware === 'boolean') {
+		astroConfig.experimental.middleware = true;
+	}
 	return astroConfig;
 }
 
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index e9900f478..95c4b1266 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -38,6 +38,8 @@ const ASTRO_CONFIG_DEFAULTS: AstroUserConfig & any = {
 	legacy: {},
 	experimental: {
 		assets: false,
+		inlineStylesheets: 'never',
+		middleware: false,
 	},
 };
 
@@ -73,6 +75,10 @@ export const AstroConfigSchema = z.object({
 		.union([z.literal('static'), z.literal('server')])
 		.optional()
 		.default('static'),
+	scopedStyleStrategy: z
+		.union([z.literal('where'), z.literal('class')])
+		.optional()
+		.default('where'),
 	adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
 	integrations: z.preprocess(
 		// preprocess
@@ -185,6 +191,11 @@ export const AstroConfigSchema = z.object({
 	experimental: z
 		.object({
 			assets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.assets),
+			inlineStylesheets: z
+				.enum(['always', 'auto', 'never'])
+				.optional()
+				.default(ASTRO_CONFIG_DEFAULTS.experimental.inlineStylesheets),
+			middleware: z.oboolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.middleware),
 		})
 		.optional()
 		.default({}),
diff --git a/packages/astro/src/core/constants.ts b/packages/astro/src/core/constants.ts
index 16dde7550..471614ce3 100644
--- a/packages/astro/src/core/constants.ts
+++ b/packages/astro/src/core/constants.ts
@@ -10,3 +10,6 @@ export const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
 	'.mdwn',
 	'.md',
 ] as const;
+
+// The folder name where to find the middleware
+export const MIDDLEWARE_PATH_SEGMENT_NAME = 'middleware';
diff --git a/packages/astro/src/core/endpoint/dev/index.ts b/packages/astro/src/core/endpoint/dev/index.ts
index 515b7aa41..24d2aa3bd 100644
--- a/packages/astro/src/core/endpoint/dev/index.ts
+++ b/packages/astro/src/core/endpoint/dev/index.ts
@@ -8,15 +8,18 @@ export async function call(options: SSROptions, logging: LogOptions) {
 	const {
 		env,
 		preload: [, mod],
+		middleware,
 	} = options;
 	const endpointHandler = mod as unknown as EndpointHandler;
 
-	const ctx = createRenderContext({
+	const ctx = await createRenderContext({
 		request: options.request,
 		origin: options.origin,
 		pathname: options.pathname,
 		route: options.route,
+		env,
+		mod: endpointHandler as any,
 	});
 
-	return await callEndpoint(endpointHandler, env, ctx, logging);
+	return await callEndpoint(endpointHandler, env, ctx, logging, middleware);
 }
diff --git a/packages/astro/src/core/endpoint/index.ts b/packages/astro/src/core/endpoint/index.ts
index 876c21aa5..e49ce8a43 100644
--- a/packages/astro/src/core/endpoint/index.ts
+++ b/packages/astro/src/core/endpoint/index.ts
@@ -1,4 +1,12 @@
-import type { APIContext, AstroConfig, EndpointHandler, Params } from '../../@types/astro';
+import type {
+	APIContext,
+	AstroConfig,
+	AstroMiddlewareInstance,
+	EndpointHandler,
+	EndpointOutput,
+	MiddlewareEndpointHandler,
+	Params,
+} from '../../@types/astro';
 import type { Environment, RenderContext } from '../render/index';
 
 import { renderEndpoint } from '../../runtime/server/index.js';
@@ -6,9 +14,11 @@ import { ASTRO_VERSION } from '../constants.js';
 import { AstroCookies, attachToResponse } from '../cookies/index.js';
 import { AstroError, AstroErrorData } from '../errors/index.js';
 import { warn, type LogOptions } from '../logger/core.js';
-import { getParamsAndProps, GetParamsAndPropsError } from '../render/core.js';
+import { callMiddleware } from '../middleware/callMiddleware.js';
+import { isValueSerializable } from '../render/core.js';
 
 const clientAddressSymbol = Symbol.for('astro.clientAddress');
+const clientLocalsSymbol = Symbol.for('astro.locals');
 
 type EndpointCallResult =
 	| {
@@ -22,7 +32,7 @@ type EndpointCallResult =
 			response: Response;
 	  };
 
-function createAPIContext({
+export function createAPIContext({
 	request,
 	params,
 	site,
@@ -35,7 +45,7 @@ function createAPIContext({
 	props: Record<string, any>;
 	adapterName?: string;
 }): APIContext {
-	return {
+	const context = {
 		cookies: new AstroCookies(request),
 		request,
 		params,
@@ -51,7 +61,6 @@ function createAPIContext({
 			});
 		},
 		url: new URL(request.url),
-		// @ts-expect-error
 		get clientAddress() {
 			if (!(clientAddressSymbol in request)) {
 				if (adapterName) {
@@ -66,44 +75,60 @@ function createAPIContext({
 
 			return Reflect.get(request, clientAddressSymbol);
 		},
-	};
+	} as APIContext;
+
+	// We define a custom property, so we can check the value passed to locals
+	Object.defineProperty(context, 'locals', {
+		get() {
+			return Reflect.get(request, clientLocalsSymbol);
+		},
+		set(val) {
+			if (typeof val !== 'object') {
+				throw new AstroError(AstroErrorData.LocalsNotAnObject);
+			} else {
+				Reflect.set(request, clientLocalsSymbol, val);
+			}
+		},
+	});
+	return context;
 }
 
-export async function call(
+export async function call<MiddlewareResult = Response | EndpointOutput>(
 	mod: EndpointHandler,
 	env: Environment,
 	ctx: RenderContext,
-	logging: LogOptions
+	logging: LogOptions,
+	middleware?: AstroMiddlewareInstance<MiddlewareResult> | undefined
 ): Promise<EndpointCallResult> {
-	const paramsAndPropsResp = await getParamsAndProps({
-		mod: mod as any,
-		route: ctx.route,
-		routeCache: env.routeCache,
-		pathname: ctx.pathname,
-		logging: env.logging,
-		ssr: env.ssr,
-	});
-
-	if (paramsAndPropsResp === GetParamsAndPropsError.NoMatchingStaticPath) {
-		throw new AstroError({
-			...AstroErrorData.NoMatchingStaticPathFound,
-			message: AstroErrorData.NoMatchingStaticPathFound.message(ctx.pathname),
-			hint: ctx.route?.component
-				? AstroErrorData.NoMatchingStaticPathFound.hint([ctx.route?.component])
-				: '',
-		});
-	}
-	const [params, props] = paramsAndPropsResp;
-
 	const context = createAPIContext({
 		request: ctx.request,
-		params,
-		props,
+		params: ctx.params,
+		props: ctx.props,
 		site: env.site,
 		adapterName: env.adapterName,
 	});
 
-	const response = await renderEndpoint(mod, context, env.ssr);
+	let response = await renderEndpoint(mod, context, env.ssr);
+	if (middleware && middleware.onRequest) {
+		if (response.body === null) {
+			const onRequest = middleware.onRequest as MiddlewareEndpointHandler;
+			response = await callMiddleware<Response | EndpointOutput>(onRequest, context, async () => {
+				if (env.mode === 'development' && !isValueSerializable(context.locals)) {
+					throw new AstroError({
+						...AstroErrorData.LocalsNotSerializable,
+						message: AstroErrorData.LocalsNotSerializable.message(ctx.pathname),
+					});
+				}
+				return response;
+			});
+		} else {
+			warn(
+				env.logging,
+				'middleware',
+				"Middleware doesn't work for endpoints that return a simple body. The middleware will be disabled for this page."
+			);
+		}
+	}
 
 	if (response instanceof Response) {
 		attachToResponse(response, context.cookies);
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index bb9a86506..27425aee5 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -628,6 +628,95 @@ See https://docs.astro.build/en/guides/server-side-rendering/ for more informati
 		code: 3030,
 		message: 'The response has already been sent to the browser and cannot be altered.',
 	},
+
+	/**
+	 * @docs
+	 * @description
+	 * Thrown when the middleware does not return any data or call the `next` function.
+	 *
+	 * For example:
+	 * ```ts
+	 * import {defineMiddleware} from "astro/middleware";
+	 * export const onRequest = defineMiddleware((context, _) => {
+	 * 	// doesn't return anything or call `next`
+	 * 	context.locals.someData = false;
+	 * });
+	 * ```
+	 */
+	MiddlewareNoDataOrNextCalled: {
+		title: "The middleware didn't return a response or call `next`",
+		code: 3031,
+		message:
+			'The middleware needs to either return a `Response` object or call the `next` function.',
+	},
+
+	/**
+	 * @docs
+	 * @description
+	 * Thrown in development mode when middleware returns something that is not a `Response` object.
+	 *
+	 * For example:
+	 * ```ts
+	 * import {defineMiddleware} from "astro/middleware";
+	 * export const onRequest = defineMiddleware(() => {
+	 *   return "string"
+	 * });
+	 * ```
+	 */
+	MiddlewareNotAResponse: {
+		title: 'The middleware returned something that is not a `Response` object',
+		code: 3032,
+		message: 'Any data returned from middleware must be a valid `Response` object.',
+	},
+
+	/**
+	 * @docs
+	 * @description
+	 *
+	 * Thrown in development mode when `locals` is overwritten with something that is not an object
+	 *
+	 * For example:
+	 * ```ts
+	 * import {defineMiddleware} from "astro/middleware";
+	 * export const onRequest = defineMiddleware((context, next) => {
+	 *   context.locals = 1541;
+	 *   return next();
+	 * });
+	 * ```
+	 */
+	LocalsNotAnObject: {
+		title: 'Value assigned to `locals` is not accepted',
+		code: 3033,
+		message:
+			'`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.',
+		hint: 'If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`.',
+	},
+
+	/**
+	 * @docs
+	 * @description
+	 * Thrown in development mode when a user attempts to store something that is not serializable in `locals`.
+	 *
+	 * For example:
+	 * ```ts
+	 * import {defineMiddleware} from "astro/middleware";
+	 * export const onRequest = defineMiddleware((context, next) => {
+	 *   context.locals = {
+	 *     foo() {
+	 *       alert("Hello world!")
+	 *     }
+	 *   };
+	 *   return next();
+	 * });
+	 * ```
+	 */
+	LocalsNotSerializable: {
+		title: '`Astro.locals` is not serializable',
+		code: 3034,
+		message: (href: string) => {
+			return `The information stored in \`Astro.locals\` for the path "${href}" is not serializable.\nMake sure you store only serializable data.`;
+		},
+	},
 	// No headings here, that way Vite errors are merged with Astro ones in the docs, which makes more sense to users.
 	// Vite Errors - 4xxx
 	/**
diff --git a/packages/astro/src/core/middleware/callMiddleware.ts b/packages/astro/src/core/middleware/callMiddleware.ts
new file mode 100644
index 000000000..5836786e6
--- /dev/null
+++ b/packages/astro/src/core/middleware/callMiddleware.ts
@@ -0,0 +1,99 @@
+import type { APIContext, MiddlewareHandler, MiddlewareNext } from '../../@types/astro';
+import { AstroError, AstroErrorData } from '../errors/index.js';
+
+/**
+ * Utility function that is in charge of calling the middleware.
+ *
+ * It accepts a `R` generic, which usually is the `Response` returned.
+ * It is a generic because endpoints can return a different payload.
+ *
+ * When calling a middleware, we provide a `next` function, this function might or
+ * might not be called.
+ *
+ * A middleware, to behave correctly, can:
+ * - return a `Response`;
+ * - call `next`;
+ *
+ * Failing doing so will result an error. A middleware can call `next` and do not return a
+ * response. A middleware can not call `next` and return a new `Response` from scratch (maybe with a redirect).
+ *
+ * ```js
+ * const onRequest = async (context, next) => {
+ *   const response = await next(context);
+ *   return response;
+ * }
+ * ```
+ *
+ * ```js
+ * const onRequest = async (context, next) => {
+ *   context.locals = "foo";
+ *   next();
+ * }
+ * ```
+ *
+ * @param onRequest The function called which accepts a `context` and a `resolve` function
+ * @param apiContext The API context
+ * @param responseFunction A callback function that should return a promise with the response
+ */
+export async function callMiddleware<R>(
+	onRequest: MiddlewareHandler<R>,
+	apiContext: APIContext,
+	responseFunction: () => Promise<R>
+): Promise<Response | R> {
+	let resolveResolve: any;
+	new Promise((resolve) => {
+		resolveResolve = resolve;
+	});
+
+	let nextCalled = false;
+	const next: MiddlewareNext<R> = async () => {
+		nextCalled = true;
+		return await responseFunction();
+	};
+
+	let middlewarePromise = onRequest(apiContext, next);
+
+	return await Promise.resolve(middlewarePromise).then(async (value) => {
+		// first we check if `next` was called
+		if (nextCalled) {
+			/**
+			 * Then we check if a value is returned. If so, we need to return the value returned by the
+			 * middleware.
+			 * e.g.
+			 * ```js
+			 * 	const response = await next();
+			 * 	const new Response(null, { status: 500, headers: response.headers });
+			 * ```
+			 */
+			if (typeof value !== 'undefined') {
+				if (value instanceof Response === false) {
+					throw new AstroError(AstroErrorData.MiddlewareNotAResponse);
+				}
+				return value as R;
+			} else {
+				/**
+				 * Here we handle the case where `next` was called and returned nothing.
+				 */
+				const responseResult = await responseFunction();
+				return responseResult;
+			}
+		} else if (typeof value === 'undefined') {
+			/**
+			 * There might be cases where `next` isn't called and the middleware **must** return
+			 * something.
+			 *
+			 * If not thing is returned, then we raise an Astro error.
+			 */
+			throw new AstroError(AstroErrorData.MiddlewareNoDataOrNextCalled);
+		} else if (value instanceof Response === false) {
+			throw new AstroError(AstroErrorData.MiddlewareNotAResponse);
+		} else {
+			// Middleware did not call resolve and returned a value
+			return value as R;
+		}
+	});
+}
+
+function isEndpointResult(response: any): boolean {
+	return response && typeof response.body !== 'undefined';
+}
diff --git a/packages/astro/src/core/middleware/index.ts b/packages/astro/src/core/middleware/index.ts
new file mode 100644
index 000000000..f9fb07bd4
--- /dev/null
+++ b/packages/astro/src/core/middleware/index.ts
@@ -0,0 +1,9 @@
+import type { MiddlewareResponseHandler } from '../../@types/astro';
+import { sequence } from './sequence.js';
+
+function defineMiddleware(fn: MiddlewareResponseHandler) {
+	return fn;
+}
+
+// NOTE: this export must export only the functions that will be exposed to user-land as officials APIs
+export { sequence, defineMiddleware };
diff --git a/packages/astro/src/core/middleware/loadMiddleware.ts b/packages/astro/src/core/middleware/loadMiddleware.ts
new file mode 100644
index 000000000..5c64565af
--- /dev/null
+++ b/packages/astro/src/core/middleware/loadMiddleware.ts
@@ -0,0 +1,22 @@
+import type { AstroSettings } from '../../@types/astro';
+import { MIDDLEWARE_PATH_SEGMENT_NAME } from '../constants.js';
+import type { ModuleLoader } from '../module-loader';
+
+/**
+ * It accepts a module loader and the astro settings, and it attempts to load the middlewares defined in the configuration.
+ *
+ * If not middlewares were not set, the function returns an empty array.
+ */
+export async function loadMiddleware(
+	moduleLoader: ModuleLoader,
+	srcDir: AstroSettings['config']['srcDir']
+) {
+	// can't use node Node.js builtins
+	let middlewarePath = srcDir.pathname + '/' + MIDDLEWARE_PATH_SEGMENT_NAME;
+	try {
+		const module = await moduleLoader.import(middlewarePath);
+		return module;
+	} catch {
+		return void 0;
+	}
+}
diff --git a/packages/astro/src/core/middleware/sequence.ts b/packages/astro/src/core/middleware/sequence.ts
new file mode 100644
index 000000000..0358f3719
--- /dev/null
+++ b/packages/astro/src/core/middleware/sequence.ts
@@ -0,0 +1,36 @@
+import type { APIContext, MiddlewareResponseHandler } from '../../@types/astro';
+import { defineMiddleware } from './index.js';
+
+// From SvelteKit: https://github.com/sveltejs/kit/blob/master/packages/kit/src/exports/hooks/sequence.js
+/**
+ *
+ * It accepts one or more middleware handlers and makes sure that they are run in sequence.
+ */
+export function sequence(...handlers: MiddlewareResponseHandler[]): MiddlewareResponseHandler {
+	const length = handlers.length;
+	if (!length) {
+		const handler: MiddlewareResponseHandler = defineMiddleware((context, next) => {
+			return next();
+		});
+		return handler;
+	}
+
+	return defineMiddleware((context, next) => {
+		return applyHandle(0, context);
+
+		function applyHandle(i: number, handleContext: APIContext) {
+			const handle = handlers[i];
+			// @ts-expect-error
+			// SAFETY: Usually `next` always returns something in user land, but in `sequence` we are actually
+			// doing a loop over all the `next` functions, and eventually we call the last `next` that returns the `Response`.
+			const result = handle(handleContext, async () => {
+				if (i < length - 1) {
+					return applyHandle(i + 1, handleContext);
+				} else {
+					return next();
+				}
+			});
+			return result;
+		}
+	});
+}
diff --git a/packages/astro/src/core/path.ts b/packages/astro/src/core/path.ts
index 8a0ac4a86..cbf959f69 100644
--- a/packages/astro/src/core/path.ts
+++ b/packages/astro/src/core/path.ts
@@ -52,7 +52,18 @@ function isString(path: unknown): path is string {
 }
 
 export function joinPaths(...paths: (string | undefined)[]) {
-	return paths.filter(isString).map(trimSlashes).join('/');
+	return paths
+		.filter(isString)
+		.map((path, i) => {
+			if (i === 0) {
+				return removeTrailingForwardSlash(path);
+			} else if (i === paths.length - 1) {
+				return removeLeadingForwardSlash(path);
+			} else {
+				return trimSlashes(path);
+			}
+		})
+		.join('/');
 }
 
 export function removeFileExtension(path: string) {
diff --git a/packages/astro/src/core/render/context.ts b/packages/astro/src/core/render/context.ts
index f6a82e9ca..d4efe35df 100644
--- a/packages/astro/src/core/render/context.ts
+++ b/packages/astro/src/core/render/context.ts
@@ -1,4 +1,13 @@
-import type { RouteData, SSRElement, SSRResult } from '../../@types/astro';
+import type {
+	ComponentInstance,
+	Params,
+	Props,
+	RouteData,
+	SSRElement,
+	SSRResult,
+} from '../../@types/astro';
+import { getParamsAndPropsOrThrow } from './core.js';
+import type { Environment } from './environment';
 
 /**
  * The RenderContext represents the parts of rendering that are specific to one request.
@@ -14,22 +23,38 @@ export interface RenderContext {
 	componentMetadata?: SSRResult['componentMetadata'];
 	route?: RouteData;
 	status?: number;
+	params: Params;
+	props: Props;
 }
 
 export type CreateRenderContextArgs = Partial<RenderContext> & {
 	origin?: string;
 	request: RenderContext['request'];
+	mod: ComponentInstance;
+	env: Environment;
 };
 
-export function createRenderContext(options: CreateRenderContextArgs): RenderContext {
+export async function createRenderContext(
+	options: CreateRenderContextArgs
+): Promise<RenderContext> {
 	const request = options.request;
 	const url = new URL(request.url);
 	const origin = options.origin ?? url.origin;
 	const pathname = options.pathname ?? url.pathname;
+	const [params, props] = await getParamsAndPropsOrThrow({
+		mod: options.mod as any,
+		route: options.route,
+		routeCache: options.env.routeCache,
+		pathname: pathname,
+		logging: options.env.logging,
+		ssr: options.env.ssr,
+	});
 	return {
 		...options,
 		origin,
 		pathname,
 		url,
+		params,
+		props,
 	};
 }
diff --git a/packages/astro/src/core/render/core.ts b/packages/astro/src/core/render/core.ts
index 8687e9006..fd57ad8bc 100644
--- a/packages/astro/src/core/render/core.ts
+++ b/packages/astro/src/core/render/core.ts
@@ -1,12 +1,11 @@
-import type { ComponentInstance, Params, Props, RouteData } from '../../@types/astro';
-import type { LogOptions } from '../logger/core.js';
-import type { RenderContext } from './context.js';
-import type { Environment } from './environment.js';
-
+import type { APIContext, ComponentInstance, Params, Props, RouteData } from '../../@types/astro';
 import { renderPage as runtimeRenderPage } from '../../runtime/server/index.js';
 import { attachToResponse } from '../cookies/index.js';
 import { AstroError, AstroErrorData } from '../errors/index.js';
+import type { LogOptions } from '../logger/core.js';
 import { getParams } from '../routing/params.js';
+import type { RenderContext } from './context.js';
+import type { Environment } from './environment.js';
 import { createResult } from './result.js';
 import { callGetStaticPaths, findPathItemByKey, RouteCache } from './route-cache.js';
 
@@ -23,6 +22,26 @@ export const enum GetParamsAndPropsError {
 	NoMatchingStaticPath,
 }
 
+/**
+ * It retrieves `Params` and `Props`, or throws an error
+ * if they are not correctly retrieved.
+ */
+export async function getParamsAndPropsOrThrow(
+	options: GetParamsAndPropsOptions
+): Promise<[Params, Props]> {
+	let paramsAndPropsResp = await getParamsAndProps(options);
+	if (paramsAndPropsResp === GetParamsAndPropsError.NoMatchingStaticPath) {
+		throw new AstroError({
+			...AstroErrorData.NoMatchingStaticPathFound,
+			message: AstroErrorData.NoMatchingStaticPathFound.message(options.pathname),
+			hint: options.route?.component
+				? AstroErrorData.NoMatchingStaticPathFound.hint([options.route?.component])
+				: '',
+		});
+	}
+	return paramsAndPropsResp;
+}
+
 export async function getParamsAndProps(
 	opts: GetParamsAndPropsOptions
 ): Promise<[Params, Props] | GetParamsAndPropsError> {
@@ -84,65 +103,63 @@ export async function getParamsAndProps(
 	return [params, pageProps];
 }
 
-export async function renderPage(mod: ComponentInstance, ctx: RenderContext, env: Environment) {
-	const paramsAndPropsRes = await getParamsAndProps({
-		logging: env.logging,
-		mod,
-		route: ctx.route,
-		routeCache: env.routeCache,
-		pathname: ctx.pathname,
-		ssr: env.ssr,
-	});
-
-	if (paramsAndPropsRes === GetParamsAndPropsError.NoMatchingStaticPath) {
-		throw new AstroError({
-			...AstroErrorData.NoMatchingStaticPathFound,
-			message: AstroErrorData.NoMatchingStaticPathFound.message(ctx.pathname),
-			hint: ctx.route?.component
-				? AstroErrorData.NoMatchingStaticPathFound.hint([ctx.route?.component])
-				: '',
-		});
-	}
-	const [params, pageProps] = paramsAndPropsRes;
+export type RenderPage = {
+	mod: ComponentInstance;
+	renderContext: RenderContext;
+	env: Environment;
+	apiContext?: APIContext;
+};
 
+export async function renderPage({ mod, renderContext, env, apiContext }: RenderPage) {
 	// Validate the page component before rendering the page
 	const Component = mod.default;
 	if (!Component)
 		throw new Error(`Expected an exported Astro component but received typeof ${typeof Component}`);
 
+	let locals = {};
+	if (apiContext) {
+		if (env.mode === 'development' && !isValueSerializable(apiContext.locals)) {
+			throw new AstroError({
+				...AstroErrorData.LocalsNotSerializable,
+				message: AstroErrorData.LocalsNotSerializable.message(renderContext.pathname),
+			});
+		}
+		locals = apiContext.locals;
+	}
 	const result = createResult({
 		adapterName: env.adapterName,
-		links: ctx.links,
-		styles: ctx.styles,
+		links: renderContext.links,
+		styles: renderContext.styles,
 		logging: env.logging,
 		markdown: env.markdown,
 		mode: env.mode,
-		origin: ctx.origin,
-		params,
-		props: pageProps,
-		pathname: ctx.pathname,
-		componentMetadata: ctx.componentMetadata,
+		origin: renderContext.origin,
+		params: renderContext.params,
+		props: renderContext.props,
+		pathname: renderContext.pathname,
+		componentMetadata: renderContext.componentMetadata,
 		resolve: env.resolve,
 		renderers: env.renderers,
-		request: ctx.request,
+		request: renderContext.request,
 		site: env.site,
-		scripts: ctx.scripts,
+		scripts: renderContext.scripts,
 		ssr: env.ssr,
-		status: ctx.status ?? 200,
+		status: renderContext.status ?? 200,
+		locals,
 	});
 
 	// Support `export const components` for `MDX` pages
 	if (typeof (mod as any).components === 'object') {
-		Object.assign(pageProps, { components: (mod as any).components });
+		Object.assign(renderContext.props, { components: (mod as any).components });
 	}
 
-	const response = await runtimeRenderPage(
+	let response = await runtimeRenderPage(
 		result,
 		Component,
-		pageProps,
+		renderContext.props,
 		null,
 		env.streaming,
-		ctx.route
+		renderContext.route
 	);
 
 	// If there is an Astro.cookies instance, attach it to the response so that
@@ -153,3 +170,57 @@ export async function renderPage(mod: ComponentInstance, ctx: RenderContext, env
 
 	return response;
 }
+
+/**
+ * Checks whether any value can is serializable.
+ *
+ * A serializable value contains plain values. For example, `Proxy`, `Set`, `Map`, functions, etc.
+ * are not serializable objects.
+ *
+ * @param object
+ */
+export function isValueSerializable(value: unknown): boolean {
+	let type = typeof value;
+	let plainObject = true;
+	if (type === 'object' && isPlainObject(value)) {
+		for (const [, nestedValue] of Object.entries(value)) {
+			if (!isValueSerializable(nestedValue)) {
+				plainObject = false;
+				break;
+			}
+		}
+	} else {
+		plainObject = false;
+	}
+	let result =
+		value === null ||
+		type === 'string' ||
+		type === 'number' ||
+		type === 'boolean' ||
+		Array.isArray(value) ||
+		plainObject;
+
+	return result;
+}
+
+/**
+ *
+ * From [redux-toolkit](https://github.com/reduxjs/redux-toolkit/blob/master/packages/toolkit/src/isPlainObject.ts)
+ *
+ * Returns true if the passed value is "plain" object, i.e. an object whose
+ * prototype is the root `Object.prototype`. This includes objects created
+ * using object literals, but not for instance for class instances.
+ */
+function isPlainObject(value: unknown): value is object {
+	if (typeof value !== 'object' || value === null) return false;
+
+	let proto = Object.getPrototypeOf(value);
+	if (proto === null) return true;
+
+	let baseProto = proto;
+	while (Object.getPrototypeOf(baseProto) !== null) {
+		baseProto = Object.getPrototypeOf(baseProto);
+	}
+
+	return proto === baseProto;
+}
diff --git a/packages/astro/src/core/render/dev/index.ts b/packages/astro/src/core/render/dev/index.ts
index 51920e800..fbbe0d48d 100644
--- a/packages/astro/src/core/render/dev/index.ts
+++ b/packages/astro/src/core/render/dev/index.ts
@@ -1,14 +1,18 @@
 import { fileURLToPath } from 'url';
 import type {
+	AstroMiddlewareInstance,
 	AstroSettings,
 	ComponentInstance,
+	MiddlewareResponseHandler,
 	RouteData,
 	SSRElement,
 	SSRLoadedRenderer,
 } from '../../../@types/astro';
 import { PAGE_SCRIPT_ID } from '../../../vite-plugin-scripts/index.js';
+import { createAPIContext } from '../../endpoint/index.js';
 import { enhanceViteSSRError } from '../../errors/dev/index.js';
 import { AggregateError, CSSError, MarkdownError } from '../../errors/index.js';
+import { callMiddleware } from '../../middleware/callMiddleware.js';
 import type { ModuleLoader } from '../../module-loader/index';
 import { isPage, resolveIdToUrl, viteID } from '../../util.js';
 import { createRenderContext, renderPage as coreRenderPage } from '../index.js';
@@ -35,6 +39,10 @@ export interface SSROptions {
 	request: Request;
 	/** optional, in case we need to render something outside of a dev server */
 	route?: RouteData;
+	/**
+	 * Optional middlewares
+	 */
+	middleware?: AstroMiddlewareInstance<unknown>;
 }
 
 export type ComponentPreload = [SSRLoadedRenderer[], ComponentInstance];
@@ -158,8 +166,9 @@ export async function renderPage(options: SSROptions): Promise<Response> {
 		env: options.env,
 		filePath: options.filePath,
 	});
+	const { env } = options;
 
-	const ctx = createRenderContext({
+	const renderContext = await createRenderContext({
 		request: options.request,
 		origin: options.origin,
 		pathname: options.pathname,
@@ -168,7 +177,25 @@ export async function renderPage(options: SSROptions): Promise<Response> {
 		styles,
 		componentMetadata: metadata,
 		route: options.route,
+		mod,
+		env,
 	});
+	if (options.middleware) {
+		if (options.middleware && options.middleware.onRequest) {
+			const apiContext = createAPIContext({
+				request: options.request,
+				params: renderContext.params,
+				props: renderContext.props,
+				adapterName: options.env.adapterName,
+			});
 
-	return await coreRenderPage(mod, ctx, options.env); // NOTE: without "await", errors won’t get caught below
+			const onRequest = options.middleware.onRequest as MiddlewareResponseHandler;
+			const response = await callMiddleware<Response>(onRequest, apiContext, () => {
+				return coreRenderPage({ mod, renderContext, env: options.env, apiContext });
+			});
+
+			return response;
+		}
+	}
+	return await coreRenderPage({ mod, renderContext, env: options.env }); // NOTE: without "await", errors won’t get caught below
 }
diff --git a/packages/astro/src/core/render/index.ts b/packages/astro/src/core/render/index.ts
index 99d680549..4e4df8239 100644
--- a/packages/astro/src/core/render/index.ts
+++ b/packages/astro/src/core/render/index.ts
@@ -1,6 +1,11 @@
 export { createRenderContext } from './context.js';
 export type { RenderContext } from './context.js';
-export { getParamsAndProps, GetParamsAndPropsError, renderPage } from './core.js';
+export {
+	getParamsAndProps,
+	GetParamsAndPropsError,
+	getParamsAndPropsOrThrow,
+	renderPage,
+} from './core.js';
 export type { Environment } from './environment';
 export { createBasicEnvironment, createEnvironment } from './environment.js';
 export { loadRenderer } from './renderer.js';
diff --git a/packages/astro/src/core/render/result.ts b/packages/astro/src/core/render/result.ts
index 26ea22eee..598ec116f 100644
--- a/packages/astro/src/core/render/result.ts
+++ b/packages/astro/src/core/render/result.ts
@@ -50,6 +50,7 @@ export interface CreateResultArgs {
 	componentMetadata?: SSRResult['componentMetadata'];
 	request: Request;
 	status: number;
+	locals: App.Locals;
 }
 
 function getFunctionExpression(slot: any) {
@@ -131,7 +132,7 @@ class Slots {
 let renderMarkdown: any = null;
 
 export function createResult(args: CreateResultArgs): SSRResult {
-	const { markdown, params, pathname, renderers, request, resolve } = args;
+	const { markdown, params, pathname, renderers, request, resolve, locals } = args;
 
 	const url = new URL(request.url);
 	const headers = new Headers();
@@ -200,6 +201,7 @@ export function createResult(args: CreateResultArgs): SSRResult {
 				},
 				params,
 				props,
+				locals,
 				request,
 				url,
 				redirect: args.ssr
diff --git a/packages/astro/src/core/render/ssr-element.ts b/packages/astro/src/core/render/ssr-element.ts
index 2ebcf7bb8..84b0ab531 100644
--- a/packages/astro/src/core/render/ssr-element.ts
+++ b/packages/astro/src/core/render/ssr-element.ts
@@ -1,6 +1,7 @@
 import slashify from 'slash';
 import type { SSRElement } from '../../@types/astro';
 import { joinPaths, prependForwardSlash } from '../../core/path.js';
+import type { StylesheetAsset } from '../app/types';
 
 export function createAssetLink(href: string, base?: string, assetsPrefix?: string): string {
 	if (assetsPrefix) {
@@ -12,28 +13,35 @@ export function createAssetLink(href: string, base?: string, assetsPrefix?: stri
 	}
 }
 
-export function createLinkStylesheetElement(
-	href: string,
+export function createStylesheetElement(
+	stylesheet: StylesheetAsset,
 	base?: string,
 	assetsPrefix?: string
 ): SSRElement {
-	return {
-		props: {
-			rel: 'stylesheet',
-			href: createAssetLink(href, base, assetsPrefix),
-		},
-		children: '',
-	};
+	if (stylesheet.type === 'inline') {
+		return {
+			props: {
+				type: 'text/css',
+			},
+			children: stylesheet.content,
+		};
+	} else {
+		return {
+			props: {
+				rel: 'stylesheet',
+				href: createAssetLink(stylesheet.src, base, assetsPrefix),
+			},
+			children: '',
+		};
+	}
 }
 
-export function createLinkStylesheetElementSet(
-	hrefs: string[],
+export function createStylesheetElementSet(
+	stylesheets: StylesheetAsset[],
 	base?: string,
 	assetsPrefix?: string
-) {
-	return new Set<SSRElement>(
-		hrefs.map((href) => createLinkStylesheetElement(href, base, assetsPrefix))
-	);
+): Set<SSRElement> {
+	return new Set(stylesheets.map((s) => createStylesheetElement(s, base, assetsPrefix)));
 }
 
 export function createModuleScriptElement(
diff --git a/packages/astro/src/core/request.ts b/packages/astro/src/core/request.ts
index 24356983f..d8ac9033d 100644
--- a/packages/astro/src/core/request.ts
+++ b/packages/astro/src/core/request.ts
@@ -16,6 +16,7 @@ export interface CreateRequestOptions {
 }
 
 const clientAddressSymbol = Symbol.for('astro.clientAddress');
+const clientLocalsSymbol = Symbol.for('astro.locals');
 
 export function createRequest({
 	url,
@@ -65,5 +66,7 @@ export function createRequest({
 		Reflect.set(request, clientAddressSymbol, clientAddress);
 	}
 
+	Reflect.set(request, clientLocalsSymbol, {});
+
 	return request;
 }
diff --git a/packages/astro/src/integrations/index.ts b/packages/astro/src/integrations/index.ts
index 9b86259ae..d306e7be3 100644
--- a/packages/astro/src/integrations/index.ts
+++ b/packages/astro/src/integrations/index.ts
@@ -55,6 +55,7 @@ export async function runHookConfigSetup({
 
 	let updatedConfig: AstroConfig = { ...settings.config };
 	let updatedSettings: AstroSettings = { ...settings, config: updatedConfig };
+
 	for (const integration of settings.config.integrations) {
 		/**
 		 * By making integration hooks optional, Astro can now ignore null or undefined Integrations
@@ -68,7 +69,7 @@ export async function runHookConfigSetup({
 		 * ]
 		 * ```
 		 */
-		if (integration?.hooks?.['astro:config:setup']) {
+		if (integration.hooks?.['astro:config:setup']) {
 			const hooks: HookParameters<'astro:config:setup'> = {
 				config: updatedConfig,
 				command,
diff --git a/packages/astro/src/runtime/server/endpoint.ts b/packages/astro/src/runtime/server/endpoint.ts
index 33ce8f6f9..9780d6599 100644
--- a/packages/astro/src/runtime/server/endpoint.ts
+++ b/packages/astro/src/runtime/server/endpoint.ts
@@ -19,7 +19,7 @@ function getHandlerFromModule(mod: EndpointHandler, method: string) {
 
 /** Renders an endpoint request to completion, returning the body. */
 export async function renderEndpoint(mod: EndpointHandler, context: APIContext, ssr: boolean) {
-	const { request, params } = context;
+	const { request, params, locals } = context;
 	const chosenMethod = request.method?.toLowerCase();
 	const handler = getHandlerFromModule(mod, chosenMethod);
 	if (!ssr && ssr === false && chosenMethod && chosenMethod !== 'get') {
diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts
index 3c388fafa..1f1e1e97b 100644
--- a/packages/astro/src/runtime/server/index.ts
+++ b/packages/astro/src/runtime/server/index.ts
@@ -19,7 +19,6 @@ export {
 	renderScriptElement,
 	renderSlot,
 	renderSlotToString,
-	renderStyleElement,
 	renderTemplate as render,
 	renderTemplate,
 	renderToString,
diff --git a/packages/astro/src/runtime/server/render/component.ts b/packages/astro/src/runtime/server/render/component.ts
index 1c427bf2a..cc8851522 100644
--- a/packages/astro/src/runtime/server/render/component.ts
+++ b/packages/astro/src/runtime/server/render/component.ts
@@ -263,7 +263,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
 			if (isPage || renderer?.name === 'astro:jsx') {
 				yield html;
 			} else if (html && html.length > 0) {
-				yield markHTMLString(html.replace(/\<\/?astro-slot\>/g, ''));
+				yield markHTMLString(html.replace(/\<\/?astro-slot\b[^>]*>/g, ''));
 			} else {
 				yield '';
 			}
diff --git a/packages/astro/src/runtime/server/render/head.ts b/packages/astro/src/runtime/server/render/head.ts
index 16a97e9ab..52923c790 100644
--- a/packages/astro/src/runtime/server/render/head.ts
+++ b/packages/astro/src/runtime/server/render/head.ts
@@ -16,7 +16,11 @@ export function renderAllHeadContent(result: SSRResult) {
 	result._metadata.hasRenderedHead = true;
 	const styles = Array.from(result.styles)
 		.filter(uniqueElements)
-		.map((style) => renderElement('style', style));
+		.map((style) =>
+			style.props.rel === 'stylesheet'
+				? renderElement('link', style)
+				: renderElement('style', style)
+		);
 	// Clear result.styles so that any new styles added will be inlined.
 	result.styles.clear();
 	const scripts = Array.from(result.scripts)
diff --git a/packages/astro/src/runtime/server/render/index.ts b/packages/astro/src/runtime/server/render/index.ts
index efa0715d2..d34bdd6c7 100644
--- a/packages/astro/src/runtime/server/render/index.ts
+++ b/packages/astro/src/runtime/server/render/index.ts
@@ -11,6 +11,6 @@ export { renderHTMLElement } from './dom.js';
 export { maybeRenderHead, renderHead } from './head.js';
 export { renderPage } from './page.js';
 export { renderSlot, renderSlotToString, type ComponentSlots } from './slot.js';
-export { renderScriptElement, renderStyleElement, renderUniqueStylesheet } from './tags.js';
+export { renderScriptElement, renderUniqueStylesheet } from './tags.js';
 export type { RenderInstruction } from './types';
 export { addAttribute, defineScriptVars, voidElementNames } from './util.js';
diff --git a/packages/astro/src/runtime/server/render/tags.ts b/packages/astro/src/runtime/server/render/tags.ts
index fe9829d0c..f15da6571 100644
--- a/packages/astro/src/runtime/server/render/tags.ts
+++ b/packages/astro/src/runtime/server/render/tags.ts
@@ -1,15 +1,7 @@
 import type { SSRElement, SSRResult } from '../../../@types/astro';
+import type { StylesheetAsset } from '../../../core/app/types';
 import { renderElement } from './util.js';
 
-const stylesheetRel = 'stylesheet';
-
-export function renderStyleElement(children: string) {
-	return renderElement('style', {
-		props: {},
-		children,
-	});
-}
-
 export function renderScriptElement({ props, children }: SSRElement) {
 	return renderElement('script', {
 		props,
@@ -17,26 +9,14 @@ export function renderScriptElement({ props, children }: SSRElement) {
 	});
 }
 
-export function renderStylesheet({ href }: { href: string }) {
-	return renderElement(
-		'link',
-		{
-			props: {
-				rel: stylesheetRel,
-				href,
-			},
-			children: '',
-		},
-		false
-	);
-}
-
-export function renderUniqueStylesheet(result: SSRResult, link: { href: string }) {
-	for (const existingLink of result.links) {
-		if (existingLink.props.rel === stylesheetRel && existingLink.props.href === link.href) {
-			return '';
-		}
+export function renderUniqueStylesheet(result: SSRResult, sheet: StylesheetAsset) {
+	if (sheet.type === 'external') {
+		if (Array.from(result.styles).some((s) => s.props.href === sheet.src)) return '';
+		return renderElement('link', { props: { rel: 'stylesheet', href: sheet.src }, children: '' });
 	}
 
-	return renderStylesheet(link);
+	if (sheet.type === 'inline') {
+		if (Array.from(result.styles).some((s) => s.children.includes(sheet.content))) return '';
+		return renderElement('style', { props: { type: 'text/css' }, children: sheet.content });
+	}
 }
diff --git a/packages/astro/src/vite-plugin-astro-server/response.ts b/packages/astro/src/vite-plugin-astro-server/response.ts
index 3c075405f..b1ac9d3cd 100644
--- a/packages/astro/src/vite-plugin-astro-server/response.ts
+++ b/packages/astro/src/vite-plugin-astro-server/response.ts
@@ -57,9 +57,10 @@ export async function writeWebResponse(res: http.ServerResponse, webResponse: Re
 
 	// Attach any set-cookie headers added via Astro.cookies.set()
 	const setCookieHeaders = Array.from(getSetCookiesFromResponse(webResponse));
-	setCookieHeaders.forEach((cookie) => {
-		headers.append('set-cookie', cookie);
-	});
+	if (setCookieHeaders.length) {
+		// Always use `res.setHeader` because headers.append causes them to be concatenated.
+		res.setHeader('set-cookie', setCookieHeaders);
+	}
 
 	const _headers = Object.fromEntries(headers.entries());
 
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index 79232f10f..cb2e76178 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -1,23 +1,21 @@
 import type http from 'http';
 import mime from 'mime';
-import type { AstroSettings, ComponentInstance, ManifestData, RouteData } from '../@types/astro';
-import type {
-	ComponentPreload,
-	DevelopmentEnvironment,
-	SSROptions,
-} from '../core/render/dev/index';
-
+import type { ComponentInstance, ManifestData, RouteData } from '../@types/astro';
 import { attachToResponse } from '../core/cookies/index.js';
 import { call as callEndpoint } from '../core/endpoint/dev/index.js';
 import { throwIfRedirectNotAllowed } from '../core/endpoint/index.js';
 import { AstroErrorData } from '../core/errors/index.js';
 import { warn } from '../core/logger/core.js';
-import { appendForwardSlash } from '../core/path.js';
+import { loadMiddleware } from '../core/middleware/loadMiddleware.js';
+import type {
+	ComponentPreload,
+	DevelopmentEnvironment,
+	SSROptions,
+} from '../core/render/dev/index';
 import { preload, renderPage } from '../core/render/dev/index.js';
 import { getParamsAndProps, GetParamsAndPropsError } from '../core/render/index.js';
 import { createRequest } from '../core/request.js';
 import { matchAllRoutes } from '../core/routing/index.js';
-import { resolvePages } from '../core/util.js';
 import { log404 } from './common.js';
 import { handle404Response, writeSSRResult, writeWebResponse } from './response.js';
 
@@ -35,11 +33,9 @@ interface MatchedRoute {
 	mod: ComponentInstance;
 }
 
-function getCustom404Route({ config }: AstroSettings, manifest: ManifestData) {
-	// For Windows compat, use relative page paths to match the 404 route
-	const relPages = resolvePages(config).href.replace(config.root.href, '');
-	const pattern = new RegExp(`${appendForwardSlash(relPages)}404.(astro|md)`);
-	return manifest.routes.find((r) => r.component.match(pattern));
+function getCustom404Route(manifest: ManifestData): RouteData | undefined {
+	const route404 = /^\/404\/?$/;
+	return manifest.routes.find((r) => route404.test(r.route));
 }
 
 export async function matchRoute(
@@ -97,7 +93,7 @@ export async function matchRoute(
 	}
 
 	log404(logging, pathname);
-	const custom404 = getCustom404Route(settings, manifest);
+	const custom404 = getCustom404Route(manifest);
 
 	if (custom404) {
 		const filePath = new URL(`./${custom404.component}`, settings.config.root);
@@ -173,7 +169,12 @@ export async function handleRoute(
 		request,
 		route,
 	};
-
+	if (env.settings.config.experimental.middleware) {
+		const middleware = await loadMiddleware(env.loader, env.settings.config.srcDir);
+		if (middleware) {
+			options.middleware = middleware;
+		}
+	}
 	// Route successfully matched! Render it.
 	if (route.type === 'endpoint') {
 		const result = await callEndpoint(options, logging);
diff --git a/packages/astro/src/vite-plugin-env/index.ts b/packages/astro/src/vite-plugin-env/index.ts
index ab8816000..1f21696e3 100644
--- a/packages/astro/src/vite-plugin-env/index.ts
+++ b/packages/astro/src/vite-plugin-env/index.ts
@@ -31,7 +31,14 @@ function getPrivateEnv(
 		// Ignore public env var
 		if (envPrefixes.every((prefix) => !key.startsWith(prefix))) {
 			if (typeof process.env[key] !== 'undefined') {
-				privateEnv[key] = `process.env.${key}`;
+				const value = process.env[key];
+				// 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]);
 			}
diff --git a/packages/astro/src/vite-plugin-jsx/index.ts b/packages/astro/src/vite-plugin-jsx/index.ts
index 0903a0413..8cab3db9f 100644
--- a/packages/astro/src/vite-plugin-jsx/index.ts
+++ b/packages/astro/src/vite-plugin-jsx/index.ts
@@ -13,6 +13,7 @@ import babel from '@babel/core';
 import * as colors from 'kleur/colors';
 import path from 'path';
 import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from '../content/index.js';
+import { astroEntryPrefix } from '../core/build/plugins/plugin-component-entry.js';
 import { error } from '../core/logger/core.js';
 import { removeQueryString } from '../core/path.js';
 import { detectImportSource } from './import-source.js';
@@ -139,7 +140,9 @@ export default function jsx({ settings, logging }: AstroPluginJSXOptions): Plugi
 		},
 		async transform(code, id, opts) {
 			const ssr = Boolean(opts?.ssr);
-			if (SPECIAL_QUERY_REGEX.test(id)) {
+			// Skip special queries and astro entries. We skip astro entries here as we know it doesn't contain
+			// JSX code, and also because we can't detect the import source to apply JSX transforms.
+			if (SPECIAL_QUERY_REGEX.test(id) || id.startsWith(astroEntryPrefix)) {
 				return null;
 			}
 			id = removeQueryString(id);
diff --git a/packages/astro/test/astro-assets-prefix.test.js b/packages/astro/test/astro-assets-prefix.test.js
index be80d4601..58eb11e39 100644
--- a/packages/astro/test/astro-assets-prefix.test.js
+++ b/packages/astro/test/astro-assets-prefix.test.js
@@ -63,6 +63,29 @@ describe('Assets Prefix - Static', () => {
 	});
 });
 
+describe('Assets Prefix - Static with path prefix', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/astro-assets-prefix/',
+			build: {
+				assetsPrefix: '/starting-slash',
+			},
+		});
+		await fixture.build();
+	});
+
+	it('all stylesheets should start with assetPrefix', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		const stylesheets = $('link[rel="stylesheet"]');
+		stylesheets.each((i, el) => {
+			expect(el.attribs.href).to.match(/^\/starting-slash\/.*/);
+		});
+	});
+});
+
 describe('Assets Prefix - Server', () => {
 	let app;
 
@@ -119,3 +142,32 @@ describe('Assets Prefix - Server', () => {
 		expect(imgAsset.attr('src')).to.match(assetsPrefixRegex);
 	});
 });
+
+describe('Assets Prefix - Server with path prefix', () => {
+	let app;
+
+	before(async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/astro-assets-prefix/',
+			output: 'server',
+			adapter: testAdapter(),
+			build: {
+				assetsPrefix: '/starting-slash',
+			},
+		});
+		await fixture.build();
+		app = await fixture.loadTestAdapterApp();
+	});
+
+	it('all stylesheets should start with assetPrefix', async () => {
+		const request = new Request('http://example.com/custom-base/');
+		const response = await app.render(request);
+		expect(response.status).to.equal(200);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		const stylesheets = $('link[rel="stylesheet"]');
+		stylesheets.each((i, el) => {
+			expect(el.attribs.href).to.match(/^\/starting-slash\/.*/);
+		});
+	});
+});
diff --git a/packages/astro/test/astro-component-code.test.js b/packages/astro/test/astro-component-code.test.js
index e9efb4ca9..6a525f58d 100644
--- a/packages/astro/test/astro-component-code.test.js
+++ b/packages/astro/test/astro-component-code.test.js
@@ -15,7 +15,7 @@ describe('<Code>', () => {
 		const $ = cheerio.load(html);
 		expect($('pre')).to.have.lengthOf(1);
 		expect($('pre').attr('style')).to.equal(
-			'background-color: #0d1117; overflow-x: auto;',
+			'background-color: #24292e; overflow-x: auto;',
 			'applies default and overflow'
 		);
 		expect($('pre > code')).to.have.lengthOf(1);
@@ -28,7 +28,7 @@ describe('<Code>', () => {
 		let html = await fixture.readFile('/basic/index.html');
 		const $ = cheerio.load(html);
 		expect($('pre')).to.have.lengthOf(1);
-		expect($('pre').attr('class'), 'astro-code');
+		expect($('pre').attr('class'), 'astro-code nord');
 		expect($('pre > code')).to.have.lengthOf(1);
 		// test: contains many generated spans
 		expect($('pre > code span').length).to.be.greaterThanOrEqual(6);
@@ -38,7 +38,7 @@ describe('<Code>', () => {
 		let html = await fixture.readFile('/custom-theme/index.html');
 		const $ = cheerio.load(html);
 		expect($('pre')).to.have.lengthOf(1);
-		expect($('pre').attr('class')).to.equal('astro-code');
+		expect($('pre').attr('class')).to.equal('astro-code nord');
 		expect($('pre').attr('style')).to.equal(
 			'background-color: #2e3440ff; overflow-x: auto;',
 			'applies custom theme'
@@ -52,7 +52,7 @@ describe('<Code>', () => {
 			expect($('pre')).to.have.lengthOf(1);
 			// test: applies wrap overflow
 			expect($('pre').attr('style')).to.equal(
-				'background-color: #0d1117; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;'
+				'background-color: #24292e; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;'
 			);
 		}
 		{
@@ -60,14 +60,14 @@ describe('<Code>', () => {
 			const $ = cheerio.load(html);
 			expect($('pre')).to.have.lengthOf(1);
 			// test: applies wrap overflow
-			expect($('pre').attr('style')).to.equal('background-color: #0d1117; overflow-x: auto;');
+			expect($('pre').attr('style')).to.equal('background-color: #24292e; overflow-x: auto;');
 		}
 		{
 			let html = await fixture.readFile('/wrap-null/index.html');
 			const $ = cheerio.load(html);
 			expect($('pre')).to.have.lengthOf(1);
 			// test: applies wrap overflow
-			expect($('pre').attr('style')).to.equal('background-color: #0d1117');
+			expect($('pre').attr('style')).to.equal('background-color: #24292e');
 		}
 	});
 
@@ -75,7 +75,7 @@ describe('<Code>', () => {
 		let html = await fixture.readFile('/css-theme/index.html');
 		const $ = cheerio.load(html);
 		expect($('pre')).to.have.lengthOf(1);
-		expect($('pre').attr('class')).to.equal('astro-code');
+		expect($('pre').attr('class')).to.equal('astro-code css-variables');
 		expect(
 			$('pre, pre span')
 				.map((i, f) => (f.attribs ? f.attribs.style : 'no style found'))
@@ -100,4 +100,14 @@ describe('<Code>', () => {
 		expect($('#lang > pre')).to.have.lengthOf(1);
 		expect($('#lang > pre > code span').length).to.equal(3);
 	});
+
+	it('<Code inline> has no pre tag', async () => {
+		let html = await fixture.readFile('/inline/index.html');
+		const $ = cheerio.load(html);
+		const codeEl = $('.astro-code');
+
+		expect(codeEl.prop('tagName')).to.eq('CODE');
+		expect(codeEl.attr('style')).to.include('background-color:');
+		expect($('pre')).to.have.lengthOf(0);
+	});
 });
diff --git a/packages/astro/test/astro-get-static-paths.test.js b/packages/astro/test/astro-get-static-paths.test.js
index 3211f3318..9914eb938 100644
--- a/packages/astro/test/astro-get-static-paths.test.js
+++ b/packages/astro/test/astro-get-static-paths.test.js
@@ -3,11 +3,11 @@ import { loadFixture } from './test-utils.js';
 import * as cheerio from 'cheerio';
 
 describe('getStaticPaths - build calls', () => {
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
 
-		const fixture = await loadFixture({
+	before(async () => {
+		fixture = await loadFixture({
 			root: './fixtures/astro-get-static-paths/',
 			site: 'https://mysite.dev/',
 			base: '/blog',
@@ -15,10 +15,22 @@ describe('getStaticPaths - build calls', () => {
 		await fixture.build();
 	});
 
+	afterEach(() => {
+		// reset the flag used by [...calledTwiceTest].astro between each test
+		globalThis.isCalledOnce = false;
+	});
+
 	it('is only called once during build', () => {
 		// useless expect; if build() throws in setup then this test fails
 		expect(true).to.equal(true);
 	});
+
+	it('Astro.url sets the current pathname', async () => {
+		const html = await fixture.readFile('/food/tacos/index.html');
+		const $ = cheerio.load(html);
+
+		expect($('#url').text()).to.equal('/blog/food/tacos/');
+	});
 });
 
 describe('getStaticPaths - dev calls', () => {
@@ -26,11 +38,16 @@ describe('getStaticPaths - dev calls', () => {
 	let devServer;
 
 	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/astro-get-static-paths/',
+			site: 'https://mysite.dev/',
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	afterEach(() => {
 		// reset the flag used by [...calledTwiceTest].astro between each test
 		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({ root: './fixtures/astro-get-static-paths/' });
-		devServer = await fixture.startDevServer();
 	});
 
 	after(async () => {
@@ -47,95 +64,46 @@ describe('getStaticPaths - dev calls', () => {
 		res = await fixture.fetch('/c');
 		expect(res.status).to.equal(200);
 	});
-});
 
-describe('getStaticPaths - 404 behavior', () => {
-	let fixture;
-	let devServer;
-
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({ root: './fixtures/astro-get-static-paths/' });
-		devServer = await fixture.startDevServer();
-	});
-
-	after(async () => {
-		devServer.stop();
-	});
-
-	it('resolves 200 on matching static path - named params', async () => {
-		const res = await fixture.fetch('/pizza/provolone-sausage');
-		expect(res.status).to.equal(200);
-	});
-
-	it('resolves 404 on pattern match without static path - named params', async () => {
-		const res = await fixture.fetch('/pizza/provolone-pineapple');
-		expect(res.status).to.equal(404);
-	});
-
-	it('resolves 200 on matching static path - rest params', async () => {
-		const res = await fixture.fetch('/pizza/grimaldis/new-york');
-		expect(res.status).to.equal(200);
-	});
-
-	it('resolves 404 on pattern match without static path - rest params', async () => {
-		const res = await fixture.fetch('/pizza/pizza-hut');
-		expect(res.status).to.equal(404);
-	});
-});
-
-describe('getStaticPaths - route params type validation', () => {
-	let fixture, devServer;
-
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({ root: './fixtures/astro-get-static-paths/' });
-		devServer = await fixture.startDevServer();
-	});
-
-	after(async () => {
-		await devServer.stop();
-	});
-
-	it('resolves 200 on nested array parameters', async () => {
-		const res = await fixture.fetch('/nested-arrays/slug1');
-		expect(res.status).to.equal(200);
-	});
-
-	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/2022/post-1');
-		expect(res.status).to.equal(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/2022/post-2');
-		expect(res.status).to.equal(200);
-	});
-});
-
-describe('getStaticPaths - numeric route params', () => {
-	let fixture;
-	let devServer;
-
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({
-			root: './fixtures/astro-get-static-paths/',
-			site: 'https://mysite.dev/',
+	describe('404 behavior', () => {
+		it('resolves 200 on matching static path - named params', async () => {
+			const res = await fixture.fetch('/pizza/provolone-sausage');
+			expect(res.status).to.equal(200);
+		});
+
+		it('resolves 404 on pattern match without static path - named params', async () => {
+			const res = await fixture.fetch('/pizza/provolone-pineapple');
+			expect(res.status).to.equal(404);
+		});
+
+		it('resolves 200 on matching static path - rest params', async () => {
+			const res = await fixture.fetch('/pizza/grimaldis/new-york');
+			expect(res.status).to.equal(200);
+		});
+
+		it('resolves 404 on pattern match without static path - rest params', async () => {
+			const res = await fixture.fetch('/pizza/pizza-hut');
+			expect(res.status).to.equal(404);
 		});
-		devServer = await fixture.startDevServer();
 	});
 
-	after(async () => {
-		await devServer.stop();
+	describe('route params type validation', () => {
+		it('resolves 200 on nested array parameters', async () => {
+			const res = await fixture.fetch('/nested-arrays/slug1');
+			expect(res.status).to.equal(200);
+		});
+
+		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/2022/post-1');
+			expect(res.status).to.equal(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/2022/post-2');
+			expect(res.status).to.equal(200);
+		});
 	});
 
 	it('resolves 200 on matching static paths', async () => {
@@ -155,25 +123,3 @@ describe('getStaticPaths - numeric route params', () => {
 		}
 	});
 });
-
-describe('getStaticPaths - Astro.url', () => {
-	/** @type {import('./test-utils').Fixture} */
-	let fixture;
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({
-			root: './fixtures/astro-get-static-paths/',
-			site: 'https://mysite.dev/',
-		});
-		await fixture.build();
-	});
-
-	it('Sets the current pathname', async () => {
-		const html = await fixture.readFile('/food/tacos/index.html');
-		const $ = cheerio.load(html);
-
-		expect($('#url').text()).to.equal('/food/tacos/');
-	});
-});
diff --git a/packages/astro/test/astro-markdown-shiki.test.js b/packages/astro/test/astro-markdown-shiki.test.js
index 9c8d86689..bf3e0724b 100644
--- a/packages/astro/test/astro-markdown-shiki.test.js
+++ b/packages/astro/test/astro-markdown-shiki.test.js
@@ -20,7 +20,7 @@ describe('Astro Markdown Shiki', () => {
 
 			expect($('pre')).to.have.lengthOf(2);
 			expect($('pre').hasClass('astro-code')).to.equal(true);
-			expect($('pre').attr().style).to.equal('background-color: #0d1117; overflow-x: auto;');
+			expect($('pre').attr().style).to.equal('background-color: #24292e; overflow-x: auto;');
 		});
 
 		it('Can render diff syntax with "user-select: none"', async () => {
@@ -47,7 +47,7 @@ describe('Astro Markdown Shiki', () => {
 
 				expect($('pre')).to.have.lengthOf(1);
 				expect($('pre').hasClass('astro-code')).to.equal(true);
-				expect($('pre').attr().style).to.equal('background-color: #ffffff; overflow-x: auto;');
+				expect($('pre').attr().style).to.equal('background-color: #fff; overflow-x: auto;');
 			});
 		});
 
@@ -84,13 +84,13 @@ describe('Astro Markdown Shiki', () => {
 
 			const segments = $('.line').get(6).children;
 			expect(segments).to.have.lengthOf(3);
-			expect(segments[0].attribs.style).to.be.equal('color: #C9D1D9');
-			expect(segments[1].attribs.style).to.be.equal('color: #79C0FF');
-			expect(segments[2].attribs.style).to.be.equal('color: #C9D1D9');
+			expect(segments[0].attribs.style).to.be.equal('color: #E1E4E8');
+			expect(segments[1].attribs.style).to.be.equal('color: #79B8FF');
+			expect(segments[2].attribs.style).to.be.equal('color: #E1E4E8');
 
 			const unknownLang = $('.line').last().html();
 			expect(unknownLang).to.be.equal(
-				'<span style="color: #c9d1d9">This language does not exist</span>'
+				'<span style="color: #e1e4e8">This language does not exist</span>'
 			);
 		});
 	});
@@ -98,7 +98,7 @@ describe('Astro Markdown Shiki', () => {
 	describe('Wrap', () => {
 		describe('wrap = true', () => {
 			const style =
-				'background-color: #0d1117; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
+				'background-color: #24292e; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
 			let fixture;
 
 			before(async () => {
@@ -117,7 +117,7 @@ describe('Astro Markdown Shiki', () => {
 	});
 
 	describe('wrap = false', () => {
-		const style = 'background-color: #0d1117; overflow-x: auto;';
+		const style = 'background-color: #24292e; overflow-x: auto;';
 		let fixture;
 
 		before(async () => {
@@ -135,7 +135,7 @@ describe('Astro Markdown Shiki', () => {
 	});
 
 	describe('wrap = null', () => {
-		const style = 'background-color: #0d1117';
+		const style = 'background-color: #24292e';
 		let fixture;
 
 		before(async () => {
diff --git a/packages/astro/test/astro-slot-with-client.test.js b/packages/astro/test/astro-slot-with-client.test.js
index 12e630548..4ad26dee4 100644
--- a/packages/astro/test/astro-slot-with-client.test.js
+++ b/packages/astro/test/astro-slot-with-client.test.js
@@ -16,4 +16,10 @@ describe('Slots with client: directives', () => {
 		const $ = cheerio.load(html);
 		expect($('script')).to.have.a.lengthOf(1);
 	});
+
+	it('Astro slot tags are cleaned', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		expect($('astro-slot')).to.have.a.lengthOf(0);
+	});
 });
diff --git a/packages/astro/test/content-collections-render.test.js b/packages/astro/test/content-collections-render.test.js
index 2aea21a74..e1107b10f 100644
--- a/packages/astro/test/content-collections-render.test.js
+++ b/packages/astro/test/content-collections-render.test.js
@@ -36,6 +36,25 @@ describe('Content Collections - render()', () => {
 			expect($('link[rel=stylesheet]')).to.have.a.lengthOf(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;
+				expect(set).to.not.contain(href);
+				set.add(href);
+			});
+
+			$('style').each((_, styleEl) => {
+				const textContent = styleEl.children[0].data;
+				expect(set).to.not.contain(textContent);
+				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);
@@ -116,6 +135,28 @@ describe('Content Collections - render()', () => {
 			expect($('link[rel=stylesheet]')).to.have.a.lengthOf(0);
 		});
 
+		it('De-duplicates CSS used both in layout and directly in target page', async () => {
+			const app = await fixture.loadTestAdapterApp();
+			const request = new Request('http://example.com/with-layout-prop/');
+			const response = await app.render(request);
+			const html = await response.text();
+			const $ = cheerio.load(html);
+
+			const set = new Set();
+
+			$('link[rel=stylesheet]').each((_, linkEl) => {
+				const href = linkEl.attribs.href;
+				expect(set).to.not.contain(href);
+				set.add(href);
+			});
+
+			$('style').each((_, styleEl) => {
+				const textContent = styleEl.children[0].data;
+				expect(set).to.not.contain(textContent);
+				set.add(textContent);
+			});
+		});
+
 		it('Applies MDX components export', async () => {
 			const app = await fixture.loadTestAdapterApp();
 			const request = new Request('http://example.com/launch-week-components-export');
diff --git a/packages/astro/test/css-inline.test.js b/packages/astro/test/css-import-as-inline.test.js
similarity index 97%
rename from packages/astro/test/css-inline.test.js
rename to packages/astro/test/css-import-as-inline.test.js
index 03bee955b..7dacab377 100644
--- a/packages/astro/test/css-inline.test.js
+++ b/packages/astro/test/css-import-as-inline.test.js
@@ -6,7 +6,7 @@ describe('Importing raw/inlined CSS', () => {
 	let fixture;
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/css-inline/',
+			root: './fixtures/css-import-as-inline/',
 		});
 	});
 	describe('Build', () => {
diff --git a/packages/astro/test/css-inline-stylesheets.test.js b/packages/astro/test/css-inline-stylesheets.test.js
new file mode 100644
index 000000000..d4009ed85
--- /dev/null
+++ b/packages/astro/test/css-inline-stylesheets.test.js
@@ -0,0 +1,285 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+import testAdapter from './test-adapter.js';
+
+describe('Setting inlineStylesheets to never in static output', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/css-inline-stylesheets/never/',
+			output: 'static',
+			experimental: {
+				inlineStylesheets: 'never',
+			},
+		});
+		await fixture.build();
+	});
+
+	it('Does not render any <style> tags', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+
+		expect($('style').toArray()).to.be.empty;
+	});
+
+	describe('Inspect linked stylesheets', () => {
+		// object, so it can be passed by reference
+		const allStyles = {};
+
+		before(async () => {
+			allStyles.value = await stylesFromStaticOutput(fixture);
+		});
+
+		commonExpectations(allStyles);
+	});
+});
+
+describe('Setting inlineStylesheets to never in server output', () => {
+	let app;
+
+	before(async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/css-inline-stylesheets/never/',
+			output: 'server',
+			adapter: testAdapter(),
+			experimental: {
+				inlineStylesheets: 'never',
+			},
+		});
+		await fixture.build();
+		app = await fixture.loadTestAdapterApp();
+	});
+
+	it('Does not render any <style> tags', async () => {
+		const request = new Request('http://example.com/');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+
+		expect($('style').toArray()).to.be.empty;
+	});
+
+	describe('Inspect linked stylesheets', () => {
+		const allStyles = {};
+
+		before(async () => {
+			allStyles.value = await stylesFromServer(app);
+		});
+
+		commonExpectations(allStyles);
+	});
+});
+
+describe('Setting inlineStylesheets to auto in static output', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/css-inline-stylesheets/auto/',
+			output: 'static',
+			experimental: {
+				inlineStylesheets: 'auto',
+			},
+			vite: {
+				build: {
+					assetsInlineLimit: 512,
+				},
+			},
+		});
+		await fixture.build();
+	});
+
+	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
+		expect($('style')).to.have.lengthOf(3);
+		expect($('link[rel=stylesheet]')).to.have.lengthOf(1);
+	});
+
+	describe('Inspect linked and inlined stylesheets', () => {
+		const allStyles = {};
+
+		before(async () => {
+			allStyles.value = await stylesFromStaticOutput(fixture);
+		});
+
+		commonExpectations(allStyles);
+	});
+});
+
+describe('Setting inlineStylesheets to auto in server output', () => {
+	let app;
+
+	before(async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/css-inline-stylesheets/auto/',
+			output: 'server',
+			adapter: testAdapter(),
+			experimental: {
+				inlineStylesheets: 'auto',
+			},
+			vite: {
+				build: {
+					assetsInlineLimit: 512,
+				},
+			},
+		});
+		await fixture.build();
+		app = await fixture.loadTestAdapterApp();
+	});
+
+	it('Renders some <style> and some <link> tags', async () => {
+		const request = new Request('http://example.com/');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+
+		// the count of style/link tags depends on our css chunking logic
+		// this test should be updated if it changes
+		expect($('style')).to.have.lengthOf(3);
+		expect($('link[rel=stylesheet]')).to.have.lengthOf(1);
+	});
+
+	describe('Inspect linked and inlined stylesheets', () => {
+		const allStyles = {};
+
+		before(async () => {
+			allStyles.value = await stylesFromServer(app);
+		});
+
+		commonExpectations(allStyles);
+	});
+});
+
+describe('Setting inlineStylesheets to always in static output', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/css-inline-stylesheets/always/',
+			output: 'static',
+			experimental: {
+				inlineStylesheets: 'always',
+			},
+		});
+		await fixture.build();
+	});
+
+	it('Does not render any <link> tags', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+
+		expect($('link[rel=stylesheet]').toArray()).to.be.empty;
+	});
+
+	describe('Inspect inlined stylesheets', () => {
+		const allStyles = {};
+
+		before(async () => {
+			allStyles.value = await stylesFromStaticOutput(fixture);
+		});
+
+		commonExpectations(allStyles);
+	});
+});
+
+describe('Setting inlineStylesheets to always in server output', () => {
+	let app;
+
+	before(async () => {
+		const fixture = await loadFixture({
+			root: './fixtures/css-inline-stylesheets/always/',
+			output: 'server',
+			adapter: testAdapter(),
+			experimental: {
+				inlineStylesheets: 'always',
+			},
+		});
+		await fixture.build();
+		app = await fixture.loadTestAdapterApp();
+	});
+
+	it('Does not render any <link> tags', async () => {
+		const request = new Request('http://example.com/');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+
+		expect($('link[rel=stylesheet]').toArray()).to.be.empty;
+	});
+
+	describe('Inspect inlined stylesheets', () => {
+		const allStyles = {};
+
+		before(async () => {
+			allStyles.value = await stylesFromServer(app);
+		});
+
+		commonExpectations(allStyles);
+	});
+});
+
+async function stylesFromStaticOutput(fixture) {
+	const html = await fixture.readFile('/index.html');
+	const $ = cheerio.load(html);
+
+	const links = $('link[rel=stylesheet]');
+	const hrefs = links.map((_, linkEl) => linkEl.attribs.href).toArray();
+	const allLinkedStylesheets = await Promise.all(hrefs.map((href) => fixture.readFile(href)));
+	const allLinkedStyles = allLinkedStylesheets.join('');
+
+	const styles = $('style');
+	const allInlinedStylesheets = styles.map((_, styleEl) => styleEl.children[0].data).toArray();
+	const allInlinedStyles = allInlinedStylesheets.join('');
+
+	return allLinkedStyles + allInlinedStyles;
+}
+
+async function stylesFromServer(app) {
+	const request = new Request('http://example.com/');
+	const response = await app.render(request);
+	const html = await response.text();
+	const $ = cheerio.load(html);
+
+	const links = $('link[rel=stylesheet]');
+	const hrefs = links.map((_, linkEl) => linkEl.attribs.href).toArray();
+	const allLinkedStylesheets = await Promise.all(
+		hrefs.map(async (href) => {
+			const cssRequest = new Request(`http://example.com${href}`);
+			const cssResponse = await app.render(cssRequest);
+			return await cssResponse.text();
+		})
+	);
+	const allLinkedStyles = allLinkedStylesheets.join('');
+
+	const styles = $('style');
+	const allInlinedStylesheets = styles.map((_, styleEl) => styleEl.children[0].data).toArray();
+	const allInlinedStyles = allInlinedStylesheets.join('');
+	return allLinkedStyles + allInlinedStyles;
+}
+
+function commonExpectations(allStyles) {
+	it('Includes all authored css', () => {
+		// authored in imported.css
+		expect(allStyles.value).to.include('.bg-lightcoral');
+
+		// authored in index.astro
+		expect(allStyles.value).to.include('#welcome');
+
+		// authored in components/Button.astro
+		expect(allStyles.value).to.include('.variant-outline');
+
+		// authored in layouts/Layout.astro
+		expect(allStyles.value).to.include('Menlo');
+	});
+
+	it('Styles used both in content layout and directly in page are included only once', () => {
+		// authored in components/Button.astro
+		expect(allStyles.value.match(/cubic-bezier/g)).to.have.lengthOf(1);
+	});
+}
diff --git a/packages/astro/test/custom-404-html.test.js b/packages/astro/test/custom-404-html.test.js
new file mode 100644
index 000000000..6c3ac6dec
--- /dev/null
+++ b/packages/astro/test/custom-404-html.test.js
@@ -0,0 +1,42 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('Custom 404.html', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/custom-404-html/',
+			site: 'http://example.com',
+		});
+	});
+
+	describe('dev', () => {
+		let devServer;
+		let $;
+
+		before(async () => {
+			devServer = await fixture.startDevServer();
+		});
+
+		after(async () => {
+			await devServer.stop();
+		});
+
+		it('renders /', async () => {
+			const html = await fixture.fetch('/').then((res) => res.text());
+			$ = cheerio.load(html);
+
+			expect($('h1').text()).to.equal('Home');
+		});
+
+		it('renders 404 for /a', async () => {
+			const html = await fixture.fetch('/a').then((res) => res.text());
+			$ = cheerio.load(html);
+
+			expect($('h1').text()).to.equal('Page not found');
+			expect($('p').text()).to.equal('This 404 is a static HTML file.');
+		});
+	});
+});
diff --git a/packages/astro/test/custom-404-injected.test.js b/packages/astro/test/custom-404-injected.test.js
new file mode 100644
index 000000000..c8963243a
--- /dev/null
+++ b/packages/astro/test/custom-404-injected.test.js
@@ -0,0 +1,42 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('Custom 404 with injectRoute', () => {
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/custom-404-injected/',
+			site: 'http://example.com',
+		});
+	});
+
+	describe('dev', () => {
+		let devServer;
+		let $;
+
+		before(async () => {
+			devServer = await fixture.startDevServer();
+		});
+
+		after(async () => {
+			await devServer.stop();
+		});
+
+		it('renders /', async () => {
+			const html = await fixture.fetch('/').then((res) => res.text());
+			$ = cheerio.load(html);
+
+			expect($('h1').text()).to.equal('Home');
+		});
+
+		it('renders 404 for /a', async () => {
+			const html = await fixture.fetch('/a').then((res) => res.text());
+			$ = cheerio.load(html);
+
+			expect($('h1').text()).to.equal('Page not found');
+			expect($('p').text()).to.equal('/a');
+		});
+	});
+});
diff --git a/packages/astro/test/dynamic-endpoint-collision.js b/packages/astro/test/dynamic-endpoint-collision.test.js
similarity index 100%
rename from packages/astro/test/dynamic-endpoint-collision.js
rename to packages/astro/test/dynamic-endpoint-collision.test.js
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/inline.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/inline.astro
new file mode 100644
index 000000000..05422c8bf
--- /dev/null
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/inline.astro
@@ -0,0 +1,10 @@
+---
+import {Code} from 'astro/components';
+---
+<html>
+<head><title>Code component</title></head>
+<body>
+  Simple:
+  <Code code="console.log('inline code');" lang="js" inline />
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/content/src/components/H3.astro b/packages/astro/test/fixtures/content/src/components/H3.astro
new file mode 100644
index 000000000..fa476e929
--- /dev/null
+++ b/packages/astro/test/fixtures/content/src/components/H3.astro
@@ -0,0 +1,2 @@
+<style>h3 { margin: 1rem }</style>
+<h3><slot /></h3>
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/content/src/components/LayoutProp.astro b/packages/astro/test/fixtures/content/src/components/LayoutProp.astro
index df7493c3e..a2954162a 100644
--- a/packages/astro/test/fixtures/content/src/components/LayoutProp.astro
+++ b/packages/astro/test/fixtures/content/src/components/LayoutProp.astro
@@ -1,6 +1,6 @@
 ---
 import { CollectionEntry, getCollection } from 'astro:content';
-
+import H3 from './H3.astro'
 // Test for recursive `getCollection()` calls
 const blog = await getCollection('blog');
 
@@ -23,6 +23,7 @@ const {
 	</head>
 	<body data-layout-prop="true">
 		<h1>{title}</h1>
+		<H3>H3 inserted in the layout</H3>
 		<nav>
 			<ul>
 				{blog.map((post) => (
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
index 672430ab5..4cbb87624 100644
--- a/packages/astro/test/fixtures/content/src/pages/with-layout-prop.astro
+++ b/packages/astro/test/fixtures/content/src/pages/with-layout-prop.astro
@@ -1,7 +1,9 @@
 ---
 import { getEntryBySlug } from 'astro:content';
+import H3 from '../components/H3.astro';
 
 const entry = await getEntryBySlug('blog', 'with-layout-prop');
 const { Content } = await entry.render();
 ---
-<Content />
+<H3>H3 directly inserted to the page</H3>
+<Content />
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-import-as-inline/package.json b/packages/astro/test/fixtures/css-import-as-inline/package.json
new file mode 100644
index 000000000..3efc3a6ec
--- /dev/null
+++ b/packages/astro/test/fixtures/css-import-as-inline/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/css-import-as-inline",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/css-inline/src/inline.css b/packages/astro/test/fixtures/css-import-as-inline/src/inline.css
similarity index 100%
rename from packages/astro/test/fixtures/css-inline/src/inline.css
rename to packages/astro/test/fixtures/css-import-as-inline/src/inline.css
diff --git a/packages/astro/test/fixtures/css-inline/src/layouts/Layout.astro b/packages/astro/test/fixtures/css-import-as-inline/src/layouts/Layout.astro
similarity index 100%
rename from packages/astro/test/fixtures/css-inline/src/layouts/Layout.astro
rename to packages/astro/test/fixtures/css-import-as-inline/src/layouts/Layout.astro
diff --git a/packages/astro/test/fixtures/css-inline/src/pages/index.astro b/packages/astro/test/fixtures/css-import-as-inline/src/pages/index.astro
similarity index 100%
rename from packages/astro/test/fixtures/css-inline/src/pages/index.astro
rename to packages/astro/test/fixtures/css-import-as-inline/src/pages/index.astro
diff --git a/packages/astro/test/fixtures/css-inline/src/raw.css b/packages/astro/test/fixtures/css-import-as-inline/src/raw.css
similarity index 100%
rename from packages/astro/test/fixtures/css-inline/src/raw.css
rename to packages/astro/test/fixtures/css-import-as-inline/src/raw.css
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/package.json b/packages/astro/test/fixtures/css-inline-stylesheets/always/package.json
new file mode 100644
index 000000000..0d4a8617d
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/always/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/css-inline-stylesheets-always",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/components/Button.astro b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/components/Button.astro
new file mode 100644
index 000000000..3f25cbd3e
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/components/Button.astro
@@ -0,0 +1,86 @@
+---
+const { class: className = '', style, href } = Astro.props;
+const { variant = 'primary' } = Astro.props;
+---
+
+<span class:list={[`link pixel variant-${variant}`, className]} >
+	<a {href}>
+		<span><slot /></span>
+	</a>
+</span>
+
+<style>
+	.link {
+		--border-radius: 8;
+		--duration: 200ms;
+		--delay: 30ms;
+		--background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+		display: flex;
+		color: white;
+		font-size: 1.25rem;
+		width: max-content;
+	}
+	a {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0.67rem 1.25rem;
+		width: 100%;
+		height: 100%;
+		text-decoration: none;
+		color: inherit !important;
+		/* Indicates the button boundaries for forced colors users in older browsers */
+		outline: 1px solid transparent;
+	}
+
+	@media (forced-colors: active) {
+		a {
+			border: 1px solid LinkText;
+		}
+	}
+
+	a > :global(* + *) {
+		margin-inline-start: 0.25rem;
+	}
+
+	.variant-primary {
+		--variant: primary;
+		--background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+	}
+	.variant-primary:hover,
+	.variant-primary:focus-within {
+		--link-color-stop-a: #6d39ff;
+		--link-color-stop-b: #af43ff;
+	}
+	.variant-primary:active {
+		--link-color-stop-a: #5f31e1;
+		--link-color-stop-b: #a740f3;
+	}
+
+	.variant-outline {
+		--variant: outline;
+		--background: none;
+		color: var(--background);
+	}
+	.variant-outline > a::before {
+		position: absolute;
+		top: 0;
+		right: calc(var(--pixel-size) * 1px);
+		bottom: calc(var(--pixel-size) * 1px);
+		left: calc(var(--pixel-size) * 1px);
+		content: '';
+		display: block;
+		transform-origin: bottom center;
+		background: linear-gradient(to top, var(--background), rgba(255, 255, 255, 0));
+		opacity: 0.3;
+		transform: scaleY(0);
+		transition: transform 200ms cubic-bezier(0.22, 1, 0.36, 1);
+	}
+	.variant-outline:hover > a::before,
+	.variant-outline:focus-within > a::before {
+		transform: scaleY(1);
+	}
+	.variant-outline:active > a::before {
+		transform: scaleY(1);
+	}
+</style>
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/content/en/endeavour.md
new file mode 100644
index 000000000..240eeeae3
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/content/en/endeavour.md
@@ -0,0 +1,15 @@
+---
+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]
+---
+
+**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.
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/imported.css b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/imported.css
new file mode 100644
index 000000000..3959523ff
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/imported.css
@@ -0,0 +1,15 @@
+.bg-skyblue {
+    background: skyblue;
+}
+
+.bg-lightcoral {
+    background: lightcoral;
+}
+
+.red {
+    color: darkred;
+}
+
+.blue {
+    color: royalblue;
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/layouts/Layout.astro b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/layouts/Layout.astro
new file mode 100644
index 000000000..b78de296c
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/layouts/Layout.astro
@@ -0,0 +1,35 @@
+---
+import '../imported.css';
+import Button from '../components/Button.astro';
+
+export interface Props {
+	title: string;
+}
+
+const { title } = Astro.props;
+---
+
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<meta name="generator" content={Astro.generator} />
+		<title>{title}</title>
+	</head>
+	<body>
+		<Button>Button used in layout</Button>
+		<slot />
+	</body>
+</html>
+<style is:global>
+	html {
+		font-family: system-ui, sans-serif;
+		background-color: #F6F6F6;
+	}
+	code {
+		font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+			Bitstream Vera Sans Mono, Courier New, monospace;
+	}
+</style>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/pages/index.astro
new file mode 100644
index 000000000..bfdbeb5f8
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/always/src/pages/index.astro
@@ -0,0 +1,17 @@
+---
+import Button from '../components/Button.astro';
+import { getEntryBySlug } from 'astro:content';
+
+const entry = await getEntryBySlug('en', 'endeavour');
+const { Content } = await entry.render();
+---
+<style>
+    #welcome::after {
+        content: '🚀'
+    }
+</style>
+<main>
+    <h1 id="welcome">Welcome to Astro</h1>
+    <Content/>
+    <Button>Button used directly in page</Button>
+</main>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/package.json b/packages/astro/test/fixtures/css-inline-stylesheets/auto/package.json
new file mode 100644
index 000000000..3eb8e9d51
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/auto/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/css-inline-stylesheets-auto",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/components/Button.astro b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/components/Button.astro
new file mode 100644
index 000000000..3f25cbd3e
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/components/Button.astro
@@ -0,0 +1,86 @@
+---
+const { class: className = '', style, href } = Astro.props;
+const { variant = 'primary' } = Astro.props;
+---
+
+<span class:list={[`link pixel variant-${variant}`, className]} >
+	<a {href}>
+		<span><slot /></span>
+	</a>
+</span>
+
+<style>
+	.link {
+		--border-radius: 8;
+		--duration: 200ms;
+		--delay: 30ms;
+		--background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+		display: flex;
+		color: white;
+		font-size: 1.25rem;
+		width: max-content;
+	}
+	a {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0.67rem 1.25rem;
+		width: 100%;
+		height: 100%;
+		text-decoration: none;
+		color: inherit !important;
+		/* Indicates the button boundaries for forced colors users in older browsers */
+		outline: 1px solid transparent;
+	}
+
+	@media (forced-colors: active) {
+		a {
+			border: 1px solid LinkText;
+		}
+	}
+
+	a > :global(* + *) {
+		margin-inline-start: 0.25rem;
+	}
+
+	.variant-primary {
+		--variant: primary;
+		--background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+	}
+	.variant-primary:hover,
+	.variant-primary:focus-within {
+		--link-color-stop-a: #6d39ff;
+		--link-color-stop-b: #af43ff;
+	}
+	.variant-primary:active {
+		--link-color-stop-a: #5f31e1;
+		--link-color-stop-b: #a740f3;
+	}
+
+	.variant-outline {
+		--variant: outline;
+		--background: none;
+		color: var(--background);
+	}
+	.variant-outline > a::before {
+		position: absolute;
+		top: 0;
+		right: calc(var(--pixel-size) * 1px);
+		bottom: calc(var(--pixel-size) * 1px);
+		left: calc(var(--pixel-size) * 1px);
+		content: '';
+		display: block;
+		transform-origin: bottom center;
+		background: linear-gradient(to top, var(--background), rgba(255, 255, 255, 0));
+		opacity: 0.3;
+		transform: scaleY(0);
+		transition: transform 200ms cubic-bezier(0.22, 1, 0.36, 1);
+	}
+	.variant-outline:hover > a::before,
+	.variant-outline:focus-within > a::before {
+		transform: scaleY(1);
+	}
+	.variant-outline:active > a::before {
+		transform: scaleY(1);
+	}
+</style>
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/content/en/endeavour.md
new file mode 100644
index 000000000..240eeeae3
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/content/en/endeavour.md
@@ -0,0 +1,15 @@
+---
+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]
+---
+
+**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.
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/imported.css b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/imported.css
new file mode 100644
index 000000000..3959523ff
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/imported.css
@@ -0,0 +1,15 @@
+.bg-skyblue {
+    background: skyblue;
+}
+
+.bg-lightcoral {
+    background: lightcoral;
+}
+
+.red {
+    color: darkred;
+}
+
+.blue {
+    color: royalblue;
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/layouts/Layout.astro b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/layouts/Layout.astro
new file mode 100644
index 000000000..b78de296c
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/layouts/Layout.astro
@@ -0,0 +1,35 @@
+---
+import '../imported.css';
+import Button from '../components/Button.astro';
+
+export interface Props {
+	title: string;
+}
+
+const { title } = Astro.props;
+---
+
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<meta name="generator" content={Astro.generator} />
+		<title>{title}</title>
+	</head>
+	<body>
+		<Button>Button used in layout</Button>
+		<slot />
+	</body>
+</html>
+<style is:global>
+	html {
+		font-family: system-ui, sans-serif;
+		background-color: #F6F6F6;
+	}
+	code {
+		font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+			Bitstream Vera Sans Mono, Courier New, monospace;
+	}
+</style>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/pages/index.astro
new file mode 100644
index 000000000..bfdbeb5f8
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/pages/index.astro
@@ -0,0 +1,17 @@
+---
+import Button from '../components/Button.astro';
+import { getEntryBySlug } from 'astro:content';
+
+const entry = await getEntryBySlug('en', 'endeavour');
+const { Content } = await entry.render();
+---
+<style>
+    #welcome::after {
+        content: '🚀'
+    }
+</style>
+<main>
+    <h1 id="welcome">Welcome to Astro</h1>
+    <Content/>
+    <Button>Button used directly in page</Button>
+</main>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/never/package.json b/packages/astro/test/fixtures/css-inline-stylesheets/never/package.json
new file mode 100644
index 000000000..382288fbc
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/never/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/css-inline-stylesheets-never",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/components/Button.astro b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/components/Button.astro
new file mode 100644
index 000000000..3f25cbd3e
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/components/Button.astro
@@ -0,0 +1,86 @@
+---
+const { class: className = '', style, href } = Astro.props;
+const { variant = 'primary' } = Astro.props;
+---
+
+<span class:list={[`link pixel variant-${variant}`, className]} >
+	<a {href}>
+		<span><slot /></span>
+	</a>
+</span>
+
+<style>
+	.link {
+		--border-radius: 8;
+		--duration: 200ms;
+		--delay: 30ms;
+		--background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+		display: flex;
+		color: white;
+		font-size: 1.25rem;
+		width: max-content;
+	}
+	a {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0.67rem 1.25rem;
+		width: 100%;
+		height: 100%;
+		text-decoration: none;
+		color: inherit !important;
+		/* Indicates the button boundaries for forced colors users in older browsers */
+		outline: 1px solid transparent;
+	}
+
+	@media (forced-colors: active) {
+		a {
+			border: 1px solid LinkText;
+		}
+	}
+
+	a > :global(* + *) {
+		margin-inline-start: 0.25rem;
+	}
+
+	.variant-primary {
+		--variant: primary;
+		--background: linear-gradient(180deg, var(--link-color-stop-a), var(--link-color-stop-b));
+	}
+	.variant-primary:hover,
+	.variant-primary:focus-within {
+		--link-color-stop-a: #6d39ff;
+		--link-color-stop-b: #af43ff;
+	}
+	.variant-primary:active {
+		--link-color-stop-a: #5f31e1;
+		--link-color-stop-b: #a740f3;
+	}
+
+	.variant-outline {
+		--variant: outline;
+		--background: none;
+		color: var(--background);
+	}
+	.variant-outline > a::before {
+		position: absolute;
+		top: 0;
+		right: calc(var(--pixel-size) * 1px);
+		bottom: calc(var(--pixel-size) * 1px);
+		left: calc(var(--pixel-size) * 1px);
+		content: '';
+		display: block;
+		transform-origin: bottom center;
+		background: linear-gradient(to top, var(--background), rgba(255, 255, 255, 0));
+		opacity: 0.3;
+		transform: scaleY(0);
+		transition: transform 200ms cubic-bezier(0.22, 1, 0.36, 1);
+	}
+	.variant-outline:hover > a::before,
+	.variant-outline:focus-within > a::before {
+		transform: scaleY(1);
+	}
+	.variant-outline:active > a::before {
+		transform: scaleY(1);
+	}
+</style>
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/content/en/endeavour.md
new file mode 100644
index 000000000..240eeeae3
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/content/en/endeavour.md
@@ -0,0 +1,15 @@
+---
+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]
+---
+
+**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.
\ No newline at end of file
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/imported.css b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/imported.css
new file mode 100644
index 000000000..3959523ff
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/imported.css
@@ -0,0 +1,15 @@
+.bg-skyblue {
+    background: skyblue;
+}
+
+.bg-lightcoral {
+    background: lightcoral;
+}
+
+.red {
+    color: darkred;
+}
+
+.blue {
+    color: royalblue;
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/layouts/Layout.astro b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/layouts/Layout.astro
new file mode 100644
index 000000000..b78de296c
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/layouts/Layout.astro
@@ -0,0 +1,35 @@
+---
+import '../imported.css';
+import Button from '../components/Button.astro';
+
+export interface Props {
+	title: string;
+}
+
+const { title } = Astro.props;
+---
+
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<meta name="generator" content={Astro.generator} />
+		<title>{title}</title>
+	</head>
+	<body>
+		<Button>Button used in layout</Button>
+		<slot />
+	</body>
+</html>
+<style is:global>
+	html {
+		font-family: system-ui, sans-serif;
+		background-color: #F6F6F6;
+	}
+	code {
+		font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
+			Bitstream Vera Sans Mono, Courier New, monospace;
+	}
+</style>
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/pages/index.astro
new file mode 100644
index 000000000..bfdbeb5f8
--- /dev/null
+++ b/packages/astro/test/fixtures/css-inline-stylesheets/never/src/pages/index.astro
@@ -0,0 +1,17 @@
+---
+import Button from '../components/Button.astro';
+import { getEntryBySlug } from 'astro:content';
+
+const entry = await getEntryBySlug('en', 'endeavour');
+const { Content } = await entry.render();
+---
+<style>
+    #welcome::after {
+        content: '🚀'
+    }
+</style>
+<main>
+    <h1 id="welcome">Welcome to Astro</h1>
+    <Content/>
+    <Button>Button used directly in page</Button>
+</main>
diff --git a/packages/astro/test/fixtures/custom-404-html/astro.config.mjs b/packages/astro/test/fixtures/custom-404-html/astro.config.mjs
new file mode 100644
index 000000000..882e6515a
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-html/astro.config.mjs
@@ -0,0 +1,4 @@
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({});
diff --git a/packages/astro/test/fixtures/custom-404-html/package.json b/packages/astro/test/fixtures/custom-404-html/package.json
new file mode 100644
index 000000000..b137ab076
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-html/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/custom-404-html",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/custom-404-html/src/pages/404.html b/packages/astro/test/fixtures/custom-404-html/src/pages/404.html
new file mode 100644
index 000000000..50051bbc0
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-html/src/pages/404.html
@@ -0,0 +1,9 @@
+<html lang="en">
+<head>
+  <title>Not Found - Custom 404</title>
+</head>
+<body>
+  <h1>Page not found</h1>
+	<p>This 404 is a static HTML file.</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/custom-404-html/src/pages/index.astro b/packages/astro/test/fixtures/custom-404-html/src/pages/index.astro
new file mode 100644
index 000000000..cf5ef9b58
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-html/src/pages/index.astro
@@ -0,0 +1,11 @@
+---
+---
+
+<html lang="en">
+<head>
+  <title>Custom 404</title>
+</head>
+<body>
+  <h1>Home</h1>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs b/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs
new file mode 100644
index 000000000..d46ce7eb7
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-injected/astro.config.mjs
@@ -0,0 +1,18 @@
+import { defineConfig } from 'astro/config';
+
+// https://astro.build/config
+export default defineConfig({
+  integrations: [
+    {
+      name: '404-integration',
+      hooks: {
+        'astro:config:setup': ({ injectRoute }) => {
+          injectRoute({
+            pattern: '404',
+            entryPoint: 'src/404.astro',
+          });
+        },
+      },
+    },
+  ],
+});
diff --git a/packages/astro/test/fixtures/custom-404-injected/package.json b/packages/astro/test/fixtures/custom-404-injected/package.json
new file mode 100644
index 000000000..855088a9f
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-injected/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/custom-404-injected",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/custom-404-injected/src/404.astro b/packages/astro/test/fixtures/custom-404-injected/src/404.astro
new file mode 100644
index 000000000..63d560b0f
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-injected/src/404.astro
@@ -0,0 +1,13 @@
+---
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
+---
+
+<html lang="en">
+<head>
+  <title>Not Found - Custom 404</title>
+</head>
+<body>
+  <h1>Page not found</h1>
+	<p>{canonicalURL.pathname}</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/custom-404-injected/src/pages/index.astro b/packages/astro/test/fixtures/custom-404-injected/src/pages/index.astro
new file mode 100644
index 000000000..cf5ef9b58
--- /dev/null
+++ b/packages/astro/test/fixtures/custom-404-injected/src/pages/index.astro
@@ -0,0 +1,11 @@
+---
+---
+
+<html lang="en">
+<head>
+  <title>Custom 404</title>
+</head>
+<body>
+  <h1>Home</h1>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-dev/astro.config.mjs b/packages/astro/test/fixtures/middleware-dev/astro.config.mjs
new file mode 100644
index 000000000..4379be246
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/astro.config.mjs
@@ -0,0 +1,7 @@
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+	experimental: {
+		middleware: true
+	}
+});
diff --git a/packages/astro/test/fixtures/css-inline/package.json b/packages/astro/test/fixtures/middleware-dev/package.json
similarity index 73%
rename from packages/astro/test/fixtures/css-inline/package.json
rename to packages/astro/test/fixtures/middleware-dev/package.json
index 5fce13947..bc889aa63 100644
--- a/packages/astro/test/fixtures/css-inline/package.json
+++ b/packages/astro/test/fixtures/middleware-dev/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@test/css-inline",
+  "name": "@test/middleware-dev",
   "version": "0.0.0",
   "private": true,
   "dependencies": {
diff --git a/packages/astro/test/fixtures/middleware-dev/src/middleware.js b/packages/astro/test/fixtures/middleware-dev/src/middleware.js
new file mode 100644
index 000000000..2a09552e7
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/middleware.js
@@ -0,0 +1,40 @@
+import { sequence, defineMiddleware } from 'astro/middleware';
+
+const first = defineMiddleware(async (context, next) => {
+	if (context.request.url.includes('/lorem')) {
+		context.locals.name = 'ipsum';
+	} else if (context.request.url.includes('/rewrite')) {
+		return new Response('<span>New content!!</span>', {
+			status: 200,
+		});
+	} else if (context.request.url.includes('/broken-500')) {
+		return new Response(null, {
+			status: 500,
+		});
+	} else {
+		context.locals.name = 'bar';
+	}
+	return await next();
+});
+
+const second = defineMiddleware(async (context, next) => {
+	if (context.request.url.includes('/second')) {
+		context.locals.name = 'second';
+	} else if (context.request.url.includes('/redirect')) {
+		return context.redirect('/', 302);
+	}
+	return await next();
+});
+
+const third = defineMiddleware(async (context, next) => {
+	if (context.request.url.includes('/broken-locals')) {
+		context.locals = {
+			fn() {},
+		};
+	} else if (context.request.url.includes('/does-nothing')) {
+		return undefined;
+	}
+	next();
+});
+
+export const onRequest = sequence(first, second, third);
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/broken-500.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/broken-500.astro
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/broken-locals.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/broken-locals.astro
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/does-nothing.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/does-nothing.astro
new file mode 100644
index 000000000..344b3797b
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/pages/does-nothing.astro
@@ -0,0 +1,9 @@
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+<p>Not interested</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/index.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/index.astro
new file mode 100644
index 000000000..395a4d695
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/pages/index.astro
@@ -0,0 +1,14 @@
+---
+const data = Astro.locals;
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+	<span>Index</span>
+	<p>{data?.name}</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/lorem.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/lorem.astro
new file mode 100644
index 000000000..c6edf9cd7
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/pages/lorem.astro
@@ -0,0 +1,13 @@
+---
+const data = Astro.locals;
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+<p>{data?.name}</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/not-interested.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/not-interested.astro
new file mode 100644
index 000000000..344b3797b
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/pages/not-interested.astro
@@ -0,0 +1,9 @@
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+<p>Not interested</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/redirect.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/redirect.astro
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/rewrite.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/rewrite.astro
new file mode 100644
index 000000000..f7f70dc88
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/pages/rewrite.astro
@@ -0,0 +1,9 @@
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+	<p>Rewrite</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-dev/src/pages/second.astro b/packages/astro/test/fixtures/middleware-dev/src/pages/second.astro
new file mode 100644
index 000000000..c6edf9cd7
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-dev/src/pages/second.astro
@@ -0,0 +1,13 @@
+---
+const data = Astro.locals;
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+<p>{data?.name}</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-ssg/astro.config.mjs b/packages/astro/test/fixtures/middleware-ssg/astro.config.mjs
new file mode 100644
index 000000000..2f2e911a8
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-ssg/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+	output: "static",
+	experimental: {
+		middleware: true
+	}
+});
diff --git a/packages/astro/test/fixtures/middleware-ssg/package.json b/packages/astro/test/fixtures/middleware-ssg/package.json
new file mode 100644
index 000000000..2ac442454
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-ssg/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/middleware-ssg",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/middleware-ssg/src/middleware.js b/packages/astro/test/fixtures/middleware-ssg/src/middleware.js
new file mode 100644
index 000000000..f28d89f67
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-ssg/src/middleware.js
@@ -0,0 +1,12 @@
+import { sequence, defineMiddleware } from 'astro/middleware';
+
+const first = defineMiddleware(async (context, next) => {
+	if (context.request.url.includes('/second')) {
+		context.locals.name = 'second';
+	} else {
+		context.locals.name = 'bar';
+	}
+	return await next();
+});
+
+export const onRequest = sequence(first);
diff --git a/packages/astro/test/fixtures/middleware-ssg/src/pages/index.astro b/packages/astro/test/fixtures/middleware-ssg/src/pages/index.astro
new file mode 100644
index 000000000..395a4d695
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-ssg/src/pages/index.astro
@@ -0,0 +1,14 @@
+---
+const data = Astro.locals;
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+	<span>Index</span>
+	<p>{data?.name}</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/middleware-ssg/src/pages/second.astro b/packages/astro/test/fixtures/middleware-ssg/src/pages/second.astro
new file mode 100644
index 000000000..c6edf9cd7
--- /dev/null
+++ b/packages/astro/test/fixtures/middleware-ssg/src/pages/second.astro
@@ -0,0 +1,13 @@
+---
+const data = Astro.locals;
+---
+
+<html>
+<head>
+	<title>Testing</title>
+</head>
+<body>
+
+<p>{data?.name}</p>
+</body>
+</html>
diff --git a/packages/astro/test/fixtures/scoped-style-strategy/package.json b/packages/astro/test/fixtures/scoped-style-strategy/package.json
new file mode 100644
index 000000000..6ff986ced
--- /dev/null
+++ b/packages/astro/test/fixtures/scoped-style-strategy/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/scoped-style-strategy",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/scoped-style-strategy/src/pages/index.astro b/packages/astro/test/fixtures/scoped-style-strategy/src/pages/index.astro
new file mode 100644
index 000000000..0ac7a52cb
--- /dev/null
+++ b/packages/astro/test/fixtures/scoped-style-strategy/src/pages/index.astro
@@ -0,0 +1,13 @@
+<html>
+	<head>
+		<title>scopedStyleStrategy</title>
+		<style>
+			h1 {
+				color: green;
+			}
+		</style>
+	</head>
+	<body>
+		<h1>scopedStyleStrategy</h1>
+	</body>
+</html>
diff --git a/packages/astro/test/fixtures/ssr-api-route/src/pages/login.js b/packages/astro/test/fixtures/ssr-api-route/src/pages/login.js
index f486927a0..dfce0b5d6 100644
--- a/packages/astro/test/fixtures/ssr-api-route/src/pages/login.js
+++ b/packages/astro/test/fixtures/ssr-api-route/src/pages/login.js
@@ -1,11 +1,12 @@
-
-export function post() {
-  const headers = new Headers();
-  headers.append('Set-Cookie', `foo=foo; HttpOnly`);
-  headers.append('Set-Cookie', `bar=bar; HttpOnly`);
-
+/** @type {import('astro').APIRoute} */
+export function post({ cookies }) {
+	cookies.set('foo', 'foo', {
+		httpOnly: true
+	});
+	cookies.set('bar', 'bar', {
+		httpOnly: true
+	});
   return new Response('', {
     status: 201,
-    headers,
   });
 }
diff --git a/packages/astro/test/fixtures/ssr-prerender/src/pages/not-prerendered.astro b/packages/astro/test/fixtures/ssr-prerender/src/pages/not-prerendered.astro
new file mode 100644
index 000000000..5b24ffaf9
--- /dev/null
+++ b/packages/astro/test/fixtures/ssr-prerender/src/pages/not-prerendered.astro
@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>Not prerendered</title>
+    </head>
+	<body>
+		<h1 id="greeting">Hello world!</h1>
+	</body>
+</html>
diff --git a/packages/astro/test/impostor-mdx-file.js b/packages/astro/test/impostor-mdx-file.test.js
similarity index 100%
rename from packages/astro/test/impostor-mdx-file.js
rename to packages/astro/test/impostor-mdx-file.test.js
diff --git a/packages/astro/test/middleware.test.js b/packages/astro/test/middleware.test.js
new file mode 100644
index 000000000..784a32c30
--- /dev/null
+++ b/packages/astro/test/middleware.test.js
@@ -0,0 +1,202 @@
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import testAdapter from './test-adapter.js';
+
+describe('Middleware in DEV mode', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+	let devServer;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/middleware-dev/',
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	after(async () => {
+		await devServer.stop();
+	});
+
+	it('should render locals data', async () => {
+		const html = await fixture.fetch('/').then((res) => res.text());
+		const $ = cheerio.load(html);
+		expect($('p').html()).to.equal('bar');
+	});
+
+	it('should change locals data based on URL', async () => {
+		let html = await fixture.fetch('/').then((res) => res.text());
+		let $ = cheerio.load(html);
+		expect($('p').html()).to.equal('bar');
+
+		html = await fixture.fetch('/lorem').then((res) => res.text());
+		$ = cheerio.load(html);
+		expect($('p').html()).to.equal('ipsum');
+	});
+
+	it('should call a second middleware', async () => {
+		let html = await fixture.fetch('/second').then((res) => res.text());
+		let $ = cheerio.load(html);
+		expect($('p').html()).to.equal('second');
+	});
+
+	it('should successfully create a new response', async () => {
+		let html = await fixture.fetch('/rewrite').then((res) => res.text());
+		let $ = cheerio.load(html);
+		expect($('p').html()).to.be.null;
+		expect($('span').html()).to.equal('New content!!');
+	});
+
+	it('should return a new response that is a 500', async () => {
+		await fixture.fetch('/broken-500').then((res) => {
+			expect(res.status).to.equal(500);
+			return res.text();
+		});
+	});
+
+	it('should successfully render a page if the middleware calls only next() and returns nothing', async () => {
+		let html = await fixture.fetch('/not-interested').then((res) => res.text());
+		let $ = cheerio.load(html);
+		expect($('p').html()).to.equal('Not interested');
+	});
+
+	it('should throw an error when locals are not serializable', async () => {
+		let html = await fixture.fetch('/broken-locals').then((res) => res.text());
+		let $ = cheerio.load(html);
+		expect($('title').html()).to.equal('LocalsNotSerializable');
+	});
+
+	it("should throw an error when the middleware doesn't call next or doesn't return a response", async () => {
+		let html = await fixture.fetch('/does-nothing').then((res) => res.text());
+		let $ = cheerio.load(html);
+		expect($('title').html()).to.equal('MiddlewareNoDataOrNextCalled');
+	});
+});
+
+describe('Middleware in PROD mode, SSG', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+	/** @type {import('./test-utils').PreviewServer} */
+	let previewServer;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/middleware-ssg/',
+		});
+		await fixture.build();
+	});
+
+	it('should render locals data', async () => {
+		const html = await fixture.readFile('/index.html');
+		const $ = cheerio.load(html);
+		expect($('p').html()).to.equal('bar');
+	});
+
+	it('should change locals data based on URL', async () => {
+		let html = await fixture.readFile('/index.html');
+		let $ = cheerio.load(html);
+		expect($('p').html()).to.equal('bar');
+
+		html = await fixture.readFile('/second/index.html');
+		$ = cheerio.load(html);
+		expect($('p').html()).to.equal('second');
+	});
+});
+
+describe('Middleware API in PROD mode, SSR', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/middleware-dev/',
+			output: 'server',
+			adapter: testAdapter({
+				// exports: ['manifest', 'createApp', 'middleware'],
+			}),
+		});
+		await fixture.build();
+	});
+
+	it('should render locals data', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		expect($('p').html()).to.equal('bar');
+	});
+
+	it('should change locals data based on URL', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		let response = await app.render(new Request('http://example.com/'));
+		let html = await response.text();
+		let $ = cheerio.load(html);
+		expect($('p').html()).to.equal('bar');
+
+		response = await app.render(new Request('http://example.com/lorem'));
+		html = await response.text();
+		$ = cheerio.load(html);
+		expect($('p').html()).to.equal('ipsum');
+	});
+
+	it('should successfully redirect to another page', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/redirect');
+		const response = await app.render(request);
+		expect(response.status).to.equal(302);
+	});
+
+	it('should call a second middleware', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const response = await app.render(new Request('http://example.com/second'));
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		expect($('p').html()).to.equal('second');
+	});
+
+	it('should successfully create a new response', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/rewrite');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		expect($('p').html()).to.be.null;
+		expect($('span').html()).to.equal('New content!!');
+	});
+
+	it('should return a new response that is a 500', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/broken-500');
+		const response = await app.render(request);
+		expect(response.status).to.equal(500);
+	});
+
+	it('should successfully render a page if the middleware calls only next() and returns nothing', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/not-interested');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		expect($('p').html()).to.equal('Not interested');
+	});
+
+	it('should NOT throw an error when locals are not serializable', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/broken-locals');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		expect($('title').html()).to.not.equal('LocalsNotSerializable');
+	});
+
+	it("should throws an error when the middleware doesn't call next or doesn't return a response", async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/does-nothing');
+		const response = await app.render(request);
+		const html = await response.text();
+		const $ = cheerio.load(html);
+		expect($('title').html()).to.not.equal('MiddlewareNoDataReturned');
+	});
+});
diff --git a/packages/astro/test/scoped-style-strategy.test.js b/packages/astro/test/scoped-style-strategy.test.js
new file mode 100644
index 000000000..022ef3d6f
--- /dev/null
+++ b/packages/astro/test/scoped-style-strategy.test.js
@@ -0,0 +1,60 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('scopedStyleStrategy', () => {
+	describe('default', () => {
+		/** @type {import('./test-utils').Fixture} */
+		let fixture;
+		let stylesheet;
+
+		before(async () => {
+			fixture = await loadFixture({
+				root: './fixtures/scoped-style-strategy/',
+			});
+			await fixture.build();
+
+			const html = await fixture.readFile('/index.html');
+			const $ = cheerio.load(html);
+			const $link = $('link[rel=stylesheet]');
+			const href = $link.attr('href');
+			stylesheet = await fixture.readFile(href);
+		});
+
+		it('includes :where pseudo-selector', () => {
+			expect(stylesheet).to.match(/:where/);
+		});
+
+		it('does not includes the class name directly in the selector', () => {
+			expect(stylesheet).to.not.match(/h1\.astro/);
+		});
+	});
+
+	describe('scopedStyleStrategy: "class"', () => {
+		/** @type {import('./test-utils').Fixture} */
+		let fixture;
+		let stylesheet;
+
+		before(async () => {
+			fixture = await loadFixture({
+				root: './fixtures/scoped-style-strategy/',
+				scopedStyleStrategy: 'class',
+			});
+			await fixture.build();
+
+			const html = await fixture.readFile('/index.html');
+			const $ = cheerio.load(html);
+			const $link = $('link[rel=stylesheet]');
+			const href = $link.attr('href');
+			stylesheet = await fixture.readFile(href);
+		});
+
+		it('does not include :where pseudo-selector', () => {
+			expect(stylesheet).to.not.match(/:where/);
+		});
+
+		it('includes the class name directly in the selector', () => {
+			expect(stylesheet).to.match(/h1\.astro/);
+		});
+	});
+});
diff --git a/packages/astro/test/ssr-api-route.test.js b/packages/astro/test/ssr-api-route.test.js
index cafbdf32c..1d8f012a6 100644
--- a/packages/astro/test/ssr-api-route.test.js
+++ b/packages/astro/test/ssr-api-route.test.js
@@ -2,6 +2,7 @@ import { expect } from 'chai';
 import { File, FormData } from 'undici';
 import testAdapter from './test-adapter.js';
 import { loadFixture } from './test-utils.js';
+import net from 'net';
 
 describe('API routes in SSR', () => {
 	/** @type {import('./test-utils').Fixture} */
@@ -95,11 +96,34 @@ describe('API routes in SSR', () => {
 		});
 
 		it('Can set multiple headers of the same type', async () => {
-			const response = await fixture.fetch('/login', {
-				method: 'POST',
+			const response = await new Promise((resolve) => {
+				let { port } = devServer.address;
+				let host = 'localhost';
+				let socket = new net.Socket();
+				socket.connect(port, host);
+				socket.on('connect', () => {
+					let rawRequest = `POST /login HTTP/1.1\r\nHost: ${host}\r\n\r\n`;
+					socket.write(rawRequest);
+				});
+
+				let rawResponse = '';
+				socket.setEncoding('utf-8');
+				socket.on('data', (chunk) => {
+					rawResponse += chunk.toString();
+					socket.destroy();
+				});
+				socket.on('close', () => {
+					resolve(rawResponse);
+				});
 			});
-			const setCookie = response.headers.get('set-cookie');
-			expect(setCookie).to.equal('foo=foo; HttpOnly, bar=bar; HttpOnly');
+
+			let count = 0;
+			let exp = /set-cookie\:/g;
+			while (exp.exec(response)) {
+				count++;
+			}
+
+			expect(count).to.equal(2, 'Found two seperate set-cookie response headers');
 		});
 	});
 });
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 b0253eabf..f7100372b 100644
--- a/packages/astro/test/ssr-prerender-get-static-paths.test.js
+++ b/packages/astro/test/ssr-prerender-get-static-paths.test.js
@@ -3,11 +3,11 @@ import { loadFixture } from './test-utils.js';
 import * as cheerio from 'cheerio';
 
 describe('prerender getStaticPaths - build calls', () => {
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
 
-		const fixture = await loadFixture({
+	before(async () => {
+		fixture = await loadFixture({
 			root: './fixtures/ssr-prerender-get-static-paths/',
 			site: 'https://mysite.dev/',
 			base: '/blog',
@@ -15,10 +15,23 @@ describe('prerender getStaticPaths - build calls', () => {
 		await fixture.build();
 	});
 
+	afterEach(() => {
+		// reset the flag used by [...calledTwiceTest].astro between each test
+		globalThis.isCalledOnce = false;
+	});
+
 	it('is only called once during build', () => {
 		// useless expect; if build() throws in setup then this test fails
 		expect(true).to.equal(true);
 	});
+
+	it('Astro.url sets the current pathname', async () => {
+		const html = await fixture.readFile('/food/tacos/index.html');
+		const $ = cheerio.load(html);
+
+		expect($('#props').text()).to.equal('10');
+		expect($('#url').text()).to.equal('/blog/food/tacos/');
+	});
 });
 
 describe('prerender getStaticPaths - dev calls', () => {
@@ -26,11 +39,17 @@ describe('prerender getStaticPaths - dev calls', () => {
 	let devServer;
 
 	before(async () => {
+		globalThis.isCalledOnce = false;
+		fixture = await loadFixture({
+			root: './fixtures/ssr-prerender-get-static-paths/',
+			site: 'https://mysite.dev/',
+		});
+		devServer = await fixture.startDevServer();
+	});
+
+	afterEach(() => {
 		// reset the flag used by [...calledTwiceTest].astro between each test
 		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({ root: './fixtures/ssr-prerender-get-static-paths/' });
-		devServer = await fixture.startDevServer();
 	});
 
 	after(async () => {
@@ -47,99 +66,50 @@ describe('prerender getStaticPaths - dev calls', () => {
 		res = await fixture.fetch('/c');
 		expect(res.status).to.equal(200);
 	});
-});
 
-describe('prerender getStaticPaths - 404 behavior', () => {
-	let fixture;
-	let devServer;
-
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({ root: './fixtures/ssr-prerender-get-static-paths/' });
-		devServer = await fixture.startDevServer();
-	});
-
-	after(async () => {
-		devServer.stop();
-	});
-
-	it('resolves 200 on matching static path - named params', async () => {
-		const res = await fixture.fetch('/pizza/provolone-sausage');
-		expect(res.status).to.equal(200);
-	});
-
-	it('resolves 404 on pattern match without static path - named params', async () => {
-		const res = await fixture.fetch('/pizza/provolone-pineapple');
-		const html = await res.text();
-		expect(res.status).to.equal(404);
-		expect(html).to.match(/404/);
-	});
-
-	it('resolves 200 on matching static path - rest params', async () => {
-		const res = await fixture.fetch('/pizza/grimaldis/new-york');
-		expect(res.status).to.equal(200);
-	});
-
-	it('resolves 404 on pattern match without static path - rest params', async () => {
-		const res = await fixture.fetch('/pizza/pizza-hut');
-		const html = await res.text();
-		expect(res.status).to.equal(404);
-		expect(html).to.match(/404/);
-	});
-});
-
-describe('prerender getStaticPaths - route params type validation', () => {
-	let fixture, devServer;
-
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({ root: './fixtures/ssr-prerender-get-static-paths/' });
-		devServer = await fixture.startDevServer();
-	});
-
-	after(async () => {
-		await devServer.stop();
-	});
-
-	it('resolves 200 on nested array parameters', async () => {
-		const res = await fixture.fetch('/nested-arrays/slug1');
-		expect(res.status).to.equal(200);
-	});
-
-	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/2022/post-1');
-		expect(res.status).to.equal(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/2022/post-2');
-		expect(res.status).to.equal(200);
-	});
-});
-
-describe('prerender getStaticPaths - numeric route params', () => {
-	let fixture;
-	let devServer;
-
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({
-			root: './fixtures/ssr-prerender-get-static-paths/',
-			site: 'https://mysite.dev/',
+	describe('404 behavior', () => {
+		it('resolves 200 on matching static path - named params', async () => {
+			const res = await fixture.fetch('/pizza/provolone-sausage');
+			expect(res.status).to.equal(200);
+		});
+
+		it('resolves 404 on pattern match without static path - named params', async () => {
+			const res = await fixture.fetch('/pizza/provolone-pineapple');
+			const html = await res.text();
+			expect(res.status).to.equal(404);
+			expect(html).to.match(/404/);
+		});
+
+		it('resolves 200 on matching static path - rest params', async () => {
+			const res = await fixture.fetch('/pizza/grimaldis/new-york');
+			expect(res.status).to.equal(200);
+		});
+
+		it('resolves 404 on pattern match without static path - rest params', async () => {
+			const res = await fixture.fetch('/pizza/pizza-hut');
+			const html = await res.text();
+			expect(res.status).to.equal(404);
+			expect(html).to.match(/404/);
 		});
-		devServer = await fixture.startDevServer();
 	});
 
-	after(async () => {
-		await devServer.stop();
+	describe('route params type validation', () => {
+		it('resolves 200 on nested array parameters', async () => {
+			const res = await fixture.fetch('/nested-arrays/slug1');
+			expect(res.status).to.equal(200);
+		});
+
+		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/2022/post-1');
+			expect(res.status).to.equal(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/2022/post-2');
+			expect(res.status).to.equal(200);
+		});
 	});
 
 	it('resolves 200 on matching static paths', async () => {
@@ -159,47 +129,3 @@ describe('prerender getStaticPaths - numeric route params', () => {
 		}
 	});
 });
-
-describe('prerender getStaticPaths - Astro.url', () => {
-	/** @type {import('./test-utils').Fixture} */
-	let fixture;
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({
-			root: './fixtures/ssr-prerender-get-static-paths/',
-			site: 'https://mysite.dev/',
-		});
-		await fixture.build();
-	});
-
-	it('Sets the current pathname', async () => {
-		const html = await fixture.readFile('/food/tacos/index.html');
-		const $ = cheerio.load(html);
-
-		expect($('#url').text()).to.equal('/food/tacos/');
-	});
-});
-
-describe('prerender getStaticPaths - props', () => {
-	/** @type {import('./test-utils').Fixture} */
-	let fixture;
-	before(async () => {
-		// reset the flag used by [...calledTwiceTest].astro between each test
-		globalThis.isCalledOnce = false;
-
-		fixture = await loadFixture({
-			root: './fixtures/ssr-prerender-get-static-paths/',
-			site: 'https://mysite.dev/',
-		});
-		await fixture.build();
-	});
-
-	it('Sets the current pathname', async () => {
-		const html = await fixture.readFile('/food/tacos/index.html');
-		const $ = cheerio.load(html);
-
-		expect($('#props').text()).to.equal('10');
-	});
-});
diff --git a/packages/astro/test/ssr-prerender-integrations.test.js b/packages/astro/test/ssr-prerender-integrations.test.js
new file mode 100644
index 000000000..29b8be0f5
--- /dev/null
+++ b/packages/astro/test/ssr-prerender-integrations.test.js
@@ -0,0 +1,48 @@
+import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
+import testAdapter from './test-adapter.js';
+
+describe('Integrations can hook into the prerendering decision', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	const testIntegration = {
+		name: 'test prerendering integration',
+		hooks: {
+			['astro:build:setup']({ pages, target }) {
+				if (target !== 'client') return;
+				// this page has `export const prerender = true`
+				pages.get('src/pages/static.astro').route.prerender = false;
+
+				// this page does not
+				pages.get('src/pages/not-prerendered.astro').route.prerender = true;
+			},
+		},
+	};
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/ssr-prerender/',
+			output: 'server',
+			integrations: [testIntegration],
+			adapter: testAdapter(),
+		});
+		await fixture.build();
+	});
+
+	it('An integration can override the prerender flag', async () => {
+		// test adapter only hosts dynamic routes
+		// /static is expected to become dynamic
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/static');
+		const response = await app.render(request);
+		expect(response.status).to.equal(200);
+	});
+
+	it('An integration can turn a normal page to a prerendered one', async () => {
+		const app = await fixture.loadTestAdapterApp();
+		const request = new Request('http://example.com/not-prerendered');
+		const response = await app.render(request);
+		expect(response.status).to.equal(404);
+	});
+});
diff --git a/packages/astro/test/test-adapter.js b/packages/astro/test/test-adapter.js
index 4faa9a7c6..cc34e3c33 100644
--- a/packages/astro/test/test-adapter.js
+++ b/packages/astro/test/test-adapter.js
@@ -42,6 +42,7 @@ export default function ({ provideAddress = true, extendAdapter } = { provideAdd
 														return new Response(data);
 													}
 
+													Reflect.set(request, Symbol.for('astro.locals'), {});
 													${provideAddress ? `request[Symbol.for('astro.clientAddress')] = '0.0.0.0';` : ''}
 													return super.render(request, routeData);
 												}
@@ -51,6 +52,7 @@ export default function ({ provideAddress = true, extendAdapter } = { provideAdd
 												return {
 													manifest,
 													createApp: (streaming) => new MyApp(manifest, streaming)
+													
 												};
 											}
 										`;
diff --git a/packages/astro/test/test-utils.js b/packages/astro/test/test-utils.js
index 3acf8df48..f933a13ad 100644
--- a/packages/astro/test/test-utils.js
+++ b/packages/astro/test/test-utils.js
@@ -187,7 +187,19 @@ export async function loadFixture(inlineConfig) {
 		},
 		config,
 		resolveUrl,
-		fetch: (url, init) => fetch(resolveUrl(url), init),
+		fetch: async (url, init) => {
+			const resolvedUrl = resolveUrl(url);
+			try {
+				return await fetch(resolvedUrl, init);
+			} catch (err) {
+				// undici throws a vague error when it fails, so we log the url here to easily debug it
+				if (err.message?.includes('fetch failed')) {
+					console.error(`[astro test] failed to fetch ${resolvedUrl}`);
+					console.error(err);
+				}
+				throw err;
+			}
+		},
 		preview: async (opts = {}) => {
 			process.env.NODE_ENV = 'production';
 			const previewServer = await preview(settings, {
@@ -219,7 +231,7 @@ export async function loadFixture(inlineConfig) {
 		},
 		loadTestAdapterApp: async (streaming) => {
 			const url = new URL(`./server/entry.mjs?id=${fixtureId}`, config.outDir);
-			const { createApp, manifest } = await import(url);
+			const { createApp, manifest, middleware } = await import(url);
 			const app = createApp(streaming);
 			app.manifest = manifest;
 			return app;
diff --git a/packages/astro/test/units/dev/dev.test.js b/packages/astro/test/units/dev/dev.test.js
index eddc14c5d..5c19af635 100644
--- a/packages/astro/test/units/dev/dev.test.js
+++ b/packages/astro/test/units/dev/dev.test.js
@@ -158,6 +158,68 @@ describe('dev container', () => {
 		);
 	});
 
+	it('Serves injected 404 route for any 404', async () => {
+		const fs = createFs(
+			{
+				'/src/components/404.astro': `<h1>Custom 404</h1>`,
+				'/src/pages/page.astro': `<h1>Regular page</h1>`,
+			},
+			root
+		);
+
+		await runInContainer(
+			{
+				fs,
+				root,
+				userConfig: {
+					output: 'server',
+					integrations: [
+						{
+							name: '@astrojs/test-integration',
+							hooks: {
+								'astro:config:setup': ({ injectRoute }) => {
+									injectRoute({
+										pattern: '/404',
+										entryPoint: './src/components/404.astro',
+									});
+								},
+							},
+						},
+					],
+				},
+			},
+			async (container) => {
+				{
+					// Regular pages are served as expected.
+					const r = createRequestAndResponse({ method: 'GET', url: '/page' });
+					container.handle(r.req, r.res);
+					await r.done;
+					const doc = await r.text();
+					expect(doc).to.match(/<h1>Regular page<\/h1>/);
+					expect(r.res.statusCode).to.equal(200);
+				}
+				{
+					// `/404` serves the custom 404 page as expected.
+					const r = createRequestAndResponse({ method: 'GET', url: '/404' });
+					container.handle(r.req, r.res);
+					await r.done;
+					const doc = await r.text();
+					expect(doc).to.match(/<h1>Custom 404<\/h1>/);
+					expect(r.res.statusCode).to.equal(200);
+				}
+				{
+					// A non-existent page also serves the custom 404 page.
+					const r = createRequestAndResponse({ method: 'GET', url: '/other-page' });
+					container.handle(r.req, r.res);
+					await r.done;
+					const doc = await r.text();
+					expect(doc).to.match(/<h1>Custom 404<\/h1>/);
+					expect(r.res.statusCode).to.equal(200);
+				}
+			}
+		);
+	});
+
 	it('items in public/ are not available from root when using a base', async () => {
 		await runInContainer(
 			{
diff --git a/packages/astro/test/units/dev/head-injection.test.js b/packages/astro/test/units/dev/head-injection.test.js
index 9d76e0a91..ed3e085d3 100644
--- a/packages/astro/test/units/dev/head-injection.test.js
+++ b/packages/astro/test/units/dev/head-injection.test.js
@@ -35,7 +35,8 @@ describe('head injection', () => {
 							factory(result, props, slots) {
 								return createHeadAndContent(
 									unescapeHTML(renderUniqueStylesheet(result, {
-										href: '/some/fake/styles.css'
+										type: 'external',
+										src: '/some/fake/styles.css'
 									})),
 									renderTemplate\`$\{renderComponent(result, 'Other', Other, props, slots)}\`
 								);
@@ -113,7 +114,8 @@ describe('head injection', () => {
 							factory(result, props, slots) {
 								return createHeadAndContent(
 									unescapeHTML(renderUniqueStylesheet(result, {
-										href: '/some/fake/styles.css'
+										type: 'external',
+										src: '/some/fake/styles.css'
 									})),
 									renderTemplate\`$\{renderComponent(result, 'Other', Other, props, slots)}\`
 								);
diff --git a/packages/astro/test/units/render/head.test.js b/packages/astro/test/units/render/head.test.js
index 103c84fda..83fbc8b11 100644
--- a/packages/astro/test/units/render/head.test.js
+++ b/packages/astro/test/units/render/head.test.js
@@ -95,13 +95,21 @@ describe('core/render', () => {
 				)}`;
 			});
 
-			const ctx = createRenderContext({
+			const PageModule = createAstroModule(Page);
+			const ctx = await createRenderContext({
 				request: new Request('http://example.com/'),
 				links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
+				mod: PageModule,
+				env,
 			});
-			const PageModule = createAstroModule(Page);
 
-			const response = await renderPage(PageModule, ctx, env);
+			const response = await renderPage({
+				mod: PageModule,
+				renderContext: ctx,
+				env,
+				params: ctx.params,
+				props: ctx.props,
+			});
 
 			const html = await response.text();
 			const $ = cheerio.load(html);
@@ -173,14 +181,21 @@ describe('core/render', () => {
 				)}`;
 			});
 
-			const ctx = createRenderContext({
+			const PageModule = createAstroModule(Page);
+			const ctx = await createRenderContext({
 				request: new Request('http://example.com/'),
 				links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
+				env,
+				mod: PageModule,
 			});
-			const PageModule = createAstroModule(Page);
-
-			const response = await renderPage(PageModule, ctx, env);
 
+			const response = await renderPage({
+				mod: PageModule,
+				renderContext: ctx,
+				env,
+				params: ctx.params,
+				props: ctx.props,
+			});
 			const html = await response.text();
 			const $ = cheerio.load(html);
 
@@ -218,14 +233,21 @@ describe('core/render', () => {
 				)}`;
 			});
 
-			const ctx = createRenderContext({
+			const PageModule = createAstroModule(Page);
+			const ctx = await createRenderContext({
 				request: new Request('http://example.com/'),
 				links: [{ name: 'link', props: { rel: 'stylesheet', href: '/main.css' }, children: '' }],
+				env,
+				mod: PageModule,
 			});
-			const PageModule = createAstroModule(Page);
-
-			const response = await renderPage(PageModule, ctx, env);
 
+			const response = await renderPage({
+				mod: PageModule,
+				renderContext: ctx,
+				env,
+				params: ctx.params,
+				props: ctx.props,
+			});
 			const html = await response.text();
 			const $ = cheerio.load(html);
 
diff --git a/packages/astro/test/units/render/jsx.test.js b/packages/astro/test/units/render/jsx.test.js
index a34b6b53b..c249bcbd5 100644
--- a/packages/astro/test/units/render/jsx.test.js
+++ b/packages/astro/test/units/render/jsx.test.js
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-
 import {
 	createComponent,
 	render,
@@ -46,8 +45,18 @@ describe('core/render', () => {
 				});
 			});
 
-			const ctx = createRenderContext({ request: new Request('http://example.com/') });
-			const response = await renderPage(createAstroModule(Page), ctx, env);
+			const mod = createAstroModule(Page);
+			const ctx = await createRenderContext({
+				request: new Request('http://example.com/'),
+				env,
+				mod,
+			});
+
+			const response = await renderPage({
+				mod,
+				renderContext: ctx,
+				env,
+			});
 
 			expect(response.status).to.equal(200);
 
@@ -85,8 +94,17 @@ describe('core/render', () => {
 				});
 			});
 
-			const ctx = createRenderContext({ request: new Request('http://example.com/') });
-			const response = await renderPage(createAstroModule(Page), ctx, env);
+			const mod = createAstroModule(Page);
+			const ctx = await createRenderContext({
+				request: new Request('http://example.com/'),
+				env,
+				mod,
+			});
+			const response = await renderPage({
+				mod,
+				renderContext: ctx,
+				env,
+			});
 
 			expect(response.status).to.equal(200);
 
@@ -105,8 +123,18 @@ describe('core/render', () => {
 				return render`<div>${renderComponent(result, 'Component', Component, {})}</div>`;
 			});
 
-			const ctx = createRenderContext({ request: new Request('http://example.com/') });
-			const response = await renderPage(createAstroModule(Page), ctx, env);
+			const mod = createAstroModule(Page);
+			const ctx = await createRenderContext({
+				request: new Request('http://example.com/'),
+				env,
+				mod,
+			});
+
+			const response = await renderPage({
+				mod,
+				renderContext: ctx,
+				env,
+			});
 
 			try {
 				await response.text();
diff --git a/packages/astro/test/virtual-astro-file.js b/packages/astro/test/virtual-astro-file.test.js
similarity index 100%
rename from packages/astro/test/virtual-astro-file.js
rename to packages/astro/test/virtual-astro-file.test.js
diff --git a/packages/integrations/cloudflare/CHANGELOG.md b/packages/integrations/cloudflare/CHANGELOG.md
index a34f6bff3..32e477035 100644
--- a/packages/integrations/cloudflare/CHANGELOG.md
+++ b/packages/integrations/cloudflare/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/cloudflare
 
+## 6.2.4
+
+### Patch Changes
+
+- [#6925](https://github.com/withastro/astro/pull/6925) [`d11d18595`](https://github.com/withastro/astro/commit/d11d1859518f9fdc94390aab9be29f8667bb27cb) Thanks [@Yan-Thomas](https://github.com/Yan-Thomas)! - Fix missing code language in Cloudflare README
+
+- Updated dependencies [[`a98df9374`](https://github.com/withastro/astro/commit/a98df9374dec65c678fa47319cb1481b1af123e2), [`50975f2ea`](https://github.com/withastro/astro/commit/50975f2ea3a59f9e023cc631a9372c0c7986eec9), [`ebae1eaf8`](https://github.com/withastro/astro/commit/ebae1eaf87f49399036033c673b513338f7d9c42), [`dc062f669`](https://github.com/withastro/astro/commit/dc062f6695ce577dc569781fc0678c903012c336)]:
+  - astro@2.3.3
+
 ## 6.2.3
 
 ### Patch Changes
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index 59a7a984c..7f0dbb514 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": "6.2.3",
+  "version": "6.2.4",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -38,7 +38,7 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:^2.3.4"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index b05ea0846..5933de5e6 100644
--- a/packages/integrations/deno/package.json
+++ b/packages/integrations/deno/package.json
@@ -33,7 +33,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:^2.3.4"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/image/CHANGELOG.md b/packages/integrations/image/CHANGELOG.md
index 3ed9575a5..d79206b9d 100644
--- a/packages/integrations/image/CHANGELOG.md
+++ b/packages/integrations/image/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @astrojs/image
 
+## 0.16.7
+
+### Patch Changes
+
+- [#6969](https://github.com/withastro/astro/pull/6969) [`77270cc2c`](https://github.com/withastro/astro/commit/77270cc2cd06c942d7abf1d882e36d9163edafa5) Thanks [@bluwy](https://github.com/bluwy)! - Avoid removing leading slash for `build.assetsPrefix` value in the build output
+
+- [#6952](https://github.com/withastro/astro/pull/6952) [`e5bd084c0`](https://github.com/withastro/astro/commit/e5bd084c01e4f60a157969b50c05ce002f7b63d2) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Update allowed Sharp versions to support 0.32.0
+
+- Updated dependencies [[`a8a319aef`](https://github.com/withastro/astro/commit/a8a319aef744a64647ee16c7d558d74de6864c6c), [`a695e44ae`](https://github.com/withastro/astro/commit/a695e44aed6e2f5d32cb950d4237be6e5657ba98), [`367e61776`](https://github.com/withastro/astro/commit/367e61776196a17d61c28daa4dfbabb6244e040c), [`77270cc2c`](https://github.com/withastro/astro/commit/77270cc2cd06c942d7abf1d882e36d9163edafa5), [`895fa07d8`](https://github.com/withastro/astro/commit/895fa07d8b4b8359984e048daca5437e40f44390), [`72c6bf01f`](https://github.com/withastro/astro/commit/72c6bf01fe49b331ca8ad9206a7506b15caf5b8d), [`e5bd084c0`](https://github.com/withastro/astro/commit/e5bd084c01e4f60a157969b50c05ce002f7b63d2)]:
+  - astro@2.3.4
+
 ## 0.16.6
 
 ### Patch Changes
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 8f12944f8..39ddb34ec 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/image",
   "description": "Load and transform images in your Astro site",
-  "version": "0.16.6",
+  "version": "0.16.7",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -51,7 +51,6 @@
   "devDependencies": {
     "@types/http-cache-semantics": "^4.0.1",
     "@types/mime": "^2.0.3",
-    "@types/sharp": "^0.30.5",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
@@ -59,11 +58,11 @@
     "fast-glob": "^3.2.11",
     "mocha": "^9.2.2",
     "rollup-plugin-copy": "^3.4.0",
-    "sharp": "^0.31.0",
+    "sharp": "^0.32.1",
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2",
+    "astro": "workspace:^2.3.4",
     "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/integrations/image/src/utils/paths.ts b/packages/integrations/image/src/utils/paths.ts
index 023fdc143..a6618ff1e 100644
--- a/packages/integrations/image/src/utils/paths.ts
+++ b/packages/integrations/image/src/utils/paths.ts
@@ -75,5 +75,16 @@ function isString(path: unknown): path is string {
 }
 
 export function joinPaths(...paths: (string | undefined)[]) {
-	return paths.filter(isString).map(trimSlashes).join('/');
+	return paths
+		.filter(isString)
+		.map((path, i) => {
+			if (i === 0) {
+				return removeTrailingForwardSlash(path);
+			} else if (i === paths.length - 1) {
+				return removeLeadingForwardSlash(path);
+			} else {
+				return trimSlashes(path);
+			}
+		})
+		.join('/');
 }
diff --git a/packages/integrations/image/test/fixtures/background-color-image/package.json b/packages/integrations/image/test/fixtures/background-color-image/package.json
index c94822bfc..db45dae31 100644
--- a/packages/integrations/image/test/fixtures/background-color-image/package.json
+++ b/packages/integrations/image/test/fixtures/background-color-image/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/basic-image/package.json b/packages/integrations/image/test/fixtures/basic-image/package.json
index 25ffbf831..4df1316ba 100644
--- a/packages/integrations/image/test/fixtures/basic-image/package.json
+++ b/packages/integrations/image/test/fixtures/basic-image/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/basic-picture/package.json b/packages/integrations/image/test/fixtures/basic-picture/package.json
index 4c84e318f..1949eb5a9 100644
--- a/packages/integrations/image/test/fixtures/basic-picture/package.json
+++ b/packages/integrations/image/test/fixtures/basic-picture/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/get-image-remote/package.json b/packages/integrations/image/test/fixtures/get-image-remote/package.json
index a5279e312..83f0e02de 100644
--- a/packages/integrations/image/test/fixtures/get-image-remote/package.json
+++ b/packages/integrations/image/test/fixtures/get-image-remote/package.json
@@ -5,6 +5,6 @@
   "dependencies": {
     "@astrojs/image": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/no-alt-text-image/package.json b/packages/integrations/image/test/fixtures/no-alt-text-image/package.json
index 752fc155d..9347ad25d 100644
--- a/packages/integrations/image/test/fixtures/no-alt-text-image/package.json
+++ b/packages/integrations/image/test/fixtures/no-alt-text-image/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json b/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json
index f5f86476e..f253b6709 100644
--- a/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json
+++ b/packages/integrations/image/test/fixtures/no-alt-text-picture/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/rotation/package.json b/packages/integrations/image/test/fixtures/rotation/package.json
index 396dd21c5..8605d684e 100644
--- a/packages/integrations/image/test/fixtures/rotation/package.json
+++ b/packages/integrations/image/test/fixtures/rotation/package.json
@@ -6,6 +6,6 @@
     "@astrojs/image": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/image/test/fixtures/with-mdx/package.json b/packages/integrations/image/test/fixtures/with-mdx/package.json
index 91de3430f..3d0e8329a 100644
--- a/packages/integrations/image/test/fixtures/with-mdx/package.json
+++ b/packages/integrations/image/test/fixtures/with-mdx/package.json
@@ -7,6 +7,6 @@
     "@astrojs/mdx": "workspace:*",
     "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
-    "sharp": "^0.31.0"
+    "sharp": "^0.32.1"
   }
 }
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index f7d416b4b..ae535d4c3 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -41,7 +41,7 @@
     "zod": "^3.17.3"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:^2.3.4"
   },
   "devDependencies": {
     "@types/chai": "^4.3.1",
diff --git a/packages/integrations/markdoc/test/fixtures/render-with-components/package.json b/packages/integrations/markdoc/test/fixtures/render-with-components/package.json
index f14c97f0f..784b6c727 100644
--- a/packages/integrations/markdoc/test/fixtures/render-with-components/package.json
+++ b/packages/integrations/markdoc/test/fixtures/render-with-components/package.json
@@ -7,6 +7,6 @@
     "astro": "workspace:*"
   },
   "devDependencies": {
-    "shiki": "^0.11.1"
+    "shiki": "^0.14.1"
   }
 }
diff --git a/packages/integrations/markdoc/test/render.test.js b/packages/integrations/markdoc/test/render.test.js
index 48d13a759..86ffcb707 100644
--- a/packages/integrations/markdoc/test/render.test.js
+++ b/packages/integrations/markdoc/test/render.test.js
@@ -122,7 +122,7 @@ function renderComponentsChecks(html) {
 	// Renders Astro Code component
 	const pre = document.querySelector('pre');
 	expect(pre).to.not.be.null;
-	expect(pre.className).to.equal('astro-code');
+	expect(pre.className).to.equal('astro-code github-dark');
 }
 
 /** @param {string} html */
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index 6f3cad30d..c801d674e 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -44,7 +44,7 @@
     "remark-frontmatter": "^4.0.1",
     "remark-gfm": "^3.0.1",
     "remark-smartypants": "^2.0.0",
-    "shiki": "^0.11.1",
+    "shiki": "^0.14.1",
     "source-map": "^0.7.4",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2"
diff --git a/packages/integrations/mdx/src/remark-shiki.ts b/packages/integrations/mdx/src/remark-shiki.ts
index d4620194c..3f3310de7 100644
--- a/packages/integrations/mdx/src/remark-shiki.ts
+++ b/packages/integrations/mdx/src/remark-shiki.ts
@@ -10,7 +10,27 @@ import { visit } from 'unist-util-visit';
  */
 const highlighterCacheAsync = new Map<string, Promise<shiki.Highlighter>>();
 
+// Map of old theme names to new names to preserve compatibility when we upgrade shiki
+const compatThemes: Record<string, string> = {
+	'material-darker': 'material-theme-darker',
+	'material-default': 'material-theme',
+	'material-lighter': 'material-theme-lighter',
+	'material-ocean': 'material-theme-ocean',
+	'material-palenight': 'material-theme-palenight',
+};
+
+const normalizeTheme = (theme: string | shiki.IShikiTheme) => {
+	if (typeof theme === 'string') {
+		return compatThemes[theme] || theme;
+	} else if (compatThemes[theme.name]) {
+		return { ...theme, name: compatThemes[theme.name] };
+	} else {
+		return theme;
+	}
+};
+
 const remarkShiki = async ({ langs = [], theme = 'github-dark', wrap = false }: ShikiConfig) => {
+	theme = normalizeTheme(theme);
 	const cacheID: string = typeof theme === 'string' ? theme : theme.name;
 	let highlighterAsync = highlighterCacheAsync.get(cacheID);
 	if (!highlighterAsync) {
diff --git a/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js b/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js
index d420faabc..40281cffd 100644
--- a/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js
+++ b/packages/integrations/mdx/test/mdx-syntax-highlighting.test.js
@@ -25,7 +25,7 @@ describe('MDX syntax highlighting', () => {
 
 			const shikiCodeBlock = document.querySelector('pre.astro-code');
 			expect(shikiCodeBlock).to.not.be.null;
-			expect(shikiCodeBlock.getAttribute('style')).to.contain('background-color:#0d1117');
+			expect(shikiCodeBlock.getAttribute('style')).to.contain('background-color:#24292e');
 		});
 
 		it('respects markdown.shikiConfig.theme', async () => {
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index f2e029a96..ea8f30f09 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -34,12 +34,12 @@
     "test": "npm run test-fn"
   },
   "dependencies": {
-    "@astrojs/webapi": "^2.1.0",
+    "@astrojs/webapi": "^2.1.1",
     "@netlify/functions": "^1.0.0",
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:^2.3.4"
   },
   "devDependencies": {
     "@netlify/edge-functions": "^2.0.0",
diff --git a/packages/integrations/netlify/test/edge-functions/dynamic-import.test.js b/packages/integrations/netlify/test/edge-functions/dynamic-import.test.js
index 82961ab8b..ff4adb490 100644
--- a/packages/integrations/netlify/test/edge-functions/dynamic-import.test.js
+++ b/packages/integrations/netlify/test/edge-functions/dynamic-import.test.js
@@ -1,9 +1,6 @@
-// @ts-ignore
 import { runBuild, runApp } from './test-utils.ts';
-// @ts-ignore
 import { assertEquals, assert, DOMParser } from './deps.ts';
 
-// @ts-ignore
 Deno.test({
 	name: 'Dynamic imports',
 	async fn() {
diff --git a/packages/integrations/netlify/test/edge-functions/edge-basic.test.ts b/packages/integrations/netlify/test/edge-functions/edge-basic.test.ts
index 2e3ae4d5f..ecdbda4e0 100644
--- a/packages/integrations/netlify/test/edge-functions/edge-basic.test.ts
+++ b/packages/integrations/netlify/test/edge-functions/edge-basic.test.ts
@@ -1,9 +1,6 @@
-// @ts-expect-error
 import { runBuild } from './test-utils.ts';
-// @ts-expect-error
 import { assertEquals, assert, DOMParser } from './deps.ts';
 
-// @ts-expect-error
 Deno.env.set('SECRET_STUFF', 'secret');
 
 // @ts-expect-error
diff --git a/packages/integrations/netlify/test/edge-functions/prerender.test.ts b/packages/integrations/netlify/test/edge-functions/prerender.test.ts
index 1a272b101..5d858ef73 100644
--- a/packages/integrations/netlify/test/edge-functions/prerender.test.ts
+++ b/packages/integrations/netlify/test/edge-functions/prerender.test.ts
@@ -1,9 +1,6 @@
-// @ts-expect-error
 import { runBuild } from './test-utils.ts';
-// @ts-expect-error
 import { assertEquals } from './deps.ts';
 
-// @ts-expect-error
 Deno.test({
 	name: 'Prerender',
 	async fn() {
diff --git a/packages/integrations/netlify/test/edge-functions/root-dynamic.test.ts b/packages/integrations/netlify/test/edge-functions/root-dynamic.test.ts
index 8e05b05de..c853e2bfc 100644
--- a/packages/integrations/netlify/test/edge-functions/root-dynamic.test.ts
+++ b/packages/integrations/netlify/test/edge-functions/root-dynamic.test.ts
@@ -1,9 +1,6 @@
-// @ts-expect-error
 import { runBuild } from './test-utils.ts';
-// @ts-expect-error
 import { assertEquals, assert, DOMParser } from './deps.ts';
 
-// @ts-expect-error
 Deno.test({
 	// TODO: debug why build cannot be found in "await import"
 	ignore: true,
diff --git a/packages/integrations/netlify/test/edge-functions/test-utils.ts b/packages/integrations/netlify/test/edge-functions/test-utils.ts
index 7ba078a3a..2025c45b3 100644
--- a/packages/integrations/netlify/test/edge-functions/test-utils.ts
+++ b/packages/integrations/netlify/test/edge-functions/test-utils.ts
@@ -1,9 +1,7 @@
-// @ts-expect-error
 import { fromFileUrl, readableStreamFromReader } from './deps.ts';
 const dir = new URL('./', import.meta.url);
 
 export async function runBuild(fixturePath: string) {
-	// @ts-expect-error
 	let proc = Deno.run({
 		cmd: ['node', '../../../../../../astro/astro.js', 'build', '--silent'],
 		cwd: fromFileUrl(new URL(fixturePath, dir)),
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md
index d5c97c9cc..18e0d5c59 100644
--- a/packages/integrations/node/CHANGELOG.md
+++ b/packages/integrations/node/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @astrojs/node
 
+## 5.1.2
+
+### Patch Changes
+
+- [#6935](https://github.com/withastro/astro/pull/6935) [`c405cef64`](https://github.com/withastro/astro/commit/c405cef64711a7b6a480e8b4068cd2bf3cf889a9) Thanks [@matthewp](https://github.com/matthewp)! - Catch errors that occur within the stream in the Node adapter
+
+- Updated dependencies [[`a98df9374`](https://github.com/withastro/astro/commit/a98df9374dec65c678fa47319cb1481b1af123e2), [`ac57b5549`](https://github.com/withastro/astro/commit/ac57b5549f828a17bdbebdaca7ace075307a3c9d), [`50975f2ea`](https://github.com/withastro/astro/commit/50975f2ea3a59f9e023cc631a9372c0c7986eec9), [`ebae1eaf8`](https://github.com/withastro/astro/commit/ebae1eaf87f49399036033c673b513338f7d9c42), [`dc062f669`](https://github.com/withastro/astro/commit/dc062f6695ce577dc569781fc0678c903012c336)]:
+  - astro@2.3.3
+  - @astrojs/webapi@2.1.1
+
 ## 5.1.1
 
 ### Patch Changes
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index da6885f44..5c7595190 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": "5.1.1",
+  "version": "5.1.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -30,12 +30,12 @@
     "test": "mocha --exit --timeout 20000 test/"
   },
   "dependencies": {
-    "@astrojs/webapi": "^2.1.0",
+    "@astrojs/webapi": "^2.1.1",
     "send": "^0.18.0",
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:^2.3.4"
   },
   "devDependencies": {
     "@types/send": "^0.17.1",
diff --git a/packages/integrations/node/src/middleware.ts b/packages/integrations/node/src/nodeMiddleware.ts
similarity index 85%
rename from packages/integrations/node/src/middleware.ts
rename to packages/integrations/node/src/nodeMiddleware.ts
index 1af4539a6..c23cdb89c 100644
--- a/packages/integrations/node/src/middleware.ts
+++ b/packages/integrations/node/src/nodeMiddleware.ts
@@ -51,8 +51,13 @@ async function writeWebResponse(app: NodeApp, res: ServerResponse, webResponse:
 
 	res.writeHead(status, Object.fromEntries(headers.entries()));
 	if (webResponse.body) {
-		for await (const chunk of responseIterator(webResponse) as unknown as Readable) {
-			res.write(chunk);
+		try {
+			for await (const chunk of responseIterator(webResponse) as unknown as Readable) {
+				res.write(chunk);
+			}
+		} catch (err: any) {
+			console.error(err?.stack || err?.message || String(err));
+			res.write('Internal server error');
 		}
 	}
 	res.end();
diff --git a/packages/integrations/node/src/server.ts b/packages/integrations/node/src/server.ts
index ed03b68a6..98f5cd14b 100644
--- a/packages/integrations/node/src/server.ts
+++ b/packages/integrations/node/src/server.ts
@@ -1,7 +1,7 @@
 import { polyfill } from '@astrojs/webapi';
 import type { SSRManifest } from 'astro';
 import { NodeApp } from 'astro/app/node';
-import middleware from './middleware.js';
+import middleware from './nodeMiddleware.js';
 import startServer from './standalone.js';
 import type { Options } from './types';
 
diff --git a/packages/integrations/node/src/standalone.ts b/packages/integrations/node/src/standalone.ts
index 813174252..85eb3822a 100644
--- a/packages/integrations/node/src/standalone.ts
+++ b/packages/integrations/node/src/standalone.ts
@@ -3,7 +3,7 @@ import https from 'https';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { createServer } from './http-server.js';
-import middleware from './middleware.js';
+import middleware from './nodeMiddleware.js';
 import type { Options } from './types';
 
 function resolvePaths(options: Options) {
diff --git a/packages/integrations/node/test/errors.test.js b/packages/integrations/node/test/errors.test.js
new file mode 100644
index 000000000..6bb93023a
--- /dev/null
+++ b/packages/integrations/node/test/errors.test.js
@@ -0,0 +1,33 @@
+import nodejs from '../dist/index.js';
+import { loadFixture } from './test-utils.js';
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+
+describe('Errors', () => {
+	let fixture;
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/errors/',
+			output: 'server',
+			adapter: nodejs({ mode: 'standalone' }),
+		});
+		await fixture.build();
+	});
+	describe('Within the stream', async () => {
+		let devPreview;
+
+		before(async () => {
+			devPreview = await fixture.preview();
+		});
+		after(async () => {
+			await devPreview.stop();
+		});
+		it('when mode is standalone', async () => {
+			const res = await fixture.fetch('/in-stream');
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			expect($('p').text().trim()).to.equal('Internal server error');
+		});
+	});
+});
diff --git a/packages/integrations/node/test/fixtures/errors/package.json b/packages/integrations/node/test/fixtures/errors/package.json
new file mode 100644
index 000000000..e9fcfe654
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/errors/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/nodejs-errors",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*",
+    "@astrojs/node": "workspace:*"
+  }
+}
diff --git a/packages/integrations/node/test/fixtures/errors/src/pages/in-stream.astro b/packages/integrations/node/test/fixtures/errors/src/pages/in-stream.astro
new file mode 100644
index 000000000..b7ee6b4ef
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/errors/src/pages/in-stream.astro
@@ -0,0 +1,13 @@
+---
+---
+<html>
+	<head>
+		<title>One</title>
+	</head>
+	<body>
+		<h1>One</h1>
+		<p>
+			{Promise.reject('Error in the stream')}
+		</p>
+	</body>
+</html>
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index 5a6dc251a..ee46c7bab 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/react
 
+## 2.1.2
+
+### Patch Changes
+
+- [#6933](https://github.com/withastro/astro/pull/6933) [`649d70934`](https://github.com/withastro/astro/commit/649d70934e709bb1aa6e5e7583b12fa1703377cb) Thanks [@matthewp](https://github.com/matthewp)! - Automatically configure redoc
+
 ## 2.1.1
 
 ### Patch Changes
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 520b42545..142376e9d 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/react",
   "description": "Use React components within Astro",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/react/src/index.ts b/packages/integrations/react/src/index.ts
index b01229c3e..d7906fe4a 100644
--- a/packages/integrations/react/src/index.ts
+++ b/packages/integrations/react/src/index.ts
@@ -66,6 +66,7 @@ function getViteConfiguration() {
 				'@mui/material',
 				'@mui/base',
 				'@babel/runtime',
+				'redoc',
 				'use-immer',
 			],
 		},
diff --git a/packages/integrations/sitemap/package.json b/packages/integrations/sitemap/package.json
index afd959a62..7c465494e 100644
--- a/packages/integrations/sitemap/package.json
+++ b/packages/integrations/sitemap/package.json
@@ -37,6 +37,7 @@
     "zod": "^3.17.3"
   },
   "devDependencies": {
+    "@astrojs/node": "workspace:*",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
diff --git a/packages/integrations/sitemap/src/index.ts b/packages/integrations/sitemap/src/index.ts
index e6e45ddd1..0814ae0e1 100644
--- a/packages/integrations/sitemap/src/index.ts
+++ b/packages/integrations/sitemap/src/index.ts
@@ -51,6 +51,8 @@ const OUTFILE = 'sitemap-index.xml';
 
 const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 	let config: AstroConfig;
+	const logger = new Logger(PKG_NAME);
+
 	return {
 		name: PKG_NAME,
 
@@ -59,10 +61,15 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 				config = cfg;
 			},
 
-			'astro:build:done': async ({ dir, pages }) => {
-				const logger = new Logger(PKG_NAME);
-
+			'astro:build:done': async ({ dir, routes }) => {
 				try {
+					if (!config.site) {
+						logger.warn(
+							'The Sitemap integration requires the `site` astro.config option. Skipping.'
+						);
+						return;
+					}
+
 					const opts = validateOptions(config.site, options);
 
 					const { filter, customPages, serialize, entryLimit } = opts;
@@ -78,12 +85,30 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 						return;
 					}
 
-					let pageUrls = pages.map((p) => {
-						if (p.pathname !== '' && !finalSiteUrl.pathname.endsWith('/'))
-							finalSiteUrl.pathname += '/';
-						const path = finalSiteUrl.pathname + p.pathname;
-						return new URL(path, finalSiteUrl).href;
-					});
+					let pageUrls = routes.reduce<string[]>((urls, r) => {
+						/**
+						 * Dynamic URLs have entries with `undefined` pathnames
+						 */
+						if (r.pathname) {
+							/**
+							 * remove the initial slash from relative pathname
+							 * because `finalSiteUrl` always has trailing slash
+							 */
+							const path = finalSiteUrl.pathname + r.generate(r.pathname).substring(1);
+
+							let newUrl = new URL(path, finalSiteUrl).href;
+
+							if (config.trailingSlash === 'never') {
+								urls.push(newUrl);
+							} else if (config.build.format === 'directory' && !newUrl.endsWith('/')) {
+								urls.push(newUrl + '/');
+							} else {
+								urls.push(newUrl);
+							}
+						}
+
+						return urls;
+					}, []);
 
 					try {
 						if (filter) {
@@ -95,18 +120,11 @@ const createPlugin = (options?: SitemapOptions): AstroIntegration => {
 					}
 
 					if (customPages) {
-						pageUrls = [...pageUrls, ...customPages];
+						pageUrls = Array.from(new Set([...pageUrls, ...customPages]));
 					}
 
 					if (pageUrls.length === 0) {
-						// offer suggestion for SSR users
-						if (config.output !== 'static') {
-							logger.warn(
-								`No pages found! We can only detect sitemap routes for "static" builds. Since you are using an SSR adapter, we recommend manually listing your sitemap routes using the "customPages" integration option.\n\nExample: \`sitemap({ customPages: ['https://example.com/route'] })\``
-							);
-						} else {
-							logger.warn(`No pages found!\n\`${OUTFILE}\` not created.`);
-						}
+						logger.warn(`No pages found!\n\`${OUTFILE}\` not created.`);
 						return;
 					}
 
diff --git a/packages/integrations/sitemap/test/fixtures/ssr/astro.config.mjs b/packages/integrations/sitemap/test/fixtures/ssr/astro.config.mjs
new file mode 100644
index 000000000..d914d4357
--- /dev/null
+++ b/packages/integrations/sitemap/test/fixtures/ssr/astro.config.mjs
@@ -0,0 +1,12 @@
+import { defineConfig } from 'astro/config';
+import sitemap from '@astrojs/sitemap';
+import nodeServer from '@astrojs/node'
+
+export default defineConfig({
+  integrations: [sitemap()],
+	site: 'http://example.com',
+	output: 'server',
+	adapter: nodeServer({
+		mode: "standalone"
+	})
+})
diff --git a/packages/integrations/sitemap/test/fixtures/ssr/package.json b/packages/integrations/sitemap/test/fixtures/ssr/package.json
new file mode 100644
index 000000000..4c4c68285
--- /dev/null
+++ b/packages/integrations/sitemap/test/fixtures/ssr/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/sitemap-ssr",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*",
+    "@astrojs/sitemap": "workspace:*"
+  }
+}
diff --git a/packages/integrations/sitemap/test/fixtures/ssr/src/pages/one.astro b/packages/integrations/sitemap/test/fixtures/ssr/src/pages/one.astro
new file mode 100644
index 000000000..0c7fb90a7
--- /dev/null
+++ b/packages/integrations/sitemap/test/fixtures/ssr/src/pages/one.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>One</title>
+	</head>
+	<body>
+		<h1>One</h1>
+	</body>
+</html>
diff --git a/packages/integrations/sitemap/test/fixtures/ssr/src/pages/two.astro b/packages/integrations/sitemap/test/fixtures/ssr/src/pages/two.astro
new file mode 100644
index 000000000..e7ba9910e
--- /dev/null
+++ b/packages/integrations/sitemap/test/fixtures/ssr/src/pages/two.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Two</title>
+	</head>
+	<body>
+		<h1>Two</h1>
+	</body>
+</html>
diff --git a/packages/integrations/sitemap/test/ssr.test.js b/packages/integrations/sitemap/test/ssr.test.js
new file mode 100644
index 000000000..e6f8412d5
--- /dev/null
+++ b/packages/integrations/sitemap/test/ssr.test.js
@@ -0,0 +1,22 @@
+import { loadFixture, readXML } from './test-utils.js';
+import { expect } from 'chai';
+
+describe('SSR support', () => {
+	/** @type {import('./test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/ssr/',
+		});
+		await fixture.build();
+	});
+
+	it('SSR pages require zero config', async () => {
+		const data = await readXML(fixture.readFile('/client/sitemap-0.xml'));
+		const urls = data.urlset.url;
+
+		expect(urls[0].loc[0]).to.equal('http://example.com/one/');
+		expect(urls[1].loc[0]).to.equal('http://example.com/two/');
+	});
+});
diff --git a/packages/integrations/solid/CHANGELOG.md b/packages/integrations/solid/CHANGELOG.md
index 7504fbe00..217a736fe 100644
--- a/packages/integrations/solid/CHANGELOG.md
+++ b/packages/integrations/solid/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/solid-js
 
+## 2.1.1
+
+### Patch Changes
+
+- [#6934](https://github.com/withastro/astro/pull/6934) [`b6797fc85`](https://github.com/withastro/astro/commit/b6797fc8583f7cb0749e69e72a56fe9fba6f815b) Thanks [@matthewp](https://github.com/matthewp)! - Allow Solid ecosystem packages to not need special export map configuration. By default Solid is now treated as an external package in SSR, so any other dependent packages will receive the same instance.
+
 ## 2.1.0
 
 ### Minor Changes
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json
index 4ddb9f31c..5adec5a2b 100644
--- a/packages/integrations/solid/package.json
+++ b/packages/integrations/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/solid-js",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Use Solid components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts
index edf58fdea..8ec9f4d8d 100644
--- a/packages/integrations/solid/src/index.ts
+++ b/packages/integrations/solid/src/index.ts
@@ -47,7 +47,7 @@ async function getViteConfiguration(isDev: boolean, astroConfig: AstroConfig) {
 		ssr: {
 			target: 'node',
 			external: ['babel-preset-solid', ...solidPkgsConfig.ssr.external],
-			noExternal: ['solid-js', ...solidPkgsConfig.ssr.noExternal],
+			noExternal: [...solidPkgsConfig.ssr.noExternal],
 		},
 	};
 }
diff --git a/packages/integrations/svelte/CHANGELOG.md b/packages/integrations/svelte/CHANGELOG.md
index 5fde2862c..054c7ac48 100644
--- a/packages/integrations/svelte/CHANGELOG.md
+++ b/packages/integrations/svelte/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/svelte
 
+## 2.1.1
+
+### Patch Changes
+
+- [#6930](https://github.com/withastro/astro/pull/6930) [`2dca81bf2`](https://github.com/withastro/astro/commit/2dca81bf2174cd5c27cb63cb0ae081ea2a1ac771) Thanks [@bluwy](https://github.com/bluwy)! - Update dependencies
+
+- Updated dependencies [[`a98df9374`](https://github.com/withastro/astro/commit/a98df9374dec65c678fa47319cb1481b1af123e2), [`50975f2ea`](https://github.com/withastro/astro/commit/50975f2ea3a59f9e023cc631a9372c0c7986eec9), [`ebae1eaf8`](https://github.com/withastro/astro/commit/ebae1eaf87f49399036033c673b513338f7d9c42), [`dc062f669`](https://github.com/withastro/astro/commit/dc062f6695ce577dc569781fc0678c903012c336)]:
+  - astro@2.3.3
+
 ## 2.1.0
 
 ### Minor Changes
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index ff00cfd63..427b97472 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/svelte",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Use Svelte components within Astro",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -43,7 +43,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2",
+    "astro": "workspace:^2.3.4",
     "svelte": "^3.54.0"
   },
   "engines": {
diff --git a/packages/integrations/tailwind/CHANGELOG.md b/packages/integrations/tailwind/CHANGELOG.md
index 60780e81e..9c0b5aedc 100644
--- a/packages/integrations/tailwind/CHANGELOG.md
+++ b/packages/integrations/tailwind/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/tailwind
 
+## 3.1.2
+
+### Patch Changes
+
+- [#6930](https://github.com/withastro/astro/pull/6930) [`2dca81bf2`](https://github.com/withastro/astro/commit/2dca81bf2174cd5c27cb63cb0ae081ea2a1ac771) Thanks [@bluwy](https://github.com/bluwy)! - Update dependencies
+
+- Updated dependencies [[`a98df9374`](https://github.com/withastro/astro/commit/a98df9374dec65c678fa47319cb1481b1af123e2), [`50975f2ea`](https://github.com/withastro/astro/commit/50975f2ea3a59f9e023cc631a9372c0c7986eec9), [`ebae1eaf8`](https://github.com/withastro/astro/commit/ebae1eaf87f49399036033c673b513338f7d9c42), [`dc062f669`](https://github.com/withastro/astro/commit/dc062f6695ce577dc569781fc0678c903012c336)]:
+  - astro@2.3.3
+
 ## 3.1.1
 
 ### Patch Changes
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index a69429b51..df770eb17 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/tailwind",
   "description": "Use Tailwind CSS to style your Astro site",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -40,7 +40,7 @@
     "vite": "^4.3.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2",
+    "astro": "workspace:^2.3.4",
     "tailwindcss": "^3.0.24"
   },
   "pnpm": {
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 2b5768994..00d37c09b 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @astrojs/vercel
 
+## 3.3.0
+
+### Minor Changes
+
+- [#6845](https://github.com/withastro/astro/pull/6845) [`6063f5657`](https://github.com/withastro/astro/commit/6063f5657392a74b6ffc4d5e0de5463c217a8563) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add support for using the Vercel Image Optimization API through `astro:assets`
+
+### Patch Changes
+
+- Updated dependencies [[`a8a319aef`](https://github.com/withastro/astro/commit/a8a319aef744a64647ee16c7d558d74de6864c6c), [`a695e44ae`](https://github.com/withastro/astro/commit/a695e44aed6e2f5d32cb950d4237be6e5657ba98), [`367e61776`](https://github.com/withastro/astro/commit/367e61776196a17d61c28daa4dfbabb6244e040c), [`77270cc2c`](https://github.com/withastro/astro/commit/77270cc2cd06c942d7abf1d882e36d9163edafa5), [`895fa07d8`](https://github.com/withastro/astro/commit/895fa07d8b4b8359984e048daca5437e40f44390), [`72c6bf01f`](https://github.com/withastro/astro/commit/72c6bf01fe49b331ca8ad9206a7506b15caf5b8d), [`e5bd084c0`](https://github.com/withastro/astro/commit/e5bd084c01e4f60a157969b50c05ce002f7b63d2)]:
+  - astro@2.3.4
+
 ## 3.2.5
 
 ### Patch Changes
diff --git a/packages/integrations/vercel/README.md b/packages/integrations/vercel/README.md
index b20131f67..0af5632b5 100644
--- a/packages/integrations/vercel/README.md
+++ b/packages/integrations/vercel/README.md
@@ -14,7 +14,7 @@ Learn how to deploy your Astro site in our [Vercel deployment guide](https://doc
 
 ## Why Astro Vercel
 
-If you're using Astro as a static site builder — its behavior out of the box — you don't need an adapter. 
+If you're using Astro as a static site builder — its behavior out of the box — you don't need an adapter.
 
 If you wish to [use server-side rendering (SSR)](https://docs.astro.build/en/guides/server-side-rendering/), Astro requires an adapter that matches your deployment runtime.
 
@@ -108,6 +108,63 @@ export default defineConfig({
 });
 ```
 
+### imageConfig
+
+**Type:** `VercelImageConfig`<br>
+**Available for:** Edge, Serverless, Static
+**Added in:** `@astrojs/vercel@3.3.0`
+
+Configuration options for [Vercel's Image Optimization API](https://vercel.com/docs/concepts/image-optimization). See [Vercel's image configuration documentation](https://vercel.com/docs/build-output-api/v3/configuration#images) for a complete list of supported parameters.
+
+```js
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/static';
+
+export default defineConfig({
+  output: 'server',
+  adapter: vercel({
+    imageConfig: {
+      sizes: [320, 640, 1280]
+    }
+  })
+});
+```
+
+### imageService
+
+**Type:** `boolean`<br>
+**Available for:** Edge, Serverless, Static
+**Added in:** `@astrojs/vercel@3.3.0`
+
+When enabled, an [Image Service](https://docs.astro.build/en/reference/image-service-reference/) powered by the Vercel Image Optimization API will be automatically configured and used in production. In development, a built-in Squoosh-based service will be used instead.
+
+```js
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+import vercel from '@astrojs/vercel/static';
+
+export default defineConfig({
+  output: 'server',
+  adapter: vercel({
+    imageService: true
+  })
+});
+```
+
+```astro
+---
+import { Image } from "astro:assets";
+import astroLogo from "../assets/logo.png";
+---
+
+<!-- This component -->
+<Image src={astroLogo} alt="My super logo!" />
+
+<!-- will become the following HTML -->
+<img src="/_vercel/image?url=_astro/logo.hash.png&w=...&q=..." alt="My super logo!" loading="lazy" decoding="async" width="..." height="..." />
+```
+
 ### includeFiles
 
 **Type:** `string[]`<br>
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 56e160623..b639cc7ca 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": "3.2.5",
+  "version": "3.3.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -23,6 +23,8 @@
     "./serverless/entrypoint": "./dist/serverless/entrypoint.js",
     "./static": "./dist/static/adapter.js",
     "./analytics": "./dist/analytics.js",
+    "./build-image-service": "./dist/image/build-service.js",
+    "./dev-image-service": "./dist/image/dev-service.js",
     "./package.json": "./package.json"
   },
   "typesVersions": {
@@ -45,7 +47,7 @@
     "test": "mocha --exit --timeout 20000 test/"
   },
   "dependencies": {
-    "@astrojs/webapi": "^2.1.0",
+    "@astrojs/webapi": "^2.1.1",
     "@vercel/analytics": "^0.1.8",
     "@vercel/nft": "^0.22.1",
     "fast-glob": "^3.2.11",
@@ -53,13 +55,14 @@
     "web-vitals": "^3.1.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2"
+    "astro": "workspace:^2.3.4"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.2",
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "chai": "^4.3.6",
-    "mocha": "^9.2.2"
+    "mocha": "^9.2.2",
+    "cheerio": "^1.0.0-rc.11"
   }
 }
diff --git a/packages/integrations/vercel/src/edge/adapter.ts b/packages/integrations/vercel/src/edge/adapter.ts
index a2e937987..3570f5b61 100644
--- a/packages/integrations/vercel/src/edge/adapter.ts
+++ b/packages/integrations/vercel/src/edge/adapter.ts
@@ -4,6 +4,12 @@ import esbuild from 'esbuild';
 import { relative as relativePath } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import {
+	defaultImageConfig,
+	getImageConfig,
+	throwIfAssetsNotEnabled,
+	type VercelImageConfig,
+} from '../image/shared.js';
 import {
 	copyFilesToFunction,
 	getFilesFromFolder,
@@ -26,11 +32,15 @@ function getAdapter(): AstroAdapter {
 export interface VercelEdgeConfig {
 	includeFiles?: string[];
 	analytics?: boolean;
+	imageService?: boolean;
+	imagesConfig?: VercelImageConfig;
 }
 
 export default function vercelEdge({
 	includeFiles = [],
 	analytics,
+	imageService,
+	imagesConfig,
 }: VercelEdgeConfig = {}): AstroIntegration {
 	let _config: AstroConfig;
 	let buildTempFolder: URL;
@@ -52,9 +62,11 @@ export default function vercelEdge({
 						client: new URL('./static/', outDir),
 						server: new URL('./dist/', config.root),
 					},
+					...getImageConfig(imageService, imagesConfig, command),
 				});
 			},
 			'astro:config:done': ({ setAdapter, config }) => {
+				throwIfAssetsNotEnabled(config, imageService);
 				setAdapter(getAdapter());
 				_config = config;
 				buildTempFolder = config.build.server;
@@ -64,7 +76,7 @@ export default function vercelEdge({
 				if (config.output === 'static') {
 					throw new Error(`
 		[@astrojs/vercel] \`output: "server"\` is required to use the edge adapter.
-	
+
 	`);
 				}
 			},
@@ -135,6 +147,9 @@ export default function vercelEdge({
 						{ handle: 'filesystem' },
 						{ src: '/.*', dest: 'render' },
 					],
+					...(imageService || imagesConfig
+						? { images: imagesConfig ? imagesConfig : defaultImageConfig }
+						: {}),
 				});
 			},
 		},
diff --git a/packages/integrations/vercel/src/image/build-service.ts b/packages/integrations/vercel/src/image/build-service.ts
new file mode 100644
index 000000000..23cd664a2
--- /dev/null
+++ b/packages/integrations/vercel/src/image/build-service.ts
@@ -0,0 +1,60 @@
+import type { ExternalImageService } from 'astro';
+import { isESMImportedImage, sharedValidateOptions } from './shared';
+
+const service: ExternalImageService = {
+	validateOptions: (options, serviceOptions) =>
+		sharedValidateOptions(options, serviceOptions, 'production'),
+	getHTMLAttributes(options, serviceOptions) {
+		const { inputtedWidth, ...props } = options;
+
+		// If `validateOptions` returned a different width than the one of the image, use it for attributes
+		if (inputtedWidth) {
+			props.width = inputtedWidth;
+		}
+
+		let targetWidth = props.width;
+		let targetHeight = props.height;
+		if (isESMImportedImage(props.src)) {
+			const aspectRatio = props.src.width / props.src.height;
+			if (targetHeight && !targetWidth) {
+				// If we have a height but no width, use height to calculate the width
+				targetWidth = Math.round(targetHeight * aspectRatio);
+			} else if (targetWidth && !targetHeight) {
+				// If we have a width but no height, use width to calculate the height
+				targetHeight = Math.round(targetWidth / aspectRatio);
+			} else if (!targetWidth && !targetHeight) {
+				// If we have neither width or height, use the original image's dimensions
+				targetWidth = props.src.width;
+				targetHeight = props.src.height;
+			}
+		}
+
+		const { src, width, height, format, quality, ...attributes } = props;
+
+		return {
+			...attributes,
+			width: targetWidth,
+			height: targetHeight,
+			loading: attributes.loading ?? 'lazy',
+			decoding: attributes.decoding ?? 'async',
+		};
+	},
+	getURL(options, serviceOptions) {
+		const fileSrc =
+			typeof options.src === 'string' ? options.src : removeLeadingForwardSlash(options.src.src);
+
+		const searchParams = new URLSearchParams();
+		searchParams.append('url', fileSrc);
+
+		options.width && searchParams.append('w', options.width.toString());
+		options.quality && searchParams.append('q', options.quality.toString());
+
+		return '/_vercel/image?' + searchParams;
+	},
+};
+
+function removeLeadingForwardSlash(path: string) {
+	return path.startsWith('/') ? path.substring(1) : path;
+}
+
+export default service;
diff --git a/packages/integrations/vercel/src/image/dev-service.ts b/packages/integrations/vercel/src/image/dev-service.ts
new file mode 100644
index 000000000..04df9932a
--- /dev/null
+++ b/packages/integrations/vercel/src/image/dev-service.ts
@@ -0,0 +1,57 @@
+import type { LocalImageService } from 'astro';
+// @ts-expect-error
+import squooshService from 'astro/assets/services/squoosh';
+import { sharedValidateOptions } from './shared';
+
+const service: LocalImageService = {
+	validateOptions: (options, serviceOptions) =>
+		sharedValidateOptions(options, serviceOptions, 'development'),
+	getHTMLAttributes(options, serviceOptions) {
+		const { inputtedWidth, ...props } = options;
+
+		// If `validateOptions` returned a different width than the one of the image, use it for attributes
+		if (inputtedWidth) {
+			props.width = inputtedWidth;
+		}
+
+		return squooshService.getHTMLAttributes(props, serviceOptions);
+	},
+	getURL(options) {
+		const fileSrc = typeof options.src === 'string' ? options.src : options.src.src;
+
+		const searchParams = new URLSearchParams();
+		searchParams.append('href', fileSrc);
+
+		options.width && searchParams.append('w', options.width.toString());
+		options.quality && searchParams.append('q', options.quality.toString());
+
+		return '/_image?' + searchParams;
+	},
+	parseURL(url) {
+		const params = url.searchParams;
+
+		if (!params.has('href')) {
+			return undefined;
+		}
+
+		const transform = {
+			src: params.get('href')!,
+			width: params.has('w') ? parseInt(params.get('w')!) : undefined,
+			quality: params.get('q'),
+		};
+
+		return transform;
+	},
+	transform(inputBuffer, transform, serviceOptions) {
+		// NOTE: Hardcoding webp here isn't accurate to how the Vercel Image Optimization API works, normally what we should
+		// do is setup a custom endpoint that sniff the user's accept-content header and serve the proper format based on the
+		// user's Vercel config. However, that's: a lot of work for: not much. The dev service is inaccurate to the prod service
+		// in many more ways, this is one of the less offending cases and is, imo, okay, erika - 2023-04-27
+		transform.format = 'webp';
+
+		// The base Squoosh service works the same way as the Vercel Image Optimization API, so it's a safe fallback in local
+		return squooshService.transform(inputBuffer, transform, serviceOptions);
+	},
+};
+
+export default service;
diff --git a/packages/integrations/vercel/src/image/shared.ts b/packages/integrations/vercel/src/image/shared.ts
new file mode 100644
index 000000000..0b6db2037
--- /dev/null
+++ b/packages/integrations/vercel/src/image/shared.ts
@@ -0,0 +1,151 @@
+import type { AstroConfig, ImageMetadata, ImageQualityPreset, ImageTransform } from 'astro';
+
+export const defaultImageConfig: VercelImageConfig = {
+	sizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+	domains: [],
+};
+
+export function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata {
+	return typeof src === 'object';
+}
+// https://vercel.com/docs/build-output-api/v3/configuration#images
+type ImageFormat = 'image/avif' | 'image/webp';
+
+type RemotePattern = {
+	protocol?: 'http' | 'https';
+	hostname: string;
+	port?: string;
+	pathname?: string;
+};
+
+export type VercelImageConfig = {
+	/**
+	 * Supported image widths.
+	 */
+	sizes: number[];
+	/**
+	 * Allowed external domains that can use Image Optimization. Leave empty for only allowing the deployment domain to use Image Optimization.
+	 */
+	domains: string[];
+	/**
+	 * Allowed external patterns that can use Image Optimization. Similar to `domains` but provides more control with RegExp.
+	 */
+	remotePatterns?: RemotePattern[];
+	/**
+	 * Cache duration (in seconds) for the optimized images.
+	 */
+	minimumCacheTTL?: number;
+	/**
+	 * Supported output image formats
+	 */
+	formats?: ImageFormat[];
+	/**
+	 * Allow SVG input image URLs. This is disabled by default for security purposes.
+	 */
+	dangerouslyAllowSVG?: boolean;
+	/**
+	 * Change the [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP) of the optimized images.
+	 */
+	contentSecurityPolicy?: string;
+};
+
+export const qualityTable: Record<ImageQualityPreset, number> = {
+	low: 25,
+	mid: 50,
+	high: 80,
+	max: 100,
+};
+
+// TODO: Remove once Astro 3.0 is out and `experimental.assets` is no longer needed
+export function throwIfAssetsNotEnabled(config: AstroConfig, imageService: boolean | undefined) {
+	if (!config.experimental.assets && imageService) {
+		throw new Error(
+			`Using the Vercel Image Optimization-powered image service requires \`experimental.assets\` to be enabled. See https://docs.astro.build/en/guides/assets/ for more information.`
+		);
+	}
+}
+
+export function getImageConfig(
+	images: boolean | undefined,
+	imagesConfig: VercelImageConfig | undefined,
+	command: string
+) {
+	if (images) {
+		return {
+			image: {
+				service: {
+					entrypoint:
+						command === 'dev'
+							? '@astrojs/vercel/dev-image-service'
+							: '@astrojs/vercel/build-image-service',
+					config: imagesConfig ? imagesConfig : defaultImageConfig,
+				},
+			},
+		};
+	}
+
+	return {};
+}
+
+export function sharedValidateOptions(
+	options: ImageTransform,
+	serviceOptions: Record<string, any>,
+	mode: 'development' | 'production'
+) {
+	const vercelImageOptions = serviceOptions as VercelImageConfig;
+
+	if (
+		mode === 'development' &&
+		(!vercelImageOptions.sizes || vercelImageOptions.sizes.length === 0)
+	) {
+		throw new Error('Vercel Image Optimization requires at least one size to be configured.');
+	}
+
+	const configuredWidths = vercelImageOptions.sizes.sort((a, b) => a - b);
+
+	// The logic for finding the perfect width is a bit confusing, here it goes:
+	// For images where no width has been specified:
+	// - For local, imported images, fallback to nearest width we can find in our configured
+	// - For remote images, that's an error, width is always required.
+	// For images where a width has been specified:
+	// - If the width that the user asked for isn't in `sizes`, then fallback to the nearest one, but save the width
+	// 	the user asked for so we can put it on the `img` tag later.
+	// - Otherwise, just use as-is.
+	// The end goal is:
+	// - The size on the page is always the one the user asked for or the base image's size
+	// - The actual size of the image file is always one of `sizes`, either the one the user asked for or the nearest to it
+	if (!options.width) {
+		const src = options.src;
+		if (isESMImportedImage(src)) {
+			const nearestWidth = configuredWidths.reduce((prev, curr) => {
+				return Math.abs(curr - src.width) < Math.abs(prev - src.width) ? curr : prev;
+			});
+
+			// Use the image's base width to inform the `width` and `height` on the `img` tag
+			options.inputtedWidth = src.width;
+			options.width = nearestWidth;
+		} else {
+			throw new Error(`Missing \`width\` parameter for remote image ${options.src}`);
+		}
+	} else {
+		if (!configuredWidths.includes(options.width)) {
+			const nearestWidth = configuredWidths.reduce((prev, curr) => {
+				return Math.abs(curr - options.width!) < Math.abs(prev - options.width!) ? curr : prev;
+			});
+
+			// Save the width the user asked for to inform the `width` and `height` on the `img` tag
+			options.inputtedWidth = options.width;
+			options.width = nearestWidth;
+		}
+	}
+
+	if (options.quality && typeof options.quality === 'string') {
+		options.quality = options.quality in qualityTable ? qualityTable[options.quality] : undefined;
+	}
+
+	if (!options.quality) {
+		options.quality = 100;
+	}
+
+	return options;
+}
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index 24b9c735b..47d164519 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -2,6 +2,12 @@ import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro';
 
 import glob from 'fast-glob';
 import { pathToFileURL } from 'url';
+import {
+	defaultImageConfig,
+	getImageConfig,
+	throwIfAssetsNotEnabled,
+	type VercelImageConfig,
+} from '../image/shared.js';
 import { getVercelOutput, removeDir, writeJson } from '../lib/fs.js';
 import { copyDependenciesToFunction } from '../lib/nft.js';
 import { getRedirects } from '../lib/redirects.js';
@@ -20,12 +26,16 @@ export interface VercelServerlessConfig {
 	includeFiles?: string[];
 	excludeFiles?: string[];
 	analytics?: boolean;
+	imageService?: boolean;
+	imagesConfig?: VercelImageConfig;
 }
 
 export default function vercelServerless({
 	includeFiles,
 	excludeFiles,
 	analytics,
+	imageService,
+	imagesConfig,
 }: VercelServerlessConfig = {}): AstroIntegration {
 	let _config: AstroConfig;
 	let buildTempFolder: URL;
@@ -47,9 +57,11 @@ export default function vercelServerless({
 						client: new URL('./static/', outDir),
 						server: new URL('./dist/', config.root),
 					},
+					...getImageConfig(imageService, imagesConfig, command),
 				});
 			},
 			'astro:config:done': ({ setAdapter, config }) => {
+				throwIfAssetsNotEnabled(config, imageService);
 				setAdapter(getAdapter());
 				_config = config;
 				buildTempFolder = config.build.server;
@@ -59,7 +71,7 @@ export default function vercelServerless({
 				if (config.output === 'static') {
 					throw new Error(`
 		[@astrojs/vercel] \`output: "server"\` is required to use the serverless adapter.
-	
+
 	`);
 				}
 			},
@@ -115,6 +127,9 @@ export default function vercelServerless({
 						{ handle: 'filesystem' },
 						{ src: '/.*', dest: 'render' },
 					],
+					...(imageService || imagesConfig
+						? { images: imagesConfig ? imagesConfig : defaultImageConfig }
+						: {}),
 				});
 			},
 		},
diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
index 5455edbc0..2aa489133 100644
--- a/packages/integrations/vercel/src/static/adapter.ts
+++ b/packages/integrations/vercel/src/static/adapter.ts
@@ -1,5 +1,11 @@
 import type { AstroAdapter, AstroConfig, AstroIntegration } from 'astro';
 
+import {
+	defaultImageConfig,
+	getImageConfig,
+	throwIfAssetsNotEnabled,
+	type VercelImageConfig,
+} from '../image/shared.js';
 import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js';
 import { getRedirects } from '../lib/redirects.js';
 
@@ -11,15 +17,21 @@ function getAdapter(): AstroAdapter {
 
 export interface VercelStaticConfig {
 	analytics?: boolean;
+	imageService?: boolean;
+	imagesConfig?: VercelImageConfig;
 }
 
-export default function vercelStatic({ analytics }: VercelStaticConfig = {}): AstroIntegration {
+export default function vercelStatic({
+	analytics,
+	imageService,
+	imagesConfig,
+}: VercelStaticConfig = {}): AstroIntegration {
 	let _config: AstroConfig;
 
 	return {
 		name: '@astrojs/vercel',
 		hooks: {
-			'astro:config:setup': ({ command, config, updateConfig, injectScript }) => {
+			'astro:config:setup': ({ command, config, injectScript, updateConfig }) => {
 				if (command === 'build' && analytics) {
 					injectScript('page', 'import "@astrojs/vercel/analytics"');
 				}
@@ -29,9 +41,11 @@ export default function vercelStatic({ analytics }: VercelStaticConfig = {}): As
 					build: {
 						format: 'directory',
 					},
+					...getImageConfig(imageService, imagesConfig, command),
 				});
 			},
 			'astro:config:done': ({ setAdapter, config }) => {
+				throwIfAssetsNotEnabled(config, imageService);
 				setAdapter(getAdapter());
 				_config = config;
 
@@ -51,6 +65,9 @@ export default function vercelStatic({ analytics }: VercelStaticConfig = {}): As
 				await writeJson(new URL(`./config.json`, getVercelOutput(_config.root)), {
 					version: 3,
 					routes: [...getRedirects(routes, _config), { handle: 'filesystem' }],
+					...(imageService || imagesConfig
+						? { images: imagesConfig ? imagesConfig : defaultImageConfig }
+						: {}),
 				});
 			},
 		},
diff --git a/packages/integrations/vercel/test/fixtures/image/astro.config.mjs b/packages/integrations/vercel/test/fixtures/image/astro.config.mjs
new file mode 100644
index 000000000..a38be5065
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/image/astro.config.mjs
@@ -0,0 +1,9 @@
+import vercel from '@astrojs/vercel/static';
+import { defineConfig } from 'astro/config';
+
+export default defineConfig({
+	adapter: vercel({imageService: true}),
+	experimental: {
+		assets: true
+	}
+});
diff --git a/packages/integrations/vercel/test/fixtures/image/package.json b/packages/integrations/vercel/test/fixtures/image/package.json
new file mode 100644
index 000000000..ea9d554f5
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/image/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/astro-vercel-image",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/vercel": "workspace:*",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/vercel/test/fixtures/image/src/assets/astro.jpeg b/packages/integrations/vercel/test/fixtures/image/src/assets/astro.jpeg
new file mode 100644
index 000000000..1443ee4b4
Binary files /dev/null and b/packages/integrations/vercel/test/fixtures/image/src/assets/astro.jpeg differ
diff --git a/packages/integrations/vercel/test/fixtures/image/src/pages/index.astro b/packages/integrations/vercel/test/fixtures/image/src/pages/index.astro
new file mode 100644
index 000000000..0a154874f
--- /dev/null
+++ b/packages/integrations/vercel/test/fixtures/image/src/pages/index.astro
@@ -0,0 +1,6 @@
+---
+import { Image } from "astro:assets";
+import astro from "../assets/astro.jpeg";
+---
+
+<Image src={astro} alt="Astro" />
diff --git a/packages/integrations/vercel/test/image.test.js b/packages/integrations/vercel/test/image.test.js
new file mode 100644
index 000000000..834b6d69b
--- /dev/null
+++ b/packages/integrations/vercel/test/image.test.js
@@ -0,0 +1,60 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('Image', () => {
+	/** @type {import('../../../astro/test/test-utils.js').Fixture} */
+	let fixture;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/image/',
+		});
+		await fixture.build();
+	});
+
+	it('build successful', async () => {
+		expect(await fixture.readFile('../.vercel/output/static/index.html')).to.be.ok;
+	});
+
+	it('has link to vercel in build with proper attributes', async () => {
+		const html = await fixture.readFile('../.vercel/output/static/index.html');
+		const $ = cheerio.load(html);
+		const img = $('img');
+
+		expect(img.attr('src').startsWith('/_vercel/image?url=_astr')).to.be.true;
+		expect(img.attr('loading')).to.equal('lazy');
+		expect(img.attr('width')).to.equal('225');
+	});
+
+	it('has proper vercel config', async () => {
+		const vercelConfig = JSON.parse(await fixture.readFile('../.vercel/output/config.json'));
+
+		expect(vercelConfig.images).to.deep.equal({
+			sizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+			domains: [],
+		});
+	});
+
+	describe('dev', () => {
+		let devServer;
+
+		before(async () => {
+			devServer = await fixture.startDevServer();
+		});
+
+		after(async () => {
+			await devServer.stop();
+		});
+
+		it('has link to local image in dev with proper attributes', async () => {
+			const html = await fixture.fetch('/').then((res) => res.text());
+			const $ = cheerio.load(html);
+			const img = $('img');
+
+			expect(img.attr('src').startsWith('/_image?href=')).to.be.true;
+			expect(img.attr('loading')).to.equal('lazy');
+			expect(img.attr('width')).to.equal('225');
+		});
+	});
+});
diff --git a/packages/integrations/vercel/test/serverless-prerender.test.js b/packages/integrations/vercel/test/serverless-prerender.test.js
index 4cada43a7..491c6d0bd 100644
--- a/packages/integrations/vercel/test/serverless-prerender.test.js
+++ b/packages/integrations/vercel/test/serverless-prerender.test.js
@@ -1,5 +1,5 @@
-import { loadFixture } from './test-utils.js';
 import { expect } from 'chai';
+import { loadFixture } from './test-utils.js';
 
 describe('Serverless prerender', () => {
 	/** @type {import('./test-utils').Fixture} */
@@ -13,6 +13,6 @@ describe('Serverless prerender', () => {
 
 	it('build successful', async () => {
 		await fixture.build();
-		expect(fixture.readFile('/static/index.html')).to.be.ok;
+		expect(await fixture.readFile('../.vercel/output/static/index.html')).to.be.ok;
 	});
 });
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 09a7d2d32..48760e11a 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -50,7 +50,7 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.3.2",
+    "astro": "workspace:^2.3.4",
     "vue": "^3.2.30"
   },
   "engines": {
diff --git a/packages/markdown/component/test/astro-markdown-shiki.test.js b/packages/markdown/component/test/astro-markdown-shiki.test.js
index fb4f8f962..580552770 100644
--- a/packages/markdown/component/test/astro-markdown-shiki.test.js
+++ b/packages/markdown/component/test/astro-markdown-shiki.test.js
@@ -41,7 +41,7 @@ describe('Astro Markdown Shiki', () => {
 
 				expect($('pre')).to.have.lengthOf(1);
 				expect($('pre').hasClass('astro-code')).to.equal(true);
-				expect($('pre').attr().style).to.equal('background-color: #ffffff; overflow-x: auto;');
+				expect($('pre').attr().style).to.equal('background-color: #fff; overflow-x: auto;');
 			});
 		});
 
@@ -78,12 +78,12 @@ describe('Astro Markdown Shiki', () => {
 
 			const segments = $('.line').get(6).children;
 			expect(segments).to.have.lengthOf(3);
-			expect(segments[0].attribs.style).to.be.equal('color: #C9D1D9');
-			expect(segments[1].attribs.style).to.be.equal('color: #79C0FF');
+			expect(segments[0].attribs.style).to.be.equal('color: #E1E4E8');
+			expect(segments[1].attribs.style).to.be.equal('color: #79B8FF');
 
 			const unknownLang = $('.line').last().html();
 			expect(unknownLang).to.be.equal(
-				'<span style="color: #c9d1d9">This language does not exist</span>'
+				'<span style="color: #e1e4e8">This language does not exist</span>'
 			);
 		});
 	});
@@ -91,7 +91,7 @@ describe('Astro Markdown Shiki', () => {
 	describe('Wrap', () => {
 		describe('wrap = true', () => {
 			const style =
-				'background-color: #0d1117; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
+				'background-color: #24292e; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
 			let fixture;
 
 			before(async () => {
@@ -110,7 +110,7 @@ describe('Astro Markdown Shiki', () => {
 	});
 
 	describe('wrap = false', () => {
-		const style = 'background-color: #0d1117; overflow-x: auto;';
+		const style = 'background-color: #24292e; overflow-x: auto;';
 		let fixture;
 
 		before(async () => {
@@ -128,7 +128,7 @@ describe('Astro Markdown Shiki', () => {
 	});
 
 	describe('wrap = null', () => {
-		const style = 'background-color: #0d1117';
+		const style = 'background-color: #24292e';
 		let fixture;
 
 		before(async () => {
diff --git a/packages/markdown/component/test/astro-markdown.test.js b/packages/markdown/component/test/astro-markdown.test.js
index d2b156334..21c839b34 100644
--- a/packages/markdown/component/test/astro-markdown.test.js
+++ b/packages/markdown/component/test/astro-markdown.test.js
@@ -119,7 +119,7 @@ describe('Astro Markdown', () => {
 
 		// test 1: the "pre" tag receives scoped style
 		const preClassList = $('pre').attr('class').split(/\s+/);
-		expect(preClassList.length).to.equal(2);
+		expect(preClassList.length).to.equal(3);
 		const preAstroClass = preClassList.find(isAstroScopedClass);
 		expect(Boolean(preAstroClass)).to.equal(true);
 
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index 82ae5bbb8..edf4cfba5 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -37,7 +37,7 @@
     "remark-parse": "^10.0.1",
     "remark-rehype": "^10.1.0",
     "remark-smartypants": "^2.0.0",
-    "shiki": "^0.11.1",
+    "shiki": "^0.14.1",
     "unified": "^10.1.2",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2"
diff --git a/packages/markdown/remark/src/remark-shiki.ts b/packages/markdown/remark/src/remark-shiki.ts
index ad7c982f9..8035635f9 100644
--- a/packages/markdown/remark/src/remark-shiki.ts
+++ b/packages/markdown/remark/src/remark-shiki.ts
@@ -10,10 +10,30 @@ import type { ShikiConfig } from './types.js';
  */
 const highlighterCacheAsync = new Map<string, Promise<shiki.Highlighter>>();
 
+// Map of old theme names to new names to preserve compatibility when we upgrade shiki
+const compatThemes: Record<string, string> = {
+	'material-darker': 'material-theme-darker',
+	'material-default': 'material-theme',
+	'material-lighter': 'material-theme-lighter',
+	'material-ocean': 'material-theme-ocean',
+	'material-palenight': 'material-theme-palenight',
+};
+
+const normalizeTheme = (theme: string | shiki.IShikiTheme) => {
+	if (typeof theme === 'string') {
+		return compatThemes[theme] || theme;
+	} else if (compatThemes[theme.name]) {
+		return { ...theme, name: compatThemes[theme.name] };
+	} else {
+		return theme;
+	}
+};
+
 const remarkShiki = async (
 	{ langs = [], theme = 'github-dark', wrap = false }: ShikiConfig,
 	scopedClassName?: string | null
 ) => {
+	theme = normalizeTheme(theme);
 	const cacheID: string = typeof theme === 'string' ? theme : theme.name;
 	let highlighterAsync = highlighterCacheAsync.get(cacheID);
 	if (!highlighterAsync) {
diff --git a/packages/telemetry/CHANGELOG.md b/packages/telemetry/CHANGELOG.md
index bfcd9e9c7..a4edcc553 100644
--- a/packages/telemetry/CHANGELOG.md
+++ b/packages/telemetry/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/telemetry
 
+## 2.1.1
+
+### Patch Changes
+
+- [#6929](https://github.com/withastro/astro/pull/6929) [`ac57b5549`](https://github.com/withastro/astro/commit/ac57b5549f828a17bdbebdaca7ace075307a3c9d) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade undici to v5.22.0
+
 ## 2.1.0
 
 ### Minor Changes
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
index 74f3fd637..63c20cba3 100644
--- a/packages/telemetry/package.json
+++ b/packages/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/telemetry",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "type": "module",
   "types": "./dist/types/index.d.ts",
   "author": "withastro",
diff --git a/packages/webapi/CHANGELOG.md b/packages/webapi/CHANGELOG.md
index b90e36fe4..bc2e5934e 100644
--- a/packages/webapi/CHANGELOG.md
+++ b/packages/webapi/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/webapi
 
+## 2.1.1
+
+### Patch Changes
+
+- [#6929](https://github.com/withastro/astro/pull/6929) [`ac57b5549`](https://github.com/withastro/astro/commit/ac57b5549f828a17bdbebdaca7ace075307a3c9d) Thanks [@bluwy](https://github.com/bluwy)! - Upgrade undici to v5.22.0
+
 ## 2.1.0
 
 ### Minor Changes
diff --git a/packages/webapi/package.json b/packages/webapi/package.json
index ef7920102..2e35c43c7 100644
--- a/packages/webapi/package.json
+++ b/packages/webapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/webapi",
   "description": "Use Web APIs in Node",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "type": "module",
   "exports": {
     ".": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 64614a659..83629c310 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -50,7 +50,7 @@ importers:
         version: 2.6.0
       eslint-plugin-prettier:
         specifier: ^4.2.1
-        version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.7)
+        version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.8)
       only-allow:
         specifier: ^1.1.1
         version: 1.1.1
@@ -58,8 +58,8 @@ importers:
         specifier: ^0.10.0
         version: 0.10.0
       prettier:
-        specifier: ^2.8.7
-        version: 2.8.7
+        specifier: ^2.8.8
+        version: 2.8.8
       prettier-plugin-astro:
         specifier: ^0.8.0
         version: 0.8.0
@@ -361,6 +361,30 @@ importers:
         specifier: ^2.3.2
         version: link:../../packages/astro
 
+  examples/middleware:
+    dependencies:
+      '@astrojs/node':
+        specifier: workspace:*
+        version: link:../../packages/integrations/node
+      astro:
+        specifier: workspace:*
+        version: link:../../packages/astro
+      concurrently:
+        specifier: ^7.2.1
+        version: 7.2.1
+      html-minifier:
+        specifier: ^4.0.0
+        version: 4.0.0
+      svelte:
+        specifier: ^3.48.0
+        version: 3.58.0
+      unocss:
+        specifier: ^0.15.6
+        version: 0.15.6
+      vite-imagetools:
+        specifier: ^4.0.4
+        version: 4.0.4
+
   examples/minimal:
     dependencies:
       astro:
@@ -529,19 +553,19 @@ importers:
   packages/astro:
     dependencies:
       '@astrojs/compiler':
-        specifier: ^1.3.1
-        version: 1.3.1
+        specifier: ^1.4.0
+        version: 1.4.0
       '@astrojs/language-server':
-        specifier: ^0.28.3
-        version: 0.28.3
+        specifier: ^1.0.0
+        version: 1.0.0
       '@astrojs/markdown-remark':
         specifier: ^2.1.4
         version: link:../markdown/remark
       '@astrojs/telemetry':
-        specifier: ^2.1.0
+        specifier: ^2.1.1
         version: link:../telemetry
       '@astrojs/webapi':
-        specifier: ^2.1.0
+        specifier: ^2.1.1
         version: link:../webapi
       '@babel/core':
         specifier: ^7.18.2
@@ -568,8 +592,8 @@ importers:
         specifier: ^21.0.0
         version: 21.0.0
       acorn:
-        specifier: ^8.8.1
-        version: 8.8.1
+        specifier: ^8.8.2
+        version: 8.8.2
       boxen:
         specifier: ^6.2.1
         version: 6.2.1
@@ -601,8 +625,8 @@ importers:
         specifier: ^1.1.0
         version: 1.1.1
       estree-walker:
-        specifier: ^3.0.1
-        version: 3.0.1
+        specifier: 3.0.0
+        version: 3.0.0
       execa:
         specifier: ^6.1.0
         version: 6.1.0
@@ -649,8 +673,8 @@ importers:
         specifier: ^1.0.1
         version: 1.0.1
       shiki:
-        specifier: ^0.11.1
-        version: 0.11.1
+        specifier: ^0.14.1
+        version: 0.14.1
       slash:
         specifier: ^4.0.0
         version: 4.0.0
@@ -748,9 +772,6 @@ importers:
       '@types/server-destroy':
         specifier: ^1.0.1
         version: 1.0.1
-      '@types/sharp':
-        specifier: ^0.31.1
-        version: 0.31.1
       '@types/unist':
         specifier: ^2.0.6
         version: 2.0.6
@@ -794,8 +815,8 @@ importers:
         specifier: ^1.52.2
         version: 1.52.2
       sharp:
-        specifier: ^0.31.3
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
       srcset-parse:
         specifier: ^1.1.0
         version: 1.1.0
@@ -2387,12 +2408,30 @@ importers:
 
   packages/astro/test/fixtures/css-assets/packages/font-awesome: {}
 
-  packages/astro/test/fixtures/css-inline:
+  packages/astro/test/fixtures/css-import-as-inline:
     dependencies:
       astro:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/css-inline-stylesheets/always:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../../..
+
+  packages/astro/test/fixtures/css-inline-stylesheets/auto:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../../..
+
+  packages/astro/test/fixtures/css-inline-stylesheets/never:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../../..
+
   packages/astro/test/fixtures/css-no-code-split:
     dependencies:
       astro:
@@ -2438,6 +2477,18 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/custom-404-html:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
+  packages/astro/test/fixtures/custom-404-injected:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/custom-404-md:
     dependencies:
       astro:
@@ -2729,7 +2780,13 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
-  packages/astro/test/fixtures/minification-html:
+  packages/astro/test/fixtures/middleware-dev:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
+  packages/astro/test/fixtures/middleware-ssg:
     dependencies:
       astro:
         specifier: workspace:*
@@ -2945,6 +3002,12 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/scoped-style-strategy:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/set-html:
     dependencies:
       astro:
@@ -3606,9 +3669,6 @@ importers:
       '@types/mime':
         specifier: ^2.0.3
         version: 2.0.3
-      '@types/sharp':
-        specifier: ^0.30.5
-        version: 0.30.5
       astro:
         specifier: workspace:*
         version: link:../../astro
@@ -3631,8 +3691,8 @@ importers:
         specifier: ^3.4.0
         version: 3.4.0
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
       vite:
         specifier: ^4.3.1
         version: 4.3.1(@types/node@18.7.21)(sass@1.52.2)
@@ -3658,8 +3718,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/basic-image:
     dependencies:
@@ -3673,8 +3733,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/basic-picture:
     dependencies:
@@ -3688,8 +3748,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/get-image-remote:
     dependencies:
@@ -3700,8 +3760,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/no-alt-text-image:
     dependencies:
@@ -3715,8 +3775,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/no-alt-text-picture:
     dependencies:
@@ -3730,8 +3790,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/rotation:
     dependencies:
@@ -3745,8 +3805,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/image/test/fixtures/squoosh-service:
     dependencies:
@@ -3775,8 +3835,8 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
       sharp:
-        specifier: ^0.31.0
-        version: 0.31.3
+        specifier: ^0.32.1
+        version: 0.32.1
 
   packages/integrations/lit:
     dependencies:
@@ -3919,8 +3979,8 @@ importers:
         version: link:../../../../../astro
     devDependencies:
       shiki:
-        specifier: ^0.11.1
-        version: 0.11.1
+        specifier: ^0.14.1
+        version: 0.14.1
 
   packages/integrations/markdoc/test/fixtures/render-with-config:
     dependencies:
@@ -3976,8 +4036,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       shiki:
-        specifier: ^0.11.1
-        version: 0.11.1
+        specifier: ^0.14.1
+        version: 0.14.1
       source-map:
         specifier: ^0.7.4
         version: 0.7.4
@@ -4038,7 +4098,7 @@ importers:
         version: 4.0.2
       rehype-pretty-code:
         specifier: ^0.4.0
-        version: 0.4.0(shiki@0.11.1)
+        version: 0.4.0(shiki@0.14.1)
       remark-math:
         specifier: ^5.1.1
         version: 5.1.1
@@ -4178,7 +4238,7 @@ importers:
   packages/integrations/netlify:
     dependencies:
       '@astrojs/webapi':
-        specifier: ^2.1.0
+        specifier: ^2.1.1
         version: link:../../webapi
       '@netlify/functions':
         specifier: ^1.0.0
@@ -4263,7 +4323,7 @@ importers:
   packages/integrations/node:
     dependencies:
       '@astrojs/webapi':
-        specifier: ^2.1.0
+        specifier: ^2.1.1
         version: link:../../webapi
       send:
         specifier: ^0.18.0
@@ -4327,6 +4387,15 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
 
+  packages/integrations/node/test/fixtures/errors:
+    dependencies:
+      '@astrojs/node':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/node/test/fixtures/node-middleware:
     dependencies:
       '@astrojs/node':
@@ -4490,6 +4559,9 @@ importers:
         specifier: ^3.17.3
         version: 3.20.6
     devDependencies:
+      '@astrojs/node':
+        specifier: workspace:*
+        version: link:../node
       astro:
         specifier: workspace:*
         version: link:../../astro
@@ -4506,6 +4578,15 @@ importers:
         specifier: 0.5.0
         version: 0.5.0
 
+  packages/integrations/sitemap/test/fixtures/ssr:
+    dependencies:
+      '@astrojs/sitemap':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/sitemap/test/fixtures/trailing-slash:
     dependencies:
       '@astrojs/sitemap':
@@ -4600,7 +4681,7 @@ importers:
   packages/integrations/vercel:
     dependencies:
       '@astrojs/webapi':
-        specifier: ^2.1.0
+        specifier: ^2.1.1
         version: link:../../webapi
       '@vercel/analytics':
         specifier: ^0.1.8
@@ -4630,10 +4711,22 @@ importers:
       chai:
         specifier: ^4.3.6
         version: 4.3.6
+      cheerio:
+        specifier: ^1.0.0-rc.11
+        version: 1.0.0-rc.11
       mocha:
         specifier: ^9.2.2
         version: 9.2.2
 
+  packages/integrations/vercel/test/fixtures/image:
+    dependencies:
+      '@astrojs/vercel':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/vercel/test/fixtures/no-output:
     dependencies:
       '@astrojs/vercel':
@@ -4878,8 +4971,8 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       shiki:
-        specifier: ^0.11.1
-        version: 0.11.1
+        specifier: ^0.14.1
+        version: 0.14.1
       unified:
         specifier: ^10.1.2
         version: 10.1.2
@@ -5314,22 +5407,20 @@ packages:
       sisteransi: 1.0.5
     dev: false
 
-  /@astrojs/compiler@0.31.4:
-    resolution: {integrity: sha512-6bBFeDTtPOn4jZaiD3p0f05MEGQL9pw2Zbfj546oFETNmjJFWO3nzHz6/m+P53calknCvyVzZ5YhoBLIvzn5iw==}
-    dev: false
+  /@astrojs/compiler@1.4.0:
+    resolution: {integrity: sha512-Vav3a32Ct+omowV9X9kDM2ghWAvFdjZkv5BdvBjZCKYbFVT6//IZApDIVbHI1UPuLuD2sKyLWx2T+E7clqUJdg==}
 
-  /@astrojs/compiler@1.3.1:
-    resolution: {integrity: sha512-xV/3r+Hrfpr4ECfJjRjeaMkJvU73KiOADowHjhkqidfNPVAWPzbqw1KePXuMK1TjzMvoAVE7E163oqfH3lDwSw==}
-
-  /@astrojs/language-server@0.28.3:
-    resolution: {integrity: sha512-fPovAX/X46eE2w03jNRMpQ7W9m2mAvNt4Ay65lD9wl1Z5vIQYxlg7Enp9qP225muTr4jSVB5QiLumFJmZMAaVA==}
+  /@astrojs/language-server@1.0.0:
+    resolution: {integrity: sha512-oEw7AwJmzjgy6HC9f5IdrphZ1GVgfV/+7xQuyf52cpTiRWd/tJISK3MsKP0cDkVlfodmNABNFnAaAWuLZEiiiA==}
     hasBin: true
     dependencies:
+      '@astrojs/compiler': 1.4.0
+      '@jridgewell/trace-mapping': 0.3.18
       '@vscode/emmet-helper': 2.8.6
       events: 3.3.0
-      prettier: 2.8.7
-      prettier-plugin-astro: 0.7.2
-      source-map: 0.7.4
+      prettier: 2.8.8
+      prettier-plugin-astro: 0.8.0
+      synckit: 0.8.5
       vscode-css-languageservice: 6.2.4
       vscode-html-languageservice: 5.0.4
       vscode-languageserver: 8.1.0
@@ -6896,7 +6987,7 @@ packages:
       fs-extra: 7.0.1
       lodash.startcase: 4.4.0
       outdent: 0.5.0
-      prettier: 2.8.7
+      prettier: 2.8.8
       resolve-from: 5.0.0
       semver: 5.7.1
     dev: true
@@ -7084,7 +7175,7 @@ packages:
       '@changesets/types': 5.2.1
       fs-extra: 7.0.1
       human-id: 1.0.2
-      prettier: 2.8.7
+      prettier: 2.8.8
     dev: true
 
   /@cloudflare/kv-asset-handler@0.2.0:
@@ -7691,7 +7782,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.5.0
       tar: 6.1.11
     transitivePeerDependencies:
       - encoding
@@ -7721,7 +7812,7 @@ packages:
       estree-util-build-jsx: 2.2.2
       estree-util-is-identifier-name: 2.1.0
       estree-util-to-js: 1.2.0
-      estree-walker: 3.0.1
+      estree-walker: 3.0.0
       hast-util-to-estree: 2.3.2
       markdown-extensions: 1.1.1
       periscopic: 3.1.0
@@ -8705,18 +8796,6 @@ packages:
       '@types/node': 18.7.21
     dev: true
 
-  /@types/sharp@0.30.5:
-    resolution: {integrity: sha512-EhO29617AIBqxoVtpd1qdBanWpspk/kD2B6qTFRJ31Q23Rdf+DNU1xlHSwtqvwq1vgOqBwq1i38SX+HGCymIQg==}
-    dependencies:
-      '@types/node': 18.7.21
-    dev: true
-
-  /@types/sharp@0.31.1:
-    resolution: {integrity: sha512-5nWwamN9ZFHXaYEincMSuza8nNfOof8nmO+mcI+Agx1uMUk4/pQnNIcix+9rLPXzKrm1pS34+6WRDbDV0Jn7ag==}
-    dependencies:
-      '@types/node': 18.7.21
-    dev: true
-
   /@types/stack-trace@0.0.29:
     resolution: {integrity: sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==}
     dev: true
@@ -8845,7 +8924,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.5.0
       tsutils: 3.21.0(typescript@5.0.2)
       typescript: 5.0.2
     transitivePeerDependencies:
@@ -8866,7 +8945,7 @@ packages:
       '@typescript-eslint/typescript-estree': 5.58.0(typescript@5.0.2)
       eslint: 8.38.0
       eslint-scope: 5.1.1
-      semver: 7.3.8
+      semver: 7.5.0
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -8925,7 +9004,7 @@ packages:
       chokidar: 3.5.3
       colorette: 2.0.19
       consola: 2.15.3
-      fast-glob: 3.2.11
+      fast-glob: 3.2.12
       pathe: 0.2.0
     dev: false
 
@@ -9017,7 +9096,7 @@ packages:
     hasBin: true
     dependencies:
       '@mapbox/node-pre-gyp': 1.0.10
-      acorn: 8.8.1
+      acorn: 8.8.2
       async-sema: 3.1.1
       bindings: 1.5.0
       estree-walker: 2.0.2
@@ -9272,12 +9351,12 @@ packages:
       acorn-walk: 7.2.0
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.8.1):
+  /acorn-jsx@5.3.2(acorn@8.8.2):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
 
   /acorn-walk@7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
@@ -9299,6 +9378,12 @@ packages:
     resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
     engines: {node: '>=0.4.0'}
     hasBin: true
+    dev: false
+
+  /acorn@8.8.2:
+    resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
 
   /agent-base@6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
@@ -9388,6 +9473,9 @@ packages:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
     engines: {node: '>=12'}
 
+  /ansi-sequence-parser@1.1.0:
+    resolution: {integrity: sha512-lEm8mt52to2fT8GhciPCGeCXACSz2UwIN4X2e2LJSnZ5uAbn2/dsYdOmUXq0AtWS5cpAupysIneExOgH0Vd2TQ==}
+
   /ansi-styles@3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
@@ -9796,7 +9884,7 @@ packages:
   /builtins@5.0.1:
     resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
     dependencies:
-      semver: 7.3.8
+      semver: 7.5.0
     dev: true
 
   /busboy@1.6.0:
@@ -9826,6 +9914,13 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /camel-case@3.0.0:
+    resolution: {integrity: sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==}
+    dependencies:
+      no-case: 2.3.2
+      upper-case: 1.1.3
+    dev: false
+
   /camelcase-css@2.0.1:
     resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
     engines: {node: '>= 6'}
@@ -9990,6 +10085,13 @@ packages:
   /ci-info@3.3.1:
     resolution: {integrity: sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==}
 
+  /clean-css@4.2.4:
+    resolution: {integrity: sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==}
+    engines: {node: '>= 4.0'}
+    dependencies:
+      source-map: 0.6.1
+    dev: false
+
   /clean-stack@4.2.0:
     resolution: {integrity: sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==}
     engines: {node: '>=12'}
@@ -11307,7 +11409,7 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: true
 
-  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.7):
+  /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.38.0)(prettier@2.8.8):
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -11320,7 +11422,7 @@ packages:
     dependencies:
       eslint: 8.38.0
       eslint-config-prettier: 8.8.0(eslint@8.38.0)
-      prettier: 2.8.7
+      prettier: 2.8.8
       prettier-linter-helpers: 1.0.0
     dev: true
 
@@ -11403,8 +11505,8 @@ packages:
     resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.8.1
-      acorn-jsx: 5.3.2(acorn@8.8.1)
+      acorn: 8.8.2
+      acorn-jsx: 5.3.2(acorn@8.8.2)
       eslint-visitor-keys: 3.4.0
     dev: true
 
@@ -11448,7 +11550,7 @@ packages:
     dependencies:
       '@types/estree-jsx': 1.0.0
       estree-util-is-identifier-name: 2.1.0
-      estree-walker: 3.0.1
+      estree-walker: 3.0.0
     dev: false
 
   /estree-util-is-identifier-name@2.1.0:
@@ -11479,8 +11581,8 @@ packages:
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
-  /estree-walker@3.0.1:
-    resolution: {integrity: sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==}
+  /estree-walker@3.0.0:
+    resolution: {integrity: sha512-s6ceX0NFiU/vKPiKvFdR83U1Zffu7upwZsGwpoqfg5rbbq1l50WQ5hCeIvM6E6oD4shUHCYMsiFPns4Jk0YfMQ==}
     dev: false
 
   /esutils@2.0.3:
@@ -12326,6 +12428,20 @@ packages:
   /html-escaper@3.0.3:
     resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==}
 
+  /html-minifier@4.0.0:
+    resolution: {integrity: sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dependencies:
+      camel-case: 3.0.0
+      clean-css: 4.2.4
+      commander: 2.20.3
+      he: 1.2.0
+      param-case: 2.1.1
+      relateurl: 0.2.7
+      uglify-js: 3.17.4
+    dev: false
+
   /html-rewriter-wasm@0.4.1:
     resolution: {integrity: sha512-lNovG8CMCCmcVB1Q7xggMSf7tqPCijZXaH4gL6iE8BFghdQCbaY5Met9i1x2Ex8m/cZHDUtXK9H6/znKamRP8Q==}
     dev: true
@@ -12853,7 +12969,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.8.1
+      acorn: 8.8.2
       acorn-globals: 6.0.0
       cssom: 0.5.0
       cssstyle: 2.3.0
@@ -13155,6 +13271,10 @@ packages:
     dependencies:
       get-func-name: 2.0.0
 
+  /lower-case@1.1.4:
+    resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==}
+    dev: false
+
   /lower-case@2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
@@ -13670,8 +13790,8 @@ packages:
   /micromark-extension-mdxjs@1.0.0:
     resolution: {integrity: sha512-TZZRZgeHvtgm+IhtgC2+uDMR7h8eTKF0QUX9YsgoL9+bADBpBY6SiLvWqnBlLbCEevITmTqmEuY3FoxMKVs1rQ==}
     dependencies:
-      acorn: 8.8.1
-      acorn-jsx: 5.3.2(acorn@8.8.1)
+      acorn: 8.8.2
+      acorn-jsx: 5.3.2(acorn@8.8.2)
       micromark-extension-mdx-expression: 1.0.4
       micromark-extension-mdx-jsx: 1.0.3
       micromark-extension-mdx-md: 1.0.0
@@ -14100,6 +14220,12 @@ packages:
       '@types/nlcst': 1.0.0
     dev: false
 
+  /no-case@2.3.2:
+    resolution: {integrity: sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==}
+    dependencies:
+      lower-case: 1.1.4
+    dev: false
+
   /no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
@@ -14111,10 +14237,14 @@ packages:
     resolution: {integrity: sha512-jAlSOFR1Bls963NmFwxeQkNTzqjUF0NThm8Le7eRIRGzFUVJuMOFZDLv5Y30W/Oaw+KEebEJLAigwO9gQHoEmw==}
     engines: {node: '>=10'}
     dependencies:
-      semver: 7.3.8
+      semver: 7.5.0
 
   /node-addon-api@5.1.0:
     resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
+    dev: false
+
+  /node-addon-api@6.1.0:
+    resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
 
   /node-domexception@1.0.0:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
@@ -14246,7 +14376,7 @@ packages:
     dependencies:
       execa: 6.1.0
       parse-package-name: 1.0.0
-      semver: 7.3.8
+      semver: 7.5.0
       validate-npm-package-name: 4.0.0
     dev: true
 
@@ -14471,6 +14601,12 @@ packages:
     resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
     dev: false
 
+  /param-case@2.1.1:
+    resolution: {integrity: sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==}
+    dependencies:
+      no-case: 2.3.2
+    dev: false
+
   /parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -14613,7 +14749,7 @@ packages:
     resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==}
     dependencies:
       '@types/estree': 1.0.0
-      estree-walker: 3.0.1
+      estree-walker: 3.0.0
       is-reference: 3.0.1
     dev: false
 
@@ -15129,28 +15265,17 @@ packages:
       fast-diff: 1.2.0
     dev: true
 
-  /prettier-plugin-astro@0.7.2:
-    resolution: {integrity: sha512-mmifnkG160BtC727gqoimoxnZT/dwr8ASxpoGGl6EHevhfblSOeu+pwH1LAm5Qu1MynizktztFujHHaijLCkww==}
-    engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'}
-    dependencies:
-      '@astrojs/compiler': 0.31.4
-      prettier: 2.8.7
-      sass-formatter: 0.7.6
-      synckit: 0.8.5
-    dev: false
-
   /prettier-plugin-astro@0.8.0:
     resolution: {integrity: sha512-kt9wk33J7HvFGwFaHb8piwy4zbUmabC8Nu+qCw493jhe96YkpjscqGBPy4nJ9TPy9pd7+kEx1zM81rp+MIdrXg==}
     engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'}
     dependencies:
-      '@astrojs/compiler': 1.3.1
-      prettier: 2.8.7
+      '@astrojs/compiler': 1.4.0
+      prettier: 2.8.8
       sass-formatter: 0.7.6
       synckit: 0.8.5
-    dev: true
 
-  /prettier@2.8.7:
-    resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==}
+  /prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
     engines: {node: '>=10.13.0'}
     hasBin: true
 
@@ -15454,14 +15579,14 @@ packages:
       unified: 10.1.2
     dev: false
 
-  /rehype-pretty-code@0.4.0(shiki@0.11.1):
+  /rehype-pretty-code@0.4.0(shiki@0.14.1):
     resolution: {integrity: sha512-Bp91nfo4blpgCXlvGP1hsG+kRFfjqBVU09o1RFcnNA62u+iIzJiJRGzpfBj4FaItq7CEQL5ASGB7vLxN5xCvyA==}
     engines: {node: ^12.16.0 || >=13.2.0}
     peerDependencies:
       shiki: '*'
     dependencies:
       parse-numeric-range: 1.3.0
-      shiki: 0.11.1
+      shiki: 0.14.1
     dev: true
 
   /rehype-raw@6.1.1:
@@ -15510,6 +15635,11 @@ packages:
     resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
     dev: false
 
+  /relateurl@0.2.7:
+    resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
+    engines: {node: '>= 0.10'}
+    dev: false
+
   /remark-code-titles@0.1.2:
     resolution: {integrity: sha512-KsHQbaI4FX8Ozxqk7YErxwmBiveUqloKuVqyPG2YPLHojpgomodWgRfG4B+bOtmn/5bfJ8khw4rR0lvgVFl2Uw==}
     dependencies:
@@ -15869,6 +15999,13 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
+  /semver@7.5.0:
+    resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+
   /send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
     engines: {node: '>= 0.8.0'}
@@ -15923,7 +16060,22 @@ packages:
       detect-libc: 2.0.1
       node-addon-api: 5.1.0
       prebuild-install: 7.1.1
-      semver: 7.3.8
+      semver: 7.5.0
+      simple-get: 4.0.1
+      tar-fs: 2.1.1
+      tunnel-agent: 0.6.0
+    dev: false
+
+  /sharp@0.32.1:
+    resolution: {integrity: sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==}
+    engines: {node: '>=14.15.0'}
+    requiresBuild: true
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.1
+      node-addon-api: 6.1.0
+      prebuild-install: 7.1.1
+      semver: 7.5.0
       simple-get: 4.0.1
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
@@ -15972,12 +16124,13 @@ packages:
       vscode-textmate: 5.2.0
     dev: true
 
-  /shiki@0.11.1:
-    resolution: {integrity: sha512-EugY9VASFuDqOexOgXR18ZV+TbFrQHeCpEYaXamO+SZlsnT/2LxuLBX25GGtIrwaEVFXUAbUQ601SWE2rMwWHA==}
+  /shiki@0.14.1:
+    resolution: {integrity: sha512-+Jz4nBkCBe0mEDqo1eKRcCdjRtrCjozmcbTUjbPTX7OOJfEbTZzlUWlZtGe3Gb5oV1/jnojhG//YZc3rs9zSEw==}
     dependencies:
+      ansi-sequence-parser: 1.1.0
       jsonc-parser: 3.2.0
       vscode-oniguruma: 1.7.0
-      vscode-textmate: 6.0.0
+      vscode-textmate: 8.0.0
 
   /side-channel@1.0.4:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
@@ -16549,7 +16702,7 @@ packages:
     hasBin: true
     dependencies:
       '@jridgewell/source-map': 0.3.3
-      acorn: 8.8.1
+      acorn: 8.8.2
       commander: 2.20.3
       source-map-support: 0.5.21
     dev: false
@@ -16873,6 +17026,12 @@ packages:
     engines: {node: '>=12.20'}
     hasBin: true
 
+  /uglify-js@3.17.4:
+    resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
+    engines: {node: '>=0.8.0'}
+    hasBin: true
+    dev: false
+
   /uhyphen@0.1.0:
     resolution: {integrity: sha512-o0QVGuFg24FK765Qdd5kk0zU/U4dEsCtN/GSiwNI9i8xsSVtjIAOdTaVhLwZ1nrbWxFVMxNDDl+9fednsOMsBw==}
     dev: true
@@ -17112,6 +17271,10 @@ packages:
       escalade: 3.1.1
       picocolors: 1.0.0
 
+  /upper-case@1.1.3:
+    resolution: {integrity: sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==}
+    dev: false
+
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
@@ -17344,7 +17507,7 @@ packages:
     engines: {node: '>=6.0'}
     hasBin: true
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
       acorn-walk: 8.2.0
     dev: true
 
@@ -17400,8 +17563,8 @@ packages:
     resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==}
     dev: true
 
-  /vscode-textmate@6.0.0:
-    resolution: {integrity: sha512-gu73tuZfJgu+mvCSy4UZwd2JXykjK9zAZsfmDeut5dx/1a7FeTk0XwJsSuqQn+cuMCGVbIBfl+s53X4T19DnzQ==}
+  /vscode-textmate@8.0.0:
+    resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==}
 
   /vscode-uri@2.1.2:
     resolution: {integrity: sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==}