diff --git a/.changeset/big-elephants-drive.md b/.changeset/big-elephants-drive.md
new file mode 100644
index 000000000000..2d760f715ee2
--- /dev/null
+++ b/.changeset/big-elephants-drive.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': patch
+---
+
+Filter unknown `class` prop warnings
diff --git a/.changeset/brown-wolves-tan.md b/.changeset/brown-wolves-tan.md
new file mode 100644
index 000000000000..4f11f4534c89
--- /dev/null
+++ b/.changeset/brown-wolves-tan.md
@@ -0,0 +1,5 @@
+---
+'create-astro': patch
+---
+
+Update 'dev' command for Bun users
diff --git a/.changeset/clever-bats-breathe.md b/.changeset/clever-bats-breathe.md
new file mode 100644
index 000000000000..2c1a6dc39f9b
--- /dev/null
+++ b/.changeset/clever-bats-breathe.md
@@ -0,0 +1,13 @@
+---
+'astro': major
+---
+
+This import alias is no longer included by default with astro:assets. If you were using this alias with experimental assets, you must convert them to relative file paths, or create your own [import aliases](https://docs.astro.build/en/guides/aliases/).
+
+```diff
+---
+// src/pages/posts/post-1.astro
+- import rocket from '~/assets/rocket.png'
++ import rocket from '../../assets/rocket.png';
+---
+```
diff --git a/.changeset/eleven-wasps-teach.md b/.changeset/eleven-wasps-teach.md
new file mode 100644
index 000000000000..3a0993f49e22
--- /dev/null
+++ b/.changeset/eleven-wasps-teach.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Ensure dotfiles are cleaned during static builds
diff --git a/.changeset/green-islands-repeat.md b/.changeset/green-islands-repeat.md
deleted file mode 100644
index 9894fde96324..000000000000
--- a/.changeset/green-islands-repeat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix AstroConfigSchema type export
diff --git a/.changeset/itchy-pants-grin.md b/.changeset/itchy-pants-grin.md
new file mode 100644
index 000000000000..2ab292f27d30
--- /dev/null
+++ b/.changeset/itchy-pants-grin.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Update image support to work with latest version of Astro
diff --git a/.changeset/lazy-pillows-burn.md b/.changeset/lazy-pillows-burn.md
deleted file mode 100644
index 009955c7eef7..000000000000
--- a/.changeset/lazy-pillows-burn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/sitemap': patch
----
-
-docs: fix github search link in README.md
diff --git a/.changeset/many-actors-flash.md b/.changeset/many-actors-flash.md
new file mode 100644
index 000000000000..92f70c55a024
--- /dev/null
+++ b/.changeset/many-actors-flash.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fix a handful of edge cases with prerendered 404/500 pages
diff --git a/.changeset/moody-houses-drum.md b/.changeset/moody-houses-drum.md
deleted file mode 100644
index 1dfaefba21dd..000000000000
--- a/.changeset/moody-houses-drum.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-astro': minor
----
-
-Reduce dependency installation size, swap `execa` for light `node:child_process` wrapper
diff --git a/.changeset/neat-mugs-end.md b/.changeset/neat-mugs-end.md
new file mode 100644
index 000000000000..dd65708a73ac
--- /dev/null
+++ b/.changeset/neat-mugs-end.md
@@ -0,0 +1,8 @@
+---
+'astro': minor
+---
+
+
+`astro:`namespace aliases for middleware and components
+
+This adds aliases of `astro:middleware` and `astro:components` for the middleware and components modules. This is to make our documentation consistent between are various modules, where some are virtual modules and others are not. Going forward new built-in modules will use this namespace.
diff --git a/.changeset/odd-plants-tie.md b/.changeset/odd-plants-tie.md
deleted file mode 100644
index b57376dee7bb..000000000000
--- a/.changeset/odd-plants-tie.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Add support for non-awaited imports to the Image component and `getImage`
diff --git a/.changeset/olive-queens-drum.md b/.changeset/olive-queens-drum.md
deleted file mode 100644
index 258d9c726367..000000000000
--- a/.changeset/olive-queens-drum.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Add second type argument to the AstroGlobal type to type Astro.self. This change will ultimately allow our editor tooling to provide props completions and intellisense for `<Astro.self />`
diff --git a/.changeset/orange-foxes-care.md b/.changeset/orange-foxes-care.md
new file mode 100644
index 000000000000..2136a95a935e
--- /dev/null
+++ b/.changeset/orange-foxes-care.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/solid-js': patch
+---
+
+Update `babel-preset-solid` dependency to `^1.7.7`
diff --git a/.changeset/popular-planes-cover.md b/.changeset/popular-planes-cover.md
new file mode 100644
index 000000000000..c379a7edc030
--- /dev/null
+++ b/.changeset/popular-planes-cover.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+ViewTransition: bug fix for lost scroll position in browser history
diff --git a/.changeset/silent-baboons-juggle.md b/.changeset/silent-baboons-juggle.md
new file mode 100644
index 000000000000..bd57c6a8a114
--- /dev/null
+++ b/.changeset/silent-baboons-juggle.md
@@ -0,0 +1,5 @@
+---
+'create-astro': patch
+---
+
+Verify internet connection and that `--template` exists before continuing
diff --git a/.changeset/soft-colts-heal.md b/.changeset/soft-colts-heal.md
deleted file mode 100644
index 4ceaf2a9bf72..000000000000
--- a/.changeset/soft-colts-heal.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-`astro add` now passes down `--save-prod`, `--save-dev`, `--save-exact`, and `--no-save` flags for installation
diff --git a/.changeset/sour-frogs-shout.md b/.changeset/sour-frogs-shout.md
new file mode 100644
index 000000000000..9006914f1061
--- /dev/null
+++ b/.changeset/sour-frogs-shout.md
@@ -0,0 +1,27 @@
+---
+'astro': patch
+---
+
+Added support for optimizing remote images from authorized sources when using `astro:assets`. This comes with two new parameters to specify which domains (`image.domains`) and host patterns (`image.remotePatterns`) are authorized for remote images.
+
+For example, the following configuration will only allow remote images from `astro.build` to be optimized:
+
+```ts
+// astro.config.mjs
+export default defineConfig({
+  image: {
+    domains: ["astro.build"],
+  }
+});
+```
+
+The following configuration will only allow remote images from HTTPS hosts:
+
+```ts
+// astro.config.mjs
+export default defineConfig({
+  image: {
+    remotePatterns: [{ protocol: "https" }],
+  }
+});
+```
diff --git a/.changeset/thin-plums-drop.md b/.changeset/thin-plums-drop.md
deleted file mode 100644
index ab3fb875aa95..000000000000
--- a/.changeset/thin-plums-drop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/react': patch
----
-
-fix a bug where react identifierPrefix was set to null for client:only components causing React.useId to generate ids prefixed with null
diff --git a/.changeset/yellow-snakes-jam.md b/.changeset/yellow-snakes-jam.md
new file mode 100644
index 000000000000..87c4d1da70b8
--- /dev/null
+++ b/.changeset/yellow-snakes-jam.md
@@ -0,0 +1,21 @@
+---
+'@astrojs/react': minor
+---
+
+Optionally parse React slots as React children.
+
+This adds a new configuration option for the React integration `experimentalReactChildren`:
+
+```js
+export default {
+  integrations: [
+    react({
+      experimentalReactChildren: true,
+    })
+  ]
+}
+```
+
+With this enabled, children passed to React from Astro components via the default slot are parsed as React components.
+
+This enables better compatibility with certain React components which manipulate their children.
diff --git a/README.md b/README.md
index 7ce0d2f8236a..2cc46177a367 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ Astro is generously supported by Netlify, Storyblok, and several other amazing o
 
 [![Astro's sponsors.](https://astro.build/sponsors.png "Astro's sponsors.
 Platinum sponsors: Netlify, storyblok, Vercel, Ship Shape, Google Chrome
-Gold sponsors: ‹div›RIOTS, DEEPGRAM, CloudCannon
+Gold sponsors: ‹div›RIOTS, DEEPGRAM, Transloadit, CloudCannon
 Sponsors: Monogram, Qoddi, Dimension")](https://github.com/sponsors/withastro)
 
   </a>
diff --git a/examples/middleware/src/middleware.ts b/examples/middleware/src/middleware.ts
index 9871e9d01e0b..eb764453545c 100644
--- a/examples/middleware/src/middleware.ts
+++ b/examples/middleware/src/middleware.ts
@@ -1,4 +1,4 @@
-import { defineMiddleware, sequence } from 'astro/middleware';
+import { defineMiddleware, sequence } from 'astro:middleware';
 import htmlMinifier from 'html-minifier';
 
 const limit = 50;
diff --git a/examples/portfolio/src/components/Nav.astro b/examples/portfolio/src/components/Nav.astro
index 680b00c0b8ba..2e9717884888 100644
--- a/examples/portfolio/src/components/Nav.astro
+++ b/examples/portfolio/src/components/Nav.astro
@@ -36,7 +36,45 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 			</template>
 		</menu-button>
 	</div>
-	<div id="menu-content">
+	<noscript class="menu-noscript">
+		<ul class="nav-items">
+			{
+				textLinks.map(({ label, href }) => (
+					<li>
+						<a
+							aria-current={Astro.url.pathname === href}
+							class:list={[
+								'link',
+								{
+									active:
+										Astro.url.pathname === href ||
+										(href !== '/' && Astro.url.pathname.startsWith(href)),
+								},
+							]}
+							href={href}
+						>
+							{label}
+						</a>
+					</li>
+				))
+			}
+		</ul>
+	</noscript>
+	<noscript style="display: contents;">
+		<div class="menu-footer">
+			<div class="socials">
+				{
+					iconLinks.map(({ href, icon, label }) => (
+						<a href={href} class="social">
+							<span class="sr-only">{label}</span>
+							<Icon icon={icon} />
+						</a>
+					))
+				}
+			</div>
+		</div>
+	</noscript>
+	<div id="menu-content" hidden>
 		<ul class="nav-items">
 			{
 				textLinks.map(({ label, href }) => (
@@ -90,6 +128,8 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 			// Hide menu (shown by default to support no-JS browsers).
 			const menu = document.getElementById('menu-content')!;
 			menu.hidden = true;
+			// Add "menu-content" class in JS to avoid covering content in non-JS browsers.
+			menu.classList.add('menu-content');
 
 			/** Set whether the menu is currently expanded or collapsed. */
 			const setExpanded = (expand: boolean) => {
@@ -169,7 +209,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 		z-index: -1;
 	}
 
-	#menu-content {
+	.menu-content {
 		position: absolute;
 		left: 0;
 		right: 0;
@@ -254,7 +294,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 			font-size: var(--text-lg);
 		}
 
-		#menu-content {
+		.menu-content {
 			display: contents;
 		}
 
diff --git a/examples/with-markdoc/src/pages/index.astro b/examples/with-markdoc/src/pages/index.astro
index d7b41e50f4f9..04cef4cad4ff 100644
--- a/examples/with-markdoc/src/pages/index.astro
+++ b/examples/with-markdoc/src/pages/index.astro
@@ -1,8 +1,8 @@
 ---
-import { getEntryBySlug } from 'astro:content';
+import { getEntry } from 'astro:content';
 import Layout from '../layouts/Layout.astro';
 
-const intro = await getEntryBySlug('docs', 'intro');
+const intro = await getEntry('docs', 'intro');
 const { Content } = await intro.render();
 ---
 
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index a551fa323b57..e026a0eeda16 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -327,6 +327,28 @@
   - @astrojs/internal-helpers@0.2.0-beta.0
   - @astrojs/markdown-remark@3.0.0-beta.0
 
+## 2.10.9
+
+### Patch Changes
+
+- [#8091](https://github.com/withastro/astro/pull/8091) [`56e7c5177`](https://github.com/withastro/astro/commit/56e7c5177bd61b404978dc9b82e2d34d76a4b2f9) Thanks [@martrapp](https://github.com/martrapp)! - Handle `<noscript>` tags in `<head>` during ViewTransitions
+
+## 2.10.8
+
+### Patch Changes
+
+- [#7702](https://github.com/withastro/astro/pull/7702) [`c19987df0`](https://github.com/withastro/astro/commit/c19987df0be3520cf774476cea270c03edd08354) Thanks [@shishkin](https://github.com/shishkin)! - Fix AstroConfigSchema type export
+
+- [#8084](https://github.com/withastro/astro/pull/8084) [`560e45924`](https://github.com/withastro/astro/commit/560e45924622141206ff5b47d134cb343d6d2a71) Thanks [@hbgl](https://github.com/hbgl)! - Stream request body instead of buffering it in memory.
+
+- [#8066](https://github.com/withastro/astro/pull/8066) [`afc45af20`](https://github.com/withastro/astro/commit/afc45af2022f7c43fbb6c5c04983695f3819e47e) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add support for non-awaited imports to the Image component and `getImage`
+
+- [#7866](https://github.com/withastro/astro/pull/7866) [`d1f7143f9`](https://github.com/withastro/astro/commit/d1f7143f9caf2ffa0e87cc55c0e05339d3501db3) Thanks [@43081j](https://github.com/43081j)! - Add second type argument to the AstroGlobal type to type Astro.self. This change will ultimately allow our editor tooling to provide props completions and intellisense for `<Astro.self />`
+
+- [#8032](https://github.com/withastro/astro/pull/8032) [`3e46634fd`](https://github.com/withastro/astro/commit/3e46634fd540e5b967d2e5c9abd6235452cee2f2) Thanks [@natemoo-re](https://github.com/natemoo-re)! - `astro add` now passes down `--save-prod`, `--save-dev`, `--save-exact`, and `--no-save` flags for installation
+
+- [#8035](https://github.com/withastro/astro/pull/8035) [`a12027b6a`](https://github.com/withastro/astro/commit/a12027b6af411be39700919ca47e240a335e9887) Thanks [@fyndor](https://github.com/fyndor)! - Removed extra double quotes from computed style in shiki code component
+
 ## 2.10.7
 
 ### Patch Changes
diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts
index 7f701b0c0507..e6389d41555e 100644
--- a/packages/astro/client.d.ts
+++ b/packages/astro/client.d.ts
@@ -119,6 +119,14 @@ declare module 'astro:transitions' {
 	export const ViewTransitions: ViewTransitionsModule['default'];
 }
 
+declare module 'astro:middleware' {
+	export * from 'astro/middleware/namespace';
+}
+
+declare module 'astro:components' {
+	export * from 'astro/components';
+}
+
 type MD = import('./dist/@types/astro').MarkdownInstance<Record<string, any>>;
 interface ExportedMarkdownModuleEntities {
 	frontmatter: MD['frontmatter'];
diff --git a/packages/astro/components/Code.astro b/packages/astro/components/Code.astro
index a990e877a470..ee7a84a09a44 100644
--- a/packages/astro/components/Code.astro
+++ b/packages/astro/components/Code.astro
@@ -74,9 +74,9 @@ const html = renderToHtml(tokens, {
 			// Handle code wrapping
 			// if wrap=null, do nothing.
 			if (wrap === false) {
-				style += '; overflow-x: auto;"';
+				style += '; overflow-x: auto;';
 			} else if (wrap === true) {
-				style += '; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"';
+				style += '; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
 			}
 			return `<${tag} class="${className}" style="${style}" tabindex="0">${children}</${tag}>`;
 		},
diff --git a/packages/astro/components/ViewTransitions.astro b/packages/astro/components/ViewTransitions.astro
index 05fc57aa6e81..47eb3c112765 100644
--- a/packages/astro/components/ViewTransitions.astro
+++ b/packages/astro/components/ViewTransitions.astro
@@ -38,12 +38,21 @@ const { fallback = 'animate' } = Astro.props as Props;
 
 	const throttle = (cb: (...args: any[]) => any, delay: number) => {
 		let wait = false;
+		// During the waiting time additional events are lost.
+		// So repeat the callback at the end if we have swallowed events.
+		let onceMore = false;
 		return (...args: any[]) => {
-			if (wait) return;
-
+			if (wait) {
+				onceMore = true;
+				return;
+			}
 			cb(...args);
 			wait = true;
 			setTimeout(() => {
+				if (onceMore) {
+					onceMore = false;
+					cb(...args);
+				}
 				wait = false;
 			}, delay);
 		};
@@ -125,6 +134,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 		};
 
 		const swap = () => {
+			// noscript tags inside head element are not honored on swap (#7969).
+			// Remove them before swapping.
+			doc.querySelectorAll('head noscript').forEach((el) => el.remove());
+
 			// Swap head
 			for (const el of Array.from(document.head.children)) {
 				const newEl = persistedHeadElement(el);
@@ -159,6 +172,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 			}
 			if (state?.scrollY != null) {
 				scrollTo(0, state.scrollY);
+				// Overwrite erroneous updates by the scroll handler during transition
+				persistState(state);
 			}
 
 			triggerEvent('astro:beforeload');
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 7739b7ee4a25..76e67fb92289 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -23,6 +23,9 @@
       ],
       "middleware": [
         "./dist/core/middleware/index.d.ts"
+      ],
+      "middleware/namespace": [
+        "./dist/core/middleware/namespace.d.ts"
       ]
     }
   },
@@ -70,6 +73,10 @@
       "types": "./dist/core/middleware/index.d.ts",
       "default": "./dist/core/middleware/index.js"
     },
+    "./middleware/namespace": {
+      "types": "./dist/core/middleware/namespace.d.ts",
+      "default": "./dist/core/middleware/namespace.js"
+    },
     "./transitions": "./dist/transitions/index.js"
   },
   "imports": {
@@ -139,6 +146,7 @@
     "fast-glob": "^3.2.12",
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
+    "http-cache-semantics": "^4.1.1",
     "html-escaper": "^3.0.3",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.4",
@@ -180,6 +188,7 @@
     "@types/estree": "^0.0.51",
     "@types/hast": "^2.3.4",
     "@types/html-escaper": "^3.0.0",
+    "@types/http-cache-semantics": "^4.0.1",
     "@types/js-yaml": "^4.0.5",
     "@types/mime": "^2.0.3",
     "@types/mocha": "^9.1.1",
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index e2b3e6d63f7f..0449b89d47ad 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -13,6 +13,7 @@ import type { AddressInfo } from 'node:net';
 import type * as rollup from 'rollup';
 import type { TsConfigJson } from 'tsconfig-resolver';
 import type * as vite from 'vite';
+import type { RemotePattern } from '../assets/utils/remotePattern';
 import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import type { AstroConfigType } from '../core/config';
@@ -45,6 +46,7 @@ export type {
 	ImageQualityPreset,
 	ImageTransform,
 } from '../assets/types';
+export type { RemotePattern } from '../assets/utils/remotePattern';
 export type { SSRManifest } from '../core/app/types';
 export type { AstroCookies } from '../core/cookies';
 
@@ -367,10 +369,10 @@ export interface ViteUserConfig extends vite.UserConfig {
 	ssr?: vite.SSROptions;
 }
 
-export interface ImageServiceConfig {
+export interface ImageServiceConfig<T extends Record<string, any> = Record<string, any>> {
 	// eslint-disable-next-line @typescript-eslint/ban-types
 	entrypoint: 'astro/assets/services/sharp' | 'astro/assets/services/squoosh' | (string & {});
-	config?: Record<string, any>;
+	config?: T;
 }
 
 /**
@@ -697,6 +699,10 @@ export interface AstroUserConfig {
 		 * - `file` - The `Astro.url.pathname` will include `.html`; ie `/foo.html`.
 		 *
 		 * This means that when you create relative URLs using `new URL('./relative', Astro.url)`, you will get consistent behavior between dev and build.
+		 *
+		 * To prevent inconsistencies with trailing slash behaviour in dev, you can restrict the [`trailingSlash` option](#trailingslash) to `'always'` or `'never'` depending on your build format:
+		 * - `directory` - Set `trailingSlash: 'always'`
+		 * - `file` - Set `trailingSlash: 'never'`
 		 */
 		format?: 'file' | 'directory';
 		/**
@@ -833,10 +839,10 @@ export interface AstroUserConfig {
 		 * @default `never`
 		 * @version 2.6.0
 		 * @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
+		 * Control whether project styles are sent to the browser in a separate css file or inlined into `<style>` tags. Choose from the following options:
+		 *  - `'always'` - project styles are inlined into `<style>` tags
+		 *  - `'auto'` - only stylesheets smaller than `ViteConfig.build.assetsInlineLimit` (default: 4kb) are inlined. Otherwise, project styles are sent in external stylesheets.
+		 *  - `'never'` - project styles are sent in external stylesheets
 		 *
 		 * ```js
 		 * {
@@ -1004,6 +1010,68 @@ export interface AstroUserConfig {
 		 * ```
 		 */
 		service: ImageServiceConfig;
+
+		/**
+		 * @docs
+		 * @name image.domains (Experimental)
+		 * @type {string[]}
+		 * @default `{domains: []}`
+		 * @version 2.10.10
+		 * @description
+		 * Defines a list of permitted image source domains for local image optimization. No other remote images will be optimized by Astro.
+		 *
+		 * This option requires an array of individual domain names as strings. Wildcards are not permitted. Instead, use [`image.remotePatterns`](#imageremotepatterns-experimental) to define a list of allowed source URL patterns.
+		 *
+		 * ```js
+		 * // astro.config.mjs
+		 * {
+		 *   image: {
+		 *     // Example: Allow remote image optimization from a single domain
+		 *     domains: ['astro.build'],
+		 *   },
+		 * }
+		 * ```
+		 */
+		domains?: string[];
+
+		/**
+		 * @docs
+		 * @name image.remotePatterns (Experimental)
+		 * @type {RemotePattern[]}
+		 * @default `{remotePatterns: []}`
+		 * @version 2.10.10
+		 * @description
+		 * Defines a list of permitted image source URL patterns for local image optimization.
+		 *
+		 * `remotePatterns` can be configured with four properties:
+		 * 1. protocol
+		 * 2. hostname
+		 * 3. port
+		 * 4. pathname
+		 *
+		 * ```js
+		 * {
+		 *   image: {
+		 *     // Example: allow processing all images from your aws s3 bucket
+		 *     remotePatterns: [{
+		 *       protocol: 'https',
+		 *       hostname: '**.amazonaws.com',
+		 *     }],
+		 *   },
+		 * }
+		 * ```
+		 *
+		 * You can use wildcards to define the permitted `hostname` and `pathname` values as described below. Otherwise, only the exact values provided will be configured:
+		 * `hostname`:
+		 *   - Start with '**.' to allow all subdomains ('endsWith').
+		 *   - Start with '*.' to allow only one level of subdomain.
+		 *
+		 * `pathname`:
+		 *   - End with '/**' to allow all sub-routes ('startsWith').
+		 *   - End with '/*' to allow only one level of sub-route.
+
+		 */
+		remotePatterns?: Partial<RemotePattern>[];
 	};
 
 	/**
@@ -1852,7 +1920,7 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
 	 *
 	 * ```ts
 	 * // src/middleware.ts
-	 * import {defineMiddleware} from "astro/middleware";
+	 * import {defineMiddleware} from "astro:middleware";
 	 *
 	 * export const onRequest = defineMiddleware((context, next) => {
 	 *   context.locals.greeting = "Hello!";
diff --git a/packages/astro/src/assets/build/generate.ts b/packages/astro/src/assets/build/generate.ts
new file mode 100644
index 000000000000..b78800a4382a
--- /dev/null
+++ b/packages/astro/src/assets/build/generate.ts
@@ -0,0 +1,174 @@
+import fs, { readFileSync } from 'node:fs';
+import { basename, join } from 'node:path/posix';
+import type { StaticBuildOptions } from '../../core/build/types.js';
+import { warn } from '../../core/logger/core.js';
+import { prependForwardSlash } from '../../core/path.js';
+import { isServerLikeOutput } from '../../prerender/utils.js';
+import { getConfiguredImageService, isESMImportedImage } from '../internal.js';
+import type { LocalImageService } from '../services/service.js';
+import type { ImageMetadata, ImageTransform } from '../types.js';
+import { loadRemoteImage, type RemoteCacheEntry } from './remote.js';
+
+interface GenerationDataUncached {
+	cached: false;
+	weight: {
+		before: number;
+		after: number;
+	};
+}
+
+interface GenerationDataCached {
+	cached: true;
+}
+
+type GenerationData = GenerationDataUncached | GenerationDataCached;
+
+export async function generateImage(
+	buildOpts: StaticBuildOptions,
+	options: ImageTransform,
+	filepath: string
+): Promise<GenerationData | undefined> {
+	let useCache = true;
+	const assetsCacheDir = new URL('assets/', buildOpts.settings.config.cacheDir);
+
+	// Ensure that the cache directory exists
+	try {
+		await fs.promises.mkdir(assetsCacheDir, { recursive: true });
+	} catch (err) {
+		warn(
+			buildOpts.logging,
+			'astro:assets',
+			`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${err}`
+		);
+		useCache = false;
+	}
+
+	let serverRoot: URL, clientRoot: URL;
+	if (isServerLikeOutput(buildOpts.settings.config)) {
+		serverRoot = buildOpts.settings.config.build.server;
+		clientRoot = buildOpts.settings.config.build.client;
+	} else {
+		serverRoot = buildOpts.settings.config.outDir;
+		clientRoot = buildOpts.settings.config.outDir;
+	}
+
+	const isLocalImage = isESMImportedImage(options.src);
+
+	const finalFileURL = new URL('.' + filepath, clientRoot);
+	const finalFolderURL = new URL('./', finalFileURL);
+
+	// For remote images, instead of saving the image directly, we save a JSON file with the image data and expiration date from the server
+	const cacheFile = basename(filepath) + (isLocalImage ? '' : '.json');
+	const cachedFileURL = new URL(cacheFile, assetsCacheDir);
+
+	await fs.promises.mkdir(finalFolderURL, { recursive: true });
+
+	// Check if we have a cached entry first
+	try {
+		if (isLocalImage) {
+			await fs.promises.copyFile(cachedFileURL, finalFileURL);
+
+			return {
+				cached: true,
+			};
+		} else {
+			const JSONData = JSON.parse(readFileSync(cachedFileURL, 'utf-8')) as RemoteCacheEntry;
+
+			// If the cache entry is not expired, use it
+			if (JSONData.expires < Date.now()) {
+				await fs.promises.writeFile(finalFileURL, Buffer.from(JSONData.data, 'base64'));
+
+				return {
+					cached: true,
+				};
+			}
+		}
+	} catch (e: any) {
+		if (e.code !== 'ENOENT') {
+			throw new Error(`An error was encountered while reading the cache file. Error: ${e}`);
+		}
+		// If the cache file doesn't exist, just move on, and we'll generate it
+	}
+
+	// The original filepath or URL from the image transform
+	const originalImagePath = isLocalImage
+		? (options.src as ImageMetadata).src
+		: (options.src as string);
+
+	let imageData;
+	let resultData: { data: Buffer | undefined; expires: number | undefined } = {
+		data: undefined,
+		expires: undefined,
+	};
+
+	// If the image is local, we can just read it directly, otherwise we need to download it
+	if (isLocalImage) {
+		imageData = await fs.promises.readFile(
+			new URL(
+				'.' +
+					prependForwardSlash(
+						join(buildOpts.settings.config.build.assets, basename(originalImagePath))
+					),
+				serverRoot
+			)
+		);
+	} else {
+		const remoteImage = await loadRemoteImage(originalImagePath);
+		resultData.expires = remoteImage.expires;
+		imageData = remoteImage.data;
+	}
+
+	const imageService = (await getConfiguredImageService()) as LocalImageService;
+	resultData.data = (
+		await imageService.transform(
+			imageData,
+			{ ...options, src: originalImagePath },
+			buildOpts.settings.config.image
+		)
+	).data;
+
+	try {
+		// Write the cache entry
+		if (useCache) {
+			if (isLocalImage) {
+				await fs.promises.writeFile(cachedFileURL, resultData.data);
+			} else {
+				await fs.promises.writeFile(
+					cachedFileURL,
+					JSON.stringify({
+						data: Buffer.from(resultData.data).toString('base64'),
+						expires: resultData.expires,
+					})
+				);
+			}
+		}
+	} catch (e) {
+		warn(
+			buildOpts.logging,
+			'astro:assets',
+			`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${e}`
+		);
+	} finally {
+		// Write the final file
+		await fs.promises.writeFile(finalFileURL, resultData.data);
+	}
+
+	return {
+		cached: false,
+		weight: {
+			// Divide by 1024 to get size in kilobytes
+			before: Math.trunc(imageData.byteLength / 1024),
+			after: Math.trunc(Buffer.from(resultData.data).byteLength / 1024),
+		},
+	};
+}
+
+export function getStaticImageList(): Iterable<
+	[string, { path: string; options: ImageTransform }]
+> {
+	if (!globalThis?.astroAsset?.staticImages) {
+		return [];
+	}
+
+	return globalThis.astroAsset.staticImages?.entries();
+}
diff --git a/packages/astro/src/assets/build/remote.ts b/packages/astro/src/assets/build/remote.ts
new file mode 100644
index 000000000000..c3d4bb9bae32
--- /dev/null
+++ b/packages/astro/src/assets/build/remote.ts
@@ -0,0 +1,48 @@
+import CachePolicy from 'http-cache-semantics';
+
+export type RemoteCacheEntry = { data: string; expires: number };
+
+export async function loadRemoteImage(src: string) {
+	const req = new Request(src);
+	const res = await fetch(req);
+
+	if (!res.ok) {
+		throw new Error(
+			`Failed to load remote image ${src}. The request did not return a 200 OK response. (received ${res.status}))`
+		);
+	}
+
+	// calculate an expiration date based on the response's TTL
+	const policy = new CachePolicy(webToCachePolicyRequest(req), webToCachePolicyResponse(res));
+	const expires = policy.storable() ? policy.timeToLive() : 0;
+
+	return {
+		data: Buffer.from(await res.arrayBuffer()),
+		expires: Date.now() + expires,
+	};
+}
+
+function webToCachePolicyRequest({ url, method, headers: _headers }: Request): CachePolicy.Request {
+	let headers: CachePolicy.Headers = {};
+	// Be defensive here due to a cookie header bug in node@18.14.1 + undici
+	try {
+		headers = Object.fromEntries(_headers.entries());
+	} catch {}
+	return {
+		method,
+		url,
+		headers,
+	};
+}
+
+function webToCachePolicyResponse({ status, headers: _headers }: Response): CachePolicy.Response {
+	let headers: CachePolicy.Headers = {};
+	// Be defensive here due to a cookie header bug in node@18.14.1 + undici
+	try {
+		headers = Object.fromEntries(_headers.entries());
+	} catch {}
+	return {
+		status,
+		headers,
+	};
+}
diff --git a/packages/astro/src/assets/generate.ts b/packages/astro/src/assets/generate.ts
deleted file mode 100644
index 04488ed8fe71..000000000000
--- a/packages/astro/src/assets/generate.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import fs from 'node:fs';
-import { basename, join } from 'node:path/posix';
-import type { StaticBuildOptions } from '../core/build/types.js';
-import { warn } from '../core/logger/core.js';
-import { prependForwardSlash } from '../core/path.js';
-import { isServerLikeOutput } from '../prerender/utils.js';
-import { getConfiguredImageService, isESMImportedImage } from './internal.js';
-import type { LocalImageService } from './services/service.js';
-import type { ImageTransform } from './types.js';
-
-interface GenerationDataUncached {
-	cached: false;
-	weight: {
-		before: number;
-		after: number;
-	};
-}
-
-interface GenerationDataCached {
-	cached: true;
-}
-
-type GenerationData = GenerationDataUncached | GenerationDataCached;
-
-export async function generateImage(
-	buildOpts: StaticBuildOptions,
-	options: ImageTransform,
-	filepath: string
-): Promise<GenerationData | undefined> {
-	if (typeof buildOpts.settings.config.image === 'undefined') {
-		throw new Error(
-			"Astro hasn't set a default service for `astro:assets`. This is an internal error and you should report it."
-		);
-	}
-	if (!isESMImportedImage(options.src)) {
-		return undefined;
-	}
-
-	let useCache = true;
-	const assetsCacheDir = new URL('assets/', buildOpts.settings.config.cacheDir);
-
-	// Ensure that the cache directory exists
-	try {
-		await fs.promises.mkdir(assetsCacheDir, { recursive: true });
-	} catch (err) {
-		warn(
-			buildOpts.logging,
-			'astro:assets',
-			`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${err}`
-		);
-		useCache = false;
-	}
-
-	let serverRoot: URL, clientRoot: URL;
-	if (isServerLikeOutput(buildOpts.settings.config)) {
-		serverRoot = buildOpts.settings.config.build.server;
-		clientRoot = buildOpts.settings.config.build.client;
-	} else {
-		serverRoot = buildOpts.settings.config.outDir;
-		clientRoot = buildOpts.settings.config.outDir;
-	}
-
-	const finalFileURL = new URL('.' + filepath, clientRoot);
-	const finalFolderURL = new URL('./', finalFileURL);
-	const cachedFileURL = new URL(basename(filepath), assetsCacheDir);
-
-	try {
-		await fs.promises.copyFile(cachedFileURL, finalFileURL);
-
-		return {
-			cached: true,
-		};
-	} catch (e) {
-		// no-op
-	}
-
-	// The original file's path (the `src` attribute of the ESM imported image passed by the user)
-	const originalImagePath = options.src.src;
-
-	const fileData = await fs.promises.readFile(
-		new URL(
-			'.' +
-				prependForwardSlash(
-					join(buildOpts.settings.config.build.assets, basename(originalImagePath))
-				),
-			serverRoot
-		)
-	);
-
-	const imageService = (await getConfiguredImageService()) as LocalImageService;
-	const resultData = await imageService.transform(
-		fileData,
-		{ ...options, src: originalImagePath },
-		buildOpts.settings.config.image.service.config
-	);
-
-	await fs.promises.mkdir(finalFolderURL, { recursive: true });
-
-	if (useCache) {
-		try {
-			await fs.promises.writeFile(cachedFileURL, resultData.data);
-			await fs.promises.copyFile(cachedFileURL, finalFileURL);
-		} catch (e) {
-			warn(
-				buildOpts.logging,
-				'astro:assets',
-				`An error was encountered while creating the cache directory. Proceeding without caching. Error: ${e}`
-			);
-			await fs.promises.writeFile(finalFileURL, resultData.data);
-		}
-	} else {
-		await fs.promises.writeFile(finalFileURL, resultData.data);
-	}
-
-	return {
-		cached: false,
-		weight: {
-			before: Math.trunc(fileData.byteLength / 1024),
-			after: Math.trunc(resultData.data.byteLength / 1024),
-		},
-	};
-}
-
-export function getStaticImageList(): Iterable<
-	[string, { path: string; options: ImageTransform }]
-> {
-	if (!globalThis?.astroAsset?.staticImages) {
-		return [];
-	}
-
-	return globalThis.astroAsset.staticImages?.entries();
-}
diff --git a/packages/astro/src/assets/image-endpoint.ts b/packages/astro/src/assets/image-endpoint.ts
index d9a101679d35..aa2baf0a59ce 100644
--- a/packages/astro/src/assets/image-endpoint.ts
+++ b/packages/astro/src/assets/image-endpoint.ts
@@ -1,8 +1,10 @@
 import mime from 'mime/lite.js';
 import type { APIRoute } from '../@types/astro.js';
 import { etag } from './utils/etag.js';
+import { isRemotePath } from '@astrojs/internal-helpers/path';
+import { getConfiguredImageService, isRemoteAllowed } from './internal.js';
 // @ts-expect-error
-import { getConfiguredImageService, imageServiceConfig } from 'astro:assets';
+import { imageConfig } from 'astro:assets';
 
 async function loadRemoteImage(src: URL) {
 	try {
@@ -30,7 +32,7 @@ export const GET: APIRoute = async ({ request }) => {
 		}
 
 		const url = new URL(request.url);
-		const transform = await imageService.parseURL(url, imageServiceConfig);
+		const transform = await imageService.parseURL(url, imageConfig);
 
 		if (!transform?.src) {
 			throw new Error('Incorrect transform returned by `parseURL`');
@@ -42,17 +44,18 @@ export const GET: APIRoute = async ({ request }) => {
 		const sourceUrl = isRemotePath(transform.src)
 			? new URL(transform.src)
 			: new URL(transform.src, url.origin);
+
+		if (isRemotePath(transform.src) && isRemoteAllowed(transform.src, imageConfig) === false) {
+			return new Response('Forbidden', { status: 403 });
+		}
+
 		inputBuffer = await loadRemoteImage(sourceUrl);
 
 		if (!inputBuffer) {
 			return new Response('Not Found', { status: 404 });
 		}
 
-		const { data, format } = await imageService.transform(
-			inputBuffer,
-			transform,
-			imageServiceConfig
-		);
+		const { data, format } = await imageService.transform(inputBuffer, transform, imageConfig);
 
 		return new Response(data, {
 			status: 200,
@@ -67,7 +70,3 @@ export const GET: APIRoute = async ({ request }) => {
 		return new Response(`Server Error: ${err}`, { status: 500 });
 	}
 };
-
-function isRemotePath(src: string) {
-	return /^(http|ftp|https|ws):?\/\//.test(src) || src.startsWith('data:');
-}
diff --git a/packages/astro/src/assets/internal.ts b/packages/astro/src/assets/internal.ts
index a49828a46f04..dd5e427f62a5 100644
--- a/packages/astro/src/assets/internal.ts
+++ b/packages/astro/src/assets/internal.ts
@@ -1,4 +1,5 @@
-import type { AstroSettings } from '../@types/astro.js';
+import { isRemotePath } from '@astrojs/internal-helpers/path';
+import type { AstroConfig, AstroSettings } from '../@types/astro.js';
 import { AstroError, AstroErrorData } from '../core/errors/index.js';
 import { isLocalService, type ImageService } from './services/service.js';
 import type {
@@ -7,6 +8,7 @@ import type {
 	ImageTransform,
 	UnresolvedImageTransform,
 } from './types.js';
+import { matchHostname, matchPattern } from './utils/remotePattern.js';
 
 export function injectImageEndpoint(settings: AstroSettings) {
 	// TODO: Add a setting to disable the image endpoint
@@ -23,6 +25,26 @@ export function isESMImportedImage(src: ImageMetadata | string): src is ImageMet
 	return typeof src === 'object';
 }
 
+export function isRemoteImage(src: ImageMetadata | string): src is string {
+	return typeof src === 'string';
+}
+
+export function isRemoteAllowed(
+	src: string,
+	{
+		domains = [],
+		remotePatterns = [],
+	}: Partial<Pick<AstroConfig['image'], 'domains' | 'remotePatterns'>>
+): boolean {
+	if (!isRemotePath(src)) return false;
+
+	const url = new URL(src);
+	return (
+		domains.some((domain) => matchHostname(url, domain)) ||
+		remotePatterns.some((remotePattern) => matchPattern(url, remotePattern))
+	);
+}
+
 export async function getConfiguredImageService(): Promise<ImageService> {
 	if (!globalThis?.astroAsset?.imageService) {
 		const { default: service }: { default: ImageService } = await import(
@@ -44,7 +66,7 @@ export async function getConfiguredImageService(): Promise<ImageService> {
 
 export async function getImage(
 	options: ImageTransform | UnresolvedImageTransform,
-	serviceConfig: Record<string, any>
+	imageConfig: AstroConfig['image']
 ): Promise<GetImageResult> {
 	if (!options || typeof options !== 'object') {
 		throw new AstroError({
@@ -65,13 +87,18 @@ export async function getImage(
 	};
 
 	const validatedOptions = service.validateOptions
-		? await service.validateOptions(resolvedOptions, serviceConfig)
+		? await service.validateOptions(resolvedOptions, imageConfig)
 		: resolvedOptions;
 
-	let imageURL = await service.getURL(validatedOptions, serviceConfig);
+	let imageURL = await service.getURL(validatedOptions, imageConfig);
 
 	// In build and for local services, we need to collect the requested parameters so we can generate the final images
-	if (isLocalService(service) && globalThis.astroAsset.addStaticImage) {
+	if (
+		isLocalService(service) &&
+		globalThis.astroAsset.addStaticImage &&
+		// If `getURL` returned the same URL as the user provided, it means the service doesn't need to do anything
+		!(isRemoteImage(validatedOptions.src) && imageURL === validatedOptions.src)
+	) {
 		imageURL = globalThis.astroAsset.addStaticImage(validatedOptions);
 	}
 
@@ -81,7 +108,7 @@ export async function getImage(
 		src: imageURL,
 		attributes:
 			service.getHTMLAttributes !== undefined
-				? service.getHTMLAttributes(validatedOptions, serviceConfig)
+				? service.getHTMLAttributes(validatedOptions, imageConfig)
 				: {},
 	};
 }
diff --git a/packages/astro/src/assets/services/service.ts b/packages/astro/src/assets/services/service.ts
index d3479c8803fa..5af4a898be8b 100644
--- a/packages/astro/src/assets/services/service.ts
+++ b/packages/astro/src/assets/services/service.ts
@@ -1,7 +1,8 @@
+import type { AstroConfig } from '../../@types/astro.js';
 import { AstroError, AstroErrorData } from '../../core/errors/index.js';
 import { joinPaths } from '../../core/path.js';
 import { VALID_SUPPORTED_FORMATS } from '../consts.js';
-import { isESMImportedImage } from '../internal.js';
+import { isESMImportedImage, isRemoteAllowed } from '../internal.js';
 import type { ImageOutputFormat, ImageTransform } from '../types.js';
 
 export type ImageService = LocalImageService | ExternalImageService;
@@ -23,7 +24,11 @@ export function parseQuality(quality: string): string | number {
 	return result;
 }
 
-interface SharedServiceProps {
+type ImageConfig<T> = Omit<AstroConfig['image'], 'service'> & {
+	service: { entrypoint: string; config: T };
+};
+
+interface SharedServiceProps<T extends Record<string, any> = Record<string, any>> {
 	/**
 	 * Return the URL to the endpoint or URL your images are generated from.
 	 *
@@ -32,7 +37,7 @@ interface SharedServiceProps {
 	 * For external services, this should point to the URL your images are coming from, for instance, `/_vercel/image`
 	 *
 	 */
-	getURL: (options: ImageTransform, serviceConfig: Record<string, any>) => string | Promise<string>;
+	getURL: (options: ImageTransform, imageConfig: ImageConfig<T>) => string | Promise<string>;
 	/**
 	 * Return any additional HTML attributes separate from `src` that your service requires to show the image properly.
 	 *
@@ -41,7 +46,7 @@ interface SharedServiceProps {
 	 */
 	getHTMLAttributes?: (
 		options: ImageTransform,
-		serviceConfig: Record<string, any>
+		imageConfig: ImageConfig<T>
 	) => Record<string, any> | Promise<Record<string, any>>;
 	/**
 	 * Validate and return the options passed by the user.
@@ -53,18 +58,20 @@ interface SharedServiceProps {
 	 */
 	validateOptions?: (
 		options: ImageTransform,
-		serviceConfig: Record<string, any>
+		imageConfig: ImageConfig<T>
 	) => ImageTransform | Promise<ImageTransform>;
 }
 
-export type ExternalImageService = SharedServiceProps;
+export type ExternalImageService<T extends Record<string, any> = Record<string, any>> =
+	SharedServiceProps<T>;
 
 export type LocalImageTransform = {
 	src: string;
 	[key: string]: any;
 };
 
-export interface LocalImageService extends SharedServiceProps {
+export interface LocalImageService<T extends Record<string, any> = Record<string, any>>
+	extends SharedServiceProps<T> {
 	/**
 	 * Parse the requested parameters passed in the URL from `getURL` back into an object to be used later by `transform`.
 	 *
@@ -72,7 +79,7 @@ export interface LocalImageService extends SharedServiceProps {
 	 */
 	parseURL: (
 		url: URL,
-		serviceConfig: Record<string, any>
+		imageConfig: ImageConfig<T>
 	) => LocalImageTransform | undefined | Promise<LocalImageTransform> | Promise<undefined>;
 	/**
 	 * Performs the image transformations on the input image and returns both the binary data and
@@ -81,7 +88,7 @@ export interface LocalImageService extends SharedServiceProps {
 	transform: (
 		inputBuffer: Buffer,
 		transform: LocalImageTransform,
-		serviceConfig: Record<string, any>
+		imageConfig: ImageConfig<T>
 	) => Promise<{ data: Buffer; format: ImageOutputFormat }>;
 }
 
@@ -202,21 +209,31 @@ export const baseService: Omit<LocalImageService, 'transform'> = {
 			decoding: attributes.decoding ?? 'async',
 		};
 	},
-	getURL(options: ImageTransform) {
-		// Both our currently available local services don't handle remote images, so we return the path as is.
-		if (!isESMImportedImage(options.src)) {
+	getURL(options, imageConfig) {
+		const searchParams = new URLSearchParams();
+
+		if (isESMImportedImage(options.src)) {
+			searchParams.append('href', options.src.src);
+		} else if (isRemoteAllowed(options.src, imageConfig)) {
+			searchParams.append('href', options.src);
+		} else {
+			// If it's not an imported image, nor is it allowed using the current domains or remote patterns, we'll just return the original URL
 			return options.src;
 		}
 
-		const searchParams = new URLSearchParams();
-		searchParams.append('href', options.src.src);
+		const params: Record<string, keyof typeof options> = {
+			w: 'width',
+			h: 'height',
+			q: 'quality',
+			f: 'format',
+		};
 
-		options.width && searchParams.append('w', options.width.toString());
-		options.height && searchParams.append('h', options.height.toString());
-		options.quality && searchParams.append('q', options.quality.toString());
-		options.format && searchParams.append('f', options.format);
+		Object.entries(params).forEach(([param, key]) => {
+			options[key] && searchParams.append(param, options[key].toString());
+		});
 
-		return joinPaths(import.meta.env.BASE_URL, '/_image?') + searchParams;
+		const imageEndpoint = joinPaths(import.meta.env.BASE_URL, '/_image');
+		return `${imageEndpoint}?${searchParams}`;
 	},
 	parseURL(url) {
 		const params = url.searchParams;
diff --git a/packages/astro/src/assets/types.ts b/packages/astro/src/assets/types.ts
index 9c5990cb77ae..ae74fc692a75 100644
--- a/packages/astro/src/assets/types.ts
+++ b/packages/astro/src/assets/types.ts
@@ -90,7 +90,7 @@ export type LocalImageProps<T> = ImageSharedProps<T> & {
 	 *
 	 * **Example**:
 	 * ```js
-	 * import myImage from "~/assets/my_image.png";
+	 * import myImage from "../assets/my_image.png";
 	 * ```
 	 * And then refer to the image, like so:
 	 * ```astro
diff --git a/packages/astro/src/assets/utils/remotePattern.ts b/packages/astro/src/assets/utils/remotePattern.ts
new file mode 100644
index 000000000000..7708b42e7380
--- /dev/null
+++ b/packages/astro/src/assets/utils/remotePattern.ts
@@ -0,0 +1,63 @@
+export type RemotePattern = {
+	hostname?: string;
+	pathname?: string;
+	protocol?: string;
+	port?: string;
+};
+
+export function matchPattern(url: URL, remotePattern: RemotePattern) {
+	return (
+		matchProtocol(url, remotePattern.protocol) &&
+		matchHostname(url, remotePattern.hostname, true) &&
+		matchPort(url, remotePattern.port) &&
+		matchPathname(url, remotePattern.pathname, true)
+	);
+}
+
+export function matchPort(url: URL, port?: string) {
+	return !port || port === url.port;
+}
+
+export function matchProtocol(url: URL, protocol?: string) {
+	return !protocol || protocol === url.protocol.slice(0, -1);
+}
+
+export function matchHostname(url: URL, hostname?: string, allowWildcard?: boolean) {
+	if (!hostname) {
+		return true;
+	} else if (!allowWildcard || !hostname.startsWith('*')) {
+		return hostname === url.hostname;
+	} else if (hostname.startsWith('**.')) {
+		const slicedHostname = hostname.slice(2); // ** length
+		return slicedHostname !== url.hostname && url.hostname.endsWith(slicedHostname);
+	} else if (hostname.startsWith('*.')) {
+		const slicedHostname = hostname.slice(1); // * length
+		const additionalSubdomains = url.hostname
+			.replace(slicedHostname, '')
+			.split('.')
+			.filter(Boolean);
+		return additionalSubdomains.length === 1;
+	}
+
+	return false;
+}
+
+export function matchPathname(url: URL, pathname?: string, allowWildcard?: boolean) {
+	if (!pathname) {
+		return true;
+	} else if (!allowWildcard || !pathname.endsWith('*')) {
+		return pathname === url.pathname;
+	} else if (pathname.endsWith('/**')) {
+		const slicedPathname = pathname.slice(0, -2); // ** length
+		return slicedPathname !== url.pathname && url.pathname.startsWith(slicedPathname);
+	} else if (pathname.endsWith('/*')) {
+		const slicedPathname = pathname.slice(0, -1); // * length
+		const additionalPathChunks = url.pathname
+			.replace(slicedPathname, '')
+			.split('/')
+			.filter(Boolean);
+		return additionalPathChunks.length === 1;
+	}
+
+	return false;
+}
diff --git a/packages/astro/src/assets/utils/transformToPath.ts b/packages/astro/src/assets/utils/transformToPath.ts
index 04ddee0a193f..d5535137be04 100644
--- a/packages/astro/src/assets/utils/transformToPath.ts
+++ b/packages/astro/src/assets/utils/transformToPath.ts
@@ -5,14 +5,13 @@ import { isESMImportedImage } from '../internal.js';
 import type { ImageTransform } from '../types.js';
 
 export function propsToFilename(transform: ImageTransform, hash: string) {
-	if (!isESMImportedImage(transform.src)) {
-		return transform.src;
-	}
-
-	let filename = removeQueryString(transform.src.src);
+	let filename = removeQueryString(
+		isESMImportedImage(transform.src) ? transform.src.src : transform.src
+	);
 	const ext = extname(filename);
 	filename = basename(filename, ext);
-	const outputExt = transform.format ? `.${transform.format}` : ext;
+
+	let outputExt = transform.format ? `.${transform.format}` : ext;
 	return `/${filename}_${hash}${outputExt}`;
 }
 
diff --git a/packages/astro/src/assets/vite-plugin-assets.ts b/packages/astro/src/assets/vite-plugin-assets.ts
index 2ab87b7c1ce0..f194e5288773 100644
--- a/packages/astro/src/assets/vite-plugin-assets.ts
+++ b/packages/astro/src/assets/vite-plugin-assets.ts
@@ -1,5 +1,4 @@
 import MagicString from 'magic-string';
-import { fileURLToPath } from 'node:url';
 import type * as vite from 'vite';
 import { normalizePath } from 'vite';
 import type { AstroPluginOptions, ImageTransform } from '../@types/astro';
@@ -10,7 +9,6 @@ import {
 	removeQueryString,
 } from '../core/path.js';
 import { VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from './consts.js';
-import { isESMImportedImage } from './internal.js';
 import { emitESMImage } from './utils/emitAsset.js';
 import { hashTransform, propsToFilename } from './utils/transformToPath.js';
 
@@ -31,18 +29,6 @@ export default function assets({
 		// Expose the components and different utilities from `astro:assets` and handle serving images from `/_image` in dev
 		{
 			name: 'astro:assets',
-			config() {
-				return {
-					resolve: {
-						alias: [
-							{
-								find: /^~\/assets\/(.+)$/,
-								replacement: fileURLToPath(new URL('./assets/$1', settings.config.srcDir)),
-							},
-						],
-					},
-				};
-			},
 			async resolveId(id) {
 				if (id === VIRTUAL_SERVICE_ID) {
 					return await this.resolve(settings.config.image.service.entrypoint);
@@ -58,8 +44,8 @@ export default function assets({
 					import { getImage as getImageInternal } from "astro/assets";
 					export { default as Image } from "astro/components/Image.astro";
 
-					export const imageServiceConfig = ${JSON.stringify(settings.config.image.service.config)};
-					export const getImage = async (options) => await getImageInternal(options, imageServiceConfig);
+					export const imageConfig = ${JSON.stringify(settings.config.image)};
+					export const getImage = async (options) => await getImageInternal(options, imageConfig);
 				`;
 				}
 			},
@@ -82,15 +68,10 @@ export default function assets({
 					if (globalThis.astroAsset.staticImages.has(hash)) {
 						filePath = globalThis.astroAsset.staticImages.get(hash)!.path;
 					} else {
-						// If the image is not imported, we can return the path as-is, since static references
-						// should only point ot valid paths for builds or remote images
-						if (!isESMImportedImage(options.src)) {
-							return options.src;
-						}
-
 						filePath = prependForwardSlash(
 							joinPaths(settings.config.build.assets, propsToFilename(options, hash))
 						);
+
 						globalThis.astroAsset.staticImages.set(hash, { path: filePath, options: options });
 					}
 
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index c3b687d01801..86b9c9d41b6f 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -16,12 +16,7 @@ import {
 	removeTrailingForwardSlash,
 } from '../path.js';
 import { RedirectSinglePageBuiltModule } from '../redirects/index.js';
-import {
-	createEnvironment,
-	createRenderContext,
-	tryRenderRoute,
-	type RenderContext,
-} from '../render/index.js';
+import { createEnvironment, createRenderContext, type RenderContext } from '../render/index.js';
 import { RouteCache } from '../render/route-cache.js';
 import {
 	createAssetLink,
@@ -258,10 +253,19 @@ export class App {
 		const errorRouteData = matchRoute('/' + status, this.#manifestData);
 		const url = new URL(request.url);
 		if (errorRouteData) {
-			if (errorRouteData.prerender && !errorRouteData.route.endsWith(`/${status}`)) {
-				const statusURL = new URL(`${this.#baseWithoutTrailingSlash}/${status}`, url);
+			if (errorRouteData.prerender) {
+				const maybeDotHtml = errorRouteData.route.endsWith(`/${status}`) ? '.html' : '';
+				const statusURL = new URL(
+					`${this.#baseWithoutTrailingSlash}/${status}${maybeDotHtml}`,
+					url
+				);
 				const response = await fetch(statusURL.toString());
-				return this.#mergeResponses(response, originalResponse);
+
+				// response for /404.html and 500.html is 200, which is not meaningful
+				// so we create an override
+				const override = { status };
+
+				return this.#mergeResponses(response, originalResponse, override);
 			}
 			const mod = await this.#getModuleForRoute(errorRouteData);
 			try {
@@ -273,11 +277,7 @@ export class App {
 					status
 				);
 				const page = (await mod.page()) as any;
-				const response = (await tryRenderRoute(
-					newRenderContext,
-					this.#pipeline.env,
-					page
-				)) as Response;
+				const response = await this.#pipeline.renderRoute(newRenderContext, page);
 				return this.#mergeResponses(response, originalResponse);
 			} catch {}
 		}
@@ -287,14 +287,31 @@ export class App {
 		return response;
 	}
 
-	#mergeResponses(newResponse: Response, oldResponse?: Response) {
-		if (!oldResponse) return newResponse;
-		const { status, statusText, headers } = oldResponse;
+	#mergeResponses(newResponse: Response, oldResponse?: Response, override?: { status: 404 | 500 }) {
+		if (!oldResponse) {
+			if (override !== undefined) {
+				return new Response(newResponse.body, {
+					status: override.status,
+					statusText: newResponse.statusText,
+					headers: newResponse.headers,
+				});
+			}
+			return newResponse;
+		}
+
+		const { statusText, headers } = oldResponse;
+
+		// If the the new response did not have a meaningful status, an override may have been provided
+		// If the original status was 200 (default), override it with the new status (probably 404 or 500)
+		// Otherwise, the user set a specific status while rendering and we should respect that one
+		const status = override?.status
+			? override.status
+			: oldResponse.status === 200
+			? newResponse.status
+			: oldResponse.status;
 
 		return new Response(newResponse.body, {
-			// If the original status was 200 (default), override it with the new status (probably 404 or 500)
-			// Otherwise, the user set a specific status while rendering and we should respect that one
-			status: status === 200 ? newResponse.status : status,
+			status,
 			statusText: status === 200 ? newResponse.statusText : statusText,
 			headers: new Headers(Array.from(headers)),
 		});
diff --git a/packages/astro/src/core/app/node.ts b/packages/astro/src/core/app/node.ts
index f31af36db970..054064a089c8 100644
--- a/packages/astro/src/core/app/node.ts
+++ b/packages/astro/src/core/app/node.ts
@@ -10,20 +10,33 @@ export { apply as applyPolyfills } from '../polyfill.js';
 
 const clientAddressSymbol = Symbol.for('astro.clientAddress');
 
-function createRequestFromNodeRequest(req: NodeIncomingMessage, body?: Uint8Array): Request {
+type CreateNodeRequestOptions = {
+	emptyBody?: boolean;
+};
+
+type BodyProps = Partial<RequestInit>;
+
+function createRequestFromNodeRequest(
+	req: NodeIncomingMessage,
+	options?: CreateNodeRequestOptions
+): Request {
 	const protocol =
 		req.socket instanceof TLSSocket || req.headers['x-forwarded-proto'] === 'https'
 			? 'https'
 			: 'http';
 	const hostname = req.headers.host || req.headers[':authority'];
 	const url = `${protocol}://${hostname}${req.url}`;
-	const rawHeaders = req.headers as Record<string, any>;
-	const entries = Object.entries(rawHeaders);
+	const headers = makeRequestHeaders(req);
 	const method = req.method || 'GET';
+	let bodyProps: BodyProps = {};
+	const bodyAllowed = method !== 'HEAD' && method !== 'GET' && !options?.emptyBody;
+	if (bodyAllowed) {
+		bodyProps = makeRequestBody(req);
+	}
 	const request = new Request(url, {
 		method,
-		headers: new Headers(entries),
-		body: ['HEAD', 'GET'].includes(method) ? null : body,
+		headers,
+		...bodyProps,
 	});
 	if (req.socket?.remoteAddress) {
 		Reflect.set(request, clientAddressSymbol, req.socket.remoteAddress);
@@ -31,63 +44,83 @@ function createRequestFromNodeRequest(req: NodeIncomingMessage, body?: Uint8Arra
 	return request;
 }
 
-class NodeIncomingMessage extends IncomingMessage {
-	/**
-	 * The read-only body property of the Request interface contains a ReadableStream with the body contents that have been added to the request.
-	 */
-	body?: unknown;
+function makeRequestHeaders(req: NodeIncomingMessage): Headers {
+	const headers = new Headers();
+	for (const [name, value] of Object.entries(req.headers)) {
+		if (value === undefined) {
+			continue;
+		}
+		if (Array.isArray(value)) {
+			for (const item of value) {
+				headers.append(name, item);
+			}
+		} else {
+			headers.append(name, value);
+		}
+	}
+	return headers;
 }
 
-export class NodeApp extends App {
-	match(req: NodeIncomingMessage | Request, opts: MatchOptions = {}) {
-		return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req), opts);
-	}
-	render(req: NodeIncomingMessage | Request, routeData?: RouteData, locals?: object) {
+function makeRequestBody(req: NodeIncomingMessage): BodyProps {
+	if (req.body !== undefined) {
 		if (typeof req.body === 'string' && req.body.length > 0) {
-			return super.render(
-				req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(req.body)),
-				routeData,
-				locals
-			);
+			return { body: Buffer.from(req.body) };
 		}
 
 		if (typeof req.body === 'object' && req.body !== null && Object.keys(req.body).length > 0) {
-			return super.render(
-				req instanceof Request
-					? req
-					: createRequestFromNodeRequest(req, Buffer.from(JSON.stringify(req.body))),
-				routeData,
-				locals
-			);
+			return { body: Buffer.from(JSON.stringify(req.body)) };
 		}
 
-		if ('on' in req) {
-			let body = Buffer.from([]);
-			let reqBodyComplete = new Promise((resolve, reject) => {
-				req.on('data', (d) => {
-					body = Buffer.concat([body, d]);
-				});
-				req.on('end', () => {
-					resolve(body);
-				});
-				req.on('error', (err) => {
-					reject(err);
-				});
-			});
+		// This covers all async iterables including Readable and ReadableStream.
+		if (
+			typeof req.body === 'object' &&
+			req.body !== null &&
+			typeof (req.body as any)[Symbol.asyncIterator] !== 'undefined'
+		) {
+			return asyncIterableToBodyProps(req.body as AsyncIterable<any>);
+		}
+	}
+
+	// Return default body.
+	return asyncIterableToBodyProps(req);
+}
+
+function asyncIterableToBodyProps(iterable: AsyncIterable<any>): BodyProps {
+	return {
+		// Node uses undici for the Request implementation. Undici accepts
+		// a non-standard async iterable for the body.
+		// @ts-expect-error
+		body: iterable,
+		// The duplex property is required when using a ReadableStream or async
+		// iterable for the body. The type definitions do not include the duplex
+		// property because they are not up-to-date.
+		// @ts-expect-error
+		duplex: 'half',
+	} satisfies BodyProps;
+}
+
+class NodeIncomingMessage extends IncomingMessage {
+	/**
+	 * Allow the request body to be explicitly overridden. For example, this
+	 * is used by the Express JSON middleware.
+	 */
+	body?: unknown;
+}
 
-			return reqBodyComplete.then(() => {
-				return super.render(
-					req instanceof Request ? req : createRequestFromNodeRequest(req, body),
-					routeData,
-					locals
-				);
+export class NodeApp extends App {
+	match(req: NodeIncomingMessage | Request, opts: MatchOptions = {}) {
+		if (!(req instanceof Request)) {
+			req = createRequestFromNodeRequest(req, {
+				emptyBody: true,
 			});
 		}
-		return super.render(
-			req instanceof Request ? req : createRequestFromNodeRequest(req),
-			routeData,
-			locals
-		);
+		return super.match(req, opts);
+	}
+	render(req: NodeIncomingMessage | Request, routeData?: RouteData, locals?: object) {
+		if (!(req instanceof Request)) {
+			req = createRequestFromNodeRequest(req);
+		}
+		return super.render(req, routeData, locals);
 	}
 }
 
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index f40896dc74c2..6c3acefdbc5d 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -19,7 +19,7 @@ import type {
 import {
 	generateImage as generateImageInternal,
 	getStaticImageList,
-} from '../../assets/generate.js';
+} from '../../assets/build/generate.js';
 import { hasPrerenderedPages, type BuildInternals } from '../../core/build/internal.js';
 import {
 	isRelativePath,
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
index cbb259e03e0e..a1c7c3e567cc 100644
--- a/packages/astro/src/core/build/static-build.ts
+++ b/packages/astro/src/core/build/static-build.ts
@@ -311,8 +311,12 @@ async function runPostBuildHooks(
 async function cleanStaticOutput(opts: StaticBuildOptions, internals: BuildInternals) {
 	const allStaticFiles = new Set();
 	for (const pageData of eachPageData(internals)) {
-		if (pageData.route.prerender)
-			allStaticFiles.add(internals.pageToBundleMap.get(pageData.moduleSpecifier));
+		if (pageData.route.prerender) {
+			const { moduleSpecifier } = pageData;
+			const pageBundleId = internals.pageToBundleMap.get(moduleSpecifier);
+			const entryBundleId = internals.entrySpecifierToBundleMap.get(moduleSpecifier);
+			allStaticFiles.add(pageBundleId ?? entryBundleId);
+		}
 	}
 	const ssr = isServerLikeOutput(opts.settings.config);
 	const out = ssr
@@ -340,7 +344,8 @@ async function cleanStaticOutput(opts: StaticBuildOptions, internals: BuildInter
 				// Replace exports (only prerendered pages) with a noop
 				let value = 'const noop = () => {};';
 				for (const e of exports) {
-					value += `\nexport const ${e.n} = noop;`;
+					if (e.n === 'default') value += `\n export default noop;`;
+					else value += `\nexport const ${e.n} = noop;`;
 				}
 				await fs.promises.writeFile(url, value, { encoding: 'utf8' });
 			})
@@ -355,6 +360,8 @@ async function cleanServerOutput(opts: StaticBuildOptions) {
 	// The SSR output is all .mjs files, the client output is not.
 	const files = await glob('**/*.mjs', {
 		cwd: fileURLToPath(out),
+		// Important! Also cleanup dotfiles like `node_modules/.pnpm/**`
+		dot: true,
 	});
 	if (files.length) {
 		// Remove all the SSR generated .mjs files
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index 48b0f3a59ac9..bff55b392b1f 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -189,6 +189,30 @@ export const AstroConfigSchema = z.object({
 				]),
 				config: z.record(z.any()).default({}),
 			}),
+			domains: z.array(z.string()).default([]),
+			remotePatterns: z
+				.array(
+					z.object({
+						protocol: z.string().optional(),
+						hostname: z
+							.string()
+							.refine(
+								(val) => !val.includes('*') || val.startsWith('*.') || val.startsWith('**.'),
+								{
+									message: 'wildcards can only be placed at the beginning of the hostname',
+								}
+							)
+							.optional(),
+						port: z.string().optional(),
+						pathname: z
+							.string()
+							.refine((val) => !val.includes('*') || val.endsWith('/*') || val.endsWith('/**'), {
+								message: 'wildcards can only be placed at the end of a pathname',
+							})
+							.optional(),
+					})
+				)
+				.default([]),
 		})
 		.default({
 			service: { entrypoint: 'astro/assets/services/sharp', config: {} },
diff --git a/packages/astro/src/core/config/tsconfig.ts b/packages/astro/src/core/config/tsconfig.ts
index 5a5d3fc64dcc..a0c78f08c62e 100644
--- a/packages/astro/src/core/config/tsconfig.ts
+++ b/packages/astro/src/core/config/tsconfig.ts
@@ -1,4 +1,3 @@
-import { deepmerge } from 'deepmerge-ts';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import * as tsr from 'tsconfig-resolver';
@@ -96,5 +95,28 @@ export function updateTSConfigForFramework(
 		return target;
 	}
 
-	return deepmerge(target, presets.get(framework)!);
+	return deepMergeObjects(target, presets.get(framework)!);
+}
+
+// Simple deep merge implementation that merges objects and strings
+function deepMergeObjects<T extends Record<string, any>>(a: T, b: T): T {
+	const merged: T = { ...a };
+
+	for (const key in b) {
+		const value = b[key];
+
+		if (a[key] == null) {
+			merged[key] = value;
+			continue;
+		}
+
+		if (typeof a[key] === 'object' && typeof value === 'object') {
+			merged[key] = deepMergeObjects(a[key], value);
+			continue;
+		}
+
+		merged[key] = value;
+	}
+
+	return merged;
 }
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 5b2ebfa21bab..f4938d2ebaf9 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -170,6 +170,14 @@ export async function createVite(
 					find: /^astro$/,
 					replacement: fileURLToPath(new URL('../@types/astro', import.meta.url)),
 				},
+				{
+					find: 'astro:middleware',
+					replacement: 'astro/middleware/namespace',
+				},
+				{
+					find: 'astro:components',
+					replacement: 'astro/components',
+				},
 			],
 			conditions: ['astro'],
 			// Astro imports in third-party packages should use the same version as root
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index c717a2b0301a..9bac015190f5 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -658,7 +658,7 @@ export const ResponseSentError = {
  *
  * For example:
  * ```ts
- * import {defineMiddleware} from "astro/middleware";
+ * import {defineMiddleware} from "astro:middleware";
  * export const onRequest = defineMiddleware((context, _) => {
  * 	// doesn't return anything or call `next`
  * 	context.locals.someData = false;
@@ -678,7 +678,7 @@ export const MiddlewareNoDataOrNextCalled = {
  *
  * For example:
  * ```ts
- * import {defineMiddleware} from "astro/middleware";
+ * import {defineMiddleware} from "astro:middleware";
  * export const onRequest = defineMiddleware(() => {
  *   return "string"
  * });
@@ -698,7 +698,7 @@ export const MiddlewareNotAResponse = {
  *
  * For example:
  * ```ts
- * import {defineMiddleware} from "astro/middleware";
+ * import {defineMiddleware} from "astro:middleware";
  * export const onRequest = defineMiddleware((context, next) => {
  *   context.locals = 1541;
  *   return next();
diff --git a/packages/astro/src/core/middleware/namespace.ts b/packages/astro/src/core/middleware/namespace.ts
new file mode 100644
index 000000000000..e504f866c05b
--- /dev/null
+++ b/packages/astro/src/core/middleware/namespace.ts
@@ -0,0 +1,4 @@
+export {
+	defineMiddleware,
+	sequence,
+} from './index.js';
diff --git a/packages/astro/src/core/pipeline.ts b/packages/astro/src/core/pipeline.ts
index b5c66517abc0..42ed7d5da2bc 100644
--- a/packages/astro/src/core/pipeline.ts
+++ b/packages/astro/src/core/pipeline.ts
@@ -59,7 +59,7 @@ export class Pipeline {
 	/**
 	 * Returns the current environment
 	 */
-	getEnvironment() {
+	getEnvironment(): Readonly<Environment> {
 		return this.env;
 	}
 
diff --git a/packages/astro/src/core/render/environment.ts b/packages/astro/src/core/render/environment.ts
index 32dfb454be66..f38d98551d46 100644
--- a/packages/astro/src/core/render/environment.ts
+++ b/packages/astro/src/core/render/environment.ts
@@ -1,6 +1,5 @@
-import type { AstroSettings, RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
+import type { RuntimeMode, SSRLoadedRenderer } from '../../@types/astro';
 import type { LogOptions } from '../logger/core.js';
-import type { ModuleLoader } from '../module-loader';
 import type { RouteCache } from './route-cache.js';
 
 /**
@@ -38,8 +37,3 @@ export type CreateEnvironmentArgs = Environment;
 export function createEnvironment(options: CreateEnvironmentArgs): Environment {
 	return options;
 }
-
-export type DevelopmentEnvironment = Environment & {
-	loader: ModuleLoader;
-	settings: AstroSettings;
-};
diff --git a/packages/astro/src/core/render/index.ts b/packages/astro/src/core/render/index.ts
index 20b964fa759b..f39c02ae2c07 100644
--- a/packages/astro/src/core/render/index.ts
+++ b/packages/astro/src/core/render/index.ts
@@ -1,18 +1,17 @@
 import type { AstroMiddlewareInstance, ComponentInstance, RouteData } from '../../@types/astro';
-import type { DevelopmentEnvironment } from './environment';
-
 export { createRenderContext } from './context.js';
 export type { RenderContext } from './context.js';
 export { tryRenderRoute } from './core.js';
-export type { Environment } from './environment';
+import type { Environment } from './environment';
 export { createEnvironment } from './environment.js';
 export { getParamsAndProps } from './params-and-props.js';
-export { loadRenderer, loadRenderers } from './renderer.js';
-export type { DevelopmentEnvironment };
+export { loadRenderer } from './renderer.js';
+
+export type { Environment };
 
 export interface SSROptions {
 	/** The environment instance */
-	env: DevelopmentEnvironment;
+	env: Environment;
 	/** location of file on disk */
 	filePath: URL;
 	/** the web request (needed for dynamic routes) */
diff --git a/packages/astro/src/core/render/renderer.ts b/packages/astro/src/core/render/renderer.ts
index 8e5e97202dfa..e64a27ba5daa 100644
--- a/packages/astro/src/core/render/renderer.ts
+++ b/packages/astro/src/core/render/renderer.ts
@@ -1,14 +1,6 @@
-import type { AstroRenderer, AstroSettings, SSRLoadedRenderer } from '../../@types/astro';
+import type { AstroRenderer, SSRLoadedRenderer } from '../../@types/astro';
 import type { ModuleLoader } from '../module-loader/index.js';
 
-export async function loadRenderers(
-	settings: AstroSettings,
-	moduleLoader: ModuleLoader
-): Promise<SSRLoadedRenderer[]> {
-	const renderers = await Promise.all(settings.renderers.map((r) => loadRenderer(r, moduleLoader)));
-	return renderers.filter(Boolean) as SSRLoadedRenderer[];
-}
-
 export async function loadRenderer(
 	renderer: AstroRenderer,
 	moduleLoader: ModuleLoader
diff --git a/packages/astro/src/prerender/routing.ts b/packages/astro/src/prerender/routing.ts
index a3b3c0d543b6..2fcfe207bc4a 100644
--- a/packages/astro/src/prerender/routing.ts
+++ b/packages/astro/src/prerender/routing.ts
@@ -1,22 +1,22 @@
 import type { AstroSettings, ComponentInstance, RouteData } from '../@types/astro';
 import { RedirectComponentInstance, routeIsRedirect } from '../core/redirects/index.js';
-import type { DevelopmentEnvironment } from '../core/render';
 import { preload } from '../vite-plugin-astro-server/index.js';
 import { getPrerenderStatus } from './metadata.js';
+import type DevPipeline from '../vite-plugin-astro-server/devPipeline';
 
 type GetSortedPreloadedMatchesParams = {
-	env: DevelopmentEnvironment;
+	pipeline: DevPipeline;
 	matches: RouteData[];
 	settings: AstroSettings;
 };
 export async function getSortedPreloadedMatches({
-	env,
+	pipeline,
 	matches,
 	settings,
 }: GetSortedPreloadedMatchesParams) {
 	return (
 		await preloadAndSetPrerenderStatus({
-			env,
+			pipeline,
 			matches,
 			settings,
 		})
@@ -24,7 +24,7 @@ export async function getSortedPreloadedMatches({
 }
 
 type PreloadAndSetPrerenderStatusParams = {
-	env: DevelopmentEnvironment;
+	pipeline: DevPipeline;
 	matches: RouteData[];
 	settings: AstroSettings;
 };
@@ -36,7 +36,7 @@ type PreloadAndSetPrerenderStatusResult = {
 };
 
 async function preloadAndSetPrerenderStatus({
-	env,
+	pipeline,
 	matches,
 	settings,
 }: PreloadAndSetPrerenderStatusParams): Promise<PreloadAndSetPrerenderStatusResult[]> {
@@ -52,12 +52,12 @@ async function preloadAndSetPrerenderStatus({
 				};
 			}
 
-			const preloadedComponent = await preload({ env, filePath });
+			const preloadedComponent = await preload({ pipeline, filePath });
 
 			// gets the prerender metadata set by the `astro:scanner` vite plugin
 			const prerenderStatus = getPrerenderStatus({
 				filePath,
-				loader: env.loader,
+				loader: pipeline.getModuleLoader(),
 			});
 
 			if (prerenderStatus !== undefined) {
diff --git a/packages/astro/src/vite-plugin-astro-server/devPipeline.ts b/packages/astro/src/vite-plugin-astro-server/devPipeline.ts
new file mode 100644
index 000000000000..eae6cc1c66e4
--- /dev/null
+++ b/packages/astro/src/vite-plugin-astro-server/devPipeline.ts
@@ -0,0 +1,128 @@
+import { Pipeline } from '../core/pipeline.js';
+import type { AstroConfig, AstroSettings, RouteData } from '../@types/astro';
+import type { ModuleLoader } from '../core/module-loader';
+import type { Environment } from '../core/render';
+import { createEnvironment, loadRenderer } from '../core/render/index.js';
+import { createResolve } from './resolve.js';
+import { RouteCache } from '../core/render/route-cache.js';
+import { isServerLikeOutput } from '../prerender/utils.js';
+import type { RuntimeMode, SSRManifest, SSRLoadedRenderer } from '../@types/astro';
+import type { LogOptions } from '../core/logger/core';
+import { Logger } from '../core/logger/core.js';
+import type { EndpointCallResult } from '../core/endpoint/index.js';
+import mime from 'mime';
+import { attachCookiesToResponse } from '../core/cookies/index.js';
+
+export default class DevPipeline extends Pipeline {
+	#settings: AstroSettings;
+	#loader: ModuleLoader;
+	#devLogger: Logger;
+	#currentMatchedRoute: RouteData | undefined;
+
+	constructor({
+		manifest,
+		logging,
+		settings,
+		loader,
+	}: {
+		manifest: SSRManifest;
+		logging: LogOptions;
+		settings: AstroSettings;
+		loader: ModuleLoader;
+	}) {
+		const env = DevPipeline.createDevelopmentEnvironment(manifest, settings, logging, loader);
+		super(env);
+		this.#devLogger = new Logger(logging);
+		this.#settings = settings;
+		this.#loader = loader;
+		this.setEndpointHandler(this.#handleEndpointResult);
+	}
+
+	setCurrentMatchedRoute(route: RouteData) {
+		this.#currentMatchedRoute = route;
+	}
+
+	clearRouteCache() {
+		this.env.routeCache.clearAll();
+	}
+
+	getSettings(): Readonly<AstroSettings> {
+		return this.#settings;
+	}
+
+	getConfig(): Readonly<AstroConfig> {
+		return this.#settings.config;
+	}
+
+	getModuleLoader(): Readonly<ModuleLoader> {
+		return this.#loader;
+	}
+
+	get logger(): Readonly<Logger> {
+		return this.#devLogger;
+	}
+
+	async loadRenderers() {
+		const renderers = await Promise.all(
+			this.#settings.renderers.map((r) => loadRenderer(r, this.#loader))
+		);
+		this.env.renderers = renderers.filter(Boolean) as SSRLoadedRenderer[];
+	}
+
+	static createDevelopmentEnvironment(
+		manifest: SSRManifest,
+		settings: AstroSettings,
+		logging: LogOptions,
+		loader: ModuleLoader
+	): Environment {
+		const mode: RuntimeMode = 'development';
+
+		return createEnvironment({
+			adapterName: manifest.adapterName,
+			logging,
+			mode,
+			// This will be overridden in the dev server
+			renderers: [],
+			clientDirectives: manifest.clientDirectives,
+			compressHTML: manifest.compressHTML,
+			resolve: createResolve(loader, settings.config.root),
+			routeCache: new RouteCache(logging, mode),
+			site: manifest.site,
+			ssr: isServerLikeOutput(settings.config),
+			streaming: true,
+		});
+	}
+
+	async #handleEndpointResult(_: Request, result: EndpointCallResult): Promise<Response> {
+		if (result.type === 'simple') {
+			if (!this.#currentMatchedRoute) {
+				throw new Error(
+					'In development mode, you must set the current matched route before handling a endpoint.'
+				);
+			}
+			let contentType = 'text/plain';
+			// Dynamic routes don't include `route.pathname`, so synthesize a path for these (e.g. 'src/pages/[slug].svg')
+			const filepath =
+				this.#currentMatchedRoute.pathname ||
+				this.#currentMatchedRoute.segments
+					.map((segment) => segment.map((p) => p.content).join(''))
+					.join('/');
+			const computedMimeType = mime.getType(filepath);
+			if (computedMimeType) {
+				contentType = computedMimeType;
+			}
+			const response = new Response(
+				result.encoding !== 'binary' ? Buffer.from(result.body, result.encoding) : result.body,
+				{
+					status: 200,
+					headers: {
+						'Content-Type': `${contentType};charset=utf-8`,
+					},
+				}
+			);
+			attachCookiesToResponse(response, result.cookies);
+			return response;
+		}
+		return result.response;
+	}
+}
diff --git a/packages/astro/src/vite-plugin-astro-server/environment.ts b/packages/astro/src/vite-plugin-astro-server/environment.ts
index ce7b92662cca..010c1b96af77 100644
--- a/packages/astro/src/vite-plugin-astro-server/environment.ts
+++ b/packages/astro/src/vite-plugin-astro-server/environment.ts
@@ -1,7 +1,7 @@
 import type { AstroSettings, RuntimeMode, SSRManifest } from '../@types/astro.js';
 import type { LogOptions } from '../core/logger/core.js';
 import type { ModuleLoader } from '../core/module-loader';
-import type { DevelopmentEnvironment } from '../core/render';
+import type { Environment } from '../core/render';
 import { createEnvironment } from '../core/render/index.js';
 import { RouteCache } from '../core/render/route-cache.js';
 import { isServerLikeOutput } from '../prerender/utils.js';
@@ -12,9 +12,9 @@ export function createDevelopmentEnvironment(
 	settings: AstroSettings,
 	logging: LogOptions,
 	loader: ModuleLoader
-): DevelopmentEnvironment {
+): Environment {
 	const mode: RuntimeMode = 'development';
-	let env = createEnvironment({
+	return createEnvironment({
 		adapterName: manifest.adapterName,
 		logging,
 		mode,
@@ -28,10 +28,4 @@ export function createDevelopmentEnvironment(
 		ssr: isServerLikeOutput(settings.config),
 		streaming: true,
 	});
-
-	return {
-		...env,
-		loader,
-		settings,
-	};
 }
diff --git a/packages/astro/src/vite-plugin-astro-server/index.ts b/packages/astro/src/vite-plugin-astro-server/index.ts
index 17302ba41965..b02c57e1c16f 100644
--- a/packages/astro/src/vite-plugin-astro-server/index.ts
+++ b/packages/astro/src/vite-plugin-astro-server/index.ts
@@ -1,26 +1,22 @@
 import type { ComponentInstance } from '../@types/astro.js';
 import { enhanceViteSSRError } from '../core/errors/dev/index.js';
 import { AggregateError, CSSError, MarkdownError } from '../core/errors/index.js';
-import type { DevelopmentEnvironment } from '../core/render/environment';
-import { loadRenderers } from '../core/render/index.js';
 import { viteID } from '../core/util.js';
+import type DevPipeline from './devPipeline';
 
 export async function preload({
-	env,
+	pipeline,
 	filePath,
 }: {
-	env: DevelopmentEnvironment;
+	pipeline: DevPipeline;
 	filePath: URL;
 }): Promise<ComponentInstance> {
 	// Important: This needs to happen first, in case a renderer provides polyfills.
-	const renderers = await loadRenderers(env.settings, env.loader);
-	// Override the environment's renderers. This ensures that if renderers change (HMR)
-	// The new instances are passed through.
-	env.renderers = renderers;
+	await pipeline.loadRenderers();
 
 	try {
 		// Load the module from the Vite SSR Runtime.
-		const mod = (await env.loader.import(viteID(filePath))) as ComponentInstance;
+		const mod = (await pipeline.getModuleLoader().import(viteID(filePath))) as ComponentInstance;
 
 		return mod;
 	} catch (error) {
@@ -29,7 +25,7 @@ export async function preload({
 			throw error;
 		}
 
-		throw enhanceViteSSRError({ error, filePath, loader: env.loader });
+		throw enhanceViteSSRError({ error, filePath, loader: pipeline.getModuleLoader() });
 	}
 }
 
diff --git a/packages/astro/src/vite-plugin-astro-server/plugin.ts b/packages/astro/src/vite-plugin-astro-server/plugin.ts
index dfaf976bff77..262d50148fc5 100644
--- a/packages/astro/src/vite-plugin-astro-server/plugin.ts
+++ b/packages/astro/src/vite-plugin-astro-server/plugin.ts
@@ -7,8 +7,8 @@ import { createViteLoader } from '../core/module-loader/index.js';
 import { createRouteManifest } from '../core/routing/index.js';
 import { baseMiddleware } from './base.js';
 import { createController } from './controller.js';
-import { createDevelopmentEnvironment } from './environment.js';
 import { handleRequest } from './request.js';
+import DevPipeline from './devPipeline.js';
 
 export interface AstroPluginOptions {
 	settings: AstroSettings;
@@ -26,13 +26,13 @@ export default function createVitePluginAstroServer({
 		configureServer(viteServer) {
 			const loader = createViteLoader(viteServer);
 			const manifest = createDevelopmentManifest(settings);
-			const env = createDevelopmentEnvironment(manifest, settings, logging, loader);
+			const pipeline = new DevPipeline({ logging, manifest, settings, loader });
 			let manifestData: ManifestData = createRouteManifest({ settings, fsMod }, logging);
 			const controller = createController({ loader });
 
 			/** rebuild the route cache + manifest, as needed. */
 			function rebuildManifest(needsManifestRebuild: boolean) {
-				env.routeCache.clearAll();
+				pipeline.clearRouteCache();
 				if (needsManifestRebuild) {
 					manifestData = createRouteManifest({ settings }, logging);
 				}
@@ -57,7 +57,7 @@ export default function createVitePluginAstroServer({
 						return;
 					}
 					handleRequest({
-						env,
+						pipeline,
 						manifestData,
 						controller,
 						incomingRequest: request,
diff --git a/packages/astro/src/vite-plugin-astro-server/request.ts b/packages/astro/src/vite-plugin-astro-server/request.ts
index ae476f9be5d1..72ce29b1b3fd 100644
--- a/packages/astro/src/vite-plugin-astro-server/request.ts
+++ b/packages/astro/src/vite-plugin-astro-server/request.ts
@@ -1,11 +1,8 @@
 import type http from 'node:http';
 import type { ManifestData, SSRManifest } from '../@types/astro';
-import type { DevelopmentEnvironment } from '../core/render/index';
 import type { DevServerController } from './controller';
-
 import { collectErrorMetadata } from '../core/errors/dev/index.js';
 import { createSafeError } from '../core/errors/index.js';
-import { error } from '../core/logger/core.js';
 import * as msg from '../core/messages.js';
 import { collapseDuplicateSlashes, removeTrailingForwardSlash } from '../core/path.js';
 import { eventError, telemetry } from '../events/index.js';
@@ -13,9 +10,10 @@ import { isServerLikeOutput } from '../prerender/utils.js';
 import { runWithErrorHandling } from './controller.js';
 import { handle500Response } from './response.js';
 import { handleRoute, matchRoute } from './route.js';
+import type DevPipeline from './devPipeline';
 
 type HandleRequest = {
-	env: DevelopmentEnvironment;
+	pipeline: DevPipeline;
 	manifestData: ManifestData;
 	controller: DevServerController;
 	incomingRequest: http.IncomingMessage;
@@ -25,15 +23,15 @@ type HandleRequest = {
 
 /** The main logic to route dev server requests to pages in Astro. */
 export async function handleRequest({
-	env,
+	pipeline,
 	manifestData,
 	controller,
 	incomingRequest,
 	incomingResponse,
 	manifest,
 }: HandleRequest) {
-	const { settings, loader: moduleLoader } = env;
-	const { config } = settings;
+	const config = pipeline.getConfig();
+	const moduleLoader = pipeline.getModuleLoader();
 	const origin = `${moduleLoader.isHttps() ? 'https' : 'http'}://${incomingRequest.headers.host}`;
 	const buildingToSSR = isServerLikeOutput(config);
 
@@ -75,7 +73,7 @@ export async function handleRequest({
 		controller,
 		pathname,
 		async run() {
-			const matchedRoute = await matchRoute(pathname, env, manifestData);
+			const matchedRoute = await matchRoute(pathname, manifestData, pipeline);
 			const resolvedPathname = matchedRoute?.resolvedPathname ?? pathname;
 			return await handleRoute({
 				matchedRoute,
@@ -83,7 +81,7 @@ export async function handleRequest({
 				pathname: resolvedPathname,
 				body,
 				origin,
-				env,
+				pipeline,
 				manifestData,
 				incomingRequest: incomingRequest,
 				incomingResponse: incomingResponse,
@@ -95,7 +93,7 @@ export async function handleRequest({
 
 			// This could be a runtime error from Vite's SSR module, so try to fix it here
 			try {
-				env.loader.fixStacktrace(err);
+				moduleLoader.fixStacktrace(err);
 			} catch {}
 
 			// This is our last line of defense regarding errors where we still might have some information about the request
@@ -104,7 +102,7 @@ export async function handleRequest({
 
 			telemetry.record(eventError({ cmd: 'dev', err: errorWithMetadata, isFatal: false }));
 
-			error(env.logging, null, msg.formatErrorMessage(errorWithMetadata));
+			pipeline.logger.error(null, msg.formatErrorMessage(errorWithMetadata));
 			handle500Response(moduleLoader, incomingResponse, errorWithMetadata);
 
 			return err;
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index 0bbaacbe222c..ae4318092c3e 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -1,25 +1,15 @@
-import mime from 'mime';
 import type http from 'node:http';
 import type {
 	ComponentInstance,
 	ManifestData,
-	MiddlewareResponseHandler,
+	MiddlewareEndpointHandler,
 	RouteData,
 	SSRElement,
 	SSRManifest,
 } from '../@types/astro';
-import { attachCookiesToResponse } from '../core/cookies/index.js';
 import { AstroErrorData, isAstroError } from '../core/errors/index.js';
-import { warn } from '../core/logger/core.js';
 import { loadMiddleware } from '../core/middleware/loadMiddleware.js';
-import { isEndpointResult } from '../core/render/core.js';
-import {
-	createRenderContext,
-	getParamsAndProps,
-	tryRenderRoute,
-	type DevelopmentEnvironment,
-	type SSROptions,
-} from '../core/render/index.js';
+import { createRenderContext, getParamsAndProps, type SSROptions } from '../core/render/index.js';
 import { createRequest } from '../core/request.js';
 import { matchAllRoutes } from '../core/routing/index.js';
 import { isPage, resolveIdToUrl, viteID } from '../core/util.js';
@@ -32,6 +22,7 @@ import { preload } from './index.js';
 import { getComponentMetadata } from './metadata.js';
 import { handle404Response, writeSSRResult, writeWebResponse } from './response.js';
 import { getScriptsForURL } from './scripts.js';
+import type DevPipeline from './devPipeline.js';
 
 const clientLocalsSymbol = Symbol.for('astro.locals');
 
@@ -56,12 +47,17 @@ function getCustom404Route(manifestData: ManifestData): RouteData | undefined {
 
 export async function matchRoute(
 	pathname: string,
-	env: DevelopmentEnvironment,
-	manifestData: ManifestData
+	manifestData: ManifestData,
+	pipeline: DevPipeline
 ): Promise<MatchedRoute | undefined> {
-	const { logging, settings, routeCache } = env;
+	const env = pipeline.getEnvironment();
+	const { routeCache, logging } = env;
 	const matches = matchAllRoutes(pathname, manifestData);
-	const preloadedMatches = await getSortedPreloadedMatches({ env, matches, settings });
+	const preloadedMatches = await getSortedPreloadedMatches({
+		pipeline,
+		matches,
+		settings: pipeline.getSettings(),
+	});
 
 	for await (const { preloadedComponent, route: maybeRoute, filePath } of preloadedMatches) {
 		// attempt to get static paths
@@ -73,7 +69,7 @@ export async function matchRoute(
 				routeCache,
 				pathname: pathname,
 				logging,
-				ssr: isServerLikeOutput(settings.config),
+				ssr: isServerLikeOutput(pipeline.getConfig()),
 			});
 			return {
 				route: maybeRoute,
@@ -96,14 +92,13 @@ export async function matchRoute(
 	// build formats, and is necessary based on how the manifest tracks build targets.
 	const altPathname = pathname.replace(/(index)?\.html$/, '');
 	if (altPathname !== pathname) {
-		return await matchRoute(altPathname, env, manifestData);
+		return await matchRoute(altPathname, manifestData, pipeline);
 	}
 
 	if (matches.length) {
 		const possibleRoutes = matches.flatMap((route) => route.component);
 
-		warn(
-			logging,
+		pipeline.logger.warn(
 			'getStaticPaths',
 			`${AstroErrorData.NoMatchingStaticPathFound.message(
 				pathname
@@ -115,8 +110,8 @@ export async function matchRoute(
 	const custom404 = getCustom404Route(manifestData);
 
 	if (custom404) {
-		const filePath = new URL(`./${custom404.component}`, settings.config.root);
-		const preloadedComponent = await preload({ env, filePath });
+		const filePath = new URL(`./${custom404.component}`, pipeline.getConfig().root);
+		const preloadedComponent = await preload({ pipeline, filePath });
 
 		return {
 			route: custom404,
@@ -136,12 +131,12 @@ type HandleRoute = {
 	pathname: string;
 	body: ArrayBuffer | undefined;
 	origin: string;
-	env: DevelopmentEnvironment;
 	manifestData: ManifestData;
 	incomingRequest: http.IncomingMessage;
 	incomingResponse: http.ServerResponse;
 	manifest: SSRManifest;
 	status?: 404 | 500;
+	pipeline: DevPipeline;
 };
 
 export async function handleRoute({
@@ -151,18 +146,21 @@ export async function handleRoute({
 	status = getStatus(matchedRoute),
 	body,
 	origin,
-	env,
+	pipeline,
 	manifestData,
 	incomingRequest,
 	incomingResponse,
 	manifest,
 }: HandleRoute): Promise<void> {
-	const { logging, settings } = env;
+	const env = pipeline.getEnvironment();
+	const settings = pipeline.getSettings();
+	const config = pipeline.getConfig();
+	const moduleLoader = pipeline.getModuleLoader();
+	const { logging } = env;
 	if (!matchedRoute) {
 		return handle404Response(origin, incomingRequest, incomingResponse);
 	}
 
-	const { config } = settings;
 	const filePath: URL | undefined = matchedRoute.filePath;
 	const { route, preloadedComponent } = matchedRoute;
 	const buildingToSSR = isServerLikeOutput(config);
@@ -192,14 +190,14 @@ export async function handleRoute({
 		request,
 		route,
 	};
-	const middleware = await loadMiddleware(env.loader, env.settings.config.srcDir);
+	const middleware = await loadMiddleware(moduleLoader, settings.config.srcDir);
 	if (middleware) {
 		options.middleware = middleware;
 	}
 	const mod = options.preload;
 
 	const { scripts, links, styles, metadata } = await getScriptsAndStyles({
-		env: options.env,
+		pipeline,
 		filePath: options.filePath,
 	});
 
@@ -214,70 +212,32 @@ export async function handleRoute({
 		mod,
 		env,
 	});
-	const onRequest = options.middleware?.onRequest as MiddlewareResponseHandler | undefined;
-
-	const result = await tryRenderRoute(renderContext, env, mod, onRequest);
-	if (isEndpointResult(result, route.type)) {
-		if (result.type === 'response') {
-			if (result.response.headers.get('X-Astro-Response') === 'Not-Found') {
-				const fourOhFourRoute = await matchRoute('/404', env, manifestData);
-				return handleRoute({
-					matchedRoute: fourOhFourRoute,
-					url: new URL('/404', url),
-					pathname: '/404',
-					status: 404,
-					body,
-					origin,
-					env,
-					manifestData,
-					incomingRequest,
-					incomingResponse,
-					manifest,
-				});
-			}
-			await writeWebResponse(incomingResponse, result.response);
-		} else {
-			let contentType = 'text/plain';
-			// Dynamic routes don't include `route.pathname`, so synthesize a path for these (e.g. 'src/pages/[slug].svg')
-			const filepath =
-				route.pathname ||
-				route.segments.map((segment) => segment.map((p) => p.content).join('')).join('/');
-			const computedMimeType = mime.getType(filepath);
-			if (computedMimeType) {
-				contentType = computedMimeType;
-			}
-			const response = new Response(
-				result.encoding !== 'binary' ? Buffer.from(result.body, result.encoding) : result.body,
-				{
-					status: 200,
-					headers: {
-						'Content-Type': `${contentType};charset=utf-8`,
-					},
-				}
-			);
-			attachCookiesToResponse(response, result.cookies);
-			await writeWebResponse(incomingResponse, response);
-		}
+	const onRequest = options.middleware?.onRequest as MiddlewareEndpointHandler | undefined;
+	if (onRequest) {
+		pipeline.setMiddlewareFunction(onRequest);
+	}
+	pipeline.setCurrentMatchedRoute(route);
+
+	let response = await pipeline.renderRoute(renderContext, mod);
+	if (response.status === 404) {
+		const fourOhFourRoute = await matchRoute('/404', manifestData, pipeline);
+		return handleRoute({
+			...options,
+			matchedRoute: fourOhFourRoute,
+			url: new URL(pathname, url),
+			status: 404,
+			body,
+			origin,
+			pipeline,
+			manifestData,
+			incomingRequest,
+			incomingResponse,
+			manifest,
+		});
+	}
+	if (route.type === 'endpoint') {
+		await writeWebResponse(incomingResponse, response);
 	} else {
-		if (result.status === 404) {
-			const fourOhFourRoute = await matchRoute('/404', env, manifestData);
-			return handleRoute({
-				...options,
-				matchedRoute: fourOhFourRoute,
-				url: new URL(pathname, url),
-				status: 404,
-				body,
-				origin,
-				env,
-				manifestData,
-				incomingRequest,
-				incomingResponse,
-				manifest,
-			});
-		}
-
-		let response = result;
-
 		if (
 			// We are in a recursion, and it's possible that this function is called itself with a status code
 			// By default, the status code passed via parameters is computed by the matched route.
@@ -291,23 +251,26 @@ export async function handleRoute({
 			return;
 		} else if (status && response.status !== status && (status === 404 || status === 500)) {
 			// Response.status is read-only, so a clone is required to override
-			response = new Response(result.body, { ...result, status });
+			response = new Response(response.body, { ...response, status });
 		}
 		await writeSSRResult(request, response, incomingResponse);
 	}
 }
 
 interface GetScriptsAndStylesParams {
-	env: DevelopmentEnvironment;
+	pipeline: DevPipeline;
 	filePath: URL;
 }
 
-async function getScriptsAndStyles({ env, filePath }: GetScriptsAndStylesParams) {
+async function getScriptsAndStyles({ pipeline, filePath }: GetScriptsAndStylesParams) {
+	const moduleLoader = pipeline.getModuleLoader();
+	const settings = pipeline.getSettings();
+	const mode = pipeline.getEnvironment().mode;
 	// Add hoisted script tags
-	const scripts = await getScriptsForURL(filePath, env.settings.config.root, env.loader);
+	const scripts = await getScriptsForURL(filePath, settings.config.root, moduleLoader);
 
 	// Inject HMR scripts
-	if (isPage(filePath, env.settings) && env.mode === 'development') {
+	if (isPage(filePath, settings) && mode === 'development') {
 		scripts.add({
 			props: { type: 'module', src: '/@vite/client' },
 			children: '',
@@ -315,20 +278,20 @@ async function getScriptsAndStyles({ env, filePath }: GetScriptsAndStylesParams)
 		scripts.add({
 			props: {
 				type: 'module',
-				src: await resolveIdToUrl(env.loader, 'astro/runtime/client/hmr.js'),
+				src: await resolveIdToUrl(moduleLoader, 'astro/runtime/client/hmr.js'),
 			},
 			children: '',
 		});
 	}
 
 	// TODO: We should allow adding generic HTML elements to the head, not just scripts
-	for (const script of env.settings.scripts) {
+	for (const script of settings.scripts) {
 		if (script.stage === 'head-inline') {
 			scripts.add({
 				props: {},
 				children: script.content,
 			});
-		} else if (script.stage === 'page' && isPage(filePath, env.settings)) {
+		} else if (script.stage === 'page' && isPage(filePath, settings)) {
 			scripts.add({
 				props: { type: 'module', src: `/@id/${PAGE_SCRIPT_ID}` },
 				children: '',
@@ -337,7 +300,7 @@ async function getScriptsAndStyles({ env, filePath }: GetScriptsAndStylesParams)
 	}
 
 	// Pass framework CSS in as style tags to be appended to the page.
-	const { urls: styleUrls, stylesMap } = await getStylesForURL(filePath, env.loader, env.mode);
+	const { urls: styleUrls, stylesMap } = await getStylesForURL(filePath, moduleLoader, mode);
 	let links = new Set<SSRElement>();
 	[...styleUrls].forEach((href) => {
 		links.add({
@@ -364,13 +327,13 @@ async function getScriptsAndStyles({ env, filePath }: GetScriptsAndStylesParams)
 			props: {
 				type: 'text/css',
 				// Track the ID so we can match it to Vite's injected style later
-				'data-astro-dev-id': viteID(new URL(`.${url}`, env.settings.config.root)),
+				'data-astro-dev-id': viteID(new URL(`.${url}`, settings.config.root)),
 			},
 			children: content,
 		});
 	});
 
-	const metadata = await getComponentMetadata(filePath, env.loader);
+	const metadata = await getComponentMetadata(filePath, moduleLoader);
 
 	return { scripts, styles, links, metadata };
 }
diff --git a/packages/astro/src/vite-plugin-integrations-container/index.ts b/packages/astro/src/vite-plugin-integrations-container/index.ts
index d6bfd76d7621..6cc2da1528ad 100644
--- a/packages/astro/src/vite-plugin-integrations-container/index.ts
+++ b/packages/astro/src/vite-plugin-integrations-container/index.ts
@@ -16,9 +16,9 @@ export default function astroIntegrationsContainerPlugin({
 }): VitePlugin {
 	return {
 		name: 'astro:integration-container',
-		configureServer(server) {
+		async configureServer(server) {
 			if (server.config.isProduction) return;
-			runHookServerSetup({ config: settings.config, server, logging });
+			await runHookServerSetup({ config: settings.config, server, logging });
 		},
 		async buildStart() {
 			if (settings.injectedRoutes.length === settings.resolvedInjectedRoutes.length) return;
diff --git a/packages/astro/test/core-image.test.js b/packages/astro/test/core-image.test.js
index ff0adde52324..26fafe41aaf7 100644
--- a/packages/astro/test/core-image.test.js
+++ b/packages/astro/test/core-image.test.js
@@ -22,6 +22,7 @@ describe('astro:image', () => {
 				root: './fixtures/core-image/',
 				image: {
 					service: testImageService({ foo: 'bar' }),
+					domains: ['avatars.githubusercontent.com'],
 				},
 			});
 
@@ -195,6 +196,15 @@ describe('astro:image', () => {
 					$ = cheerio.load(html);
 				});
 
+				it('has proper link and works', async () => {
+					let $img = $('#remote img');
+
+					let src = $img.attr('src');
+					expect(src.startsWith('/_image?')).to.be.true;
+					const imageRequest = await fixture.fetch(src);
+					expect(imageRequest.status).to.equal(200);
+				});
+
 				it('includes the provided alt', async () => {
 					let $img = $('#remote img');
 					expect($img.attr('alt')).to.equal('fred');
@@ -572,6 +582,7 @@ describe('astro:image', () => {
 				root: './fixtures/core-image-ssg/',
 				image: {
 					service: testImageService(),
+					domains: ['astro.build'],
 				},
 			});
 			// Remove cache directory
@@ -589,6 +600,15 @@ describe('astro:image', () => {
 			expect(data).to.be.an.instanceOf(Buffer);
 		});
 
+		it('writes out allowed remote images', async () => {
+			const html = await fixture.readFile('/remote/index.html');
+			const $ = cheerio.load(html);
+			const src = $('#remote img').attr('src');
+			expect(src.length).to.be.greaterThan(0);
+			const data = await fixture.readFile(src, null);
+			expect(data).to.be.an.instanceOf(Buffer);
+		});
+
 		it('writes out images to dist folder with proper extension if no format was passed', async () => {
 			const html = await fixture.readFile('/index.html');
 			const $ = cheerio.load(html);
@@ -693,12 +713,15 @@ describe('astro:image', () => {
 		});
 
 		it('has cache entries', async () => {
-			const generatedImages = (await fixture.glob('_astro/**/*.webp')).map((path) =>
-				basename(path)
-			);
-			const cachedImages = (await fixture.glob('../node_modules/.astro/assets/**/*.webp')).map(
-				(path) => basename(path)
-			);
+			const generatedImages = (await fixture.glob('_astro/**/*.webp'))
+				.map((path) => basename(path))
+				.sort();
+			const cachedImages = [
+				...(await fixture.glob('../node_modules/.astro/assets/**/*.webp')),
+				...(await fixture.glob('../node_modules/.astro/assets/**/*.json')),
+			]
+				.map((path) => basename(path).replace('.webp.json', '.webp'))
+				.sort();
 
 			expect(generatedImages).to.deep.equal(cachedImages);
 		});
diff --git a/packages/astro/test/css-inline-stylesheets.test.js b/packages/astro/test/css-inline-stylesheets.test.js
index 63148bbfd693..bcd895a47161 100644
--- a/packages/astro/test/css-inline-stylesheets.test.js
+++ b/packages/astro/test/css-inline-stylesheets.test.js
@@ -8,7 +8,11 @@ describe('Setting inlineStylesheets to never in static output', () => {
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/css-inline-stylesheets/never/',
+			// inconsequential config that differs between tests
+			// to bust cache and prevent modules and their state
+			// from being reused
+			site: 'https://test.dev/',
+			root: './fixtures/css-inline-stylesheets/',
 			output: 'static',
 			build: {
 				inlineStylesheets: 'never',
@@ -41,7 +45,11 @@ describe('Setting inlineStylesheets to never in server output', () => {
 
 	before(async () => {
 		const fixture = await loadFixture({
-			root: './fixtures/css-inline-stylesheets/never/',
+			// inconsequential config that differs between tests
+			// to bust cache and prevent modules and their state
+			// from being reused
+			site: 'https://test.dev/',
+			root: './fixtures/css-inline-stylesheets/',
 			output: 'server',
 			adapter: testAdapter(),
 			build: {
@@ -77,7 +85,11 @@ describe('Setting inlineStylesheets to auto in static output', () => {
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/css-inline-stylesheets/auto/',
+			// inconsequential config that differs between tests
+			// to bust cache and prevent modules and their state
+			// from being reused
+			site: 'https://test.info/',
+			root: './fixtures/css-inline-stylesheets/',
 			output: 'static',
 			build: {
 				inlineStylesheets: 'auto',
@@ -117,7 +129,11 @@ describe('Setting inlineStylesheets to auto in server output', () => {
 
 	before(async () => {
 		const fixture = await loadFixture({
-			root: './fixtures/css-inline-stylesheets/auto/',
+			// inconsequential config that differs between tests
+			// to bust cache and prevent modules and their state
+			// from being reused
+			site: 'https://test.info/',
+			root: './fixtures/css-inline-stylesheets/',
 			output: 'server',
 			adapter: testAdapter(),
 			build: {
@@ -161,7 +177,11 @@ describe('Setting inlineStylesheets to always in static output', () => {
 
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/css-inline-stylesheets/always/',
+			// inconsequential config that differs between tests
+			// to bust cache and prevent modules and their state
+			// from being reused
+			site: 'https://test.net/',
+			root: './fixtures/css-inline-stylesheets/',
 			output: 'static',
 			build: {
 				inlineStylesheets: 'always',
@@ -193,7 +213,11 @@ describe('Setting inlineStylesheets to always in server output', () => {
 
 	before(async () => {
 		const fixture = await loadFixture({
-			root: './fixtures/css-inline-stylesheets/always/',
+			// inconsequential config that differs between tests
+			// to bust cache and prevent modules and their state
+			// from being reused
+			site: 'https://test.net/',
+			root: './fixtures/css-inline-stylesheets/',
 			output: 'server',
 			adapter: testAdapter(),
 			build: {
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/basic.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/basic.astro
index 9fba8620a6dd..ddbd92fede7d 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/basic.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/basic.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/css-theme.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/css-theme.astro
index 8a4a8debf362..74342384959f 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/css-theme.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/css-theme.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/custom-theme.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/custom-theme.astro
index 80cafe5cced5..45e92dccf346 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/custom-theme.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/custom-theme.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/imported.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/imported.astro
index 02e6b4b03b34..6ea6782d6862 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/imported.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/imported.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 import riGrammar from '../assets/ri.tmLanguage.json'
 import serendipity from '../assets/serendipity-morning.json'
 
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
index 05422c8bf66a..10c17f4e2673 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/inline.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/inline.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/no-lang.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/no-lang.astro
index ebc1b0810d49..d0ae5f95f35e 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/no-lang.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/no-lang.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-false.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-false.astro
index ca1e238c71a2..aa4a58707b5f 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-false.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-false.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-null.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-null.astro
index cff0190e8b8e..f72e093dda20 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-null.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-null.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-true.astro b/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-true.astro
index 82e8f65c2fb9..43ccb54521b5 100644
--- a/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-true.astro
+++ b/packages/astro/test/fixtures/astro-component-code/src/pages/wrap-true.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Code component</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/code-component/src/pages/index.astro b/packages/astro/test/fixtures/code-component/src/pages/index.astro
index 763f32caebd0..d165a4308691 100644
--- a/packages/astro/test/fixtures/code-component/src/pages/index.astro
+++ b/packages/astro/test/fixtures/code-component/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import { Code } from 'astro/components';
+import { Code } from 'astro:components';
 ---
 <html>
 	<head>
diff --git a/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json b/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json
index c62d06aab009..8ab06ff1f24f 100644
--- a/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json
+++ b/packages/astro/test/fixtures/content-collection-references/src/content/banners/welcome.json
@@ -1,4 +1,4 @@
 {
   "alt": "Futuristic landscape with chrome buildings and blue skies",
-  "src": "~/assets/the-future.jpg"
+  "src": "../../assets/the-future.jpg"
 }
diff --git a/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md b/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md
index 59a5b77baf03..d449290ef6d6 100644
--- a/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md
+++ b/packages/astro/test/fixtures/core-image-base/src/content/blog/one.md
@@ -1,6 +1,6 @@
 ---
 title: One
-image: ~/assets/penguin2.jpg
+image: ../../assets/penguin2.jpg
 cover:
   image: ../../assets/penguin1.jpg
 ---
diff --git a/packages/astro/test/fixtures/core-image-base/tsconfig.json b/packages/astro/test/fixtures/core-image-base/tsconfig.json
new file mode 100644
index 000000000000..b5bf6a715eb5
--- /dev/null
+++ b/packages/astro/test/fixtures/core-image-base/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/assets/*": ["src/assets/*"]
+    },
+  }
+}
diff --git a/packages/astro/test/fixtures/core-image-ssg/src/pages/remote.astro b/packages/astro/test/fixtures/core-image-ssg/src/pages/remote.astro
new file mode 100644
index 000000000000..727a15ff0868
--- /dev/null
+++ b/packages/astro/test/fixtures/core-image-ssg/src/pages/remote.astro
@@ -0,0 +1,7 @@
+---
+import { Image } from "astro:assets";
+---
+
+<div id="remote">
+<Image src="https://astro.build/sponsors.png" alt="fred" width="48" height="48" />
+</div>
diff --git a/packages/astro/test/fixtures/core-image-ssg/tsconfig.json b/packages/astro/test/fixtures/core-image-ssg/tsconfig.json
new file mode 100644
index 000000000000..b5bf6a715eb5
--- /dev/null
+++ b/packages/astro/test/fixtures/core-image-ssg/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/assets/*": ["src/assets/*"]
+    },
+  }
+}
diff --git a/packages/astro/test/fixtures/core-image/src/content/blog/one.md b/packages/astro/test/fixtures/core-image/src/content/blog/one.md
index ef0993f638b0..8c6522534185 100644
--- a/packages/astro/test/fixtures/core-image/src/content/blog/one.md
+++ b/packages/astro/test/fixtures/core-image/src/content/blog/one.md
@@ -1,11 +1,11 @@
 ---
 title: One
-image: ~/assets/penguin2.jpg
+image: ../../assets/penguin2.jpg
 cover:
   image: ../../assets/penguin1.jpg
 arrayOfImages:
-  - ~/assets/penguin2.jpg
-  - ~/assets/penguin1.jpg
+  - ../../assets/penguin2.jpg
+  - ../../assets/penguin1.jpg
 refinedImage: ../../assets/penguin1.jpg
 ---
 
diff --git a/packages/astro/test/fixtures/core-image/tsconfig.json b/packages/astro/test/fixtures/core-image/tsconfig.json
new file mode 100644
index 000000000000..b5bf6a715eb5
--- /dev/null
+++ b/packages/astro/test/fixtures/core-image/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/assets/*": ["src/assets/*"]
+    },
+  }
+}
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/auto/package.json b/packages/astro/test/fixtures/css-inline-stylesheets/auto/package.json
deleted file mode 100644
index 3eb8e9d51232..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/auto/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "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
deleted file mode 100644
index 3f25cbd3e3ae..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/components/Button.astro
+++ /dev/null
@@ -1,86 +0,0 @@
----
-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
deleted file mode 100644
index 240eeeae3993..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/content/en/endeavour.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-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
deleted file mode 100644
index 3959523ff16e..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/imported.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.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
deleted file mode 100644
index 0a26655189f5..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/layouts/Layout.astro
+++ /dev/null
@@ -1,35 +0,0 @@
----
-import Button from '../components/Button.astro';
-import '../imported.css';
-
-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>
-	        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </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
deleted file mode 100644
index bfdbeb5f8e85..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/auto/src/pages/index.astro
+++ /dev/null
@@ -1,17 +0,0 @@
----
-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
deleted file mode 100644
index 382288fbc12e..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/never/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "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
deleted file mode 100644
index 3f25cbd3e3ae..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/components/Button.astro
+++ /dev/null
@@ -1,86 +0,0 @@
----
-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
deleted file mode 100644
index 240eeeae3993..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/content/en/endeavour.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-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
deleted file mode 100644
index 3959523ff16e..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/imported.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.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
deleted file mode 100644
index 0a26655189f5..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/layouts/Layout.astro
+++ /dev/null
@@ -1,35 +0,0 @@
----
-import Button from '../components/Button.astro';
-import '../imported.css';
-
-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>
-	        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </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
deleted file mode 100644
index bfdbeb5f8e85..000000000000
--- a/packages/astro/test/fixtures/css-inline-stylesheets/never/src/pages/index.astro
+++ /dev/null
@@ -1,17 +0,0 @@
----
-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/always/package.json b/packages/astro/test/fixtures/css-inline-stylesheets/package.json
similarity index 100%
rename from packages/astro/test/fixtures/css-inline-stylesheets/always/package.json
rename to packages/astro/test/fixtures/css-inline-stylesheets/package.json
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/components/Button.astro b/packages/astro/test/fixtures/css-inline-stylesheets/src/components/Button.astro
similarity index 100%
rename from packages/astro/test/fixtures/css-inline-stylesheets/always/src/components/Button.astro
rename to packages/astro/test/fixtures/css-inline-stylesheets/src/components/Button.astro
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/content/en/endeavour.md b/packages/astro/test/fixtures/css-inline-stylesheets/src/content/en/endeavour.md
similarity index 100%
rename from packages/astro/test/fixtures/css-inline-stylesheets/always/src/content/en/endeavour.md
rename to packages/astro/test/fixtures/css-inline-stylesheets/src/content/en/endeavour.md
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/imported.css b/packages/astro/test/fixtures/css-inline-stylesheets/src/imported.css
similarity index 100%
rename from packages/astro/test/fixtures/css-inline-stylesheets/always/src/imported.css
rename to packages/astro/test/fixtures/css-inline-stylesheets/src/imported.css
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/layouts/Layout.astro b/packages/astro/test/fixtures/css-inline-stylesheets/src/layouts/Layout.astro
similarity index 100%
rename from packages/astro/test/fixtures/css-inline-stylesheets/always/src/layouts/Layout.astro
rename to packages/astro/test/fixtures/css-inline-stylesheets/src/layouts/Layout.astro
diff --git a/packages/astro/test/fixtures/css-inline-stylesheets/always/src/pages/index.astro b/packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro
similarity index 100%
rename from packages/astro/test/fixtures/css-inline-stylesheets/always/src/pages/index.astro
rename to packages/astro/test/fixtures/css-inline-stylesheets/src/pages/index.astro
diff --git a/packages/astro/test/fixtures/integration-server-setup/integration.js b/packages/astro/test/fixtures/integration-server-setup/integration.js
index bcbd86228a89..f5000fa6bacd 100644
--- a/packages/astro/test/fixtures/integration-server-setup/integration.js
+++ b/packages/astro/test/fixtures/integration-server-setup/integration.js
@@ -1,8 +1,12 @@
+import { setTimeout } from "node:timers/promises";
+
 export default function() {
 	return {
 		name: '@astrojs/test-integration',
 		hooks: {
-			'astro:server:setup': ({ server }) => {
+			'astro:server:setup': async ({ server }) => {
+				// Ensure that `async` is respected
+				await setTimeout(100);
 				server.middlewares.use(
 					function middleware(req, res, next) {
 						res.setHeader('x-middleware', 'true');
diff --git a/packages/astro/test/fixtures/middleware-dev/src/middleware.js b/packages/astro/test/fixtures/middleware-dev/src/middleware.js
index 2f9fc08b9151..854c997c1099 100644
--- a/packages/astro/test/fixtures/middleware-dev/src/middleware.js
+++ b/packages/astro/test/fixtures/middleware-dev/src/middleware.js
@@ -1,4 +1,4 @@
-import { sequence, defineMiddleware } from 'astro/middleware';
+import { sequence, defineMiddleware } from 'astro:middleware';
 
 const first = defineMiddleware(async (context, next) => {
 	if (context.request.url.includes('/lorem')) {
diff --git a/packages/astro/test/fixtures/middleware-ssg/src/middleware.js b/packages/astro/test/fixtures/middleware-ssg/src/middleware.js
index f28d89f670aa..04c0bfb3a41d 100644
--- a/packages/astro/test/fixtures/middleware-ssg/src/middleware.js
+++ b/packages/astro/test/fixtures/middleware-ssg/src/middleware.js
@@ -1,4 +1,4 @@
-import { sequence, defineMiddleware } from 'astro/middleware';
+import { sequence, defineMiddleware } from 'astro:middleware';
 
 const first = defineMiddleware(async (context, next) => {
 	if (context.request.url.includes('/second')) {
diff --git a/packages/astro/test/fixtures/react-component/src/components/WithChildren.jsx b/packages/astro/test/fixtures/react-component/src/components/WithChildren.jsx
deleted file mode 100644
index cdcb0e0a6d79..000000000000
--- a/packages/astro/test/fixtures/react-component/src/components/WithChildren.jsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import React from 'react';
-
-export default function ({ children }) {
-  return <div className="with-children">{children}</div>;
-}
diff --git a/packages/astro/test/fixtures/ssr-redirect/src/middleware.ts b/packages/astro/test/fixtures/ssr-redirect/src/middleware.ts
index a8de8d130676..57ce556781a8 100644
--- a/packages/astro/test/fixtures/ssr-redirect/src/middleware.ts
+++ b/packages/astro/test/fixtures/ssr-redirect/src/middleware.ts
@@ -1,4 +1,4 @@
-import { defineMiddleware } from 'astro/middleware';
+import { defineMiddleware } from 'astro:middleware';
 
 export const onRequest = defineMiddleware(({ request }, next) => {
 	if(new URL(request.url).pathname === '/middleware-redirect/') {
diff --git a/packages/astro/test/fixtures/static-build-code-component/src/pages/index.astro b/packages/astro/test/fixtures/static-build-code-component/src/pages/index.astro
index e2f564a3bcf6..c87ed5b088ba 100644
--- a/packages/astro/test/fixtures/static-build-code-component/src/pages/index.astro
+++ b/packages/astro/test/fixtures/static-build-code-component/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Testing</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/fixtures/static-build-dir/src/pages/index.astro b/packages/astro/test/fixtures/static-build-dir/src/pages/index.astro
index e2f564a3bcf6..c87ed5b088ba 100644
--- a/packages/astro/test/fixtures/static-build-dir/src/pages/index.astro
+++ b/packages/astro/test/fixtures/static-build-dir/src/pages/index.astro
@@ -1,5 +1,5 @@
 ---
-import {Code} from 'astro/components';
+import {Code} from 'astro:components';
 ---
 <html>
 <head><title>Testing</title>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
diff --git a/packages/astro/test/ssr-prerender.test.js b/packages/astro/test/ssr-prerender.test.js
index 90ec1b6faa54..567371f0bbaa 100644
--- a/packages/astro/test/ssr-prerender.test.js
+++ b/packages/astro/test/ssr-prerender.test.js
@@ -30,8 +30,7 @@ describe('SSR: prerender', () => {
 			const app = await fixture.loadTestAdapterApp();
 			/** @type {Set<string>} */
 			const assets = app.manifest.assets;
-			expect(assets.size).to.equal(1);
-			expect(Array.from(assets)[0].endsWith('static/index.html')).to.be.true;
+			expect(assets).to.contain('/static/index.html');
 		});
 	});
 
diff --git a/packages/astro/test/test-image-service.js b/packages/astro/test/test-image-service.js
index ebdbb0765d40..bcf623caa809 100644
--- a/packages/astro/test/test-image-service.js
+++ b/packages/astro/test/test-image-service.js
@@ -17,8 +17,8 @@ export default {
 	...baseService,
 	getHTMLAttributes(options, serviceConfig) {
 		options['data-service'] = 'my-custom-service';
-		if (serviceConfig.foo) {
-			options['data-service-config'] = serviceConfig.foo;
+		if (serviceConfig.service.config.foo) {
+			options['data-service-config'] = serviceConfig.service.config.foo;
 		}
 		return baseService.getHTMLAttributes(options);
 	},
diff --git a/packages/astro/test/units/assets/remote-pattern.test.js b/packages/astro/test/units/assets/remote-pattern.test.js
new file mode 100644
index 000000000000..62a411e3a659
--- /dev/null
+++ b/packages/astro/test/units/assets/remote-pattern.test.js
@@ -0,0 +1,111 @@
+import { expect } from 'chai';
+import {
+	matchProtocol,
+	matchPort,
+	matchHostname,
+	matchPathname,
+	matchPattern,
+} from '../../../dist/assets/utils/remotePattern.js';
+
+describe('astro/src/assets/utils/remotePattern', () => {
+	const url1 = new URL('https://docs.astro.build/en/getting-started');
+	const url2 = new URL('http://preview.docs.astro.build:8080/');
+	const url3 = new URL('https://astro.build/');
+	const url4 = new URL('https://example.co/');
+
+	describe('remote pattern matchers', () => {
+		it('matches protocol', async () => {
+			// undefined
+			expect(matchProtocol(url1)).to.be.true;
+
+			// defined, true/false
+			expect(matchProtocol(url1, 'http')).to.be.false;
+			expect(matchProtocol(url1, 'https')).to.be.true;
+		});
+
+		it('matches port', async () => {
+			// undefined
+			expect(matchPort(url1)).to.be.true;
+
+			// defined, but port is empty (default port used in URL)
+			expect(matchPort(url1, '')).to.be.true;
+
+			// defined and port is custom
+			expect(matchPort(url2, '8080')).to.be.true;
+		});
+
+		it('matches hostname (no wildcards)', async () => {
+			// undefined
+			expect(matchHostname(url1)).to.be.true;
+
+			// defined, true/false
+			expect(matchHostname(url1, 'astro.build')).to.be.false;
+			expect(matchHostname(url1, 'docs.astro.build')).to.be.true;
+		});
+
+		it('matches hostname (with wildcards)', async () => {
+			// defined, true/false
+			expect(matchHostname(url1, 'docs.astro.build', true)).to.be.true;
+			expect(matchHostname(url1, '**.astro.build', true)).to.be.true;
+			expect(matchHostname(url1, '*.astro.build', true)).to.be.true;
+
+			expect(matchHostname(url2, '*.astro.build', true)).to.be.false;
+			expect(matchHostname(url2, '**.astro.build', true)).to.be.true;
+
+			expect(matchHostname(url3, 'astro.build', true)).to.be.true;
+			expect(matchHostname(url3, '*.astro.build', true)).to.be.false;
+			expect(matchHostname(url3, '**.astro.build', true)).to.be.false;
+		});
+
+		it('matches pathname (no wildcards)', async () => {
+			// undefined
+			expect(matchPathname(url1)).to.be.true;
+
+			// defined, true/false
+			expect(matchPathname(url1, '/')).to.be.false;
+			expect(matchPathname(url1, '/en/getting-started')).to.be.true;
+		});
+
+		it('matches pathname (with wildcards)', async () => {
+			// defined, true/false
+			expect(matchPathname(url1, '/en/**', true)).to.be.true;
+			expect(matchPathname(url1, '/en/*', true)).to.be.true;
+			expect(matchPathname(url1, '/**', true)).to.be.true;
+
+			expect(matchPathname(url2, '/**', true)).to.be.false;
+			expect(matchPathname(url2, '/*', true)).to.be.false;
+		});
+
+		it('matches patterns', async () => {
+			expect(matchPattern(url1, {})).to.be.true;
+
+			expect(
+				matchPattern(url1, {
+					protocol: 'https',
+				})
+			).to.be.true;
+
+			expect(
+				matchPattern(url1, {
+					protocol: 'https',
+					hostname: '**.astro.build',
+				})
+			).to.be.true;
+
+			expect(
+				matchPattern(url1, {
+					protocol: 'https',
+					hostname: '**.astro.build',
+					pathname: '/en/**',
+				})
+			).to.be.true;
+
+			expect(
+				matchPattern(url4, {
+					protocol: 'https',
+					hostname: 'example.com',
+				})
+			).to.be.false;
+		});
+	});
+});
diff --git a/packages/astro/test/units/routing/route-matching.test.js b/packages/astro/test/units/routing/route-matching.test.js
index e1c4df5c59ad..c0bf7d6e6c7c 100644
--- a/packages/astro/test/units/routing/route-matching.test.js
+++ b/packages/astro/test/units/routing/route-matching.test.js
@@ -12,8 +12,8 @@ import { createContainer } from '../../../dist/core/dev/container.js';
 import * as cheerio from 'cheerio';
 import testAdapter from '../../test-adapter.js';
 import { getSortedPreloadedMatches } from '../../../dist/prerender/routing.js';
-import { createDevelopmentEnvironment } from '../../../dist/vite-plugin-astro-server/environment.js';
 import { createDevelopmentManifest } from '../../../dist/vite-plugin-astro-server/plugin.js';
+import DevPipeline from '../../../dist/vite-plugin-astro-server/devPipeline.js';
 
 const root = new URL('../../fixtures/alias/', import.meta.url);
 const fileSystem = {
@@ -124,7 +124,7 @@ const fileSystem = {
 };
 
 describe('Route matching', () => {
-	let env;
+	let pipeline;
 	let manifestData;
 	let container;
 	let settings;
@@ -145,7 +145,7 @@ describe('Route matching', () => {
 
 		const loader = createViteLoader(container.viteServer);
 		const manifest = createDevelopmentManifest(container.settings);
-		env = createDevelopmentEnvironment(manifest, container.settings, defaultLogging, loader);
+		pipeline = new DevPipeline({ manifest, logging: defaultLogging, settings, loader });
 		manifestData = createRouteManifest(
 			{
 				cwd: fileURLToPath(root),
@@ -163,7 +163,7 @@ describe('Route matching', () => {
 	describe('Matched routes', () => {
 		it('should be sorted correctly', async () => {
 			const matches = matchAllRoutes('/try-matching-a-route', manifestData);
-			const preloadedMatches = await getSortedPreloadedMatches({ env, matches, settings });
+			const preloadedMatches = await getSortedPreloadedMatches({ pipeline, matches, settings });
 			const sortedRouteNames = preloadedMatches.map((match) => match.route.route);
 
 			expect(sortedRouteNames).to.deep.equal([
@@ -177,7 +177,7 @@ describe('Route matching', () => {
 		});
 		it('nested should be sorted correctly', async () => {
 			const matches = matchAllRoutes('/nested/try-matching-a-route', manifestData);
-			const preloadedMatches = await getSortedPreloadedMatches({ env, matches, settings });
+			const preloadedMatches = await getSortedPreloadedMatches({ pipeline, matches, settings });
 			const sortedRouteNames = preloadedMatches.map((match) => match.route.route);
 
 			expect(sortedRouteNames).to.deep.equal([
diff --git a/packages/astro/test/units/vite-plugin-astro-server/request.test.js b/packages/astro/test/units/vite-plugin-astro-server/request.test.js
index 48d449ccdcfb..58ad404fd339 100644
--- a/packages/astro/test/units/vite-plugin-astro-server/request.test.js
+++ b/packages/astro/test/units/vite-plugin-astro-server/request.test.js
@@ -1,31 +1,35 @@
 import { expect } from 'chai';
-
 import { createLoader } from '../../../dist/core/module-loader/index.js';
 import { createRouteManifest } from '../../../dist/core/routing/index.js';
 import { createComponent, render } from '../../../dist/runtime/server/index.js';
 import { createController, handleRequest } from '../../../dist/vite-plugin-astro-server/index.js';
 import {
 	createAstroModule,
-	createBasicEnvironment,
 	createBasicSettings,
 	createFs,
 	createRequestAndResponse,
 	defaultLogging,
 } from '../test-utils.js';
+import { createDevelopmentManifest } from '../../../dist/vite-plugin-astro-server/plugin.js';
+import DevPipeline from '../../../dist/vite-plugin-astro-server/devPipeline.js';
+
+async function createDevPipeline(overrides = {}) {
+	const settings = overrides.settings ?? (await createBasicSettings({ root: '/' }));
+	const loader = overrides.loader ?? createLoader();
+	const manifest = createDevelopmentManifest(settings);
 
-async function createDevEnvironment(overrides = {}) {
-	const env = createBasicEnvironment();
-	env.settings = await createBasicSettings({ root: '/' });
-	env.settings.renderers = [];
-	env.loader = createLoader();
-	Object.assign(env, overrides);
-	return env;
+	return new DevPipeline({
+		manifest,
+		settings,
+		logging: defaultLogging,
+		loader,
+	});
 }
 
 describe('vite-plugin-astro-server', () => {
 	describe('request', () => {
 		it('renders a request', async () => {
-			const env = await createDevEnvironment({
+			const pipeline = await createDevPipeline({
 				loader: createLoader({
 					import() {
 						const Page = createComponent(() => {
@@ -35,7 +39,7 @@ describe('vite-plugin-astro-server', () => {
 					},
 				}),
 			});
-			const controller = createController({ loader: env.loader });
+			const controller = createController({ loader: pipeline.getModuleLoader() });
 			const { req, res, text } = createRequestAndResponse();
 			const fs = createFs(
 				{
@@ -47,14 +51,14 @@ describe('vite-plugin-astro-server', () => {
 			const manifestData = createRouteManifest(
 				{
 					fsMod: fs,
-					settings: env.settings,
+					settings: pipeline.getSettings(),
 				},
 				defaultLogging
 			);
 
 			try {
 				await handleRequest({
-					env,
+					pipeline,
 					manifestData,
 					controller,
 					incomingRequest: req,
diff --git a/packages/astro/tsconfigs/base.json b/packages/astro/tsconfigs/base.json
index d921ef4bef6e..5786931959d4 100644
--- a/packages/astro/tsconfigs/base.json
+++ b/packages/astro/tsconfigs/base.json
@@ -23,11 +23,6 @@
     "esModuleInterop": true,
     // Skip typechecking libraries and .d.ts files
     "skipLibCheck": true,
-    // Add alias for assets folder for easy reference to assets
-    "baseUrl": ".",
-    "paths": {
-      "~/assets/*": ["src/assets/*"]
-    },
     // Allow JavaScript files to be imported
     "allowJs": true
   }
diff --git a/packages/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md
index 519133c715dc..be4257b58691 100644
--- a/packages/create-astro/CHANGELOG.md
+++ b/packages/create-astro/CHANGELOG.md
@@ -6,6 +6,18 @@
 
 - [`1eae2e3f7`](https://github.com/withastro/astro/commit/1eae2e3f7d693c9dfe91c8ccfbe606d32bf2fb81) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Remove support for Node 16. The lowest supported version by Astro and all integrations is now v18.14.1. As a reminder, Node 16 will be deprecated on the 11th September 2023.
 
+## 3.2.1
+
+### Patch Changes
+
+- [#8089](https://github.com/withastro/astro/pull/8089) [`04755e846`](https://github.com/withastro/astro/commit/04755e84658ea10914a09f3d07f302267326d610) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix install step to avoid uncaught errors
+
+## 3.2.0
+
+### Minor Changes
+
+- [#8077](https://github.com/withastro/astro/pull/8077) [`44cf30a25`](https://github.com/withastro/astro/commit/44cf30a25209b331e6e8a95a4b40a768ede3604a) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Reduce dependency installation size, swap `execa` for light `node:child_process` wrapper
+
 ## 3.1.13
 
 ### Patch Changes
diff --git a/packages/create-astro/src/actions/next-steps.ts b/packages/create-astro/src/actions/next-steps.ts
index 1b3a0db286c4..01c1963d9826 100644
--- a/packages/create-astro/src/actions/next-steps.ts
+++ b/packages/create-astro/src/actions/next-steps.ts
@@ -5,7 +5,12 @@ import { nextSteps, say } from '../messages.js';
 
 export async function next(ctx: Pick<Context, 'cwd' | 'pkgManager' | 'skipHouston'>) {
 	let projectDir = path.relative(process.cwd(), ctx.cwd);
-	const devCmd = ctx.pkgManager === 'npm' ? 'npm run dev' : `${ctx.pkgManager} dev`;
+	const devCmd =
+		ctx.pkgManager === 'npm'
+			? 'npm run dev'
+			: ctx.pkgManager === 'bun'
+			? 'bun run dev'
+			: `${ctx.pkgManager} dev`;
 	await nextSteps({ projectDir, devCmd });
 
 	if (!ctx.skipHouston) {
diff --git a/packages/create-astro/src/actions/template.ts b/packages/create-astro/src/actions/template.ts
index ca041642bf99..887ba69f56e9 100644
--- a/packages/create-astro/src/actions/template.ts
+++ b/packages/create-astro/src/actions/template.ts
@@ -66,7 +66,7 @@ const FILES_TO_UPDATE = {
 		}),
 };
 
-function getTemplateTarget(tmpl: string, ref = 'latest') {
+export function getTemplateTarget(tmpl: string, ref = 'latest') {
 	if (tmpl.startsWith('starlight')) {
 		const [, starter = 'basics'] = tmpl.split('/');
 		return `withastro/starlight/examples/${starter}`;
diff --git a/packages/create-astro/src/actions/verify.ts b/packages/create-astro/src/actions/verify.ts
new file mode 100644
index 000000000000..73359142bdb6
--- /dev/null
+++ b/packages/create-astro/src/actions/verify.ts
@@ -0,0 +1,93 @@
+import type { Context } from './context';
+
+import { color } from '@astrojs/cli-kit';
+import fetch from 'node-fetch-native';
+import dns from 'node:dns/promises';
+import { bannerAbort, error, info, log } from '../messages.js';
+import { getTemplateTarget } from './template.js';
+
+export async function verify(
+	ctx: Pick<Context, 'version' | 'dryRun' | 'template' | 'ref' | 'exit'>
+) {
+	if (!ctx.dryRun) {
+		const online = await isOnline();
+		if (!online) {
+			bannerAbort();
+			log('');
+			error('error', `Unable to connect to the internet.`);
+			ctx.exit(1);
+		}
+	}
+
+	if (ctx.template) {
+		const ok = await verifyTemplate(ctx.template, ctx.ref);
+		if (!ok) {
+			bannerAbort();
+			log('');
+			error('error', `Template ${color.reset(ctx.template)} ${color.dim('could not be found!')}`);
+			await info('check', 'https://astro.build/examples');
+			ctx.exit(1);
+		}
+	}
+}
+
+function isOnline(): Promise<boolean> {
+	return dns.lookup('github.com').then(
+		() => true,
+		() => false
+	);
+}
+
+async function verifyTemplate(tmpl: string, ref?: string) {
+	const target = getTemplateTarget(tmpl, ref);
+	const { repo, subdir, ref: branch } = parseGitURI(target.replace('github:', ''));
+	const url = new URL(`/repos/${repo}/contents${subdir}?ref=${branch}`, 'https://api.github.com/');
+
+	let res = await fetch(url.toString(), {
+		headers: {
+			Accept: 'application/vnd.github+json',
+			'X-GitHub-Api-Version': '2022-11-28',
+		},
+	});
+
+	// If users hit a ratelimit, fallback to the GitHub website
+	if (res.status === 403) {
+		res = await fetch(`https://github.com/${repo}/tree/${branch}${subdir}`);
+	}
+
+	return res.status === 200;
+}
+
+// Adapted from https://github.com/unjs/giget/blob/main/src/_utils.ts
+// MIT License
+
+// Copyright (c) Pooya Parsa <pooya@pi0.io>
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+const GIT_RE = /^(?<repo>[\w.-]+\/[\w.-]+)(?<subdir>[^#]+)?(?<ref>#[\w.-]+)?/;
+
+function parseGitURI(input: string) {
+	const m = input.match(GIT_RE)?.groups;
+	if (!m) throw new Error(`Unable to parse "${input}"`);
+	return {
+		repo: m.repo,
+		subdir: m.subdir || '/',
+		ref: m.ref ? m.ref.slice(1) : 'main',
+	};
+}
diff --git a/packages/create-astro/src/index.ts b/packages/create-astro/src/index.ts
index b99aa1cc3325..a33e11bff25d 100644
--- a/packages/create-astro/src/index.ts
+++ b/packages/create-astro/src/index.ts
@@ -8,6 +8,7 @@ import { next } from './actions/next-steps.js';
 import { projectName } from './actions/project-name.js';
 import { template } from './actions/template.js';
 import { setupTypeScript, typescript } from './actions/typescript.js';
+import { verify } from './actions/verify.js';
 import { setStdout } from './messages.js';
 
 const exit = () => process.exit(0);
@@ -30,6 +31,7 @@ export async function main() {
 	}
 
 	const steps = [
+		verify,
 		intro,
 		projectName,
 		template,
@@ -58,4 +60,5 @@ export {
 	setupTypeScript,
 	template,
 	typescript,
+	verify,
 };
diff --git a/packages/create-astro/src/messages.ts b/packages/create-astro/src/messages.ts
index 89ccddcdb889..fbf276794b90 100644
--- a/packages/create-astro/src/messages.ts
+++ b/packages/create-astro/src/messages.ts
@@ -93,11 +93,14 @@ export const getVersion = () =>
 export const log = (message: string) => stdout.write(message + '\n');
 export const banner = async (version: string) =>
 	log(
-		`\n${label('astro', color.bgGreen, color.black)}  ${
-			version ? color.green(color.bold(`v${version}`)) : ''
+		`\n${label('astro', color.bgGreen, color.black)}${
+			version ? '  ' + color.green(color.bold(`v${version}`)) : ''
 		} ${color.bold('Launch sequence initiated.')}`
 	);
 
+export const bannerAbort = () =>
+	log(`\n${label('astro', color.bgRed)} ${color.bold('Launch sequence aborted.')}`);
+
 export const info = async (prefix: string, text: string) => {
 	await sleep(100);
 	if (stdout.columns < 80) {
diff --git a/packages/create-astro/src/shell.ts b/packages/create-astro/src/shell.ts
index d2d7ef0338d9..e6f1295ea32a 100644
--- a/packages/create-astro/src/shell.ts
+++ b/packages/create-astro/src/shell.ts
@@ -1,11 +1,10 @@
 // This is an extremely simplified version of [`execa`](https://github.com/sindresorhus/execa)
 // intended to keep our dependency size down
-import type { StdioOptions } from 'node:child_process';
+import type { ChildProcess, StdioOptions } from 'node:child_process';
 import type { Readable } from 'node:stream';
 
 import { spawn } from 'node:child_process';
 import { text as textFromStream } from 'node:stream/consumers';
-import { setTimeout as sleep } from 'node:timers/promises';
 
 export interface ExecaOptions {
 	cwd?: string | URL;
@@ -25,25 +24,28 @@ export async function shell(
 	flags: string[],
 	opts: ExecaOptions = {}
 ): Promise<Output> {
-	const controller = opts.timeout ? new AbortController() : undefined;
-	const child = spawn(command, flags, {
-		cwd: opts.cwd,
-		shell: true,
-		stdio: opts.stdio,
-		signal: controller?.signal,
-	});
-	const stdout = await text(child.stdout);
-	const stderr = await text(child.stderr);
-	if (opts.timeout) {
-		sleep(opts.timeout).then(() => {
-			controller!.abort();
-			throw { stdout, stderr, exitCode: 1 };
+	let child: ChildProcess;
+	let stdout = '';
+	let stderr = '';
+	try {
+		child = spawn(command, flags, {
+			cwd: opts.cwd,
+			shell: true,
+			stdio: opts.stdio,
+			timeout: opts.timeout,
 		});
+		const done = new Promise((resolve) => child.on('close', resolve));
+		[stdout, stderr] = await Promise.all([text(child.stdout), text(child.stderr)]);
+		await done;
+	} catch (e) {
+		throw { stdout, stderr, exitCode: 1 };
 	}
-	await new Promise((resolve) => child.on('exit', resolve));
 	const { exitCode } = child;
+	if (exitCode === null) {
+		throw new Error('Timeout');
+	}
 	if (exitCode !== 0) {
-		throw { stdout, stderr, exitCode };
+		throw new Error(stderr);
 	}
 	return { stdout, stderr, exitCode };
 }
diff --git a/packages/create-astro/test/verify.test.js b/packages/create-astro/test/verify.test.js
new file mode 100644
index 000000000000..ecfaba7279a5
--- /dev/null
+++ b/packages/create-astro/test/verify.test.js
@@ -0,0 +1,41 @@
+import { expect } from 'chai';
+
+import { verify } from '../dist/index.js';
+import { setup } from './utils.js';
+
+describe('verify', () => {
+	const fixture = setup();
+	const exit = (code) => {
+		throw code;
+	};
+
+	it('basics', async () => {
+		const context = { template: 'basics', exit };
+		await verify(context);
+		expect(fixture.messages().length).to.equal(0, 'Did not expect `verify` to log any messages');
+	});
+
+	it('missing', async () => {
+		const context = { template: 'missing', exit };
+		let err = null;
+		try {
+			await verify(context);
+		} catch (e) {
+			err = e;
+		}
+		expect(err).to.eq(1);
+		expect(fixture.hasMessage('Template missing does not exist!'));
+	});
+
+	it('starlight', async () => {
+		const context = { template: 'starlight', exit };
+		await verify(context);
+		expect(fixture.messages().length).to.equal(0, 'Did not expect `verify` to log any messages');
+	});
+
+	it('starlight/tailwind', async () => {
+		const context = { template: 'starlight/tailwind', exit };
+		await verify(context);
+		expect(fixture.messages().length).to.equal(0, 'Did not expect `verify` to log any messages');
+	});
+});
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index ffd036038094..bf107a367db3 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -52,7 +52,8 @@
     "astro-scripts": "workspace:*",
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
+    "kill-port": "^2.0.1",
     "mocha": "^9.2.2",
-    "wrangler": "^2.0.23"
+    "wrangler": "^3.5.0"
   }
 }
diff --git a/packages/integrations/cloudflare/test/basics.test.js b/packages/integrations/cloudflare/test/basics.test.js
index 9aa78f98e4ca..c27b6be6ccdb 100644
--- a/packages/integrations/cloudflare/test/basics.test.js
+++ b/packages/integrations/cloudflare/test/basics.test.js
@@ -14,7 +14,7 @@ describe('Basic app', () => {
 		});
 		await fixture.build();
 
-		cli = runCLI('./fixtures/basics/', { silent: true, port: 8789 });
+		cli = await runCLI('./fixtures/basics/', { silent: true, port: 8789 });
 		await cli.ready;
 	});
 
@@ -23,7 +23,7 @@ describe('Basic app', () => {
 	});
 
 	it('can render', async () => {
-		let res = await fetch(`http://localhost:8789/`);
+		let res = await fetch(`http://127.0.0.1:8789/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);
diff --git a/packages/integrations/cloudflare/test/cf.test.js b/packages/integrations/cloudflare/test/cf.test.js
index f8ab9c02f1b1..ec0e52c97e4d 100644
--- a/packages/integrations/cloudflare/test/cf.test.js
+++ b/packages/integrations/cloudflare/test/cf.test.js
@@ -17,7 +17,7 @@ describe('Cf metadata and caches', () => {
 		});
 		await fixture.build();
 
-		cli = runCLI('./fixtures/cf/', { silent: false, port: 8788 });
+		cli = await runCLI('./fixtures/cf/', { silent: false, port: 8788 });
 		await cli.ready;
 	});
 
@@ -26,12 +26,12 @@ describe('Cf metadata and caches', () => {
 	});
 
 	it('Load cf and caches API', async () => {
-		let res = await fetch(`http://localhost:8788/`);
+		let res = await fetch(`http://127.0.0.1:8788/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);
-		// console.log($('#cf').text(), html);
-		expect($('#cf').text()).to.contain('city');
+
+		expect($('#hasRuntime').text()).to.equal('true');
 		expect($('#hasCache').text()).to.equal('true');
 	});
 });
diff --git a/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
index c9e67bb05af4..6ba48e803213 100644
--- a/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/cf/src/pages/index.astro
@@ -8,7 +8,7 @@ const runtime = getRuntime(Astro.request);
 	        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 	<body>
 		<h1>Testing</h1>
-		<div id="cf">{JSON.stringify(runtime.cf)}</div>
+		<div id="hasRuntime">{!!runtime.cf?.colo}</div>
 		<div id="hasCache">{!!runtime.caches}</div>
 	</body>
 </html>
diff --git a/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro b/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro
index 320e8e16243f..aa73ab8ea666 100644
--- a/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro
+++ b/packages/integrations/cloudflare/test/fixtures/runtime/src/pages/index.astro
@@ -8,8 +8,8 @@ const env = runtime.env;
 	        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 	<body>
 		<h1>Testing</h1>
-		<div id="cf">{JSON.stringify(runtime.cf)}</div>
 		<div id="env">{JSON.stringify(env)}</div>
+		<div id="hasRuntime">{!!runtime.cf?.colo}</div>
 		<div id="hasCache">{!!runtime.caches}</div>
 	</body>
 </html>
diff --git a/packages/integrations/cloudflare/test/runtime.test.js b/packages/integrations/cloudflare/test/runtime.test.js
index 243c1dd67c1c..be14718e8f4f 100644
--- a/packages/integrations/cloudflare/test/runtime.test.js
+++ b/packages/integrations/cloudflare/test/runtime.test.js
@@ -17,7 +17,7 @@ describe('Runtime Locals', () => {
 		});
 		await fixture.build();
 
-		cli = runCLI('./fixtures/runtime/', { silent: true, port: 8793 });
+		cli = await runCLI('./fixtures/runtime/', { silent: true, port: 8793 });
 		await cli.ready;
 	});
 
@@ -26,13 +26,13 @@ describe('Runtime Locals', () => {
 	});
 
 	it('has CF and Caches', async () => {
-		let res = await fetch(`http://localhost:8793/`);
+		let res = await fetch(`http://127.0.0.1:8793/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);
-		expect($('#cf').text()).to.contain('city');
 		expect($('#env').text()).to.contain('SECRET_STUFF');
 		expect($('#env').text()).to.contain('secret');
+		expect($('#hasRuntime').text()).to.contain('true');
 		expect($('#hasCache').text()).to.equal('true');
 	});
 });
diff --git a/packages/integrations/cloudflare/test/test-utils.js b/packages/integrations/cloudflare/test/test-utils.js
index 90147a7f64a1..36515f8316b4 100644
--- a/packages/integrations/cloudflare/test/test-utils.js
+++ b/packages/integrations/cloudflare/test/test-utils.js
@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
+import kill from 'kill-port';
 import { loadFixture as baseLoadFixture } from '../../../astro/test/test-utils.js';
 
 export { fixLineEndings } from '../../../astro/test/test-utils.js';
@@ -21,22 +22,39 @@ const wranglerPath = fileURLToPath(
 );
 
 /**
- * @returns {WranglerCLI}
+ * @returns {Promise<WranglerCLI>}
  */
-export function runCLI(basePath, { silent, port = 8787 }) {
+export async function runCLI(basePath, { silent, port }) {
+	// Hack: force existing process on port to be killed
+	try {
+		await kill(port, 'tcp');
+	} catch {
+		// Will throw if port is not in use, but that's fine
+	}
+
 	const script = fileURLToPath(new URL(`${basePath}/dist/_worker.js`, import.meta.url));
-	const p = spawn('node', [wranglerPath, 'dev', '-l', script, '--port', port]);
+	const p = spawn('node', [
+		wranglerPath,
+		'dev',
+		script,
+		'--port',
+		port,
+		'--log-level',
+		'info',
+		'--persist-to',
+		`${basePath}/.wrangler/state`,
+	]);
 
 	p.stderr.setEncoding('utf-8');
 	p.stdout.setEncoding('utf-8');
 
-	const timeout = 10000;
+	const timeout = 20_000;
 
 	const ready = new Promise(async (resolve, reject) => {
-		const failed = setTimeout(
-			() => reject(new Error(`Timed out starting the wrangler CLI`)),
-			timeout
-		);
+		const failed = setTimeout(() => {
+			p.kill();
+			reject(new Error(`Timed out starting the wrangler CLI`));
+		}, timeout);
 
 		(async function () {
 			for (const msg of p.stderr) {
@@ -50,7 +68,7 @@ export function runCLI(basePath, { silent, port = 8787 }) {
 			if (!silent) {
 				console.log(msg);
 			}
-			if (msg.includes(`Listening on`)) {
+			if (msg.includes(`[mf:inf] Ready on`)) {
 				break;
 			}
 		}
diff --git a/packages/integrations/cloudflare/test/with-solid-js.test.js b/packages/integrations/cloudflare/test/with-solid-js.test.js
index 90c1c0722302..c091d04b3dba 100644
--- a/packages/integrations/cloudflare/test/with-solid-js.test.js
+++ b/packages/integrations/cloudflare/test/with-solid-js.test.js
@@ -14,7 +14,7 @@ describe('With SolidJS', () => {
 		});
 		await fixture.build();
 
-		cli = runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 });
+		cli = await runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 });
 		await cli.ready;
 	});
 
@@ -23,7 +23,7 @@ describe('With SolidJS', () => {
 	});
 
 	it('renders the solid component', async () => {
-		let res = await fetch(`http://localhost:8790/`);
+		let res = await fetch(`http://127.0.0.1:8790/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);
diff --git a/packages/integrations/cloudflare/test/wrangler.toml b/packages/integrations/cloudflare/test/wrangler.toml
index 6e2d864b0c4e..2c1acb55aaaf 100644
--- a/packages/integrations/cloudflare/test/wrangler.toml
+++ b/packages/integrations/cloudflare/test/wrangler.toml
@@ -1,4 +1,6 @@
 # for tests only
 
+send_metrics = false
+
 [vars]
 SECRET_STUFF = "secret"
diff --git a/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json b/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json
new file mode 100644
index 000000000000..b5bf6a715eb5
--- /dev/null
+++ b/packages/integrations/markdoc/test/fixtures/image-assets/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/assets/*": ["src/assets/*"]
+    },
+  }
+}
diff --git a/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json b/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json
new file mode 100644
index 000000000000..b5bf6a715eb5
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/mdx-images/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "~/assets/*": ["src/assets/*"]
+    },
+  }
+}
diff --git a/packages/integrations/node/CHANGELOG.md b/packages/integrations/node/CHANGELOG.md
index 01e61307f97f..95b8e8ad187c 100644
--- a/packages/integrations/node/CHANGELOG.md
+++ b/packages/integrations/node/CHANGELOG.md
@@ -39,6 +39,15 @@
 - Updated dependencies [[`1eae2e3f7`](https://github.com/withastro/astro/commit/1eae2e3f7d693c9dfe91c8ccfbe606d32bf2fb81), [`76ddef19c`](https://github.com/withastro/astro/commit/76ddef19ccab6e5f7d3a5740cd41acf10e334b38), [`9b4f70a62`](https://github.com/withastro/astro/commit/9b4f70a629f55e461759ba46f68af7097a2e9215), [`3fdf509b2`](https://github.com/withastro/astro/commit/3fdf509b2731a9b2f972d89291e57cf78d62c769), [`2f951cd40`](https://github.com/withastro/astro/commit/2f951cd403dfcc2c3ca6aae618ae3e1409516e32), [`c022a4217`](https://github.com/withastro/astro/commit/c022a4217a805d223c1494e9eda4e48bbf810388), [`67becaa58`](https://github.com/withastro/astro/commit/67becaa580b8f787df58de66b7008b7098f1209c), [`bc37331d8`](https://github.com/withastro/astro/commit/bc37331d8154e3e95a8df9131e4e014e78a7a9e7), [`dfc2d93e3`](https://github.com/withastro/astro/commit/dfc2d93e3c645995379358fabbdfa9aab99f43d8), [`3dc1ca2fa`](https://github.com/withastro/astro/commit/3dc1ca2fac8d9965cc5085a5d09e72ed87b4281a), [`1be84dfee`](https://github.com/withastro/astro/commit/1be84dfee3ce8e6f5cc624f99aec4e980f6fde37), [`35f01df79`](https://github.com/withastro/astro/commit/35f01df797d23315f2bee2fc3fd795adb0559c58), [`3fdf509b2`](https://github.com/withastro/astro/commit/3fdf509b2731a9b2f972d89291e57cf78d62c769), [`78de801f2`](https://github.com/withastro/astro/commit/78de801f21fd4ca1653950027d953bf08614566b), [`59d6e569f`](https://github.com/withastro/astro/commit/59d6e569f63e175c97e82e94aa7974febfb76f7c), [`7723c4cc9`](https://github.com/withastro/astro/commit/7723c4cc93298c2e6530e55da7afda048f22cf81), [`fb5cd6b56`](https://github.com/withastro/astro/commit/fb5cd6b56dc27a71366ed5e1ab8bfe9b8f96bac5), [`631b9c410`](https://github.com/withastro/astro/commit/631b9c410d5d66fa384674027ba95d69ebb5063f)]:
   - astro@3.0.0-beta.0
 
+## 5.3.4
+
+### Patch Changes
+
+- [#8084](https://github.com/withastro/astro/pull/8084) [`560e45924`](https://github.com/withastro/astro/commit/560e45924622141206ff5b47d134cb343d6d2a71) Thanks [@hbgl](https://github.com/hbgl)! - Stream request body instead of buffering it in memory.
+
+- Updated dependencies [[`c19987df0`](https://github.com/withastro/astro/commit/c19987df0be3520cf774476cea270c03edd08354), [`560e45924`](https://github.com/withastro/astro/commit/560e45924622141206ff5b47d134cb343d6d2a71), [`afc45af20`](https://github.com/withastro/astro/commit/afc45af2022f7c43fbb6c5c04983695f3819e47e), [`d1f7143f9`](https://github.com/withastro/astro/commit/d1f7143f9caf2ffa0e87cc55c0e05339d3501db3), [`3e46634fd`](https://github.com/withastro/astro/commit/3e46634fd540e5b967d2e5c9abd6235452cee2f2), [`a12027b6a`](https://github.com/withastro/astro/commit/a12027b6af411be39700919ca47e240a335e9887)]:
+  - astro@2.10.8
+
 ## 5.3.3
 
 ### Patch Changes
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 999ce294acab..c3ef4963774f 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -48,6 +48,7 @@
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^9.2.2",
-    "node-mocks-http": "^1.12.2"
+    "node-mocks-http": "^1.13.0",
+    "undici": "^5.22.1"
   }
 }
diff --git a/packages/integrations/node/test/api-route.test.js b/packages/integrations/node/test/api-route.test.js
index 7fbd9577630b..c830eee2d6c8 100644
--- a/packages/integrations/node/test/api-route.test.js
+++ b/packages/integrations/node/test/api-route.test.js
@@ -1,6 +1,7 @@
 import nodejs from '../dist/index.js';
 import { loadFixture, createRequestAndResponse } from './test-utils.js';
 import { expect } from 'chai';
+import crypto from 'node:crypto';
 
 describe('API routes', () => {
 	/** @type {import('./test-utils').Fixture} */
@@ -22,9 +23,11 @@ describe('API routes', () => {
 			url: '/recipes',
 		});
 
-		handler(req, res);
+		req.once('async_iterator', () => {
+			req.send(JSON.stringify({ id: 2 }));
+		});
 
-		req.send(JSON.stringify({ id: 2 }));
+		handler(req, res);
 
 		let [buffer] = await done;
 
@@ -43,11 +46,47 @@ describe('API routes', () => {
 			url: '/binary',
 		});
 
+		req.once('async_iterator', () => {
+			req.send(Buffer.from(new Uint8Array([1, 2, 3, 4, 5])));
+		});
+
 		handler(req, res);
-		req.send(Buffer.from(new Uint8Array([1, 2, 3, 4, 5])));
 
 		let [out] = await done;
 		let arr = Array.from(new Uint8Array(out.buffer));
 		expect(arr).to.deep.equal([5, 4, 3, 2, 1]);
 	});
+
+	it('Can post large binary data', async () => {
+		const { handler } = await import('./fixtures/api-route/dist/server/entry.mjs');
+
+		let { req, res, done } = createRequestAndResponse({
+			method: 'POST',
+			url: '/hash',
+		});
+
+		handler(req, res);
+
+		let expectedDigest = null;
+		req.once('async_iterator', () => {
+			// Send 256MB of garbage data in 256KB chunks. This should be fast (< 1sec).
+			let remainingBytes = 256 * 1024 * 1024;
+			const chunkSize = 256 * 1024;
+
+			const hash = crypto.createHash('sha256');
+			while (remainingBytes > 0) {
+				const size = Math.min(remainingBytes, chunkSize);
+				const chunk = Buffer.alloc(size, Math.floor(Math.random() * 256));
+				hash.update(chunk);
+				req.emit('data', chunk);
+				remainingBytes -= size;
+			}
+
+			req.emit('end');
+			expectedDigest = hash.digest();
+		});
+
+		let [out] = await done;
+		expect(new Uint8Array(out.buffer)).to.deep.equal(expectedDigest);
+	});
 });
diff --git a/packages/integrations/node/test/fixtures/api-route/src/pages/hash.ts b/packages/integrations/node/test/fixtures/api-route/src/pages/hash.ts
new file mode 100644
index 000000000000..fbf44c5478bc
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/api-route/src/pages/hash.ts
@@ -0,0 +1,16 @@
+import crypto from 'node:crypto';
+
+export async function post({ request }: { request: Request }) {
+	const hash = crypto.createHash('sha256');
+
+    const iterable = request.body as unknown as AsyncIterable<Uint8Array>;
+    for await (const chunk of iterable) {
+        hash.update(chunk);
+    }
+
+	return new Response(hash.digest(), {
+		headers: {
+			'Content-Type': 'application/octet-stream'
+		}
+	});
+}
diff --git a/packages/integrations/node/test/fixtures/prerender-404/package.json b/packages/integrations/node/test/fixtures/prerender-404-500/package.json
similarity index 67%
rename from packages/integrations/node/test/fixtures/prerender-404/package.json
rename to packages/integrations/node/test/fixtures/prerender-404-500/package.json
index dfd109c9142f..f962fe991e3f 100644
--- a/packages/integrations/node/test/fixtures/prerender-404/package.json
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/package.json
@@ -1,7 +1,8 @@
 {
-  "name": "@test/nodejs-prerender-404",
+  "name": "@test/nodejs-prerender-404-500",
   "version": "0.0.0",
   "private": true,
+  "type": "module",
   "dependencies": {
     "astro": "workspace:*",
     "@astrojs/node": "workspace:*"
diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/src/external-stylesheet.css b/packages/integrations/node/test/fixtures/prerender-404-500/src/external-stylesheet.css
new file mode 100644
index 000000000000..5f331948a60d
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/src/external-stylesheet.css
@@ -0,0 +1,3 @@
+body {
+    background-color: ivory;
+}
diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/src/nondeterminism-404.ts b/packages/integrations/node/test/fixtures/prerender-404-500/src/nondeterminism-404.ts
new file mode 100644
index 000000000000..1795c26b07af
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/src/nondeterminism-404.ts
@@ -0,0 +1,17 @@
+// This module is only used by the prerendered 404.astro.
+// It exhibits different behavior if it's called more than once,
+// which is detected by a test and interpreted as a failure.
+
+let usedOnce = false
+let dynamicMessage = "Page was not prerendered"
+
+export default function () {
+    if (usedOnce === false) {
+        usedOnce = true
+        return "Page does not exist"
+    }
+    
+    dynamicMessage += "+"
+    
+    return dynamicMessage
+}
diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/src/nondeterminism-500.ts b/packages/integrations/node/test/fixtures/prerender-404-500/src/nondeterminism-500.ts
new file mode 100644
index 000000000000..8f8024a6083b
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/src/nondeterminism-500.ts
@@ -0,0 +1,17 @@
+// This module is only used by the prerendered 500.astro.
+// It exhibits different behavior if it's called more than once,
+// which is detected by a test and interpreted as a failure.
+
+let usedOnce = false
+let dynamicMessage = "Page was not prerendered"
+
+export default function () {
+    if (usedOnce === false) {
+        usedOnce = true
+        return "Something went wrong"
+    }
+    
+    dynamicMessage += "+"
+    
+    return dynamicMessage
+}
diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/404.astro b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/404.astro
new file mode 100644
index 000000000000..37fd1c1d39c4
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/404.astro
@@ -0,0 +1,5 @@
+---
+import message from "../nondeterminism-404"
+export const prerender = true;
+---
+{message()}
diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/500.astro b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/500.astro
new file mode 100644
index 000000000000..ef91ad0ffa91
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/500.astro
@@ -0,0 +1,6 @@
+---
+import "../external-stylesheet.css"
+import message from "../nondeterminism-500"
+export const prerender = true
+---
+<h1>{message()}</h1>
diff --git a/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/fivehundred.astro b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/fivehundred.astro
new file mode 100644
index 000000000000..99d103567db2
--- /dev/null
+++ b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/fivehundred.astro
@@ -0,0 +1,4 @@
+---
+return new Response(null, { status: 500 })
+---
+<p>This html will not be served</p>
diff --git a/packages/integrations/node/test/fixtures/prerender-404/src/pages/static.astro b/packages/integrations/node/test/fixtures/prerender-404-500/src/pages/static.astro
similarity index 100%
rename from packages/integrations/node/test/fixtures/prerender-404/src/pages/static.astro
rename to packages/integrations/node/test/fixtures/prerender-404-500/src/pages/static.astro
diff --git a/packages/integrations/node/test/fixtures/prerender-404/src/pages/404.astro b/packages/integrations/node/test/fixtures/prerender-404/src/pages/404.astro
deleted file mode 100644
index 230402bbccdb..000000000000
--- a/packages/integrations/node/test/fixtures/prerender-404/src/pages/404.astro
+++ /dev/null
@@ -1,5 +0,0 @@
----
-export const prerender = true;
----
-
-Page does not exist
diff --git a/packages/integrations/node/test/prerender-404.test.js b/packages/integrations/node/test/prerender-404-500.test.js
similarity index 50%
rename from packages/integrations/node/test/prerender-404.test.js
rename to packages/integrations/node/test/prerender-404-500.test.js
index 3a39a9470530..8816ebe4c134 100644
--- a/packages/integrations/node/test/prerender-404.test.js
+++ b/packages/integrations/node/test/prerender-404-500.test.js
@@ -9,10 +9,11 @@ import * as cheerio from 'cheerio';
 
 async function load() {
 	const mod = await import(
-		`./fixtures/prerender-404/dist/server/entry.mjs?dropcache=${Date.now()}`
+		`./fixtures/prerender-404-500/dist/server/entry.mjs?dropcache=${Date.now()}`
 	);
 	return mod;
 }
+
 describe('Prerender 404', () => {
 	/** @type {import('./test-utils').Fixture} */
 	let fixture;
@@ -24,8 +25,12 @@ describe('Prerender 404', () => {
 			process.env.PRERENDER = true;
 
 			fixture = await loadFixture({
+				// inconsequential config that differs between tests
+				// to bust cache and prevent modules and their state
+				// from being reused
+				site: 'https://test.dev/',
 				base: '/some-base',
-				root: './fixtures/prerender-404/',
+				root: './fixtures/prerender-404-500/',
 				output: 'server',
 				adapter: nodejs({ mode: 'standalone' }),
 			});
@@ -51,13 +56,53 @@ describe('Prerender 404', () => {
 		});
 
 		it('Can handle prerendered 404', async () => {
-			const res = await fetch(`http://${server.host}:${server.port}/some-base/missing`);
-			const html = await res.text();
-			const $ = cheerio.load(html);
+			const url = `http://${server.host}:${server.port}/some-base/missing`;
+			const res1 = await fetch(url);
+			const res2 = await fetch(url);
+			const res3 = await fetch(url);
+
+			expect(res1.status).to.equal(404);
+			expect(res2.status).to.equal(404);
+			expect(res3.status).to.equal(404);
+
+			const html1 = await res1.text();
+			const html2 = await res2.text();
+			const html3 = await res3.text();
+
+			expect(html1).to.equal(html2);
+			expect(html2).to.equal(html3);
+
+			const $ = cheerio.load(html1);
 
-			expect(res.status).to.equal(404);
 			expect($('body').text()).to.equal('Page does not exist');
 		});
+
+		it(' Can handle prerendered 500 called indirectly', async () => {
+			const url = `http://${server.host}:${server.port}/some-base/fivehundred`;
+			const response1 = await fetch(url);
+			const response2 = await fetch(url);
+			const response3 = await fetch(url);
+
+			expect(response1.status).to.equal(500);
+
+			const html1 = await response1.text();
+			const html2 = await response2.text();
+			const html3 = await response3.text();
+
+			expect(html1).to.contain('Something went wrong');
+
+			expect(html1).to.equal(html2);
+			expect(html2).to.equal(html3);
+		});
+
+		it('prerendered 500 page includes expected styles', async () => {
+			const response = await fetch(`http://${server.host}:${server.port}/some-base/fivehundred`);
+			const html = await response.text();
+			const $ = cheerio.load(html);
+
+			// length will be 0 if the stylesheet does not get included
+			expect($('link[rel=stylesheet]')).to.have.a.lengthOf(1);
+		});
 	});
 
 	describe('Without base', async () => {
@@ -66,12 +111,16 @@ describe('Prerender 404', () => {
 			process.env.PRERENDER = true;
 
 			fixture = await loadFixture({
-				root: './fixtures/prerender-404/',
+				// inconsequential config that differs between tests
+				// to bust cache and prevent modules and their state
+				// from being reused
+				site: 'https://test.info/',
+				root: './fixtures/prerender-404-500/',
 				output: 'server',
 				adapter: nodejs({ mode: 'standalone' }),
 			});
 			await fixture.build();
-			const { startServer } = await await load();
+			const { startServer } = await load();
 			let res = startServer();
 			server = res.server;
 		});
@@ -92,11 +141,24 @@ describe('Prerender 404', () => {
 		});
 
 		it('Can handle prerendered 404', async () => {
-			const res = await fetch(`http://${server.host}:${server.port}/missing`);
-			const html = await res.text();
-			const $ = cheerio.load(html);
+			const url = `http://${server.host}:${server.port}/some-base/missing`;
+			const res1 = await fetch(url);
+			const res2 = await fetch(url);
+			const res3 = await fetch(url);
+
+			expect(res1.status).to.equal(404);
+			expect(res2.status).to.equal(404);
+			expect(res3.status).to.equal(404);
+
+			const html1 = await res1.text();
+			const html2 = await res2.text();
+			const html3 = await res3.text();
+
+			expect(html1).to.equal(html2);
+			expect(html2).to.equal(html3);
+
+			const $ = cheerio.load(html1);
 
-			expect(res.status).to.equal(404);
 			expect($('body').text()).to.equal('Page does not exist');
 		});
 	});
@@ -112,13 +174,17 @@ describe('Hybrid 404', () => {
 			process.env.ASTRO_NODE_AUTOSTART = 'disabled';
 			process.env.PRERENDER = false;
 			fixture = await loadFixture({
+				// inconsequential config that differs between tests
+				// to bust cache and prevent modules and their state
+				// from being reused
+				site: 'https://test.com/',
 				base: '/some-base',
-				root: './fixtures/prerender-404/',
+				root: './fixtures/prerender-404-500/',
 				output: 'hybrid',
 				adapter: nodejs({ mode: 'standalone' }),
 			});
 			await fixture.build();
-			const { startServer } = await await load();
+			const { startServer } = await load();
 			let res = startServer();
 			server = res.server;
 		});
@@ -139,11 +205,24 @@ describe('Hybrid 404', () => {
 		});
 
 		it('Can handle prerendered 404', async () => {
-			const res = await fetch(`http://${server.host}:${server.port}/some-base/missing`);
-			const html = await res.text();
-			const $ = cheerio.load(html);
+			const url = `http://${server.host}:${server.port}/some-base/missing`;
+			const res1 = await fetch(url);
+			const res2 = await fetch(url);
+			const res3 = await fetch(url);
+
+			expect(res1.status).to.equal(404);
+			expect(res2.status).to.equal(404);
+			expect(res3.status).to.equal(404);
+
+			const html1 = await res1.text();
+			const html2 = await res2.text();
+			const html3 = await res3.text();
+
+			expect(html1).to.equal(html2);
+			expect(html2).to.equal(html3);
+
+			const $ = cheerio.load(html1);
 
-			expect(res.status).to.equal(404);
 			expect($('body').text()).to.equal('Page does not exist');
 		});
 	});
@@ -153,12 +232,16 @@ describe('Hybrid 404', () => {
 			process.env.ASTRO_NODE_AUTOSTART = 'disabled';
 			process.env.PRERENDER = false;
 			fixture = await loadFixture({
-				root: './fixtures/prerender-404/',
+				// inconsequential config that differs between tests
+				// to bust cache and prevent modules and their state
+				// from being reused
+				site: 'https://test.net/',
+				root: './fixtures/prerender-404-500/',
 				output: 'hybrid',
 				adapter: nodejs({ mode: 'standalone' }),
 			});
 			await fixture.build();
-			const { startServer } = await await load();
+			const { startServer } = await load();
 			let res = startServer();
 			server = res.server;
 		});
@@ -179,11 +262,24 @@ describe('Hybrid 404', () => {
 		});
 
 		it('Can handle prerendered 404', async () => {
-			const res = await fetch(`http://${server.host}:${server.port}/missing`);
-			const html = await res.text();
-			const $ = cheerio.load(html);
+			const url = `http://${server.host}:${server.port}/missing`;
+			const res1 = await fetch(url);
+			const res2 = await fetch(url);
+			const res3 = await fetch(url);
+
+			expect(res1.status).to.equal(404);
+			expect(res2.status).to.equal(404);
+			expect(res3.status).to.equal(404);
+
+			const html1 = await res1.text();
+			const html2 = await res2.text();
+			const html3 = await res3.text();
+
+			expect(html1).to.equal(html2);
+			expect(html2).to.equal(html3);
+
+			const $ = cheerio.load(html1);
 
-			expect(res.status).to.equal(404);
 			expect($('body').text()).to.equal('Page does not exist');
 		});
 	});
diff --git a/packages/integrations/react/CHANGELOG.md b/packages/integrations/react/CHANGELOG.md
index cf056a58f770..146d36427095 100644
--- a/packages/integrations/react/CHANGELOG.md
+++ b/packages/integrations/react/CHANGELOG.md
@@ -23,6 +23,12 @@
 
 - [`1eae2e3f7`](https://github.com/withastro/astro/commit/1eae2e3f7d693c9dfe91c8ccfbe606d32bf2fb81) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Remove support for Node 16. The lowest supported version by Astro and all integrations is now v18.14.1. As a reminder, Node 16 will be deprecated on the 11th September 2023.
 
+## 2.2.2
+
+### Patch Changes
+
+- [#8075](https://github.com/withastro/astro/pull/8075) [`da517d405`](https://github.com/withastro/astro/commit/da517d4055825ee1b630cd4a6983818d6120a7b7) Thanks [@SudoCat](https://github.com/SudoCat)! - fix a bug where react identifierPrefix was set to null for client:only components causing React.useId to generate ids prefixed with null
+
 ## 2.2.1
 
 ### Patch Changes
diff --git a/packages/integrations/react/README.md b/packages/integrations/react/README.md
index 48c45881f059..8009972b3047 100644
--- a/packages/integrations/react/README.md
+++ b/packages/integrations/react/README.md
@@ -61,6 +61,46 @@ To use your first React component in Astro, head to our [UI framework documentat
 - 💧 client-side hydration options, and
 - 🤝 opportunities to mix and nest frameworks together
 
+## Options
+
+### Children parsing
+
+Children passed into a React component from an Astro component are parsed as plain strings, not React nodes.
+
+For example, the `<ReactComponent />` below will only receive a single child element:
+
+```astro
+---
+import ReactComponent from './ReactComponent';
+---
+
+<ReactComponent>
+  <div>one</div>
+  <div>two</div>
+</ReactComponent>
+```
+
+If you are using a library that _expects_ more than one child element element to be passed, for example so that it can slot certain elements in different places, you might find this to be a blocker.
+
+You can set the experimental flag `experimentalReactChildren` to tell Astro to always pass children to React as React vnodes. There is some runtime cost to this, but it can help with compatibility.
+
+You can enable this option in the configuration for the React integration:
+
+```js
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+import react from '@astrojs/react';
+
+export default defineConfig({
+  // ...
+  integrations: [
+    react({
+      experimentalReactChildren: true,
+    }),
+  ],
+});
+```
+
 ## Troubleshooting
 
 For help, check out the `#support` channel on [Discord](https://astro.build/chat). Our friendly Support Squad members are here to help!
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index 87fd46f94774..302ac4ae092e 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -45,7 +45,8 @@
   },
   "dependencies": {
     "@astrojs/internal-helpers": "0.2.0-beta.1",
-    "@vitejs/plugin-react": "^4.0.3"
+    "@vitejs/plugin-react": "^4.0.3",
+    "ultrahtml": "^1.2.0"
   },
   "devDependencies": {
     "@types/react": "^17.0.62",
@@ -53,7 +54,10 @@
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react-dom": "^18.1.0",
+    "chai": "^4.3.7",
+    "cheerio": "1.0.0-rc.12",
+    "vite": "^4.4.6"
   },
   "peerDependencies": {
     "@types/react": "^17.0.50 || ^18.0.21",
diff --git a/packages/integrations/react/server.js b/packages/integrations/react/server.js
index 8c02c4b26b38..c2400accb673 100644
--- a/packages/integrations/react/server.js
+++ b/packages/integrations/react/server.js
@@ -2,6 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/server';
 import StaticHtml from './static-html.js';
 import { incrementId } from './context.js';
+import opts from 'astro:react:opts';
 
 const slotName = (str) => str.trim().replace(/[-_]([a-z])/g, (_, w) => w.toUpperCase());
 const reactTypeof = Symbol.for('react.element');
@@ -85,7 +86,10 @@ async function renderToStaticMarkup(Component, props, { default: children, ...sl
 		...slots,
 	};
 	const newChildren = children ?? props.children;
-	if (newChildren != null) {
+	if (children && opts.experimentalReactChildren) {
+		const convert = await import('./vnode-children.js').then((mod) => mod.default);
+		newProps.children = convert(children);
+	} else if (newChildren != null) {
 		newProps.children = React.createElement(StaticHtml, {
 			hydrate: needsHydration(metadata),
 			value: newChildren,
diff --git a/packages/integrations/react/src/index.ts b/packages/integrations/react/src/index.ts
index f5332e2ed972..712b986102cc 100644
--- a/packages/integrations/react/src/index.ts
+++ b/packages/integrations/react/src/index.ts
@@ -2,6 +2,11 @@ import type { AstroIntegration } from 'astro';
 import { version as ReactVersion } from 'react-dom';
 import react, { type Options as ViteReactPluginOptions } from '@vitejs/plugin-react';
 import { appendForwardSlash } from '@astrojs/internal-helpers/path';
+import type * as vite from 'vite';
+
+export type ReactIntegrationOptions = Pick<ViteReactPluginOptions, 'include' | 'exclude'> & {
+	experimentalReactChildren?: boolean;
+};
 
 const FAST_REFRESH_PREAMBLE = react.preambleCode;
 
@@ -17,7 +22,29 @@ function getRenderer() {
 	};
 }
 
-function getViteConfiguration({ include, exclude }: Options = {}) {
+function optionsPlugin(experimentalReactChildren: boolean): vite.Plugin {
+	const virtualModule = 'astro:react:opts';
+	const virtualModuleId = '\0' + virtualModule;
+	return {
+		name: '@astrojs/react:opts',
+		resolveId(id) {
+			if (id === virtualModule) {
+				return virtualModuleId;
+			}
+		},
+		load(id) {
+			if (id === virtualModuleId) {
+				return {
+					code: `export default {
+						experimentalReactChildren: ${JSON.stringify(experimentalReactChildren)}
+					}`,
+				};
+			}
+		},
+	};
+}
+
+function getViteConfiguration({ include, exclude, experimentalReactChildren }: ReactIntegrationOptions = {}) {
 	return {
 		optimizeDeps: {
 			include: [
@@ -35,7 +62,10 @@ function getViteConfiguration({ include, exclude }: Options = {}) {
 					: '@astrojs/react/server-v17.js',
 			],
 		},
-		plugins: [react({ include, exclude })],
+		plugins: [
+			react({ include, exclude }),
+			optionsPlugin(!!experimentalReactChildren)
+		],
 		resolve: {
 			dedupe: ['react', 'react-dom', 'react-dom/server'],
 		},
@@ -55,17 +85,17 @@ function getViteConfiguration({ include, exclude }: Options = {}) {
 	};
 }
 
-export type Options = Pick<ViteReactPluginOptions, 'include' | 'exclude'>;
 export default function ({
 	include,
 	exclude,
-}: Pick<ViteReactPluginOptions, 'include' | 'exclude'> = {}): AstroIntegration {
+	experimentalReactChildren
+}: ReactIntegrationOptions = {}): AstroIntegration {
 	return {
 		name: '@astrojs/react',
 		hooks: {
 			'astro:config:setup': ({ config, command, addRenderer, updateConfig, injectScript }) => {
 				addRenderer(getRenderer());
-				updateConfig({ vite: getViteConfiguration({ include, exclude }) });
+				updateConfig({ vite: getViteConfiguration({ include, exclude, experimentalReactChildren }) });
 				if (command === 'dev') {
 					const preamble = FAST_REFRESH_PREAMBLE.replace(
 						`__BASE__`,
diff --git a/packages/astro/test/fixtures/react-component/astro.config.mjs b/packages/integrations/react/test/fixtures/react-component/astro.config.mjs
similarity index 69%
rename from packages/astro/test/fixtures/react-component/astro.config.mjs
rename to packages/integrations/react/test/fixtures/react-component/astro.config.mjs
index 53d0bd03b26f..cd54d60f804d 100644
--- a/packages/astro/test/fixtures/react-component/astro.config.mjs
+++ b/packages/integrations/react/test/fixtures/react-component/astro.config.mjs
@@ -4,5 +4,7 @@ import vue from '@astrojs/vue';
 
 // https://astro.build/config
 export default defineConfig({
-	integrations: [react(), vue()],
-});
\ No newline at end of file
+	integrations: [react({
+		experimentalReactChildren: true,
+	}), vue()],
+});
diff --git a/packages/astro/test/fixtures/react-component/package.json b/packages/integrations/react/test/fixtures/react-component/package.json
similarity index 100%
rename from packages/astro/test/fixtures/react-component/package.json
rename to packages/integrations/react/test/fixtures/react-component/package.json
diff --git a/packages/astro/test/fixtures/react-component/src/components/ArrowFunction.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/ArrowFunction.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/ArrowFunction.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/ArrowFunction.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/CloneElement.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/CloneElement.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/CloneElement.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/CloneElement.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/ForgotImport.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/ForgotImport.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/ForgotImport.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/ForgotImport.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/GetSearch.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/GetSearch.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/GetSearch.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/GetSearch.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/Goodbye.vue b/packages/integrations/react/test/fixtures/react-component/src/components/Goodbye.vue
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/Goodbye.vue
rename to packages/integrations/react/test/fixtures/react-component/src/components/Goodbye.vue
diff --git a/packages/astro/test/fixtures/react-component/src/components/Hello.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/Hello.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/Hello.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/Hello.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/ImportsThrowsAnError.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/ImportsThrowsAnError.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/ImportsThrowsAnError.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/ImportsThrowsAnError.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/LazyComponent.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/LazyComponent.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/LazyComponent.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/LazyComponent.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/PragmaComment.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/PragmaComment.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/PragmaComment.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/PragmaComment.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/PragmaCommentTypeScript.tsx b/packages/integrations/react/test/fixtures/react-component/src/components/PragmaCommentTypeScript.tsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/PragmaCommentTypeScript.tsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/PragmaCommentTypeScript.tsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/PropsSpread.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/PropsSpread.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/PropsSpread.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/PropsSpread.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/Pure.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/Pure.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/Pure.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/Pure.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/Research.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/Research.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/Research.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/Research.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/Suspense.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/Suspense.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/Suspense.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/Suspense.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/ThrowsAnError.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/ThrowsAnError.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/ThrowsAnError.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/ThrowsAnError.jsx
diff --git a/packages/astro/test/fixtures/react-component/src/components/TypeScriptComponent.tsx b/packages/integrations/react/test/fixtures/react-component/src/components/TypeScriptComponent.tsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/TypeScriptComponent.tsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/TypeScriptComponent.tsx
diff --git a/packages/integrations/react/test/fixtures/react-component/src/components/WithChildren.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/WithChildren.jsx
new file mode 100644
index 000000000000..500c0c6949b3
--- /dev/null
+++ b/packages/integrations/react/test/fixtures/react-component/src/components/WithChildren.jsx
@@ -0,0 +1,10 @@
+import React from 'react';
+
+export default function ({ children }) {
+	return (
+		<div>
+			<div className="with-children">{children}</div>
+			<div className="with-children-count">{children.length}</div>
+		</div>
+	);
+}
diff --git a/packages/astro/test/fixtures/react-component/src/components/WithId.jsx b/packages/integrations/react/test/fixtures/react-component/src/components/WithId.jsx
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/components/WithId.jsx
rename to packages/integrations/react/test/fixtures/react-component/src/components/WithId.jsx
diff --git a/packages/integrations/react/test/fixtures/react-component/src/pages/children.astro b/packages/integrations/react/test/fixtures/react-component/src/pages/children.astro
new file mode 100644
index 000000000000..59595c26642c
--- /dev/null
+++ b/packages/integrations/react/test/fixtures/react-component/src/pages/children.astro
@@ -0,0 +1,14 @@
+---
+import WithChildren from '../components/WithChildren';
+---
+
+<html>
+  <head>
+    <!-- Head Stuff -->
+          <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+  <body>
+		<WithChildren>
+			<div>child 1</div><div>child 2</div>
+		</WithChildren>
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/react-component/src/pages/error-rendering.astro b/packages/integrations/react/test/fixtures/react-component/src/pages/error-rendering.astro
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/pages/error-rendering.astro
rename to packages/integrations/react/test/fixtures/react-component/src/pages/error-rendering.astro
diff --git a/packages/astro/test/fixtures/react-component/src/pages/index.astro b/packages/integrations/react/test/fixtures/react-component/src/pages/index.astro
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/pages/index.astro
rename to packages/integrations/react/test/fixtures/react-component/src/pages/index.astro
diff --git a/packages/astro/test/fixtures/react-component/src/pages/pragma-comment.astro b/packages/integrations/react/test/fixtures/react-component/src/pages/pragma-comment.astro
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/pages/pragma-comment.astro
rename to packages/integrations/react/test/fixtures/react-component/src/pages/pragma-comment.astro
diff --git a/packages/astro/test/fixtures/react-component/src/pages/suspense.astro b/packages/integrations/react/test/fixtures/react-component/src/pages/suspense.astro
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/pages/suspense.astro
rename to packages/integrations/react/test/fixtures/react-component/src/pages/suspense.astro
diff --git a/packages/astro/test/fixtures/react-component/src/skipped-pages/forgot-import.astro b/packages/integrations/react/test/fixtures/react-component/src/skipped-pages/forgot-import.astro
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/skipped-pages/forgot-import.astro
rename to packages/integrations/react/test/fixtures/react-component/src/skipped-pages/forgot-import.astro
diff --git a/packages/astro/test/fixtures/react-component/src/skipped-pages/window.astro b/packages/integrations/react/test/fixtures/react-component/src/skipped-pages/window.astro
similarity index 100%
rename from packages/astro/test/fixtures/react-component/src/skipped-pages/window.astro
rename to packages/integrations/react/test/fixtures/react-component/src/skipped-pages/window.astro
diff --git a/packages/astro/test/react-component.test.js b/packages/integrations/react/test/react-component.test.js
similarity index 89%
rename from packages/astro/test/react-component.test.js
rename to packages/integrations/react/test/react-component.test.js
index a6bb8cfaebee..43df1d9e4f0e 100644
--- a/packages/astro/test/react-component.test.js
+++ b/packages/integrations/react/test/react-component.test.js
@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 import { load as cheerioLoad } from 'cheerio';
-import { isWindows, loadFixture } from './test-utils.js';
+import { isWindows, loadFixture } from '../../../astro/test/test-utils.js';
 
 let fixture;
 
 describe('React Components', () => {
 	before(async () => {
 		fixture = await loadFixture({
-			root: './fixtures/react-component/',
+			root: new URL('./fixtures/react-component/', import.meta.url),
 		});
 	});
 
@@ -51,7 +51,9 @@ describe('React Components', () => {
 			// test 10: Should properly render children passed as props
 			const islandsWithChildren = $('.with-children');
 			expect(islandsWithChildren).to.have.lengthOf(2);
-			expect($(islandsWithChildren[0]).html()).to.equal($(islandsWithChildren[1]).html());
+			expect($(islandsWithChildren[0]).html()).to.equal(
+				$(islandsWithChildren[1]).find('astro-slot').html()
+			);
 
 			// test 11: Should generate unique React.useId per island
 			const islandsWithId = $('.react-use-id');
@@ -99,12 +101,18 @@ describe('React Components', () => {
 			const $ = cheerioLoad(html);
 			expect($('#cloned').text()).to.equal('Cloned With Props');
 		});
+
+		it('Children are parsed as React components, can be manipulated', async () => {
+			const html = await fixture.readFile('/children/index.html');
+			const $ = cheerioLoad(html);
+			expect($('.with-children-count').text()).to.equal('2');
+		});
 	});
 
 	if (isWindows) return;
 
 	describe('dev', () => {
-		/** @type {import('./test-utils').Fixture} */
+		/** @type {import('../../../astro/test/test-utils.js').Fixture} */
 		let devServer;
 
 		before(async () => {
diff --git a/packages/integrations/react/vnode-children.js b/packages/integrations/react/vnode-children.js
new file mode 100644
index 000000000000..9c7abe64418c
--- /dev/null
+++ b/packages/integrations/react/vnode-children.js
@@ -0,0 +1,37 @@
+import { parse, walkSync, DOCUMENT_NODE, ELEMENT_NODE, TEXT_NODE } from 'ultrahtml';
+import { createElement, Fragment } from 'react';
+
+export default function convert(children) {
+	const nodeMap = new WeakMap();
+	let doc = parse(children.toString().trim());
+	let root = createElement(Fragment, { children: [] });
+
+	walkSync(doc, (node, parent, index) => {
+		let newNode = {};
+		if (node.type === DOCUMENT_NODE) {
+			nodeMap.set(node, root);
+		} else if (node.type === ELEMENT_NODE) {
+			const { class: className, ...props } = node.attributes;
+			newNode = createElement(node.name, { ...props, className, children: [] });
+			nodeMap.set(node, newNode);
+			if (parent) {
+				const newParent = nodeMap.get(parent);
+				newParent.props.children[index] = newNode;
+			}
+		} else if (node.type === TEXT_NODE) {
+			newNode = node.value.trim();
+			if (newNode.trim()) {
+				if (parent) {
+					const newParent = nodeMap.get(parent);
+					if (parent.children.length === 1) {
+						newParent.props.children[0] = newNode;
+					} else {
+						newParent.props.children[index] = newNode;
+					}
+				}
+			}
+		}
+	});
+
+	return root.props.children;
+}
diff --git a/packages/integrations/sitemap/CHANGELOG.md b/packages/integrations/sitemap/CHANGELOG.md
index c6c64db1e973..32c54dcc850e 100644
--- a/packages/integrations/sitemap/CHANGELOG.md
+++ b/packages/integrations/sitemap/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 - [`1eae2e3f7`](https://github.com/withastro/astro/commit/1eae2e3f7d693c9dfe91c8ccfbe606d32bf2fb81) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Remove support for Node 16. The lowest supported version by Astro and all integrations is now v18.14.1. As a reminder, Node 16 will be deprecated on the 11th September 2023.
 
+## 2.0.2
+
+### Patch Changes
+
+- [#8063](https://github.com/withastro/astro/pull/8063) [`bee284cb7`](https://github.com/withastro/astro/commit/bee284cb7741ee594e8b38b1a618763e9058740b) Thanks [@martrapp](https://github.com/martrapp)! - docs: fix github search link in README.md
+
 ## 2.0.1
 
 ### Patch Changes
diff --git a/packages/integrations/svelte/client.js b/packages/integrations/svelte/client.js
index 658ddb02f3d7..0d07ff2ba563 100644
--- a/packages/integrations/svelte/client.js
+++ b/packages/integrations/svelte/client.js
@@ -1,5 +1,8 @@
 const noop = () => {};
 
+let originalConsoleWarning;
+let consoleFilterRefs = 0;
+
 export default (target) => {
 	return (Component, props, slotted, { client }) => {
 		if (!target.hasAttribute('ssr')) return;
@@ -7,7 +10,10 @@ export default (target) => {
 		for (const [key, value] of Object.entries(slotted)) {
 			slots[key] = createSlotDefinition(key, value);
 		}
+
 		try {
+			if (import.meta.env.DEV) useConsoleFilter();
+
 			new Component({
 				target,
 				props: {
@@ -18,7 +24,10 @@ export default (target) => {
 				hydrate: client !== 'only',
 				$$inline: true,
 			});
-		} catch (e) {}
+		} catch (e) {
+		} finally {
+			if (import.meta.env.DEV) finishUsingConsoleFilter();
+		}
 	};
 };
 
@@ -51,3 +60,52 @@ function createSlotDefinition(key, children) {
 		noop,
 	];
 }
+
+/**
+ * Reduces console noise by filtering known non-problematic warnings.
+ *
+ * Performs reference counting to allow parallel usage from async code.
+ *
+ * To stop filtering, please ensure that there always is a matching call
+ * to `finishUsingConsoleFilter` afterwards.
+ */
+function useConsoleFilter() {
+	consoleFilterRefs++;
+
+	if (!originalConsoleWarning) {
+		originalConsoleWarning = console.warn;
+		try {
+			console.warn = filteredConsoleWarning;
+		} catch (error) {
+			// If we're unable to hook `console.warn`, just accept it
+		}
+	}
+}
+
+/**
+ * Indicates that the filter installed by `useConsoleFilter`
+ * is no longer needed by the calling code.
+ */
+function finishUsingConsoleFilter() {
+	consoleFilterRefs--;
+
+	// Note: Instead of reverting `console.warning` back to the original
+	// when the reference counter reaches 0, we leave our hook installed
+	// to prevent potential race conditions once `check` is made async
+}
+
+/**
+ * Hook/wrapper function for the global `console.warning` function.
+ *
+ * Ignores known non-problematic errors while any code is using the console filter.
+ * Otherwise, simply forwards all arguments to the original function.
+ */
+function filteredConsoleWarning(msg, ...rest) {
+	if (consoleFilterRefs > 0 && typeof msg === 'string') {
+		// Astro passes a `class` prop to the Svelte component, which
+		// outputs the following warning, which we can safely filter out.
+		const isKnownSvelteError = msg.endsWith("was created with unknown prop 'class'");
+		if (isKnownSvelteError) return;
+	}
+	originalConsoleWarning(msg, ...rest);
+}
diff --git a/packages/integrations/vercel/src/image/build-service.ts b/packages/integrations/vercel/src/image/build-service.ts
index 973ceb22a7aa..63a37a5fee89 100644
--- a/packages/integrations/vercel/src/image/build-service.ts
+++ b/packages/integrations/vercel/src/image/build-service.ts
@@ -3,7 +3,7 @@ import { isESMImportedImage, sharedValidateOptions } from './shared';
 
 const service: ExternalImageService = {
 	validateOptions: (options, serviceOptions) =>
-		sharedValidateOptions(options, serviceOptions, 'production'),
+		sharedValidateOptions(options, serviceOptions.service.config, 'production'),
 	getHTMLAttributes(options) {
 		const { inputtedWidth, ...props } = options;
 
diff --git a/packages/integrations/vercel/src/image/dev-service.ts b/packages/integrations/vercel/src/image/dev-service.ts
index d812efb93fce..72eb7ca0bfad 100644
--- a/packages/integrations/vercel/src/image/dev-service.ts
+++ b/packages/integrations/vercel/src/image/dev-service.ts
@@ -4,7 +4,7 @@ import { sharedValidateOptions } from './shared';
 
 const service: LocalImageService = {
 	validateOptions: (options, serviceOptions) =>
-		sharedValidateOptions(options, serviceOptions, 'development'),
+		sharedValidateOptions(options, serviceOptions.service.config, 'development'),
 	getHTMLAttributes(options, serviceOptions) {
 		const { inputtedWidth, ...props } = options;
 
diff --git a/packages/integrations/vercel/src/image/shared.ts b/packages/integrations/vercel/src/image/shared.ts
index 2947b92d805d..ad6b45bd0a7c 100644
--- a/packages/integrations/vercel/src/image/shared.ts
+++ b/packages/integrations/vercel/src/image/shared.ts
@@ -80,10 +80,10 @@ export function getImageConfig(
 
 export function sharedValidateOptions(
 	options: ImageTransform,
-	serviceOptions: Record<string, any>,
+	serviceConfig: Record<string, any>,
 	mode: 'development' | 'production'
 ) {
-	const vercelImageOptions = serviceOptions as VercelImageConfig;
+	const vercelImageOptions = serviceConfig as VercelImageConfig;
 
 	if (
 		mode === 'development' &&
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index dd2ce9a21cf6..3b79ac9a7121 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -569,6 +569,9 @@ importers:
       html-escaper:
         specifier: ^3.0.3
         version: 3.0.3
+      http-cache-semantics:
+        specifier: ^4.1.1
+        version: 4.1.1
       js-yaml:
         specifier: ^4.1.0
         version: 4.1.0
@@ -684,6 +687,9 @@ importers:
       '@types/html-escaper':
         specifier: ^3.0.0
         version: 3.0.0
+      '@types/http-cache-semantics':
+        specifier: ^4.0.1
+        version: 4.0.1
       '@types/js-yaml':
         specifier: ^4.0.5
         version: 4.0.5
@@ -2431,23 +2437,11 @@ importers:
         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:
+  packages/astro/test/fixtures/css-inline-stylesheets:
     dependencies:
       astro:
         specifier: workspace:*
-        version: link:../../../..
-
-  packages/astro/test/fixtures/css-inline-stylesheets/never:
-    dependencies:
-      astro:
-        specifier: workspace:*
-        version: link:../../../..
+        version: link:../../..
 
   packages/astro/test/fixtures/css-no-code-split:
     dependencies:
@@ -2992,27 +2986,6 @@ importers:
         specifier: ^1.7.6
         version: 1.7.6
 
-  packages/astro/test/fixtures/react-component:
-    dependencies:
-      '@astrojs/react':
-        specifier: workspace:*
-        version: link:../../../../integrations/react
-      '@astrojs/vue':
-        specifier: workspace:*
-        version: link:../../../../integrations/vue
-      astro:
-        specifier: workspace:*
-        version: link:../../..
-      react:
-        specifier: ^18.1.0
-        version: 18.2.0
-      react-dom:
-        specifier: ^18.1.0
-        version: 18.2.0(react@18.2.0)
-      vue:
-        specifier: ^3.3.4
-        version: 3.3.4
-
   packages/astro/test/fixtures/react-jsx-export:
     dependencies:
       react:
@@ -3643,12 +3616,15 @@ importers:
       cheerio:
         specifier: 1.0.0-rc.12
         version: 1.0.0-rc.12
+      kill-port:
+        specifier: ^2.0.1
+        version: 2.0.1
       mocha:
         specifier: ^9.2.2
         version: 9.2.2
       wrangler:
-        specifier: ^2.0.23
-        version: 2.0.23
+        specifier: ^3.5.0
+        version: 3.5.0
 
   packages/integrations/cloudflare/test/fixtures/basics:
     dependencies:
@@ -4323,8 +4299,11 @@ importers:
         specifier: ^9.2.2
         version: 9.2.2
       node-mocks-http:
-        specifier: ^1.12.2
-        version: 1.12.2
+        specifier: ^1.13.0
+        version: 1.13.0
+      undici:
+        specifier: ^5.22.1
+        version: 5.22.1
 
   packages/integrations/node/test/fixtures/api-route:
     dependencies:
@@ -4407,7 +4386,7 @@ importers:
         specifier: workspace:*
         version: link:../../../../../astro
 
-  packages/integrations/node/test/fixtures/prerender-404:
+  packages/integrations/node/test/fixtures/prerender-404-500:
     dependencies:
       '@astrojs/node':
         specifier: workspace:*
@@ -4534,7 +4513,10 @@ importers:
         version: link:../../internal-helpers
       '@vitejs/plugin-react':
         specifier: ^4.0.3
-        version: 4.0.3
+        version: 4.0.3(vite@4.4.6)
+      ultrahtml:
+        specifier: ^1.2.0
+        version: 1.2.0
     devDependencies:
       '@types/react':
         specifier: ^17.0.62
@@ -4548,12 +4530,42 @@ importers:
       astro-scripts:
         specifier: workspace:*
         version: link:../../../scripts
+      chai:
+        specifier: ^4.3.7
+        version: 4.3.7
+      cheerio:
+        specifier: 1.0.0-rc.12
+        version: 1.0.0-rc.12
+      react:
+        specifier: ^18.1.0
+        version: 18.2.0
+      react-dom:
+        specifier: ^18.1.0
+        version: 18.2.0(react@18.2.0)
+      vite:
+        specifier: ^4.4.6
+        version: 4.4.6(@types/node@18.16.18)(sass@1.63.4)
+
+  packages/integrations/react/test/fixtures/react-component:
+    dependencies:
+      '@astrojs/react':
+        specifier: workspace:*
+        version: link:../../..
+      '@astrojs/vue':
+        specifier: workspace:*
+        version: link:../../../../vue
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
       react:
         specifier: ^18.1.0
         version: 18.2.0
       react-dom:
         specifier: ^18.1.0
         version: 18.2.0(react@18.2.0)
+      vue:
+        specifier: ^3.3.4
+        version: 3.3.4
 
   packages/integrations/sitemap:
     dependencies:
@@ -6947,6 +6959,51 @@ packages:
       mime: 3.0.0
     dev: true
 
+  /@cloudflare/workerd-darwin-64@1.20230814.1:
+    resolution: {integrity: sha512-aQUO7q7qXl+SVtOiMMlVKLNOSeL6GX43RKeflwzsD74dGgyHPiSfw5KCvXhkVbyN7u+yYF6HyFdaIvHLfn5jyA==}
+    engines: {node: '>=16'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@cloudflare/workerd-darwin-arm64@1.20230814.1:
+    resolution: {integrity: sha512-U2mcgi+AiuI/4EY5Wk/GmygiNoCNw/V2mcHmxESqe4r6XbJYOzBdEsjnqJ05rqd0JlEM8m64jRtE6/qBnQHygg==}
+    engines: {node: '>=16'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@cloudflare/workerd-linux-64@1.20230814.1:
+    resolution: {integrity: sha512-Q4kITXLTCuG2i2Z01fbb5AjVRRIf3+lS4ZVsFbTbIwtcOOG4Ozcw7ee7tKsFES7hFqR4Eg9gMG4/aS0mmi+L2g==}
+    engines: {node: '>=16'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@cloudflare/workerd-linux-arm64@1.20230814.1:
+    resolution: {integrity: sha512-BX5SaksXw+pkREVw3Rw2eSNXplqZw+14CcwW/5x/4oq/C6yn5qCvKxJfM7pukJGMI4wkJPOYops7B3g27FB/HA==}
+    engines: {node: '>=16'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@cloudflare/workerd-windows-64@1.20230814.1:
+    resolution: {integrity: sha512-GWHqfyhsG/1wm2W8afkYX3q3fWXUWWD8NGtHfAs6ZVTHdW3mmYyMhKR0lc6ptBwz5i5aXRlP2S+CxxxwwDbKpw==}
+    engines: {node: '>=16'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@cloudflare/workers-types@4.20230518.0:
     resolution: {integrity: sha512-A0w1V+5SUawGaaPRlhFhSC/SCDT9oQG8TMoWOKFLA4qbqagELqEAFD4KySBIkeVOvCBLT1DZSYBMCxbXddl0kw==}
     dev: false
@@ -7138,24 +7195,33 @@ packages:
     resolution: {integrity: sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==}
     dev: true
 
-  /@esbuild-plugins/node-globals-polyfill@0.1.1(esbuild@0.14.47):
+  /@esbuild-plugins/node-globals-polyfill@0.1.1(esbuild@0.16.3):
     resolution: {integrity: sha512-MR0oAA+mlnJWrt1RQVQ+4VYuRJW/P2YmRTv1AsplObyvuBMnPHiizUF95HHYiSsMGLhyGtWufaq2XQg6+iurBg==}
     peerDependencies:
       esbuild: '*'
     dependencies:
-      esbuild: 0.14.47
+      esbuild: 0.16.3
     dev: true
 
-  /@esbuild-plugins/node-modules-polyfill@0.1.4(esbuild@0.14.47):
+  /@esbuild-plugins/node-modules-polyfill@0.1.4(esbuild@0.16.3):
     resolution: {integrity: sha512-uZbcXi0zbmKC/050p3gJnne5Qdzw8vkXIv+c2BW0Lsc1ji1SkrxbKPUy5Efr0blbTu1SL8w4eyfpnSdPg3G0Qg==}
     peerDependencies:
       esbuild: '*'
     dependencies:
-      esbuild: 0.14.47
+      esbuild: 0.16.3
       escape-string-regexp: 4.0.0
       rollup-plugin-node-polyfills: 0.2.1
     dev: true
 
+  /@esbuild/android-arm64@0.16.3:
+    resolution: {integrity: sha512-RolFVeinkeraDvN/OoRf1F/lP0KUfGNb5jxy/vkIMeRRChkrX/HTYN6TYZosRJs3a1+8wqpxAo5PI5hFmxyPRg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm64@0.17.19:
     resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
     engines: {node: '>=12'}
@@ -7182,6 +7248,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/android-arm@0.16.3:
+    resolution: {integrity: sha512-mueuEoh+s1eRbSJqq9KNBQwI4QhQV6sRXIfTyLXSHGMpyew61rOK4qY21uKbXl1iBoMb0AdL1deWFCQVlN2qHA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-arm@0.17.19:
     resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
     engines: {node: '>=12'}
@@ -7199,6 +7274,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/android-x64@0.16.3:
+    resolution: {integrity: sha512-SFpTUcIT1bIJuCCBMCQWq1bL2gPTjWoLZdjmIhjdcQHaUfV41OQfho6Ici5uvvkMmZRXIUGpM3GxysP/EU7ifQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/android-x64@0.17.19:
     resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
     engines: {node: '>=12'}
@@ -7216,6 +7300,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/darwin-arm64@0.16.3:
+    resolution: {integrity: sha512-DO8WykMyB+N9mIDfI/Hug70Dk1KipavlGAecxS3jDUwAbTpDXj0Lcwzw9svkhxfpCagDmpaTMgxWK8/C/XcXvw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-arm64@0.17.19:
     resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
     engines: {node: '>=12'}
@@ -7233,6 +7326,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/darwin-x64@0.16.3:
+    resolution: {integrity: sha512-uEqZQ2omc6BvWqdCiyZ5+XmxuHEi1SPzpVxXCSSV2+Sh7sbXbpeNhHIeFrIpRjAs0lI1FmA1iIOxFozKBhKgRQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/darwin-x64@0.17.19:
     resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
     engines: {node: '>=12'}
@@ -7250,6 +7352,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/freebsd-arm64@0.16.3:
+    resolution: {integrity: sha512-nJansp3sSXakNkOD5i5mIz2Is/HjzIhFs49b1tjrPrpCmwgBmH9SSzhC/Z1UqlkivqMYkhfPwMw1dGFUuwmXhw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-arm64@0.17.19:
     resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
     engines: {node: '>=12'}
@@ -7267,6 +7378,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/freebsd-x64@0.16.3:
+    resolution: {integrity: sha512-TfoDzLw+QHfc4a8aKtGSQ96Wa+6eimljjkq9HKR0rHlU83vw8aldMOUSJTUDxbcUdcgnJzPaX8/vGWm7vyV7ug==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/freebsd-x64@0.17.19:
     resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
     engines: {node: '>=12'}
@@ -7284,6 +7404,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-arm64@0.16.3:
+    resolution: {integrity: sha512-7I3RlsnxEFCHVZNBLb2w7unamgZ5sVwO0/ikE2GaYvYuUQs9Qte/w7TqWcXHtCwxvZx/2+F97ndiUQAWs47ZfQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm64@0.17.19:
     resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
     engines: {node: '>=12'}
@@ -7301,6 +7430,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-arm@0.16.3:
+    resolution: {integrity: sha512-VwswmSYwVAAq6LysV59Fyqk3UIjbhuc6wb3vEcJ7HEJUtFuLK9uXWuFoH1lulEbE4+5GjtHi3MHX+w1gNHdOWQ==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-arm@0.17.19:
     resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
     engines: {node: '>=12'}
@@ -7318,6 +7456,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-ia32@0.16.3:
+    resolution: {integrity: sha512-X8FDDxM9cqda2rJE+iblQhIMYY49LfvW4kaEjoFbTTQ4Go8G96Smj2w3BRTwA8IHGoi9dPOPGAX63dhuv19UqA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ia32@0.17.19:
     resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
     engines: {node: '>=12'}
@@ -7344,6 +7491,15 @@ packages:
     dev: false
     optional: true
 
+  /@esbuild/linux-loong64@0.16.3:
+    resolution: {integrity: sha512-hIbeejCOyO0X9ujfIIOKjBjNAs9XD/YdJ9JXAy1lHA+8UXuOqbFe4ErMCqMr8dhlMGBuvcQYGF7+kO7waj2KHw==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-loong64@0.17.19:
     resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
     engines: {node: '>=12'}
@@ -7361,6 +7517,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-mips64el@0.16.3:
+    resolution: {integrity: sha512-znFRzICT/V8VZQMt6rjb21MtAVJv/3dmKRMlohlShrbVXdBuOdDrGb+C2cZGQAR8RFyRe7HS6klmHq103WpmVw==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-mips64el@0.17.19:
     resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
     engines: {node: '>=12'}
@@ -7378,6 +7543,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-ppc64@0.16.3:
+    resolution: {integrity: sha512-EV7LuEybxhXrVTDpbqWF2yehYRNz5e5p+u3oQUS2+ZFpknyi1NXxr8URk4ykR8Efm7iu04//4sBg249yNOwy5Q==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-ppc64@0.17.19:
     resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
     engines: {node: '>=12'}
@@ -7395,6 +7569,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-riscv64@0.16.3:
+    resolution: {integrity: sha512-uDxqFOcLzFIJ+r/pkTTSE9lsCEaV/Y6rMlQjUI9BkzASEChYL/aSQjZjchtEmdnVxDKETnUAmsaZ4pqK1eE5BQ==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-riscv64@0.17.19:
     resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
     engines: {node: '>=12'}
@@ -7412,6 +7595,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-s390x@0.16.3:
+    resolution: {integrity: sha512-NbeREhzSxYwFhnCAQOQZmajsPYtX71Ufej3IQ8W2Gxskfz9DK58ENEju4SbpIj48VenktRASC52N5Fhyf/aliQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-s390x@0.17.19:
     resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
     engines: {node: '>=12'}
@@ -7429,6 +7621,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/linux-x64@0.16.3:
+    resolution: {integrity: sha512-SDiG0nCixYO9JgpehoKgScwic7vXXndfasjnD5DLbp1xltANzqZ425l7LSdHynt19UWOcDjG9wJJzSElsPvk0w==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/linux-x64@0.17.19:
     resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
     engines: {node: '>=12'}
@@ -7446,6 +7647,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/netbsd-x64@0.16.3:
+    resolution: {integrity: sha512-AzbsJqiHEq1I/tUvOfAzCY15h4/7Ivp3ff/o1GpP16n48JMNAtbW0qui2WCgoIZArEHD0SUQ95gvR0oSO7ZbdA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/netbsd-x64@0.17.19:
     resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
     engines: {node: '>=12'}
@@ -7463,6 +7673,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/openbsd-x64@0.16.3:
+    resolution: {integrity: sha512-gSABi8qHl8k3Cbi/4toAzHiykuBuWLZs43JomTcXkjMZVkp0gj3gg9mO+9HJW/8GB5H89RX/V0QP4JGL7YEEVg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/openbsd-x64@0.17.19:
     resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
     engines: {node: '>=12'}
@@ -7480,6 +7699,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/sunos-x64@0.16.3:
+    resolution: {integrity: sha512-SF9Kch5Ete4reovvRO6yNjMxrvlfT0F0Flm+NPoUw5Z4Q3r1d23LFTgaLwm3Cp0iGbrU/MoUI+ZqwCv5XJijCw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/sunos-x64@0.17.19:
     resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
     engines: {node: '>=12'}
@@ -7497,6 +7725,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-arm64@0.16.3:
+    resolution: {integrity: sha512-u5aBonZIyGopAZyOnoPAA6fGsDeHByZ9CnEzyML9NqntK6D/xl5jteZUKm/p6nD09+v3pTM6TuUIqSPcChk5gg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-arm64@0.17.19:
     resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
     engines: {node: '>=12'}
@@ -7514,6 +7751,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-ia32@0.16.3:
+    resolution: {integrity: sha512-GlgVq1WpvOEhNioh74TKelwla9KDuAaLZrdxuuUgsP2vayxeLgVc+rbpIv0IYF4+tlIzq2vRhofV+KGLD+37EQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-ia32@0.17.19:
     resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
     engines: {node: '>=12'}
@@ -7531,6 +7777,15 @@ packages:
     requiresBuild: true
     optional: true
 
+  /@esbuild/win32-x64@0.16.3:
+    resolution: {integrity: sha512-5/JuTd8OWW8UzEtyf19fbrtMJENza+C9JoPIkvItgTBQ1FO2ZLvjbPO6Xs54vk0s5JB5QsfieUEshRQfu7ZHow==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+    requiresBuild: true
+    dev: true
+    optional: true
+
   /@esbuild/win32-x64@0.17.19:
     resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
     engines: {node: '>=12'}
@@ -7613,10 +7868,6 @@ packages:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
 
-  /@iarna/toml@2.2.5:
-    resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
-    dev: true
-
   /@jridgewell/gen-mapping@0.3.3:
     resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
     engines: {node: '>=6.0.0'}
@@ -7766,178 +8017,6 @@ packages:
       - supports-color
     dev: false
 
-  /@miniflare/cache@2.14.0:
-    resolution: {integrity: sha512-0mz0OCzTegiX75uMURLJpDo3DaOCSx9M0gv7NMFWDbK/XrvjoENiBZiKu98UBM5fts0qtK19a+MfB4aT0uBCFg==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      http-cache-semantics: 4.1.1
-      undici: 5.20.0
-    dev: true
-
-  /@miniflare/cli-parser@2.14.0:
-    resolution: {integrity: sha512-6Wb0jTMqwI7GRGAhz9WOF8AONUsXXPmwu+Qhg+tnRWtQpJ3DYd5dku1N04L9L1R7np/mD8RrycLyCdg3hLZ3aA==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-      kleur: 4.1.5
-    dev: true
-
-  /@miniflare/core@2.14.0:
-    resolution: {integrity: sha512-BjmV/ZDwsKvXnJntYHt3AQgzVKp/5ZzWPpYWoOnUSNxq6nnRCQyvFvjvBZKnhubcmJCLSqegvz0yHejMA90CTA==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@iarna/toml': 2.2.5
-      '@miniflare/queues': 2.14.0
-      '@miniflare/shared': 2.14.0
-      '@miniflare/watcher': 2.14.0
-      busboy: 1.6.0
-      dotenv: 10.0.0
-      kleur: 4.1.5
-      set-cookie-parser: 2.6.0
-      undici: 5.20.0
-      urlpattern-polyfill: 4.0.3
-    dev: true
-
-  /@miniflare/d1@2.14.0:
-    resolution: {integrity: sha512-9YoeLAkZuWGAu9BMsoctHoMue0xHzJYZigAJWGvWrqSFT1gBaT+RlUefQCHXggi8P7sOJ1+BKlsWAhkB5wfMWQ==}
-    engines: {node: '>=16.7'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-    dev: true
-
-  /@miniflare/durable-objects@2.14.0:
-    resolution: {integrity: sha512-P8eh1P62BPGpj+MCb1i1lj7Tlt/G3BMmnxHp9duyb0Wro/ILVGPQskZl+iq7DHq1w3C+n0+6/E1B44ff+qn0Mw==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      '@miniflare/storage-memory': 2.14.0
-      undici: 5.20.0
-    dev: true
-
-  /@miniflare/html-rewriter@2.14.0:
-    resolution: {integrity: sha512-7CJZk3xZkxK8tGNofnhgWcChZ8YLx6MhAdN2nn6ONSXrK/TevzEKdL8bnVv1OJ6J8Y23OxvfinOhufr33tMS8g==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      html-rewriter-wasm: 0.4.1
-      undici: 5.20.0
-    dev: true
-
-  /@miniflare/http-server@2.14.0:
-    resolution: {integrity: sha512-APaBlvGRAW+W18ph5ruPXX26/iKdByPz1tZH1OjPAKBDAiKFZSGek4QzUmQALBWLx5VMTMrt7QIe7KE4nM4sdw==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      '@miniflare/web-sockets': 2.14.0
-      kleur: 4.1.5
-      selfsigned: 2.1.1
-      undici: 5.20.0
-      ws: 8.13.0
-      youch: 2.2.2
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: true
-
-  /@miniflare/kv@2.14.0:
-    resolution: {integrity: sha512-FHAnVjmhV/VHxgjNf2whraz+k7kfMKlfM+5gO8WT6HrOsWxSdx8OueWVScnOuuDkSeUg5Ctrf5SuztTV8Uy1cg==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-    dev: true
-
-  /@miniflare/queues@2.14.0:
-    resolution: {integrity: sha512-flS4MqlgBKyv6QBqKD0IofjmMDW9wP1prUNQy2wWPih9lA6bFKmml3VdFeDsPnWtE2J67K0vCTf5kj1Q0qdW1w==}
-    engines: {node: '>=16.7'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-    dev: true
-
-  /@miniflare/r2@2.14.0:
-    resolution: {integrity: sha512-+WJJP4J0QzY69HPrG6g5OyW23lJ02WHpHZirCxwPSz8CajooqZCJVx+qvUcNmU8MyKASbUZMWnH79LysuBh+jA==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      undici: 5.20.0
-    dev: true
-
-  /@miniflare/runner-vm@2.14.0:
-    resolution: {integrity: sha512-01CmNzv74u0RZgT/vjV/ggDzECXTG88ZJAKhXyhAx0s2DOLIXzsGHn6pUJIsfPCrtj8nfqtTCp1Vf0UMVWSpmw==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-    dev: true
-
-  /@miniflare/scheduler@2.14.0:
-    resolution: {integrity: sha512-/D28OeY/HxcOyY0rkPc2qU/wzxCcUv3/F7NRpgDix37sMkYjAAS51ehVIAkPwAdFEMdantcyVuHNQ2kO1xbT+Q==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      cron-schedule: 3.0.6
-    dev: true
-
-  /@miniflare/shared@2.14.0:
-    resolution: {integrity: sha512-O0jAEdMkp8BzrdFCfMWZu76h4Cq+tt3/oDtcTFgzum3fRW5vUhIi/5f6bfndu6rkGbSlzxwor8CJWpzityXGug==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@types/better-sqlite3': 7.6.4
-      kleur: 4.1.5
-      npx-import: 1.1.4
-      picomatch: 2.3.1
-    dev: true
-
-  /@miniflare/sites@2.14.0:
-    resolution: {integrity: sha512-qI8MFZpD1NV+g+HQ/qheDVwscKzwG58J+kAVTU/1fgub2lMLsxhE3Mmbi5AIpyIiJ7Q5Sezqga234CEkHkS7dA==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/kv': 2.14.0
-      '@miniflare/shared': 2.14.0
-      '@miniflare/storage-file': 2.14.0
-    dev: true
-
-  /@miniflare/storage-file@2.14.0:
-    resolution: {integrity: sha512-Ps0wHhTO+ie33a58efI0p/ppFXSjlbYmykQXfYtMeVLD60CKl+4Lxor0+gD6uYDFbhMWL5/GMDvyr4AM87FA+Q==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-      '@miniflare/storage-memory': 2.14.0
-    dev: true
-
-  /@miniflare/storage-memory@2.14.0:
-    resolution: {integrity: sha512-5aFjEiTSNrHJ+iAiGMCA/TVPnNMrnokG5r0vKrwj4knbf8pisgfP04x18zCgOlG7kaIWNmqdO/vtVT5BIioiSQ==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-    dev: true
-
-  /@miniflare/watcher@2.14.0:
-    resolution: {integrity: sha512-O8Abg2eHpGmcZb8WyUaA6Av1Mqt5bSrorzz4CrWwsvJHBdekZPIX0GihC9vn327d/1pKRs81YTiSAfBoSZpVIw==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/shared': 2.14.0
-    dev: true
-
-  /@miniflare/web-sockets@2.14.0:
-    resolution: {integrity: sha512-lB1CB4rBq0mbCuh55WgIEH4L3c4/i4MNDBfrQL+6r+wGcr/BJUqF8BHpsfAt5yHWUJVtK5mlMeesS/xpg4Ao1w==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      '@miniflare/core': 2.14.0
-      '@miniflare/shared': 2.14.0
-      undici: 5.20.0
-      ws: 8.13.0
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: true
-
   /@nanostores/preact@0.4.1(nanostores@0.8.1)(preact@10.15.1):
     resolution: {integrity: sha512-a5nUVjoGuPqdMBUINOFbQKPfabD1mVLcuspefmtdKZqhvXeDkw9Vg8S6xINIjfWnu/eZgpA+Hb1Pkl/Sx1l/vw==}
     engines: {node: ^16.0.0 || >=18.0.0}
@@ -8430,12 +8509,6 @@ packages:
     dependencies:
       '@babel/types': 7.22.5
 
-  /@types/better-sqlite3@7.6.4:
-    resolution: {integrity: sha512-dzrRZCYPXIXfSR1/surNbJ/grU3scTaygS0OMzjlGf71i9sc2fGyHPXXiXmEvNIoE0cGwsanEFMVJxPXmco9Eg==}
-    dependencies:
-      '@types/node': 18.16.18
-    dev: true
-
   /@types/canvas-confetti@1.6.0:
     resolution: {integrity: sha512-Yq6rIccwcco0TLD5SMUrIM7Fk7Fe/C0jmNRxJJCLtAF6gebDkPuUjK5EHedxecm69Pi/aA+It39Ux4OHmFhjRw==}
     dev: false
@@ -8519,6 +8592,10 @@ packages:
     resolution: {integrity: sha512-OcJcvP3Yk8mjYwf/IdXZtTE1tb/u0WF0qa29ER07ZHCYUBZXSN29Z1mBS+/96+kNMGTFUAbSz9X+pHmHpZrTCw==}
     dev: true
 
+  /@types/http-cache-semantics@4.0.1:
+    resolution: {integrity: sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==}
+    dev: true
+
   /@types/is-ci@3.0.0:
     resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==}
     dependencies:
@@ -8713,10 +8790,6 @@ packages:
       '@types/node': 18.16.18
     dev: true
 
-  /@types/stack-trace@0.0.29:
-    resolution: {integrity: sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==}
-    dev: true
-
   /@types/strip-bom@3.0.0:
     resolution: {integrity: sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==}
     dev: true
@@ -8940,7 +9013,7 @@ packages:
       - supports-color
     dev: false
 
-  /@vitejs/plugin-react@4.0.3:
+  /@vitejs/plugin-react@4.0.3(vite@4.4.6):
     resolution: {integrity: sha512-pwXDog5nwwvSIzwrvYYmA2Ljcd/ZNlcsSG2Q9CNDBwnsd55UGAyr2doXtB5j+2uymRCnCfExlznzzSFbBRcoCg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -8953,6 +9026,7 @@ packages:
       '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.22.5)
       '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.5)
       react-refresh: 0.14.0
+      vite: 4.4.6(@types/node@18.16.18)(sass@1.63.4)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -9437,6 +9511,12 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /as-table@1.0.55:
+    resolution: {integrity: sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==}
+    dependencies:
+      printable-characters: 1.0.42
+    dev: true
+
   /assertion-error@1.1.0:
     resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
@@ -9626,7 +9706,6 @@ packages:
 
   /base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: false
 
   /bcp-47-match@2.0.3:
     resolution: {integrity: sha512-JtTezzbAibu8G0R9op9zb3vcWZd9JF6M0xOYGPn0fNCd7wOpRB1mU2mH9T8gaBGbAAyIIVgB2G7xG0GP98zMAQ==}
@@ -9643,6 +9722,14 @@ packages:
       is-windows: 1.0.2
     dev: true
 
+  /better-sqlite3@8.5.0:
+    resolution: {integrity: sha512-vbPcv/Hx5WYdyNg/NbcfyaBZyv9s/NVbxb7yCeC5Bq1pVocNxeL2tZmSu3Rlm4IEOTjYdGyzWQgyx0OSdORBzw==}
+    requiresBuild: true
+    dependencies:
+      bindings: 1.5.0
+      prebuild-install: 7.1.1
+    dev: true
+
   /binary-extensions@2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
@@ -9651,7 +9738,6 @@ packages:
     resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
     dependencies:
       file-uri-to-path: 1.0.0
-    dev: false
 
   /bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
@@ -9659,7 +9745,6 @@ packages:
       buffer: 5.7.1
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: false
 
   /bl@5.1.0:
     resolution: {integrity: sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==}
@@ -9756,7 +9841,6 @@ packages:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
-    dev: false
 
   /buffer@6.0.3:
     resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
@@ -9770,12 +9854,6 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
-  /builtins@5.0.1:
-    resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
-    dependencies:
-      semver: 7.5.3
-    dev: true
-
   /busboy@1.6.0:
     resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
     engines: {node: '>=10.16.0'}
@@ -9840,6 +9918,15 @@ packages:
     resolution: {integrity: sha512-ej+w/m8Jzpv9Z7W7uJZer14Ke8P2ogsjg4ZMGIuq4iqUOqY2Jq8BNW42iGmNfRwREaaEfFIczLuZZiEVSYNHAA==}
     dev: false
 
+  /capnp-ts@0.7.0:
+    resolution: {integrity: sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==}
+    dependencies:
+      debug: 4.3.4
+      tslib: 2.5.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
@@ -9975,7 +10062,6 @@ packages:
 
   /chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
-    dev: false
 
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
@@ -10171,15 +10257,9 @@ packages:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
     dev: false
 
-  /cookie@0.4.2:
-    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
-    engines: {node: '>= 0.6'}
-    dev: true
-
   /cookie@0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
-    dev: false
 
   /core-js-compat@3.30.2:
     resolution: {integrity: sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==}
@@ -10191,10 +10271,6 @@ packages:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
     dev: true
 
-  /cron-schedule@3.0.6:
-    resolution: {integrity: sha512-izfGgKyzzIyLaeb1EtZ3KbglkS6AKp9cv7LxmiyoOu+fXfol1tQDC0Cof0enVZGNtudTHW+3lfuW9ZkLQss4Wg==}
-    dev: true
-
   /cross-argv@2.0.0:
     resolution: {integrity: sha512-YIaY9TR5Nxeb8SMdtrU8asWVM4jqJDNDYlKV21LxtYcfNJhp1kEsgSa6qXwXgzN0WQWGODps0+TlGp2xQSHwOg==}
     dev: false
@@ -10339,6 +10415,10 @@ packages:
       stream-transform: 2.1.3
     dev: true
 
+  /data-uri-to-buffer@2.0.2:
+    resolution: {integrity: sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==}
+    dev: true
+
   /data-uri-to-buffer@3.0.1:
     resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==}
     engines: {node: '>= 6'}
@@ -10434,7 +10514,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       mimic-response: 3.1.0
-    dev: false
 
   /dedent-js@1.0.1:
     resolution: {integrity: sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==}
@@ -10449,7 +10528,6 @@ packages:
   /deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
-    dev: false
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -10543,7 +10621,6 @@ packages:
   /detect-libc@2.0.1:
     resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
     engines: {node: '>=8'}
-    dev: false
 
   /devalue@4.3.2:
     resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==}
@@ -10612,13 +10689,8 @@ packages:
     resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
     dependencies:
       dom-serializer: 2.0.0
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-
-  /dotenv@10.0.0:
-    resolution: {integrity: sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==}
-    engines: {node: '>=10'}
-    dev: true
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
 
   /dotenv@8.6.0:
     resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
@@ -10682,7 +10754,6 @@ packages:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
       once: 1.4.0
-    dev: false
 
   /enhanced-resolve@5.14.0:
     resolution: {integrity: sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw==}
@@ -10778,15 +10849,6 @@ packages:
       is-date-object: 1.0.5
       is-symbol: 1.0.4
 
-  /esbuild-android-64@0.14.47:
-    resolution: {integrity: sha512-R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-android-64@0.15.18:
     resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
     engines: {node: '>=12'}
@@ -10796,15 +10858,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-android-arm64@0.14.47:
-    resolution: {integrity: sha512-OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-android-arm64@0.15.18:
     resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
     engines: {node: '>=12'}
@@ -10814,15 +10867,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-darwin-64@0.14.47:
-    resolution: {integrity: sha512-R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-darwin-64@0.15.18:
     resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
     engines: {node: '>=12'}
@@ -10832,15 +10876,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-darwin-arm64@0.14.47:
-    resolution: {integrity: sha512-seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-darwin-arm64@0.15.18:
     resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
     engines: {node: '>=12'}
@@ -10850,15 +10885,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-freebsd-64@0.14.47:
-    resolution: {integrity: sha512-ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-freebsd-64@0.15.18:
     resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
     engines: {node: '>=12'}
@@ -10868,15 +10894,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-freebsd-arm64@0.14.47:
-    resolution: {integrity: sha512-ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-freebsd-arm64@0.15.18:
     resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
     engines: {node: '>=12'}
@@ -10886,15 +10903,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-32@0.14.47:
-    resolution: {integrity: sha512-FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-32@0.15.18:
     resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
     engines: {node: '>=12'}
@@ -10904,15 +10912,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-64@0.14.47:
-    resolution: {integrity: sha512-nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-64@0.15.18:
     resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
     engines: {node: '>=12'}
@@ -10922,15 +10921,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-arm64@0.14.47:
-    resolution: {integrity: sha512-ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-arm64@0.15.18:
     resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
     engines: {node: '>=12'}
@@ -10940,15 +10930,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-arm@0.14.47:
-    resolution: {integrity: sha512-ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-arm@0.15.18:
     resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
     engines: {node: '>=12'}
@@ -10958,15 +10939,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-mips64le@0.14.47:
-    resolution: {integrity: sha512-mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-mips64le@0.15.18:
     resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
     engines: {node: '>=12'}
@@ -10976,15 +10948,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-ppc64le@0.14.47:
-    resolution: {integrity: sha512-WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-ppc64le@0.15.18:
     resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
     engines: {node: '>=12'}
@@ -10994,15 +10957,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-riscv64@0.14.47:
-    resolution: {integrity: sha512-1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-riscv64@0.15.18:
     resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
     engines: {node: '>=12'}
@@ -11012,15 +10966,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-linux-s390x@0.14.47:
-    resolution: {integrity: sha512-eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-linux-s390x@0.15.18:
     resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
     engines: {node: '>=12'}
@@ -11030,15 +10975,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-netbsd-64@0.14.47:
-    resolution: {integrity: sha512-Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-netbsd-64@0.15.18:
     resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
     engines: {node: '>=12'}
@@ -11048,15 +10984,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-openbsd-64@0.14.47:
-    resolution: {integrity: sha512-QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-openbsd-64@0.15.18:
     resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
     engines: {node: '>=12'}
@@ -11078,15 +11005,6 @@ packages:
       globby: 11.1.0
     dev: true
 
-  /esbuild-sunos-64@0.14.47:
-    resolution: {integrity: sha512-uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-sunos-64@0.15.18:
     resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
     engines: {node: '>=12'}
@@ -11096,15 +11014,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-windows-32@0.14.47:
-    resolution: {integrity: sha512-H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-windows-32@0.15.18:
     resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
     engines: {node: '>=12'}
@@ -11114,15 +11023,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-windows-64@0.14.47:
-    resolution: {integrity: sha512-/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-windows-64@0.15.18:
     resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
     engines: {node: '>=12'}
@@ -11132,15 +11032,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild-windows-arm64@0.14.47:
-    resolution: {integrity: sha512-HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
   /esbuild-windows-arm64@0.15.18:
     resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
     engines: {node: '>=12'}
@@ -11150,34 +11041,6 @@ packages:
     dev: false
     optional: true
 
-  /esbuild@0.14.47:
-    resolution: {integrity: sha512-wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      esbuild-android-64: 0.14.47
-      esbuild-android-arm64: 0.14.47
-      esbuild-darwin-64: 0.14.47
-      esbuild-darwin-arm64: 0.14.47
-      esbuild-freebsd-64: 0.14.47
-      esbuild-freebsd-arm64: 0.14.47
-      esbuild-linux-32: 0.14.47
-      esbuild-linux-64: 0.14.47
-      esbuild-linux-arm: 0.14.47
-      esbuild-linux-arm64: 0.14.47
-      esbuild-linux-mips64le: 0.14.47
-      esbuild-linux-ppc64le: 0.14.47
-      esbuild-linux-riscv64: 0.14.47
-      esbuild-linux-s390x: 0.14.47
-      esbuild-netbsd-64: 0.14.47
-      esbuild-openbsd-64: 0.14.47
-      esbuild-sunos-64: 0.14.47
-      esbuild-windows-32: 0.14.47
-      esbuild-windows-64: 0.14.47
-      esbuild-windows-arm64: 0.14.47
-    dev: true
-
   /esbuild@0.15.18:
     resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
     engines: {node: '>=12'}
@@ -11208,6 +11071,36 @@ packages:
       esbuild-windows-arm64: 0.15.18
     dev: false
 
+  /esbuild@0.16.3:
+    resolution: {integrity: sha512-71f7EjPWTiSguen8X/kxEpkAS7BFHwtQKisCDDV3Y4GLGWBaoSCyD5uXkaUew6JDzA9FEN1W23mdnSwW9kqCeg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@esbuild/android-arm': 0.16.3
+      '@esbuild/android-arm64': 0.16.3
+      '@esbuild/android-x64': 0.16.3
+      '@esbuild/darwin-arm64': 0.16.3
+      '@esbuild/darwin-x64': 0.16.3
+      '@esbuild/freebsd-arm64': 0.16.3
+      '@esbuild/freebsd-x64': 0.16.3
+      '@esbuild/linux-arm': 0.16.3
+      '@esbuild/linux-arm64': 0.16.3
+      '@esbuild/linux-ia32': 0.16.3
+      '@esbuild/linux-loong64': 0.16.3
+      '@esbuild/linux-mips64el': 0.16.3
+      '@esbuild/linux-ppc64': 0.16.3
+      '@esbuild/linux-riscv64': 0.16.3
+      '@esbuild/linux-s390x': 0.16.3
+      '@esbuild/linux-x64': 0.16.3
+      '@esbuild/netbsd-x64': 0.16.3
+      '@esbuild/openbsd-x64': 0.16.3
+      '@esbuild/sunos-x64': 0.16.3
+      '@esbuild/win32-arm64': 0.16.3
+      '@esbuild/win32-ia32': 0.16.3
+      '@esbuild/win32-x64': 0.16.3
+    dev: true
+
   /esbuild@0.17.19:
     resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
     engines: {node: '>=12'}
@@ -11529,10 +11422,14 @@ packages:
       signal-exit: 3.0.7
       strip-final-newline: 3.0.0
 
+  /exit-hook@2.2.1:
+    resolution: {integrity: sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==}
+    engines: {node: '>=6'}
+    dev: true
+
   /expand-template@2.0.3:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
-    dev: false
 
   /extend-shallow@2.0.1:
     resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
@@ -11631,7 +11528,6 @@ packages:
 
   /file-uri-to-path@1.0.0:
     resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
-    dev: false
 
   /file-uri-to-path@2.0.0:
     resolution: {integrity: sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==}
@@ -11720,7 +11616,6 @@ packages:
 
   /fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-    dev: false
 
   /fs-extra@10.1.0:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
@@ -11842,6 +11737,13 @@ packages:
     resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==}
     dev: false
 
+  /get-source@2.0.12:
+    resolution: {integrity: sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==}
+    dependencies:
+      data-uri-to-buffer: 2.0.2
+      source-map: 0.6.1
+    dev: true
+
   /get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
@@ -11853,6 +11755,10 @@ packages:
       call-bind: 1.0.2
       get-intrinsic: 1.2.1
 
+  /get-them-args@1.3.2:
+    resolution: {integrity: sha512-LRn8Jlk+DwZE4GTlDbT3Hikd1wSHgLMme/+7ddlqKd7ldwR6LjJgTVWzBnR01wnYGe4KgrXjg287RaI22UHmAw==}
+    dev: true
+
   /get-uri@3.0.2:
     resolution: {integrity: sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==}
     engines: {node: '>= 6'}
@@ -11884,7 +11790,6 @@ packages:
 
   /github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
-    dev: false
 
   /github-slugger@1.5.0:
     resolution: {integrity: sha512-wIh+gKBI9Nshz2o46B0B3f5k/W+WI9ZAv6y5Dn5WJ5SK1t0TnDimB4WE5rmTD05ZAIn8HALCZVmCsvj0w0v0lw==}
@@ -11905,6 +11810,10 @@ packages:
     dependencies:
       is-glob: 4.0.3
 
+  /glob-to-regexp@0.4.1:
+    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+    dev: true
+
   /glob@7.1.6:
     resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
     dependencies:
@@ -12272,10 +12181,6 @@ packages:
       uglify-js: 3.17.4
     dev: false
 
-  /html-rewriter-wasm@0.4.1:
-    resolution: {integrity: sha512-lNovG8CMCCmcVB1Q7xggMSf7tqPCijZXaH4gL6iE8BFghdQCbaY5Met9i1x2Ex8m/cZHDUtXK9H6/znKamRP8Q==}
-    dev: true
-
   /html-tags@3.3.1:
     resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
     engines: {node: '>=8'}
@@ -12305,7 +12210,6 @@ packages:
 
   /http-cache-semantics@4.1.1:
     resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
-    dev: true
 
   /http-errors@2.0.0:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
@@ -12387,7 +12291,6 @@ packages:
 
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-    dev: false
 
   /ignore@5.2.4:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
@@ -12434,7 +12337,6 @@ packages:
 
   /ini@1.3.8:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-    dev: false
 
   /inline-style-parser@0.1.1:
     resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
@@ -12925,6 +12827,14 @@ packages:
       commander: 8.3.0
     dev: true
 
+  /kill-port@2.0.1:
+    resolution: {integrity: sha512-e0SVOV5jFo0mx8r7bS29maVWp17qGqLBZ5ricNSajON6//kmb7qqqNnml4twNE8Dtj97UQD+gNFOaipS/q1zzQ==}
+    hasBin: true
+    dependencies:
+      get-them-args: 1.3.2
+      shell-exec: 1.0.2
+    dev: true
+
   /kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
     engines: {node: '>=0.10.0'}
@@ -13864,52 +13774,35 @@ packages:
   /mimic-response@3.1.0:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
-    dev: false
 
   /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
     dev: true
 
-  /miniflare@2.14.0:
-    resolution: {integrity: sha512-xBOUccq1dm5riOfaqoMWCC1uCqT71EW0x4akQQuGYgm+Q44N1ETEmzXSbFVroJgOHe8Hwpqxo2D7OOFwqFevew==}
+  /miniflare@3.20230801.0:
+    resolution: {integrity: sha512-jXl++AYc3PDMu9cxeMbFgzrnbgwU8VIkw49cdpOaIAz7jQgPcLuNLOyAw3G+uaLELnILHs81MM67fGR1hAc62A==}
     engines: {node: '>=16.13'}
-    hasBin: true
-    peerDependencies:
-      '@miniflare/storage-redis': 2.14.0
-      cron-schedule: ^3.0.4
-      ioredis: ^4.27.9
-    peerDependenciesMeta:
-      '@miniflare/storage-redis':
-        optional: true
-      cron-schedule:
-        optional: true
-      ioredis:
-        optional: true
     dependencies:
-      '@miniflare/cache': 2.14.0
-      '@miniflare/cli-parser': 2.14.0
-      '@miniflare/core': 2.14.0
-      '@miniflare/d1': 2.14.0
-      '@miniflare/durable-objects': 2.14.0
-      '@miniflare/html-rewriter': 2.14.0
-      '@miniflare/http-server': 2.14.0
-      '@miniflare/kv': 2.14.0
-      '@miniflare/queues': 2.14.0
-      '@miniflare/r2': 2.14.0
-      '@miniflare/runner-vm': 2.14.0
-      '@miniflare/scheduler': 2.14.0
-      '@miniflare/shared': 2.14.0
-      '@miniflare/sites': 2.14.0
-      '@miniflare/storage-file': 2.14.0
-      '@miniflare/storage-memory': 2.14.0
-      '@miniflare/web-sockets': 2.14.0
+      acorn: 8.9.0
+      acorn-walk: 8.2.0
+      better-sqlite3: 8.5.0
+      capnp-ts: 0.7.0
+      exit-hook: 2.2.1
+      glob-to-regexp: 0.4.1
+      http-cache-semantics: 4.1.1
       kleur: 4.1.5
-      semiver: 1.1.0
+      set-cookie-parser: 2.6.0
       source-map-support: 0.5.21
-      undici: 5.20.0
+      stoppable: 1.1.0
+      undici: 5.22.1
+      workerd: 1.20230814.1
+      ws: 8.13.0
+      youch: 3.2.3
+      zod: 3.20.6
     transitivePeerDependencies:
       - bufferutil
+      - supports-color
       - utf-8-validate
     dev: true
 
@@ -13981,7 +13874,6 @@ packages:
 
   /mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
-    dev: false
 
   /mkdirp@0.5.6:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
@@ -14093,7 +13985,6 @@ packages:
 
   /napi-build-utils@1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
-    dev: false
 
   /natural-compare-lite@1.4.0:
     resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
@@ -14149,7 +14040,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       semver: 7.5.3
-    dev: false
 
   /node-addon-api@6.1.0:
     resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
@@ -14210,6 +14100,22 @@ packages:
       type-is: 1.6.18
     dev: true
 
+  /node-mocks-http@1.13.0:
+    resolution: {integrity: sha512-lArD6sJMPJ53WF50GX0nJ89B1nkV1TdMvNwq8WXXFrUXF80ujSyye1T30mgiHh4h2It0/svpF3C4kZ2OAONVlg==}
+    engines: {node: '>=14'}
+    dependencies:
+      accepts: 1.3.8
+      content-disposition: 0.5.4
+      depd: 1.1.2
+      fresh: 0.5.2
+      merge-descriptors: 1.0.1
+      methods: 1.1.2
+      mime: 1.6.0
+      parseurl: 1.3.3
+      range-parser: 1.2.1
+      type-is: 1.6.18
+    dev: true
+
   /node-releases@2.0.10:
     resolution: {integrity: sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==}
 
@@ -14273,15 +14179,6 @@ packages:
       set-blocking: 2.0.0
     dev: false
 
-  /npx-import@1.1.4:
-    resolution: {integrity: sha512-3ShymTWOgqGyNlh5lMJAejLuIv3W1K3fbI5Ewc6YErZU3Sp0PqsNs8UIU1O8z5+KVl/Du5ag56Gza9vdorGEoA==}
-    dependencies:
-      execa: 6.1.0
-      parse-package-name: 1.0.0
-      semver: 7.5.3
-      validate-npm-package-name: 4.0.0
-    dev: true
-
   /nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
     dependencies:
@@ -14550,10 +14447,6 @@ packages:
     resolution: {integrity: sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==}
     dev: true
 
-  /parse-package-name@1.0.0:
-    resolution: {integrity: sha512-kBeTUtcj+SkyfaW4+KBe0HtsloBJ/mKTPoxpVdA57GZiPerREsUWJOhVj9anXweFiJkm5y8FG1sxFZkZ0SN6wg==}
-    dev: true
-
   /parse5-htmlparser2-tree-adapter@7.0.0:
     resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
     dependencies:
@@ -15130,7 +15023,6 @@ packages:
       simple-get: 4.0.1
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
-    dev: false
 
   /preferred-pm@3.0.3:
     resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
@@ -15209,6 +15101,10 @@ packages:
     resolution: {integrity: sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==}
     dev: false
 
+  /printable-characters@1.0.42:
+    resolution: {integrity: sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==}
+    dev: true
+
   /prismjs@1.29.0:
     resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
     engines: {node: '>=6'}
@@ -15263,7 +15159,6 @@ packages:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
-    dev: false
 
   /punycode@2.3.0:
     resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
@@ -15308,7 +15203,6 @@ packages:
       ini: 1.3.8
       minimist: 1.2.8
       strip-json-comments: 2.0.1
-    dev: false
 
   /react-dom@18.2.0(react@18.2.0):
     resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
@@ -15396,7 +15290,6 @@ packages:
       inherits: 2.0.4
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
-    dev: false
 
   /readdirp@3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
@@ -15905,11 +15798,6 @@ packages:
       node-forge: 1.3.1
     dev: true
 
-  /semiver@1.1.0:
-    resolution: {integrity: sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==}
-    engines: {node: '>=6'}
-    dev: true
-
   /semver@5.7.1:
     resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
     hasBin: true
@@ -16026,6 +15914,10 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
+  /shell-exec@1.0.2:
+    resolution: {integrity: sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==}
+    dev: true
+
   /shell-quote@1.8.1:
     resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
     dev: true
@@ -16080,7 +15972,6 @@ packages:
 
   /simple-concat@1.0.1:
     resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
-    dev: false
 
   /simple-get@4.0.1:
     resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
@@ -16088,7 +15979,6 @@ packages:
       decompress-response: 6.0.0
       once: 1.4.0
       simple-concat: 1.0.1
-    dev: false
 
   /simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
@@ -16199,7 +16089,6 @@ packages:
   /source-map@0.7.4:
     resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
     engines: {node: '>= 8'}
-    dev: false
 
   /source-map@0.8.0-beta.0:
     resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
@@ -16260,14 +16149,17 @@ packages:
     resolution: {integrity: sha512-JWp4cG2eybkvKA1QUHGoNK6JDEYcOnSuhzNGjZuYUPqXreDl/VkkvP2sZW7Rmh+icuCttrR9ccb2WPIazyM/Cw==}
     dev: true
 
-  /stack-trace@0.0.10:
-    resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
-    dev: true
-
   /stackback@0.0.2:
     resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
     dev: false
 
+  /stacktracey@2.1.8:
+    resolution: {integrity: sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==}
+    dependencies:
+      as-table: 1.0.55
+      get-source: 2.0.12
+    dev: true
+
   /statuses@2.0.1:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
@@ -16283,6 +16175,11 @@ packages:
       bl: 5.1.0
     dev: false
 
+  /stoppable@1.1.0:
+    resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
+    engines: {node: '>=4', npm: '>=6'}
+    dev: true
+
   /stream-transform@2.1.3:
     resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==}
     dependencies:
@@ -16363,7 +16260,6 @@ packages:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
     dependencies:
       safe-buffer: 5.2.1
-    dev: false
 
   /stringify-entities@4.0.3:
     resolution: {integrity: sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==}
@@ -16576,7 +16472,6 @@ packages:
       mkdirp-classic: 0.5.3
       pump: 3.0.0
       tar-stream: 2.2.0
-    dev: false
 
   /tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
@@ -16587,7 +16482,6 @@ packages:
       fs-constants: 1.0.0
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: false
 
   /tar@6.1.14:
     resolution: {integrity: sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==}
@@ -16815,7 +16709,6 @@ packages:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
       safe-buffer: 5.2.1
-    dev: false
 
   /turbo-darwin-64@1.10.3:
     resolution: {integrity: sha512-IIB9IomJGyD3EdpSscm7Ip1xVWtYb7D0x7oH3vad3gjFcjHJzDz9xZ/iw/qItFEW+wGFcLSRPd+1BNnuLM8AsA==}
@@ -16987,6 +16880,10 @@ packages:
     resolution: {integrity: sha512-P24ulZdT9UKyQuKA1IApdAZ+F9lwruGvmKb4pG3+sMvR3CjN0pjawPnxuSABHQFB+XqnB35TVXzJPOBYjCv6Kw==}
     dev: false
 
+  /ultrahtml@1.2.0:
+    resolution: {integrity: sha512-vxZM2yNvajRmCj/SknRYGNXk2tqiy6kRNvZjJLaleG3zJbSh/aNkOqD1/CVzypw8tyHyhpzYuwQgMMhUB4ZVNQ==}
+    dev: false
+
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
@@ -16995,9 +16892,9 @@ packages:
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
-  /undici@5.20.0:
-    resolution: {integrity: sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==}
-    engines: {node: '>=12.18'}
+  /undici@5.22.1:
+    resolution: {integrity: sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==}
+    engines: {node: '>=14.0'}
     dependencies:
       busboy: 1.6.0
     dev: true
@@ -17212,10 +17109,6 @@ packages:
       requires-port: 1.0.0
     dev: true
 
-  /urlpattern-polyfill@4.0.3:
-    resolution: {integrity: sha512-DOE84vZT2fEcl9gqCUTcnAw5ZY5Id55ikUcziSUntuEFL3pRvavg5kwDmTEUJkeCHInTlV/HexFomgYnzO5kdQ==}
-    dev: true
-
   /util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
@@ -17249,13 +17142,6 @@ packages:
       spdx-expression-parse: 3.0.1
     dev: true
 
-  /validate-npm-package-name@4.0.0:
-    resolution: {integrity: sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      builtins: 5.0.1
-    dev: true
-
   /vfile-location@4.1.0:
     resolution: {integrity: sha512-YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw==}
     dependencies:
@@ -18024,32 +17910,44 @@ packages:
       workbox-core: 6.6.0
     dev: false
 
+  /workerd@1.20230814.1:
+    resolution: {integrity: sha512-zJeSEteXuAD+bpYJT8WvzTAHvIAkKPVxOV+Jy6zCLKz5e08N3OUbAF+wrvGWc8b2aB1sj+IYsdXfkv4puH+qXQ==}
+    engines: {node: '>=16'}
+    hasBin: true
+    requiresBuild: true
+    optionalDependencies:
+      '@cloudflare/workerd-darwin-64': 1.20230814.1
+      '@cloudflare/workerd-darwin-arm64': 1.20230814.1
+      '@cloudflare/workerd-linux-64': 1.20230814.1
+      '@cloudflare/workerd-linux-arm64': 1.20230814.1
+      '@cloudflare/workerd-windows-64': 1.20230814.1
+    dev: true
+
   /workerpool@6.2.0:
     resolution: {integrity: sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==}
 
-  /wrangler@2.0.23:
-    resolution: {integrity: sha512-qMyK/pmHIrubxuJuXnCwcidY4LlQImcTTyOGoqMJtNz8y+pDfsluExSBpwqGSl3JPUQF2FiofqaBkj/iB8rvYw==}
-    engines: {node: '>=16.7.0'}
+  /wrangler@3.5.0:
+    resolution: {integrity: sha512-lvYo2JUxRXdobzd0hs96FT354DvKAYoAiPslceEpKmr0oHCreMWhU5AStfZwg1PEaJJZCwP17LqA5GgjvQ6zyg==}
+    engines: {node: '>=16.13.0'}
     hasBin: true
     dependencies:
       '@cloudflare/kv-asset-handler': 0.2.0
-      '@esbuild-plugins/node-globals-polyfill': 0.1.1(esbuild@0.14.47)
-      '@esbuild-plugins/node-modules-polyfill': 0.1.4(esbuild@0.14.47)
+      '@esbuild-plugins/node-globals-polyfill': 0.1.1(esbuild@0.16.3)
+      '@esbuild-plugins/node-modules-polyfill': 0.1.4(esbuild@0.16.3)
       blake3-wasm: 2.1.5
       chokidar: 3.5.3
-      esbuild: 0.14.47
-      miniflare: 2.14.0
+      esbuild: 0.16.3
+      miniflare: 3.20230801.0
       nanoid: 3.3.6
       path-to-regexp: 6.2.1
       selfsigned: 2.1.1
+      source-map: 0.7.4
       xxhash-wasm: 1.0.2
     optionalDependencies:
       fsevents: 2.3.2
     transitivePeerDependencies:
-      - '@miniflare/storage-redis'
       - bufferutil
-      - cron-schedule
-      - ioredis
+      - supports-color
       - utf-8-validate
     dev: true
 
@@ -18228,18 +18126,16 @@ packages:
     engines: {node: '>=12.20'}
     dev: false
 
-  /youch@2.2.2:
-    resolution: {integrity: sha512-/FaCeG3GkuJwaMR34GHVg0l8jCbafZLHiFowSjqLlqhC6OMyf2tPJBu8UirF7/NI9X/R5ai4QfEKUCOxMAGxZQ==}
+  /youch@3.2.3:
+    resolution: {integrity: sha512-ZBcWz/uzZaQVdCvfV4uk616Bbpf2ee+F/AvuKDR5EwX/Y4v06xWdtMluqTD7+KlZdM93lLm9gMZYo0sKBS0pgw==}
     dependencies:
-      '@types/stack-trace': 0.0.29
-      cookie: 0.4.2
+      cookie: 0.5.0
       mustache: 4.2.0
-      stack-trace: 0.0.10
+      stacktracey: 2.1.8
     dev: true
 
   /zod@3.20.6:
     resolution: {integrity: sha512-oyu0m54SGCtzh6EClBVqDDlAYRz4jrVtKwQ7ZnsEmMI9HnzuZFj8QFwAY1M5uniIYACdGvv0PBWPF2kO0aNofA==}
-    dev: false
 
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
@@ -18252,21 +18148,25 @@ packages:
   file:packages/astro/test/fixtures/css-assets/packages/font-awesome:
     resolution: {directory: packages/astro/test/fixtures/css-assets/packages/font-awesome, type: directory}
     name: '@test/astro-font-awesome-package'
+    version: 0.0.1
     dev: false
 
   file:packages/astro/test/fixtures/multiple-renderers/renderers/one:
     resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/one, type: directory}
     name: '@test/astro-renderer-one'
+    version: 1.0.0
     dev: false
 
   file:packages/astro/test/fixtures/multiple-renderers/renderers/two:
     resolution: {directory: packages/astro/test/fixtures/multiple-renderers/renderers/two, type: directory}
     name: '@test/astro-renderer-two'
+    version: 1.0.0
     dev: false
 
   file:packages/astro/test/fixtures/solid-component/deps/solid-jsx-component:
     resolution: {directory: packages/astro/test/fixtures/solid-component/deps/solid-jsx-component, type: directory}
     name: '@test/solid-jsx-component'
+    version: 0.0.0
     dependencies:
       solid-js: 1.7.6
     dev: false