diff --git a/.changeset/angry-dryers-hang.md b/.changeset/angry-dryers-hang.md
new file mode 100644
index 000000000000..7c1e4c3f44eb
--- /dev/null
+++ b/.changeset/angry-dryers-hang.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/rss": patch
+---
+
+Restores `rssSchema` to a zod object
diff --git a/.changeset/breezy-plants-smoke.md b/.changeset/breezy-plants-smoke.md
new file mode 100644
index 000000000000..034ab448a56f
--- /dev/null
+++ b/.changeset/breezy-plants-smoke.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes types generation from Content Collections config file
diff --git a/.changeset/eight-turtles-itch.md b/.changeset/eight-turtles-itch.md
deleted file mode 100644
index dbac472b9ad4..000000000000
--- a/.changeset/eight-turtles-itch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"astro": patch
----
-
-Improves HMR behavior for style-only changes in `.astro` files
diff --git a/.changeset/heavy-beers-tickle.md b/.changeset/heavy-beers-tickle.md
new file mode 100644
index 000000000000..f6b19aa74b76
--- /dev/null
+++ b/.changeset/heavy-beers-tickle.md
@@ -0,0 +1,31 @@
+---
+"@astrojs/alpinejs": minor
+---
+
+Allows extending Alpine using the new `entrypoint` configuration
+
+You can extend Alpine by setting the `entrypoint` option to a root-relative import specifier (for example, `entrypoint: "/src/entrypoint"`).
+
+The default export of this file should be a function that accepts an Alpine instance prior to starting, allowing the use of custom directives, plugins and other customizations for advanced use cases.
+
+```js
+// astro.config.mjs
+import { defineConfig } from 'astro/config';
+import alpine from '@astrojs/alpinejs';
+
+export default defineConfig({
+  // ...
+  integrations: [alpine({ entrypoint: '/src/entrypoint' })],
+});
+```
+
+```js
+// src/entrypoint.ts
+import type { Alpine } from 'alpinejs'
+
+export default (Alpine: Alpine) => {
+    Alpine.directive('foo', el => {
+        el.textContent = 'bar';
+    })
+}
+```
\ No newline at end of file
diff --git a/.changeset/lemon-carrots-cheer.md b/.changeset/lemon-carrots-cheer.md
deleted file mode 100644
index f7ef5c228737..000000000000
--- a/.changeset/lemon-carrots-cheer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@astrojs/markdown-remark": patch
----
-
-Initializes internal `cwdUrlStr` variable lazily for performance, and workaround Rollup side-effect detection bug when building for non-Node runtimes
diff --git a/.changeset/red-carrots-fail.md b/.changeset/red-carrots-fail.md
deleted file mode 100644
index caef47017deb..000000000000
--- a/.changeset/red-carrots-fail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"astro": patch
----
-
-Adds support for dynamic slot names
diff --git a/.changeset/selfish-donuts-approve.md b/.changeset/selfish-donuts-approve.md
deleted file mode 100644
index f5cf4d6f9ebe..000000000000
--- a/.changeset/selfish-donuts-approve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Improves the CLI output of `astro preferences list` to include additional relevant information
diff --git a/.changeset/strange-students-shake.md b/.changeset/strange-students-shake.md
new file mode 100644
index 000000000000..9e5bd382bf3e
--- /dev/null
+++ b/.changeset/strange-students-shake.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes environment variables replacement for `export const prerender`
diff --git a/.changeset/sweet-owls-trade.md b/.changeset/sweet-owls-trade.md
deleted file mode 100644
index 625b315e2c07..000000000000
--- a/.changeset/sweet-owls-trade.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"astro": patch
----
-
-Allow i18n routing utilities like getRelativeLocaleUrl to also get the default local path when redirectToDefaultLocale is false
diff --git a/.changeset/tame-crabs-reply.md b/.changeset/tame-crabs-reply.md
new file mode 100644
index 000000000000..e20c17528e94
--- /dev/null
+++ b/.changeset/tame-crabs-reply.md
@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Refactors internals of the `astro:i18n` module to be more maintainable.
diff --git a/.changeset/thick-carrots-run.md b/.changeset/thick-carrots-run.md
deleted file mode 100644
index 2da50fae793a..000000000000
--- a/.changeset/thick-carrots-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@astrojs/markdown-remark": minor
----
-
-Fixes usage in browser environments by using subpath imports
diff --git a/scripts/notify/index.js b/.github/scripts/announce.mjs
similarity index 80%
rename from scripts/notify/index.js
rename to .github/scripts/announce.mjs
index 7dd8a3751767..6ac4c2d3bacd 100755
--- a/scripts/notify/index.js
+++ b/.github/scripts/announce.mjs
@@ -1,6 +1,7 @@
 import { globby as glob } from 'globby';
 import { fileURLToPath } from 'node:url';
 import { readFile } from 'node:fs/promises';
+import { setOutput } from './utils.mjs';
 
 const { GITHUB_REF = 'main' } = process.env;
 const baseUrl = new URL(`https://github.com/withastro/astro/blob/${GITHUB_REF}/`);
@@ -17,34 +18,34 @@ const descriptors = [
 	'updates',
 ];
 const verbs = [
-	'just went out!',
-	'just launched!',
-	'now available!',
-	'in the wild!',
-	'now live!',
-	'hit the registry!',
-	'to share!',
-	'for you!',
-	'for y’all! 🤠',
-	'comin’ your way!',
-	'comin’ atcha!',
-	'comin’ in hot!',
-	'freshly minted on the blockchain! (jk)',
-	'[is] out (now with 100% more reticulated splines!)',
-	'(as seen on TV!)',
-	'just dropped!',
-	'– artisanally hand-crafted just for you.',
-	'– oh happy day!',
-	'– enjoy!',
-	'now out. Be the first on your block to download!',
-	'made with love 💕',
-	'[is] out! Our best [version] yet!',
-	'[is] here. DOWNLOAD! DOWNLOAD! DOWNLOAD!',
-	'... HUZZAH!',
-	'[has] landed!',
-	'landed! The internet just got a little more fun.',
-	'– from our family to yours.',
-	'– go forth and build!',
+	"just went out!",
+	"just launched!",
+	"now available!",
+	"in the wild!",
+	"now live!",
+	"hit the registry!",
+	"to share!",
+	"for you!",
+	"for y’all! 🤠",
+	"comin’ your way!",
+	"comin’ atcha!",
+	"comin’ in hot!",
+	"freshly minted on the blockchain! (jk)",
+	"[is] out (now with 100% more reticulated splines!)",
+	"(as seen on TV!)",
+	"just dropped!",
+	"– artisanally hand-crafted just for you.",
+	"– oh happy day!",
+	"– enjoy!",
+	"now out. Be the first on your block to download!",
+	"made with love 💕",
+	"[is] out! Our best [version] yet!",
+	"[is] here. DOWNLOAD! DOWNLOAD! DOWNLOAD!",
+	"... HUZZAH!",
+	"[has] landed!",
+	"landed! The internet just got a little more fun.",
+	"– from our family to yours.",
+	"– go forth and build!"
 ];
 const extraVerbs = [
 	'new',
@@ -162,14 +163,7 @@ async function run() {
 		process.exit(1);
 	}
 	const content = await generateMessage();
-
-	await fetch(`${process.env.DISCORD_WEBHOOK}?wait=true`, {
-		method: 'POST',
-		body: JSON.stringify({ content }),
-		headers: {
-			'content-type': 'application/json',
-		},
-	});
+	setOutput('DISCORD_MESSAGE', content);
 }
 
 run();
diff --git a/.github/scripts/utils.mjs b/.github/scripts/utils.mjs
new file mode 100644
index 000000000000..da5befc2c288
--- /dev/null
+++ b/.github/scripts/utils.mjs
@@ -0,0 +1,59 @@
+import * as fs from 'node:fs'
+import * as os from 'node:os'
+import * as crypto from 'node:crypto'
+
+/** Based on https://github.com/actions/toolkit/blob/4e3b068ce116d28cb840033c02f912100b4592b0/packages/core/src/file-command.ts */
+export function setOutput(key, value) {
+  const filePath = process.env['GITHUB_OUTPUT'] || ''
+  if (filePath) {
+    return issueFileCommand('OUTPUT', prepareKeyValueMessage(key, value))
+  }
+  process.stdout.write(os.EOL)
+}
+
+function issueFileCommand(command, message) {
+  const filePath = process.env[`GITHUB_${command}`]
+  if (!filePath) {
+    throw new Error(
+      `Unable to find environment variable for file command ${command}`
+    )
+  }
+  if (!fs.existsSync(filePath)) {
+    throw new Error(`Missing file at path: ${filePath}`)
+  }
+
+  fs.appendFileSync(filePath, `${toCommandValue(message)}${os.EOL}`, {
+    encoding: 'utf8'
+  })
+}
+
+function prepareKeyValueMessage(key, value) {
+  const delimiter = `gh-delimiter-${crypto.randomUUID()}`
+  const convertedValue = toCommandValue(value)
+
+  // These should realistically never happen, but just in case someone finds a
+  // way to exploit uuid generation let's not allow keys or values that contain
+  // the delimiter.
+  if (key.includes(delimiter)) {
+    throw new Error(
+      `Unexpected input: name should not contain the delimiter "${delimiter}"`
+    )
+  }
+
+  if (convertedValue.includes(delimiter)) {
+    throw new Error(
+      `Unexpected input: value should not contain the delimiter "${delimiter}"`
+    )
+  }
+
+  return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`
+}
+
+function toCommandValue(input) {
+  if (input === null || input === undefined) {
+    return ''
+  } else if (typeof input === 'string' || input instanceof String) {
+    return input
+  }
+  return JSON.stringify(input)
+}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d25ec07e5617..68a1c971764d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -59,9 +59,17 @@ jobs:
           # Needs access to publish to npm
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: Generate Notification
-        id: notification
+      - name: Generate Announcement
+        id: message
         if: steps.changesets.outputs.published == 'true'
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        run: node scripts/notify/index.js '${{ steps.changesets.outputs.publishedPackages }}'
+        run: node .github/scripts/announce.mjs '${{ steps.changesets.outputs.publishedPackages }}'
+      
+      - name: Send message on Discord
+        if: steps.changesets.outputs.published == 'true'
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.3.2
+        with:
+          args: "${{ steps.message.outputs.DISCORD_MESSAGE }}"
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 5bd74167d042..6d4f97825b1d 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 6825d1c8d0e3..8a988f43cdf5 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.5",
-    "@astrojs/rss": "^4.0.2",
+    "@astrojs/mdx": "^2.1.0",
+    "@astrojs/rss": "^4.0.3",
     "@astrojs/sitemap": "^3.0.5",
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
index 6b549e712237..e34db92c04fd 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   },
   "peerDependencies": {
-    "astro": "^3.0.0"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 32b3a3c98631..d6dba38a7987 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.2",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 621523a24951..57a0cb109a66 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 6d9a7d4f9bd5..aed44ca9455c 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^4.0.1",
     "@astrojs/svelte": "^5.0.3",
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 1da422d8f447..4ddaa990a776 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 432d585d80c7..f03359a0d716 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 2f0ba2a787de..df5af1cd1498 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.0.1",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 4e5fbf094de6..f2c35fd7c494 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 60e0ae6ad622..5ff5b2cefb5e 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.8",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index be1bcd740ee6..b07972e13286 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.0.0",
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 90803ebd9cd2..192a5d86a0e1 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,9 +15,9 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   },
   "peerDependencies": {
-    "astro": "^3.0.0"
+    "astro": "^4.0.0"
   }
 }
diff --git a/examples/middleware/package.json b/examples/middleware/package.json
index 06bcaa2682fc..dfc479a1aeb2 100644
--- a/examples/middleware/package.json
+++ b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^8.0.0",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index b481dfbe74b2..bf67cd4aebb7 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 5138dab7b1a8..57c4a3a0dc41 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index edc358f6b034..24a8771d305e 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/portfolio/src/styles/global.css b/examples/portfolio/src/styles/global.css
index 77ed2d480741..1ff987e2f2ed 100644
--- a/examples/portfolio/src/styles/global.css
+++ b/examples/portfolio/src/styles/global.css
@@ -117,7 +117,7 @@
 
 html,
 body {
-	height: 100%;
+	min-height: 100%;
 	overflow-x: hidden;
 }
 
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 5d88434baa16..2b37fc9ea9d9 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^8.0.0",
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/starlog/package.json b/examples/starlog/package.json
index 41b698aa7359..cc877fb2bc79 100644
--- a/examples/starlog/package.json
+++ b/examples/starlog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "sass": "^1.69.5",
     "sharp": "^0.32.6"
   }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
index 3c324d50cbad..39b0101b0f8b 100644
--- a/examples/view-transitions/package.json
+++ b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
     "@astrojs/node": "^8.0.0",
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index fe7d09f2f9f2..83bd3c048945 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.3",
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 221ad543b12c..47b517cf5724 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^4.1.0",
-    "astro": "^4.2.1",
+    "@astrojs/markdown-remark": "^4.2.0",
+    "astro": "^4.2.4",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index e37aeb1d17cb..c2eea06f37f7 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.2.1"
+    "astro": "^4.2.4"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index b4746a24f7f2..85ed71cc15fe 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.5",
+    "@astrojs/mdx": "^2.1.0",
     "@astrojs/preact": "^3.1.0",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 184edb41151b..801fd3acd397 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.0",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index bfae6b612005..30658b5cc861 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.5",
+    "@astrojs/mdx": "^2.1.0",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.2.1",
+    "astro": "^4.2.4",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index 96450f6afd5e..7f601435e31d 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.2.1",
-    "vitest": "^0.34.2"
+    "astro": "^4.2.4",
+    "vitest": "^1.2.1"
   }
 }
diff --git a/package.json b/package.json
index ad073d17d513..f85212d923e8 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "prettier": "^3.1.0",
     "prettier-plugin-astro": "^0.12.2",
     "tiny-glob": "^0.2.9",
+    "globby": "^14.0.0",
     "turbo": "^1.10.12",
     "typescript": "~5.2.2"
   },
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
index 9ac0638b3b88..e12cfe35870d 100644
--- a/packages/astro-rss/CHANGELOG.md
+++ b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 4.0.3
+
+### Patch Changes
+
+- [#9746](https://github.com/withastro/astro/pull/9746) [`7356336d18c916804001bdf64bff5445d82baceb`](https://github.com/withastro/astro/commit/7356336d18c916804001bdf64bff5445d82baceb) Thanks [@florian-lefebvre](https://github.com/florian-lefebvre)! - Fixes `rssSchema` definition to allow calling standard zod object methods (like `extend`)
+
 ## 4.0.2
 
 ### Patch Changes
diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
index 1459d4958e47..e3ae85a46697 100644
--- a/packages/astro-rss/package.json
+++ b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/astro-rss/src/index.ts b/packages/astro-rss/src/index.ts
index b866365ab342..b3e0253d2ce7 100644
--- a/packages/astro-rss/src/index.ts
+++ b/packages/astro-rss/src/index.ts
@@ -137,7 +137,12 @@ export function pagesGlobToRssItems(items: GlobResult): Promise<ValidatedRSSFeed
 					`[RSS] You can only glob entries within 'src/pages/' when passing import.meta.glob() directly. Consider mapping the result to an array of RSSFeedItems. See the RSS docs for usage examples: https://docs.astro.build/en/guides/rss/#2-list-of-rss-feed-objects`
 				);
 			}
-			const parsedResult = rssSchema.safeParse({ ...frontmatter, link: url }, { errorMap });
+			const parsedResult = rssSchema
+				.refine((val) => val.title || val.description, {
+					message: 'At least title or description must be provided.',
+					path: ['title', 'description'],
+				})
+				.safeParse({ ...frontmatter, link: url }, { errorMap });
 
 			if (parsedResult.success) {
 				return parsedResult.data;
diff --git a/packages/astro-rss/src/schema.ts b/packages/astro-rss/src/schema.ts
index 773d39cf2020..79d2e5987636 100644
--- a/packages/astro-rss/src/schema.ts
+++ b/packages/astro-rss/src/schema.ts
@@ -22,7 +22,4 @@ export const rssSchema = z.object({
 		.optional(),
 	link: z.string().optional(),
 	content: z.string().optional(),
-}).refine(val => val.title || val.description, {
-	message: "At least title or description must be provided.",
-	path: ["title", "description"]
-})
\ No newline at end of file
+});
diff --git a/packages/astro-rss/test/rss.test.js b/packages/astro-rss/test/rss.test.js
index 3f37e88a5699..833abf91c9b7 100644
--- a/packages/astro-rss/test/rss.test.js
+++ b/packages/astro-rss/test/rss.test.js
@@ -1,6 +1,7 @@
 import chai from 'chai';
 import chaiPromises from 'chai-as-promised';
 import chaiXml from 'chai-xml';
+import { z } from 'astro/zod';
 import rss, { getRssString } from '../dist/index.js';
 import { rssSchema } from '../dist/schema.js';
 import {
@@ -214,4 +215,16 @@ describe('getRssString', () => {
 		chai.expect(res.success).to.be.false;
 		chai.expect(res.error.issues[0].path[0]).to.equal('pubDate');
 	});
+
+	it('should be extendable', () => {
+		let error = null;
+		try {
+			rssSchema.extend({
+				category: z.string().optional(),
+			});
+		} catch (e) {
+			error = e.message;
+		}
+		chai.expect(error).to.be.null;
+	});
 });
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 39573513f102..84a4818b920a 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,84 @@
 # astro
 
+## 4.2.4
+
+### Patch Changes
+
+- [#9792](https://github.com/withastro/astro/pull/9792) [`e22cb8b10c0ca9f6d88cab53cd2713f57875ab4b`](https://github.com/withastro/astro/commit/e22cb8b10c0ca9f6d88cab53cd2713f57875ab4b) Thanks [@tugrulates](https://github.com/tugrulates)! - Accept aria role `switch` on toolbar audit.
+
+- [#9606](https://github.com/withastro/astro/pull/9606) [`e6945bcf23b6ad29388bbadaf5bb3cc31dd4a114`](https://github.com/withastro/astro/commit/e6945bcf23b6ad29388bbadaf5bb3cc31dd4a114) Thanks [@eryue0220](https://github.com/eryue0220)! - Fixes escaping behavior for `.html` files and components
+
+- [#9786](https://github.com/withastro/astro/pull/9786) [`5b29550996a7f5459a0d611feea6e51d44e1d8ed`](https://github.com/withastro/astro/commit/5b29550996a7f5459a0d611feea6e51d44e1d8ed) Thanks [@Fryuni](https://github.com/Fryuni)! - Fixes a regression in routing priority for index pages in rest parameter folders and dynamic sibling trees.
+
+  Considering the following tree:
+
+  ```
+  src/pages/
+  ├── index.astro
+  ├── static.astro
+  ├── [dynamic_file].astro
+  ├── [...rest_file].astro
+  ├── blog/
+  │   └── index.astro
+  ├── [dynamic_folder]/
+  │   ├── index.astro
+  │   ├── static.astro
+  │   └── [...rest].astro
+  └── [...rest_folder]/
+      ├── index.astro
+      └── static.astro
+  ```
+
+  The routes are sorted in this order:
+
+  ```
+  /src/pages/index.astro
+  /src/pages/blog/index.astro
+  /src/pages/static.astro
+  /src/pages/[dynamic_folder]/index.astro
+  /src/pages/[dynamic_file].astro
+  /src/pages/[dynamic_folder]/static.astro
+  /src/pages/[dynamic_folder]/[...rest].astro
+  /src/pages/[...rest_folder]/static.astro
+  /src/pages/[...rest_folder]/index.astro
+  /src/pages/[...rest_file]/index.astro
+  ```
+
+  This allows for index files to be used as overrides to rest parameter routes on SSR when the rest parameter matching `undefined` is not desired.
+
+- [#9775](https://github.com/withastro/astro/pull/9775) [`075706f26d2e11e66ef8b52288d07e3c0fa97eb1`](https://github.com/withastro/astro/commit/075706f26d2e11e66ef8b52288d07e3c0fa97eb1) Thanks [@lilnasy](https://github.com/lilnasy)! - Simplifies internals that handle endpoints.
+
+- [#9773](https://github.com/withastro/astro/pull/9773) [`9aa7a5368c502ae488d3a173e732d81f3d000e98`](https://github.com/withastro/astro/commit/9aa7a5368c502ae488d3a173e732d81f3d000e98) Thanks [@LunaticMuch](https://github.com/LunaticMuch)! - Raises the required vite version to address a vulnerability in `vite.server.fs.deny` that affected the dev mode.
+
+- [#9781](https://github.com/withastro/astro/pull/9781) [`ccc05d54014e24c492ca5fddd4862f318aac8172`](https://github.com/withastro/astro/commit/ccc05d54014e24c492ca5fddd4862f318aac8172) Thanks [@stevenbenner](https://github.com/stevenbenner)! - Fix build failure when image file name includes special characters
+
+## 4.2.3
+
+### Patch Changes
+
+- [#9768](https://github.com/withastro/astro/pull/9768) [`eed0e8757c35dde549707e71c45862438a043fb0`](https://github.com/withastro/astro/commit/eed0e8757c35dde549707e71c45862438a043fb0) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix apps being able to crash the dev toolbar in certain cases
+
+## 4.2.2
+
+### Patch Changes
+
+- [#9712](https://github.com/withastro/astro/pull/9712) [`ea6cbd06a2580527786707ec735079ff9abd0ec0`](https://github.com/withastro/astro/commit/ea6cbd06a2580527786707ec735079ff9abd0ec0) Thanks [@bluwy](https://github.com/bluwy)! - Improves HMR behavior for style-only changes in `.astro` files
+
+- [#9739](https://github.com/withastro/astro/pull/9739) [`3ecb3ef64326a8f77aa170df1e3c89cb5c12cc93`](https://github.com/withastro/astro/commit/3ecb3ef64326a8f77aa170df1e3c89cb5c12cc93) Thanks [@ematipico](https://github.com/ematipico)! - Makes i18n redirects take the `build.format` configuration into account
+
+- [#9762](https://github.com/withastro/astro/pull/9762) [`1fba85681e86aa83d24336d4209cafbc76b37607`](https://github.com/withastro/astro/commit/1fba85681e86aa83d24336d4209cafbc76b37607) Thanks [@ematipico](https://github.com/ematipico)! - Adds `popovertarget" to the attribute that can be passed to the `button` element
+
+- [#9605](https://github.com/withastro/astro/pull/9605) [`8ce40a417c854d9e6a4fa7d5a85d50a6436b4a3c`](https://github.com/withastro/astro/commit/8ce40a417c854d9e6a4fa7d5a85d50a6436b4a3c) Thanks [@MoustaphaDev](https://github.com/MoustaphaDev)! - Adds support for dynamic slot names
+
+- [#9381](https://github.com/withastro/astro/pull/9381) [`9e01f9cc1efcfb938355829676d51b24818ab2bb`](https://github.com/withastro/astro/commit/9e01f9cc1efcfb938355829676d51b24818ab2bb) Thanks [@martrapp](https://github.com/martrapp)! - Improves the CLI output of `astro preferences list` to include additional relevant information
+
+- [#9741](https://github.com/withastro/astro/pull/9741) [`73d74402007896204ee965f6553dc83b3dec8d2f`](https://github.com/withastro/astro/commit/73d74402007896204ee965f6553dc83b3dec8d2f) Thanks [@taktran](https://github.com/taktran)! - Fixes an issue where dot files were not copied over from the public folder to the output folder, when build command was run in a folder other than the root of the project.
+
+- [#9730](https://github.com/withastro/astro/pull/9730) [`8d2e5db096f1e7b098511b4fe9357434a6ff0703`](https://github.com/withastro/astro/commit/8d2e5db096f1e7b098511b4fe9357434a6ff0703) Thanks [@Blede2000](https://github.com/Blede2000)! - Allow i18n routing utilities like getRelativeLocaleUrl to also get the default local path when redirectToDefaultLocale is false
+
+- Updated dependencies [[`53c69dcc82cdf4000aff13a6c11fffe19096cf45`](https://github.com/withastro/astro/commit/53c69dcc82cdf4000aff13a6c11fffe19096cf45), [`2f81cffa9da9db0e2802d303f94feaee8d2f54ec`](https://github.com/withastro/astro/commit/2f81cffa9da9db0e2802d303f94feaee8d2f54ec), [`a505190933365268d48139a5f197a3cfb5570870`](https://github.com/withastro/astro/commit/a505190933365268d48139a5f197a3cfb5570870)]:
+  - @astrojs/markdown-remark@4.2.0
+
 ## 4.2.1
 
 ### Patch Changes
diff --git a/packages/astro/astro-jsx.d.ts b/packages/astro/astro-jsx.d.ts
index f79c5a36544a..accd9002532c 100644
--- a/packages/astro/astro-jsx.d.ts
+++ b/packages/astro/astro-jsx.d.ts
@@ -647,6 +647,7 @@ declare namespace astroHTML.JSX {
 		name?: string | undefined | null;
 		type?: 'submit' | 'reset' | 'button' | undefined | null;
 		value?: string | string[] | number | undefined | null;
+		popovertarget?: string | undefined | null;
 	}
 
 	interface CanvasHTMLAttributes extends HTMLAttributes {
@@ -811,6 +812,7 @@ declare namespace astroHTML.JSX {
 		type?: HTMLInputTypeAttribute | undefined | null;
 		value?: string | string[] | number | undefined | null;
 		width?: number | string | undefined | null;
+		popovertarget?: string | undefined | null;
 	}
 
 	interface KeygenHTMLAttributes extends HTMLAttributes {
diff --git a/packages/astro/client.d.ts b/packages/astro/client.d.ts
index 3b30d7700886..8542faa471a9 100644
--- a/packages/astro/client.d.ts
+++ b/packages/astro/client.d.ts
@@ -149,147 +149,7 @@ declare module 'astro:prefetch' {
 }
 
 declare module 'astro:i18n' {
-	export type GetLocaleOptions = import('./dist/virtual-modules/i18n.js').GetLocaleOptions;
-
-	/**
-	 * @param {string} locale A locale
-	 * @param {string} [path=""] An optional path to add after the `locale`.
-	 * @param {import('./dist/virtual-modules/i18n.js').GetLocaleOptions} options Customise the generated path
-	 * @return {string}
-	 *
-	 * Returns a _relative_ path with passed locale.
-	 *
-	 * ## Errors
-	 *
-	 * Throws an error if the locale doesn't exist in the list of locales defined in the configuration.
-	 *
-	 * ## Examples
-	 *
-	 * ```js
-	 * import { getRelativeLocaleUrl } from "astro:i18n";
-	 * getRelativeLocaleUrl("es"); // /es
-	 * getRelativeLocaleUrl("es", "getting-started"); // /es/getting-started
-	 * getRelativeLocaleUrl("es_US", "getting-started", { prependWith: "blog" }); // /blog/es-us/getting-started
-	 * getRelativeLocaleUrl("es_US", "getting-started", { prependWith: "blog", normalizeLocale: false }); // /blog/es_US/getting-started
-	 * ```
-	 */
-	export const getRelativeLocaleUrl: (
-		locale: string,
-		path?: string,
-		options?: GetLocaleOptions
-	) => string;
-
-	/**
-	 *
-	 * @param {string} locale A locale
-	 * @param {string} [path=""] An optional path to add after the `locale`.
-	 * @param {import('./dist/virtual-modules/i18n.js').GetLocaleOptions} options Customise the generated path
-	 * @return {string}
-	 *
-	 * Returns an absolute path with the passed locale. The behaviour is subject to change based on `site` configuration.
-	 * If _not_ provided, the function will return a _relative_ URL.
-	 *
-	 * ## Errors
-	 *
-	 * Throws an error if the locale doesn't exist in the list of locales defined in the configuration.
-	 *
-	 * ## Examples
-	 *
-	 * If `site` is `https://example.com`:
-	 *
-	 * ```js
-	 * import { getAbsoluteLocaleUrl } from "astro:i18n";
-	 * getAbsoluteLocaleUrl("es"); // https://example.com/es
-	 * getAbsoluteLocaleUrl("es", "getting-started"); // https://example.com/es/getting-started
-	 * getAbsoluteLocaleUrl("es_US", "getting-started", { prependWith: "blog" }); // https://example.com/blog/es-us/getting-started
-	 * getAbsoluteLocaleUrl("es_US", "getting-started", { prependWith: "blog", normalizeLocale: false }); // https://example.com/blog/es_US/getting-started
-	 * ```
-	 */
-	export const getAbsoluteLocaleUrl: (
-		locale: string,
-		path?: string,
-		options?: GetLocaleOptions
-	) => string;
-
-	/**
-	 * @param {string} [path=""] An optional path to add after the `locale`.
-	 * @param {import('./dist/virtual-modules/i18n.js').GetLocaleOptions} options Customise the generated path
-	 * @return {string[]}
-	 *
-	 * Works like `getRelativeLocaleUrl` but it emits the relative URLs for ALL locales:
-	 */
-	export const getRelativeLocaleUrlList: (path?: string, options?: GetLocaleOptions) => string[];
-	/**
-	 * @param {string} [path=""] An optional path to add after the `locale`.
-	 * @param {import('./dist/virtual-modules/i18n.js').GetLocaleOptions} options Customise the generated path
-	 * @return {string[]}
-	 *
-	 * Works like `getAbsoluteLocaleUrl` but it emits the absolute URLs for ALL locales:
-	 */
-	export const getAbsoluteLocaleUrlList: (path?: string, options?: GetLocaleOptions) => string[];
-
-	/**
-	 * A function that return the `path` associated to a locale (defined as code). It's particularly useful in case you decide
-	 * to use locales that are broken down in paths and codes.
-	 *
-	 * @param {string} code The code of the locale
-	 * @returns {string} The path associated to the locale
-	 *
-	 * ## Example
-	 *
-	 * ```js
-	 * // astro.config.mjs
-	 *
-	 * export default defineConfig({
-	 * 	i18n: {
-	 * 		locales: [
-	 * 			{ codes: ["it", "it-VT"], path: "italiano" },
-	 * 			"es"
-	 * 		]
-	 * 	}
-	 * })
-	 * ```
-	 *
-	 * ```js
-	 * import { getPathByLocale } from "astro:i18n";
-	 * getPathByLocale("it"); // returns "italiano"
-	 * getPathByLocale("it-VT"); // returns "italiano"
-	 * getPathByLocale("es"); // returns "es"
-	 * ```
-	 */
-	export const getPathByLocale: (code: string) => string;
-
-	/**
-	 * A function that returns the preferred locale given a certain path. This is particularly useful if you configure a locale using
-	 * `path` and `codes`. When you define multiple `code`, this function will return the first code of the array.
-	 *
-	 * Astro will treat the first code as the one that the user prefers.
-	 *
-	 * @param {string} path The path that maps to a locale
-	 * @returns {string} The path associated to the locale
-	 *
-	 * ## Example
-	 *
-	 * ```js
-	 * // astro.config.mjs
-	 *
-	 * export default defineConfig({
-	 * 	i18n: {
-	 * 		locales: [
-	 * 			{ codes: ["it-VT", "it"], path: "italiano" },
-	 * 			"es"
-	 * 		]
-	 * 	}
-	 * })
-	 * ```
-	 *
-	 * ```js
-	 * import { getLocaleByPath } from "astro:i18n";
-	 * getLocaleByPath("italiano"); // returns "it-VT" because that's the first code configured
-	 * getLocaleByPath("es"); // returns "es"
-	 * ```
-	 */
-	export const getLocaleByPath: (path: string) => string;
+	export * from 'astro/virtual-modules/i18n.js';
 }
 
 declare module 'astro:middleware' {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index aeadbc8893f8..ce8dae159bf7 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.2.1",
+  "version": "4.2.4",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -172,7 +172,7 @@
     "tsconfck": "^3.0.0",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.0.10",
+    "vite": "^5.0.12",
     "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index 49d3ab991305..8a26ebaba6cd 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -1535,6 +1535,9 @@ export interface AstroUserConfig {
 		};
 	};
 
+	/** ⚠️ WARNING: SUBJECT TO CHANGE */
+	db?: Config.Database;
+
 	/**
 	 * @docs
 	 * @kind heading
@@ -2699,7 +2702,7 @@ export interface ClientDirectiveConfig {
 export interface DevToolbarApp {
 	id: string;
 	name: string;
-	icon: Icon;
+	icon?: Icon;
 	init?(canvas: ShadowRoot, eventTarget: EventTarget): void | Promise<void>;
 	beforeTogglingOff?(canvas: ShadowRoot): boolean | Promise<boolean>;
 }
@@ -2743,3 +2746,10 @@ declare global {
 		'astro-dev-overlay-card': DevToolbarCard;
 	}
 }
+
+declare global {
+	// eslint-disable-next-line @typescript-eslint/no-namespace
+	namespace Config {
+		type Database = Record<string, any>;
+	}
+}
diff --git a/packages/astro/src/cli/db/index.ts b/packages/astro/src/cli/db/index.ts
new file mode 100644
index 000000000000..8b45e88e0318
--- /dev/null
+++ b/packages/astro/src/cli/db/index.ts
@@ -0,0 +1,30 @@
+import type { Arguments } from 'yargs-parser';
+import { createLoggerFromFlags, flagsToAstroInlineConfig } from '../flags.js';
+import { getPackage } from '../install-package.js';
+import { resolveConfig } from '../../core/config/config.js';
+import type { AstroConfig } from '../../@types/astro.js';
+
+type DBPackage = {
+	cli: (args: { flags: Arguments; config: AstroConfig }) => unknown;
+};
+
+export async function db({ flags }: { flags: Arguments }) {
+	const logger = createLoggerFromFlags(flags);
+	const getPackageOpts = { skipAsk: flags.yes || flags.y, cwd: flags.root };
+	const dbPackage = await getPackage<DBPackage>('@astrojs/db', logger, getPackageOpts, []);
+
+	if (!dbPackage) {
+		logger.error(
+			'check',
+			'The `@astrojs/db` package is required for this command to work. Please manually install it in your project and try again.'
+		);
+		return;
+	}
+
+	const { cli } = dbPackage;
+
+	const inlineConfig = flagsToAstroInlineConfig(flags);
+	const { astroConfig } = await resolveConfig(inlineConfig, 'build');
+
+	await cli({ flags, config: astroConfig });
+}
diff --git a/packages/astro/src/cli/index.ts b/packages/astro/src/cli/index.ts
index 19347ebecd16..a6ca88400d6a 100644
--- a/packages/astro/src/cli/index.ts
+++ b/packages/astro/src/cli/index.ts
@@ -11,6 +11,7 @@ type CLICommand =
 	| 'dev'
 	| 'build'
 	| 'preview'
+	| 'db'
 	| 'sync'
 	| 'check'
 	| 'info'
@@ -72,6 +73,7 @@ function resolveCommand(flags: yargs.Arguments): CLICommand {
 		'preview',
 		'check',
 		'docs',
+		'db',
 		'info',
 	]);
 	if (supportedCommands.has(cmd)) {
@@ -143,6 +145,11 @@ async function runCommand(cmd: string, flags: yargs.Arguments) {
 			await add(packages, { flags });
 			return;
 		}
+		case 'db': {
+			const { db } = await import('./db/index.js');
+			await db({ flags });
+			return;
+		}
 		case 'dev': {
 			const { dev } = await import('./dev/index.js');
 			const server = await dev({ flags });
diff --git a/packages/astro/src/content/types-generator.ts b/packages/astro/src/content/types-generator.ts
index 4d466f594223..d08f15109230 100644
--- a/packages/astro/src/content/types-generator.ts
+++ b/packages/astro/src/content/types-generator.ts
@@ -333,6 +333,22 @@ function invalidateVirtualMod(viteServer: ViteDevServer) {
 	viteServer.moduleGraph.invalidateModule(virtualMod);
 }
 
+/**
+ * Takes the source (`from`) and destination (`to`) of a config path and
+ * returns a normalized relative version:
+ *  -   If is not relative, it adds `./` to the beginning.
+ *  -   If it ends with `.ts`, it replaces it with `.js`.
+ *  -   It adds `""` around the string.
+ * @param from Config path source.
+ * @param to Config path destination.
+ * @returns Normalized config path.
+ */
+function normalizeConfigPath(from: string, to: string) {
+	const configPath = path.relative(from, to).replace(/\.ts$/, '.js');
+
+	return `"${isRelativePath(configPath) ? '' : './'}${configPath}"` as const;
+}
+
 async function writeContentFiles({
 	fs,
 	contentPaths,
@@ -415,18 +431,11 @@ async function writeContentFiles({
 		fs.mkdirSync(contentPaths.cacheDir, { recursive: true });
 	}
 
-	let configPathRelativeToCacheDir = normalizePath(
-		path.relative(contentPaths.cacheDir.pathname, contentPaths.config.url.pathname)
+	const configPathRelativeToCacheDir = normalizeConfigPath(
+		contentPaths.cacheDir.pathname,
+		contentPaths.config.url.pathname
 	);
 
-	if (!isRelativePath(configPathRelativeToCacheDir))
-		configPathRelativeToCacheDir = './' + configPathRelativeToCacheDir;
-
-	// Remove `.ts` from import path
-	if (configPathRelativeToCacheDir.endsWith('.ts')) {
-		configPathRelativeToCacheDir = configPathRelativeToCacheDir.replace(/\.ts$/, '');
-	}
-
 	for (const contentEntryType of contentEntryTypes) {
 		if (contentEntryType.contentModuleTypes) {
 			typeTemplateContent = contentEntryType.contentModuleTypes + '\n' + typeTemplateContent;
@@ -436,7 +445,7 @@ async function writeContentFiles({
 	typeTemplateContent = typeTemplateContent.replace('// @@DATA_ENTRY_MAP@@', dataTypesStr);
 	typeTemplateContent = typeTemplateContent.replace(
 		"'@@CONTENT_CONFIG_TYPE@@'",
-		contentConfig ? `typeof import(${JSON.stringify(configPathRelativeToCacheDir)})` : 'never'
+		contentConfig ? `typeof import(${configPathRelativeToCacheDir})` : 'never'
 	);
 
 	await fs.promises.writeFile(
diff --git a/packages/astro/src/core/app/index.ts b/packages/astro/src/core/app/index.ts
index ad207d129054..6189b00f8efe 100644
--- a/packages/astro/src/core/app/index.ts
+++ b/packages/astro/src/core/app/index.ts
@@ -25,7 +25,7 @@ import {
 	createStylesheetElementSet,
 } from '../render/ssr-element.js';
 import { matchRoute } from '../routing/match.js';
-import { EndpointNotFoundError, SSRRoutePipeline } from './ssrPipeline.js';
+import { SSRRoutePipeline } from './ssrPipeline.js';
 import type { RouteInfo } from './types.js';
 export { deserializeManifest } from './common.js';
 
@@ -255,7 +255,8 @@ export class App {
 			const i18nMiddleware = createI18nMiddleware(
 				this.#manifest.i18n,
 				this.#manifest.base,
-				this.#manifest.trailingSlash
+				this.#manifest.trailingSlash,
+				this.#manifest.buildFormat
 			);
 			if (i18nMiddleware) {
 				if (mod.onRequest) {
@@ -271,28 +272,30 @@ export class App {
 			}
 			response = await this.#pipeline.renderRoute(renderContext, pageModule);
 		} catch (err: any) {
-			if (err instanceof EndpointNotFoundError) {
-				return this.#renderError(request, { status: 404, response: err.originalResponse });
-			} else {
-				this.#logger.error(null, err.stack || err.message || String(err));
-				return this.#renderError(request, { status: 500 });
-			}
+			this.#logger.error(null, err.stack || err.message || String(err));
+			return this.#renderError(request, { status: 500 });
 		}
 
-		// endpoints do not participate in implicit rerouting
-		if (routeData.type === 'page' || routeData.type === 'redirect') {
-			if (REROUTABLE_STATUS_CODES.has(response.status)) {
-				return this.#renderError(request, {
-					response,
-					status: response.status as 404 | 500,
-				});
-			}
+		if (
+			REROUTABLE_STATUS_CODES.has(response.status) &&
+			response.headers.get('X-Astro-Reroute') !== 'no'
+		) {
+			return this.#renderError(request, {
+				response,
+				status: response.status as 404 | 500,
+			});
+		}
+
+		if (response.headers.has('X-Astro-Reroute')) {
+			response.headers.delete('X-Astro-Reroute');
 		}
+
 		if (addCookieHeader) {
 			for (const setCookieHeaderValue of App.getSetCookieFromResponse(response)) {
 				response.headers.append('set-cookie', setCookieHeaderValue);
 			}
 		}
+
 		Reflect.set(response, responseSentSymbol, true);
 		return response;
 	}
diff --git a/packages/astro/src/core/app/ssrPipeline.ts b/packages/astro/src/core/app/ssrPipeline.ts
index 94e8c9139cd2..f31636f9a51f 100644
--- a/packages/astro/src/core/app/ssrPipeline.ts
+++ b/packages/astro/src/core/app/ssrPipeline.ts
@@ -1,28 +1,3 @@
 import { Pipeline } from '../pipeline.js';
-import type { Environment } from '../render/index.js';
 
-/**
- * Thrown when an endpoint contains a response with the header "X-Astro-Response" === 'Not-Found'
- */
-export class EndpointNotFoundError extends Error {
-	originalResponse: Response;
-	constructor(originalResponse: Response) {
-		super();
-		this.originalResponse = originalResponse;
-	}
-}
-
-export class SSRRoutePipeline extends Pipeline {
-	constructor(env: Environment) {
-		super(env);
-		this.setEndpointHandler(this.#ssrEndpointHandler);
-	}
-
-	// This function is responsible for handling the result coming from an endpoint.
-	async #ssrEndpointHandler(request: Request, response: Response): Promise<Response> {
-		if (response.headers.get('X-Astro-Response') === 'Not-Found') {
-			throw new EndpointNotFoundError(response);
-		}
-		return response;
-	}
-}
+export class SSRRoutePipeline extends Pipeline {}
diff --git a/packages/astro/src/core/app/types.ts b/packages/astro/src/core/app/types.ts
index c0dbb54e75de..b38f51d64f72 100644
--- a/packages/astro/src/core/app/types.ts
+++ b/packages/astro/src/core/app/types.ts
@@ -40,6 +40,7 @@ export type SSRManifest = {
 	site?: string;
 	base: string;
 	trailingSlash: 'always' | 'never' | 'ignore';
+	buildFormat: 'file' | 'directory';
 	compressHTML: boolean;
 	assetsPrefix?: string;
 	renderers: SSRLoadedRenderer[];
diff --git a/packages/astro/src/core/build/buildPipeline.ts b/packages/astro/src/core/build/buildPipeline.ts
index 166e42a2f8cb..c5a499d7023a 100644
--- a/packages/astro/src/core/build/buildPipeline.ts
+++ b/packages/astro/src/core/build/buildPipeline.ts
@@ -67,7 +67,6 @@ export class BuildPipeline extends Pipeline {
 		this.#internals = internals;
 		this.#staticBuildOptions = staticBuildOptions;
 		this.#manifest = manifest;
-		this.setEndpointHandler(this.#handleEndpointResult);
 	}
 
 	getInternals(): Readonly<BuildInternals> {
@@ -193,8 +192,4 @@ export class BuildPipeline extends Pipeline {
 
 		return pages;
 	}
-
-	async #handleEndpointResult(_: Request, response: Response): Promise<Response> {
-		return response;
-	}
 }
diff --git a/packages/astro/src/core/build/generate.ts b/packages/astro/src/core/build/generate.ts
index a58eb0742329..e3b93ea44f62 100644
--- a/packages/astro/src/core/build/generate.ts
+++ b/packages/astro/src/core/build/generate.ts
@@ -265,7 +265,8 @@ async function generatePage(
 	const i18nMiddleware = createI18nMiddleware(
 		pipeline.getManifest().i18n,
 		pipeline.getManifest().base,
-		pipeline.getManifest().trailingSlash
+		pipeline.getManifest().trailingSlash,
+		pipeline.getManifest().buildFormat
 	);
 	if (config.i18n && i18nMiddleware) {
 		if (onRequest) {
@@ -486,7 +487,8 @@ async function generatePath(
 ) {
 	const { mod, scripts: hoistedScripts, styles: _styles } = gopts;
 	const manifest = pipeline.getManifest();
-	pipeline.getEnvironment().logger.debug('build', `Generating: ${pathname}`);
+	const logger = pipeline.getLogger();
+	logger.debug('build', `Generating: ${pathname}`);
 
 	const links = new Set<never>();
 	const scripts = createModuleScriptsSet(
@@ -657,5 +659,6 @@ export function createBuildManifest(
 			: settings.config.site,
 		componentMetadata: internals.componentMetadata,
 		i18n: i18nManifest,
+		buildFormat: settings.config.build.format,
 	};
 }
diff --git a/packages/astro/src/core/build/plugins/plugin-manifest.ts b/packages/astro/src/core/build/plugins/plugin-manifest.ts
index ebdb4734e304..09408e23af36 100644
--- a/packages/astro/src/core/build/plugins/plugin-manifest.ts
+++ b/packages/astro/src/core/build/plugins/plugin-manifest.ts
@@ -264,5 +264,6 @@ function buildManifest(
 		entryModules,
 		assets: staticFiles.map(prefixAssetPath),
 		i18n: i18nManifest,
+		buildFormat: settings.config.build.format,
 	};
 }
diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
index 86b7740c4b64..c4ecfd6a2448 100644
--- a/packages/astro/src/core/build/static-build.ts
+++ b/packages/astro/src/core/build/static-build.ts
@@ -439,7 +439,7 @@ async function cleanServerOutput(
 	// Clean out directly if the outDir is outside of root
 	if (out.toString() !== opts.settings.config.outDir.toString()) {
 		// Copy assets before cleaning directory if outside root
-		await copyFiles(out, opts.settings.config.outDir);
+		await copyFiles(out, opts.settings.config.outDir, true);
 		await fs.promises.rm(out, { recursive: true });
 		return;
 	}
diff --git a/packages/astro/src/core/config/schema.ts b/packages/astro/src/core/config/schema.ts
index 655db8ed8f5f..29c817bce052 100644
--- a/packages/astro/src/core/config/schema.ts
+++ b/packages/astro/src/core/config/schema.ts
@@ -112,6 +112,7 @@ export const AstroConfigSchema = z.object({
 		.optional()
 		.default('attribute'),
 	adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
+	db: z.object({}).passthrough().default({}).optional(),
 	integrations: z.preprocess(
 		// preprocess
 		(val) => (Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val),
diff --git a/packages/astro/src/core/create-vite.ts b/packages/astro/src/core/create-vite.ts
index 99082b830419..0b0c7d47ff04 100644
--- a/packages/astro/src/core/create-vite.ts
+++ b/packages/astro/src/core/create-vite.ts
@@ -143,7 +143,7 @@ export async function createVite(
 			astroTransitions({ settings }),
 			astroDevToolbar({ settings, logger }),
 			vitePluginFileURL({}),
-			!!settings.config.i18n && astroInternationalization({ settings }),
+			astroInternationalization({ settings }),
 		],
 		publicDir: fileURLToPath(settings.config.publicDir),
 		root: fileURLToPath(settings.config.root),
diff --git a/packages/astro/src/core/errors/errors-data.ts b/packages/astro/src/core/errors/errors-data.ts
index fb463a77fe1c..74bd29770280 100644
--- a/packages/astro/src/core/errors/errors-data.ts
+++ b/packages/astro/src/core/errors/errors-data.ts
@@ -1034,6 +1034,18 @@ export const UnhandledRejection = {
 	hint: 'Make sure your promises all have an `await` or a `.catch()` handler.',
 } satisfies ErrorData;
 
+/**
+ * @docs
+ * @description
+ * Astro could not find any code to handle a rejected `Promise`. Make sure all your promises have an `await` or `.catch()` handler.
+ */
+export const i18nNotEnabled = {
+	name: 'i18nNotEnabled',
+	title: 'i18n Not Enabled',
+	message: 'The `astro:i18n` module can not be used without enabling i18n in your Astro config.',
+	hint: 'See https://docs.astro.build/en/guides/internationalization for a guide on setting up i18n.',
+} satisfies ErrorData;
+
 /**
  * @docs
  * @kind heading
diff --git a/packages/astro/src/core/logger/core.ts b/packages/astro/src/core/logger/core.ts
index f2230f754296..3f9c9f4177b5 100644
--- a/packages/astro/src/core/logger/core.ts
+++ b/packages/astro/src/core/logger/core.ts
@@ -27,6 +27,7 @@ export type LoggerLabel =
 	| 'middleware'
 	| 'preferences'
 	| 'redirects'
+	| 'toolbar'
 	// SKIP_FORMAT: A special label that tells the logger not to apply any formatting.
 	// Useful for messages that are already formatted, like the server start message.
 	| 'SKIP_FORMAT';
diff --git a/packages/astro/src/core/pipeline.ts b/packages/astro/src/core/pipeline.ts
index 67081a47e93f..88b8e800daaa 100644
--- a/packages/astro/src/core/pipeline.ts
+++ b/packages/astro/src/core/pipeline.ts
@@ -4,11 +4,6 @@ import { callMiddleware } from './middleware/callMiddleware.js';
 import { renderPage } from './render/core.js';
 import { type Environment, type RenderContext } from './render/index.js';
 
-type EndpointResultHandler = (
-	originalRequest: Request,
-	result: Response
-) => Promise<Response> | Response;
-
 type PipelineHooks = {
 	before: PipelineHookFunction[];
 };
@@ -26,11 +21,6 @@ export class Pipeline {
 	#hooks: PipelineHooks = {
 		before: [],
 	};
-	/**
-	 * The handler accepts the *original* `Request` and result returned by the endpoint.
-	 * It must return a `Response`.
-	 */
-	#endpointHandler?: EndpointResultHandler;
 
 	/**
 	 * When creating a pipeline, an environment is mandatory.
@@ -42,15 +32,6 @@ export class Pipeline {
 
 	setEnvironment() {}
 
-	/**
-	 * When rendering a route, an "endpoint" will a type that needs to be handled and transformed into a `Response`.
-	 *
-	 * Each consumer might have different needs; use this function to set up the handler.
-	 */
-	setEndpointHandler(handler: EndpointResultHandler) {
-		this.#endpointHandler = handler;
-	}
-
 	/**
 	 * A middleware function that will be called before each request.
 	 */
@@ -81,22 +62,7 @@ export class Pipeline {
 		for (const hook of this.#hooks.before) {
 			hook(renderContext, componentInstance);
 		}
-		const result = await this.#tryRenderRoute(
-			renderContext,
-			this.env,
-			componentInstance,
-			this.#onRequest
-		);
-		if (renderContext.route.type === 'endpoint') {
-			if (!this.#endpointHandler) {
-				throw new Error(
-					'You created a pipeline that does not know how to handle the result coming from an endpoint.'
-				);
-			}
-			return this.#endpointHandler(renderContext.request, result);
-		} else {
-			return result;
-		}
+		return await this.#tryRenderRoute(renderContext, this.env, componentInstance, this.#onRequest);
 	}
 
 	/**
diff --git a/packages/astro/src/core/routing/manifest/create.ts b/packages/astro/src/core/routing/manifest/create.ts
index 6ab297a5ee22..e05bfe346d61 100644
--- a/packages/astro/src/core/routing/manifest/create.ts
+++ b/packages/astro/src/core/routing/manifest/create.ts
@@ -194,39 +194,90 @@ function isSemanticallyEqualSegment(segmentA: RoutePart[], segmentB: RoutePart[]
  *   The definition of "alphabetically" is dependent on the default locale of the running system.
  */
 function routeComparator(a: ManifestRouteData, b: ManifestRouteData) {
-	// For sorting purposes, an index route is considered to have one more segment than the URL it represents.
-	const aLength = a.isIndex ? a.segments.length + 1 : a.segments.length;
-	const bLength = b.isIndex ? b.segments.length + 1 : b.segments.length;
+	const commonLength = Math.min(a.segments.length, b.segments.length);
 
-	// Sort more specific routes before less specific routes
-	if (aLength !== bLength) {
-		return aLength > bLength ? -1 : 1;
+	for (let index = 0; index < commonLength; index++) {
+		const aSegment = a.segments[index];
+		const bSegment = b.segments[index];
+
+		const aIsStatic = aSegment.every((part) => !part.dynamic && !part.spread);
+		const bIsStatic = bSegment.every((part) => !part.dynamic && !part.spread);
+
+		if (aIsStatic && bIsStatic) {
+			// Both segments are static, they are sorted alphabetically if they are different
+			const aContent = aSegment.map((part) => part.content).join('');
+			const bContent = bSegment.map((part) => part.content).join('');
+
+			if (aContent !== bContent) {
+				return aContent.localeCompare(bContent);
+			}
+		}
+
+		// Sort static routes before dynamic routes
+		if (aIsStatic !== bIsStatic) {
+			return aIsStatic ? -1 : 1;
+		}
+
+		const aHasSpread = aSegment.some((part) => part.spread);
+		const bHasSpread = bSegment.some((part) => part.spread);
+
+		// Sort dynamic routes with rest parameters after dynamic routes with single parameters
+		// (also after static, but that is already covered by the previous condition)
+		if (aHasSpread !== bHasSpread) {
+			return aHasSpread ? 1 : -1;
+		}
 	}
 
-	const aIsStatic = a.segments.every((segment) =>
-		segment.every((part) => !part.dynamic && !part.spread)
-	);
-	const bIsStatic = b.segments.every((segment) =>
-		segment.every((part) => !part.dynamic && !part.spread)
-	);
+	// Special case to have `/[foo].astro` be equivalent to `/[foo]/index.astro`
+	// when compared against `/[foo]/[...rest].astro`.
+	if (Math.abs(a.segments.length - b.segments.length) === 1) {
+		const aEndsInRest = a.segments.at(-1)?.some((part) => part.spread);
+		const bEndsInRest = b.segments.at(-1)?.some((part) => part.spread);
+
+		// Routes with rest parameters are less specific than their parent route.
+		// For example, `/foo/[...bar]` is sorted after `/foo`.
+
+		if (a.segments.length > b.segments.length && !bEndsInRest) {
+			return 1;
+		}
 
-	// Sort static routes before dynamic routes
-	if (aIsStatic !== bIsStatic) {
-		return aIsStatic ? -1 : 1;
+		if (b.segments.length > a.segments.length && !aEndsInRest) {
+			return -1;
+		}
 	}
 
-	const aHasSpread = a.segments.some((segment) => segment.some((part) => part.spread));
-	const bHasSpread = b.segments.some((segment) => segment.some((part) => part.spread));
+	if (a.isIndex !== b.isIndex) {
+		// Index pages are lower priority than other static segments in the same prefix.
+		// They match the path up to their parent, but are more specific than the parent.
+		// For example:
+		//  - `/foo/index.astro` is sorted before `/foo`
+		//  - `/foo/index.astro` is sorted before `/foo/[bar].astro`
+		//  - `/[...foo]/index.astro` is sorted after `/[...foo]/bar.astro`
+
+		if (a.isIndex) {
+			const followingBSegment = b.segments.at(a.segments.length);
+			const followingBSegmentIsStatic = followingBSegment?.every(
+				(part) => !part.dynamic && !part.spread
+			);
+
+			return followingBSegmentIsStatic ? 1 : -1;
+		}
+
+		const followingASegment = a.segments.at(b.segments.length);
+		const followingASegmentIsStatic = followingASegment?.every(
+			(part) => !part.dynamic && !part.spread
+		);
 
-	// Sort dynamic routes with rest parameters after dynamic routes with single parameters
-	// (also after static, but that is already covered by the previous condition)
-	if (aHasSpread !== bHasSpread) {
-		return aHasSpread ? 1 : -1;
+		return followingASegmentIsStatic ? -1 : 1;
 	}
 
-	// Sort prerendered routes before non-prerendered routes
-	if (a.prerender !== b.prerender) {
-		return a.prerender ? -1 : 1;
+	// For sorting purposes, an index route is considered to have one more segment than the URL it represents.
+	const aLength = a.isIndex ? a.segments.length + 1 : a.segments.length;
+	const bLength = b.isIndex ? b.segments.length + 1 : b.segments.length;
+
+	if (aLength !== bLength) {
+		// Routes are equal up to the smaller of the two lengths, so the longer route is more specific
+		return aLength > bLength ? -1 : 1;
 	}
 
 	// Sort endpoints before pages
@@ -234,7 +285,7 @@ function routeComparator(a: ManifestRouteData, b: ManifestRouteData) {
 		return a.type === 'endpoint' ? -1 : 1;
 	}
 
-	// Sort alphabetically
+	// Both routes have segments with the same properties
 	return a.route.localeCompare(b.route);
 }
 
diff --git a/packages/astro/src/i18n/index.ts b/packages/astro/src/i18n/index.ts
index 5a44d084092b..4b882b7829df 100644
--- a/packages/astro/src/i18n/index.ts
+++ b/packages/astro/src/i18n/index.ts
@@ -84,14 +84,14 @@ export function getLocaleAbsoluteUrl({ site, ...rest }: GetLocaleAbsoluteUrl) {
 	}
 }
 
-type GetLocalesBaseUrl = GetLocaleOptions & {
+interface GetLocalesRelativeUrlList extends GetLocaleOptions {
 	base: string;
 	locales: Locales;
 	trailingSlash: AstroConfig['trailingSlash'];
 	format: AstroConfig['build']['format'];
 	routing?: RoutingStrategies;
 	defaultLocale: string;
-};
+}
 
 export function getLocaleRelativeUrlList({
 	base,
@@ -103,7 +103,7 @@ export function getLocaleRelativeUrlList({
 	normalizeLocale = false,
 	routing = 'pathname-prefix-other-locales',
 	defaultLocale,
-}: GetLocalesBaseUrl) {
+}: GetLocalesRelativeUrlList) {
 	const locales = toPaths(_locales);
 	return locales.map((locale) => {
 		const pathsToJoin = [base, prependWith];
@@ -123,7 +123,11 @@ export function getLocaleRelativeUrlList({
 	});
 }
 
-export function getLocaleAbsoluteUrlList({ site, ...rest }: GetLocaleAbsoluteUrl) {
+interface GetLocalesAbsoluteUrlList extends GetLocalesRelativeUrlList {
+	site?: string;
+}
+
+export function getLocaleAbsoluteUrlList({ site, ...rest }: GetLocalesAbsoluteUrlList) {
 	const locales = getLocaleRelativeUrlList(rest);
 	return locales.map((locale) => {
 		if (site) {
@@ -139,7 +143,7 @@ export function getLocaleAbsoluteUrlList({ site, ...rest }: GetLocaleAbsoluteUrl
  * @param locale
  * @param locales
  */
-export function getPathByLocale(locale: string, locales: Locales) {
+export function getPathByLocale(locale: string, locales: Locales): string {
 	for (const loopLocale of locales) {
 		if (typeof loopLocale === 'string') {
 			if (loopLocale === locale) {
@@ -153,6 +157,7 @@ export function getPathByLocale(locale: string, locales: Locales) {
 			}
 		}
 	}
+	throw new Unreachable();
 }
 
 /**
@@ -161,19 +166,20 @@ export function getPathByLocale(locale: string, locales: Locales) {
  * @param path
  * @param locales
  */
-export function getLocaleByPath(path: string, locales: Locales): string | undefined {
+export function getLocaleByPath(path: string, locales: Locales): string {
 	for (const locale of locales) {
 		if (typeof locale !== 'string') {
 			if (locale.path === path) {
 				// the first code is the one that user usually wants
 				const code = locale.codes.at(0);
+				if (code === undefined) throw new Unreachable();
 				return code;
 			}
 		} else if (locale === path) {
 			return locale;
 		}
 	}
-	return undefined;
+	throw new Unreachable();
 }
 
 /**
@@ -235,3 +241,14 @@ function peekCodePathToUse(locales: Locales, locale: string): undefined | string
 
 	return undefined;
 }
+
+class Unreachable extends Error {
+	constructor() {
+		super(
+			'Astro encountered an unexpected line of code.\n' +
+				'In most cases, this is not your fault, but a bug in astro code.\n' +
+				"If there isn't one already, please create an issue.\n" +
+				'https://astro.build/issues'
+		);
+	}
+}
diff --git a/packages/astro/src/i18n/middleware.ts b/packages/astro/src/i18n/middleware.ts
index 2ec796a05ef3..1298dcac8154 100644
--- a/packages/astro/src/i18n/middleware.ts
+++ b/packages/astro/src/i18n/middleware.ts
@@ -2,6 +2,7 @@ import { appendForwardSlash, joinPaths } from '@astrojs/internal-helpers/path';
 import type { Locales, MiddlewareHandler, RouteData, SSRManifest } from '../@types/astro.js';
 import type { PipelineHookFunction } from '../core/pipeline.js';
 import { getPathByLocale, normalizeTheLocale } from './index.js';
+import { shouldAppendForwardSlash } from '../core/build/util.js';
 
 const routeDataSymbol = Symbol.for('astro.routeData');
 
@@ -26,28 +27,18 @@ function pathnameHasLocale(pathname: string, locales: Locales): boolean {
 export function createI18nMiddleware(
 	i18n: SSRManifest['i18n'],
 	base: SSRManifest['base'],
-	trailingSlash: SSRManifest['trailingSlash']
-): MiddlewareHandler | undefined {
-	if (!i18n) {
-		return undefined;
-	}
+	trailingSlash: SSRManifest['trailingSlash'],
+	buildFormat: SSRManifest['buildFormat']
+): MiddlewareHandler {
+	if (!i18n) return (_, next) => next();
 
 	return async (context, next) => {
-		if (!i18n) {
+		const routeData: RouteData | undefined = Reflect.get(context.request, routeDataSymbol);
+		// If the route we're processing is not a page, then we ignore it
+		if (routeData?.type !== 'page' && routeData?.type !== 'fallback') {
 			return await next();
 		}
 
-		const routeData = Reflect.get(context.request, routeDataSymbol);
-		if (routeData) {
-			// If the route we're processing is not a page, then we ignore it
-			if (
-				(routeData as RouteData).type !== 'page' &&
-				(routeData as RouteData).type !== 'fallback'
-			) {
-				return await next();
-			}
-		}
-
 		const url = context.url;
 		const { locales, defaultLocale, fallback, routing } = i18n;
 		const response = await next();
@@ -83,7 +74,7 @@ export function createI18nMiddleware(
 
 				case 'pathname-prefix-always': {
 					if (url.pathname === base + '/' || url.pathname === base) {
-						if (trailingSlash === 'always') {
+						if (shouldAppendForwardSlash(trailingSlash, buildFormat)) {
 							return context.redirect(`${appendForwardSlash(joinPaths(base, i18n.defaultLocale))}`);
 						} else {
 							return context.redirect(`${joinPaths(base, i18n.defaultLocale)}`);
diff --git a/packages/astro/src/i18n/vite-plugin-i18n.ts b/packages/astro/src/i18n/vite-plugin-i18n.ts
index f01116f6cf41..856ce46a7415 100644
--- a/packages/astro/src/i18n/vite-plugin-i18n.ts
+++ b/packages/astro/src/i18n/vite-plugin-i18n.ts
@@ -1,69 +1,55 @@
 import type * as vite from 'vite';
-import type { AstroSettings } from '../@types/astro.js';
+import type { AstroConfig, AstroSettings } from '../@types/astro.js';
+import { AstroError } from '../core/errors/errors.js';
+import { AstroErrorData } from '../core/errors/index.js';
 
 const virtualModuleId = 'astro:i18n';
-const resolvedVirtualModuleId = '\0' + virtualModuleId;
+const configId = 'astro-internal:i18n-config';
+const resolvedConfigId = `\0${configId}`;
 
 type AstroInternationalization = {
 	settings: AstroSettings;
 };
 
+export interface I18nInternalConfig
+	extends Pick<AstroConfig, 'base' | 'site' | 'trailingSlash'>,
+		NonNullable<AstroConfig['i18n']>,
+		Pick<AstroConfig['build'], 'format'> {}
+
 export default function astroInternationalization({
 	settings,
 }: AstroInternationalization): vite.Plugin {
+	const {
+		base,
+		build: { format },
+		i18n,
+		site,
+		trailingSlash,
+	} = settings.config;
 	return {
 		name: 'astro:i18n',
 		enforce: 'pre',
 		async resolveId(id) {
 			if (id === virtualModuleId) {
-				return resolvedVirtualModuleId;
+				if (i18n === undefined) throw new AstroError(AstroErrorData.i18nNotEnabled);
+				return this.resolve('astro/virtual-modules/i18n.js');
 			}
+			if (id === configId) return resolvedConfigId;
 		},
 		load(id) {
-			if (id === resolvedVirtualModuleId) {
-				return `
-					import { 
-						getLocaleRelativeUrl as _getLocaleRelativeUrl, 
-						getLocaleRelativeUrlList as _getLocaleRelativeUrlList,
-						getLocaleAbsoluteUrl as _getLocaleAbsoluteUrl, 
-						getLocaleAbsoluteUrlList as _getLocaleAbsoluteUrlList,
-						getPathByLocale as _getPathByLocale, 
-						getLocaleByPath as _getLocaleByPath,
-					} from "astro/virtual-modules/i18n.js";
-					
-					const base =  ${JSON.stringify(settings.config.base)};
-					const trailingSlash =  ${JSON.stringify(settings.config.trailingSlash)};
-					const format =  ${JSON.stringify(settings.config.build.format)};
-					const site = ${JSON.stringify(settings.config.site)};
-					const i18n = ${JSON.stringify(settings.config.i18n)};
-					
-					export const getRelativeLocaleUrl = (locale, path = "", opts) => _getLocaleRelativeUrl({ 
-						locale,
-						path, 
-						base, 
-						trailingSlash, 
-						format,
-						...i18n,
-						...opts 
-					});
-					export const getAbsoluteLocaleUrl = (locale, path = "", opts) => _getLocaleAbsoluteUrl({ 
-						locale, 
-						path, 
-						base, 
-						trailingSlash, 
-						format, 
-						site, 
-						...i18n,
-						...opts 
-					});
-					
-					export const getRelativeLocaleUrlList = (path = "", opts) => _getLocaleRelativeUrlList({ 
-						base, path, trailingSlash, format, ...i18n, ...opts });
-					export const getAbsoluteLocaleUrlList = (path = "", opts) => _getLocaleAbsoluteUrlList({ base, path, trailingSlash, format, site, ...i18n, ...opts });
-					
-					export const getPathByLocale = (locale) => _getPathByLocale(locale, i18n.locales);
-					export const getLocaleByPath = (path) => _getLocaleByPath(path, i18n.locales);
-				`;
+			if (id === resolvedConfigId) {
+				const { defaultLocale, locales, routing, fallback } = i18n!;
+				const config: I18nInternalConfig = {
+					base,
+					format,
+					site,
+					trailingSlash,
+					defaultLocale,
+					locales,
+					routing,
+					fallback,
+				};
+				return `export default ${JSON.stringify(config)};`;
 			}
 		},
 	};
diff --git a/packages/astro/src/prerender/utils.ts b/packages/astro/src/prerender/utils.ts
index b444352135d5..5cc627343028 100644
--- a/packages/astro/src/prerender/utils.ts
+++ b/packages/astro/src/prerender/utils.ts
@@ -6,7 +6,7 @@ export function isServerLikeOutput(config: AstroConfig) {
 }
 
 export function getPrerenderDefault(config: AstroConfig) {
-	return config.output === 'hybrid';
+	return config.output !== 'server';
 }
 
 /**
diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/a11y.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/a11y.ts
index e004b70b5fb1..6eb4cd97b597 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/apps/audit/a11y.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/apps/audit/a11y.ts
@@ -208,7 +208,7 @@ const ariaAttributes = new Set(
 );
 
 const ariaRoles = new Set(
-	'alert alertdialog application article banner button cell checkbox columnheader combobox complementary contentinfo definition dialog directory document feed figure form grid gridcell group heading img link list listbox listitem log main marquee math menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option presentation progressbar radio radiogroup region row rowgroup rowheader scrollbar search searchbox separator slider spinbutton status tab tablist tabpanel textbox timer toolbar tooltip tree treegrid treeitem'.split(
+	'alert alertdialog application article banner button cell checkbox columnheader combobox complementary contentinfo definition dialog directory document feed figure form grid gridcell group heading img link list listbox listitem log main marquee math menu menubar menuitem menuitemcheckbox menuitemradio navigation none note option presentation progressbar radio radiogroup region row rowgroup rowheader scrollbar search searchbox separator slider spinbutton status switch tab tablist tabpanel textbox timer toolbar tooltip tree treegrid treeitem'.split(
 		' '
 	)
 );
diff --git a/packages/astro/src/runtime/client/dev-toolbar/apps/settings.ts b/packages/astro/src/runtime/client/dev-toolbar/apps/settings.ts
index 7e7fa5e3a594..d6a2cbde8320 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/apps/settings.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/apps/settings.ts
@@ -26,7 +26,7 @@ const settingsRows = [
 
 				settings.updateSetting('disableAppNotification', evt.currentTarget.checked);
 				const action = evt.currentTarget.checked ? 'disabled' : 'enabled';
-				settings.log(`App notification badges ${action}`);
+				settings.logger.verboseLog(`App notification badges ${action}`);
 			}
 		},
 	},
@@ -39,7 +39,7 @@ const settingsRows = [
 			if (evt.currentTarget instanceof HTMLInputElement) {
 				settings.updateSetting('verbose', evt.currentTarget.checked);
 				const action = evt.currentTarget.checked ? 'enabled' : 'disabled';
-				settings.log(`Verbose logging ${action}`);
+				settings.logger.verboseLog(`Verbose logging ${action}`);
 			}
 		},
 	},
diff --git a/packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts b/packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts
index a1d5484e3ac2..6a62b8416612 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/entrypoint.ts
@@ -201,7 +201,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 
 					const iconContainer = document.createElement('div');
 					const iconElement = document.createElement('template');
-					iconElement.innerHTML = getAppIcon(app.icon);
+					iconElement.innerHTML = app.icon ? getAppIcon(app.icon) : '?';
 					iconContainer.append(iconElement.content.cloneNode(true));
 
 					const notification = document.createElement('div');
diff --git a/packages/astro/src/runtime/client/dev-toolbar/settings.ts b/packages/astro/src/runtime/client/dev-toolbar/settings.ts
index 6e3656dca32c..ee7386d4f565 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/settings.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/settings.ts
@@ -44,6 +44,13 @@ function getSettings() {
 			return _settings;
 		},
 		updateSetting,
-		log,
+		logger: {
+			log,
+			verboseLog: (message: string) => {
+				if (_settings.verbose) {
+					log(message);
+				}
+			},
+		},
 	};
 }
diff --git a/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts b/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts
index 8e1c714014d6..1c9257cf8897 100644
--- a/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts
+++ b/packages/astro/src/runtime/client/dev-toolbar/toolbar.ts
@@ -126,6 +126,11 @@ export class AstroDevToolbar extends HTMLElement {
 				outline-offset: -3px;
 			}
 
+			#dev-bar #bar-container .item[data-app-error]:hover, #dev-bar #bar-container .item[data-app-error]:focus-visible {
+				cursor: not-allowed;
+				background: #ff252520;
+			}
+
 			#dev-bar .item:first-of-type {
 				border-top-left-radius: 9999px;
 				border-bottom-left-radius: 9999px;
@@ -166,6 +171,10 @@ export class AstroDevToolbar extends HTMLElement {
 				border-top: 5px solid #343841;
 			}
 
+			#dev-bar .item[data-app-error] .icon {
+				opacity: 0.35;
+			}
+
 			#dev-bar .item:hover .item-tooltip, #dev-bar .item:not(.active):focus-visible .item-tooltip {
 				transition: opacity 0.2s ease-in-out 200ms;
 				opacity: 1;
@@ -266,7 +275,7 @@ export class AstroDevToolbar extends HTMLElement {
 
 		// Create app canvases
 		this.apps.forEach(async (app) => {
-			if (settings.config.verbose) console.log(`Creating app canvas for ${app.id}`);
+			settings.logger.verboseLog(`Creating app canvas for ${app.id}`);
 			const appCanvas = document.createElement('astro-dev-toolbar-app-canvas');
 			appCanvas.dataset.appId = app.id;
 			this.shadowRoot?.append(appCanvas);
@@ -353,24 +362,40 @@ export class AstroDevToolbar extends HTMLElement {
 		const shadowRoot = this.getAppCanvasById(app.id)!.shadowRoot!;
 		app.status = 'loading';
 		try {
-			if (settings.config.verbose) console.info(`Initializing app ${app.id}`);
+			settings.logger.verboseLog(`Initializing app ${app.id}`);
 
 			await app.init?.(shadowRoot, app.eventTarget);
 			app.status = 'ready';
 
 			if (import.meta.hot) {
 				import.meta.hot.send(`${WS_EVENT_NAME}:${app.id}:initialized`);
+				// TODO: Remove in Astro 5.0
 				import.meta.hot.send(`${WS_EVENT_NAME_DEPRECATED}:${app.id}:initialized`);
 			}
 		} catch (e) {
 			console.error(`Failed to init app ${app.id}, error: ${e}`);
 			app.status = 'error';
+
+			if (import.meta.hot) {
+				import.meta.hot.send('astro:devtoolbar:error:init', {
+					app: app,
+					error: e instanceof Error ? e.stack : e,
+				});
+			}
+
+			const appButton = this.getAppButtonById(app.id);
+			const appTooltip = appButton?.querySelector<HTMLElement>('.item-tooltip');
+
+			if (appButton && appTooltip) {
+				appButton.toggleAttribute('data-app-error', true);
+				appTooltip.innerText = `Error initializing ${app.name}`;
+			}
 		}
 	}
 
 	getAppTemplate(app: DevToolbarApp) {
 		return `<button class="item" data-app-id="${app.id}">
-				<div class="icon">${getAppIcon(app.icon)}<div class="notification"></div></div>
+				<div class="icon">${app.icon ? getAppIcon(app.icon) : '?'}<div class="notification"></div></div>
 				<span class="item-tooltip">${app.name}</span>
 			</button>`;
 	}
@@ -385,6 +410,10 @@ export class AstroDevToolbar extends HTMLElement {
 		);
 	}
 
+	getAppButtonById(id: string) {
+		return this.shadowRoot.querySelector<HTMLElement>(`[data-app-id="${id}"]`);
+	}
+
 	async toggleAppStatus(app: DevToolbarApp) {
 		const activeApp = this.getActiveApp();
 		if (activeApp) {
@@ -418,7 +447,7 @@ export class AstroDevToolbar extends HTMLElement {
 		}
 
 		app.active = newStatus ?? !app.active;
-		const mainBarButton = this.shadowRoot.querySelector(`[data-app-id="${app.id}"]`);
+		const mainBarButton = this.getAppButtonById(app.id);
 		const moreBarButton = this.getAppCanvasById('astro:more')?.shadowRoot?.querySelector(
 			`[data-app-id="${app.id}"]`
 		);
diff --git a/packages/astro/src/runtime/server/endpoint.ts b/packages/astro/src/runtime/server/endpoint.ts
index 851d9bf0906d..aec9c6a1be0e 100644
--- a/packages/astro/src/runtime/server/endpoint.ts
+++ b/packages/astro/src/runtime/server/endpoint.ts
@@ -33,16 +33,14 @@ export async function renderEndpoint(
 					? `One of the exported handlers is "all" (lowercase), did you mean to export 'ALL'?\n`
 					: '')
 		);
-		// No handler found, so this should be a 404. Using a custom header
-		// to signal to the renderer that this is an internal 404 that should
-		// be handled by a custom 404 route if possible.
-		return new Response(null, {
-			status: 404,
-			headers: {
-				'X-Astro-Response': 'Not-Found',
-			},
-		});
+		// No handler matching the verb found, so this should be a
+		// 404. Should be handled by 404.astro route if possible.
+		return new Response(null, { status: 404 });
 	}
 
-	return handler.call(mod, context);
+	const response = await handler.call(mod, context);
+	// Endpoints explicitly returning 404 or 500 response status should
+	// NOT be subject to rerouting to 404.astro or 500.astro.
+	response.headers.set('X-Astro-Reroute', 'no');
+	return response;
 }
diff --git a/packages/astro/src/virtual-modules/i18n.ts b/packages/astro/src/virtual-modules/i18n.ts
index a55c1f6cfb59..d9d470431117 100644
--- a/packages/astro/src/virtual-modules/i18n.ts
+++ b/packages/astro/src/virtual-modules/i18n.ts
@@ -1 +1,183 @@
-export * from '../i18n/index.js';
+import * as I18nInternals from '../i18n/index.js';
+import type { I18nInternalConfig } from '../i18n/vite-plugin-i18n.js';
+export { normalizeTheLocale, toCodes, toPaths } from '../i18n/index.js';
+// @ts-expect-error
+import config from 'astro-internal:i18n-config';
+const { trailingSlash, format, site, defaultLocale, locales, routing } =
+	config as I18nInternalConfig;
+const base = import.meta.env.BASE_URL;
+
+export type GetLocaleOptions = I18nInternals.GetLocaleOptions;
+
+/**
+ * @param locale A locale
+ * @param path An optional path to add after the `locale`.
+ * @param options Customise the generated path
+ *
+ * Returns a _relative_ path with passed locale.
+ *
+ * ## Errors
+ *
+ * Throws an error if the locale doesn't exist in the list of locales defined in the configuration.
+ *
+ * ## Examples
+ *
+ * ```js
+ * import { getRelativeLocaleUrl } from "astro:i18n";
+ * getRelativeLocaleUrl("es"); // /es
+ * getRelativeLocaleUrl("es", "getting-started"); // /es/getting-started
+ * getRelativeLocaleUrl("es_US", "getting-started", { prependWith: "blog" }); // /blog/es-us/getting-started
+ * getRelativeLocaleUrl("es_US", "getting-started", { prependWith: "blog", normalizeLocale: false }); // /blog/es_US/getting-started
+ * ```
+ */
+export const getRelativeLocaleUrl = (locale: string, path?: string, options?: GetLocaleOptions) =>
+	I18nInternals.getLocaleRelativeUrl({
+		locale,
+		path,
+		base,
+		trailingSlash,
+		format,
+		defaultLocale,
+		locales,
+		routing,
+		...options,
+	});
+
+/**
+ *
+ * @param locale A locale
+ * @param path An optional path to add after the `locale`.
+ * @param options Customise the generated path
+ *
+ * Returns an absolute path with the passed locale. The behaviour is subject to change based on `site` configuration.
+ * If _not_ provided, the function will return a _relative_ URL.
+ *
+ * ## Errors
+ *
+ * Throws an error if the locale doesn't exist in the list of locales defined in the configuration.
+ *
+ * ## Examples
+ *
+ * If `site` is `https://example.com`:
+ *
+ * ```js
+ * import { getAbsoluteLocaleUrl } from "astro:i18n";
+ * getAbsoluteLocaleUrl("es"); // https://example.com/es
+ * getAbsoluteLocaleUrl("es", "getting-started"); // https://example.com/es/getting-started
+ * getAbsoluteLocaleUrl("es_US", "getting-started", { prependWith: "blog" }); // https://example.com/blog/es-us/getting-started
+ * getAbsoluteLocaleUrl("es_US", "getting-started", { prependWith: "blog", normalizeLocale: false }); // https://example.com/blog/es_US/getting-started
+ * ```
+ */
+export const getAbsoluteLocaleUrl = (locale: string, path = '', options?: GetLocaleOptions) =>
+	I18nInternals.getLocaleAbsoluteUrl({
+		locale,
+		path,
+		base,
+		trailingSlash,
+		format,
+		site,
+		defaultLocale,
+		locales,
+		routing,
+		...options,
+	});
+
+/**
+ * @param path An optional path to add after the `locale`.
+ * @param options Customise the generated path
+ *
+ * Works like `getRelativeLocaleUrl` but it emits the relative URLs for ALL locales:
+ */
+export const getRelativeLocaleUrlList = (path?: string, options?: GetLocaleOptions) =>
+	I18nInternals.getLocaleRelativeUrlList({
+		base,
+		path,
+		trailingSlash,
+		format,
+		defaultLocale,
+		locales,
+		routing,
+		...options,
+	});
+
+/**
+ * @param path An optional path to add after the `locale`.
+ * @param options Customise the generated path
+ *
+ * Works like `getAbsoluteLocaleUrl` but it emits the absolute URLs for ALL locales:
+ */
+export const getAbsoluteLocaleUrlList = (path?: string, options?: GetLocaleOptions) =>
+	I18nInternals.getLocaleAbsoluteUrlList({
+		site,
+		base,
+		path,
+		trailingSlash,
+		format,
+		defaultLocale,
+		locales,
+		routing,
+		...options,
+	});
+
+/**
+ * A function that return the `path` associated to a locale (defined as code). It's particularly useful in case you decide
+ * to use locales that are broken down in paths and codes.
+ *
+ * @param locale The code of the locale
+ * @returns The path associated to the locale
+ *
+ * ## Example
+ *
+ * ```js
+ * // astro.config.mjs
+ *
+ * export default defineConfig({
+ * 	i18n: {
+ * 		locales: [
+ * 			{ codes: ["it", "it-VT"], path: "italiano" },
+ * 			"es"
+ * 		]
+ * 	}
+ * })
+ * ```
+ *
+ * ```js
+ * import { getPathByLocale } from "astro:i18n";
+ * getPathByLocale("it"); // returns "italiano"
+ * getPathByLocale("it-VT"); // returns "italiano"
+ * getPathByLocale("es"); // returns "es"
+ * ```
+ */
+export const getPathByLocale = (locale: string) => I18nInternals.getPathByLocale(locale, locales);
+
+/**
+ * A function that returns the preferred locale given a certain path. This is particularly useful if you configure a locale using
+ * `path` and `codes`. When you define multiple `code`, this function will return the first code of the array.
+ *
+ * Astro will treat the first code as the one that the user prefers.
+ *
+ * @param path The path that maps to a locale
+ * @returns The path associated to the locale
+ *
+ * ## Example
+ *
+ * ```js
+ * // astro.config.mjs
+ *
+ * export default defineConfig({
+ * 	i18n: {
+ * 		locales: [
+ * 			{ codes: ["it-VT", "it"], path: "italiano" },
+ * 			"es"
+ * 		]
+ * 	}
+ * })
+ * ```
+ *
+ * ```js
+ * import { getLocaleByPath } from "astro:i18n";
+ * getLocaleByPath("italiano"); // returns "it-VT" because that's the first code configured
+ * getLocaleByPath("es"); // returns "es"
+ * ```
+ */
+export const getLocaleByPath = (path: string) => I18nInternals.getLocaleByPath(path, locales);
diff --git a/packages/astro/src/vite-plugin-astro-server/devPipeline.ts b/packages/astro/src/vite-plugin-astro-server/devPipeline.ts
index d9758f4783f2..409851eafdc5 100644
--- a/packages/astro/src/vite-plugin-astro-server/devPipeline.ts
+++ b/packages/astro/src/vite-plugin-astro-server/devPipeline.ts
@@ -35,7 +35,6 @@ export default class DevPipeline extends Pipeline {
 		this.#devLogger = logger;
 		this.#settings = settings;
 		this.#loader = loader;
-		this.setEndpointHandler(this.#handleEndpointResult);
 	}
 
 	clearRouteCache() {
@@ -88,9 +87,5 @@ export default class DevPipeline extends Pipeline {
 		});
 	}
 
-	async #handleEndpointResult(_: Request, response: Response): Promise<Response> {
-		return response;
-	}
-
 	async handleFallback() {}
 }
diff --git a/packages/astro/src/vite-plugin-astro-server/plugin.ts b/packages/astro/src/vite-plugin-astro-server/plugin.ts
index 67aef0babadd..4bbd85969e8a 100644
--- a/packages/astro/src/vite-plugin-astro-server/plugin.ts
+++ b/packages/astro/src/vite-plugin-astro-server/plugin.ts
@@ -125,6 +125,7 @@ export function createDevelopmentManifest(settings: AstroSettings): SSRManifest
 	}
 	return {
 		trailingSlash: settings.config.trailingSlash,
+		buildFormat: settings.config.build.format,
 		compressHTML: settings.config.compressHTML,
 		assets: new Set(),
 		entryModules: {},
diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts
index e24b7ca26774..67a2a4baa3af 100644
--- a/packages/astro/src/vite-plugin-astro-server/route.ts
+++ b/packages/astro/src/vite-plugin-astro-server/route.ts
@@ -308,7 +308,12 @@ export async function handleRoute({
 
 	const onRequest = middleware?.onRequest as MiddlewareHandler | undefined;
 	if (config.i18n) {
-		const i18Middleware = createI18nMiddleware(config.i18n, config.base, config.trailingSlash);
+		const i18Middleware = createI18nMiddleware(
+			config.i18n,
+			config.base,
+			config.trailingSlash,
+			config.build.format
+		);
 
 		if (i18Middleware) {
 			if (onRequest) {
diff --git a/packages/astro/src/vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.ts b/packages/astro/src/vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.ts
index 4e9526993ca6..022a8586c87e 100644
--- a/packages/astro/src/vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.ts
+++ b/packages/astro/src/vite-plugin-dev-toolbar/vite-plugin-dev-toolbar.ts
@@ -4,7 +4,7 @@ import type { AstroPluginOptions } from '../@types/astro.js';
 const VIRTUAL_MODULE_ID = 'astro:dev-toolbar';
 const resolvedVirtualModuleId = '\0' + VIRTUAL_MODULE_ID;
 
-export default function astroDevToolbar({ settings }: AstroPluginOptions): vite.Plugin {
+export default function astroDevToolbar({ settings, logger }: AstroPluginOptions): vite.Plugin {
 	return {
 		name: 'astro:dev-toolbar',
 		config() {
@@ -20,14 +20,55 @@ export default function astroDevToolbar({ settings }: AstroPluginOptions): vite.
 				return resolvedVirtualModuleId;
 			}
 		},
+		configureServer(server) {
+			server.ws.on('astro:devtoolbar:error:load', (args) => {
+				logger.error(
+					'toolbar',
+					`Failed to load dev toolbar app from ${args.entrypoint}: ${args.error}`
+				);
+			});
+
+			server.ws.on('astro:devtoolbar:error:init', (args) => {
+				logger.error(
+					'toolbar',
+					`Failed to initialize dev toolbar app ${args.app.name} (${args.app.id}):\n${args.error}`
+				);
+			});
+		},
 		async load(id) {
 			if (id === resolvedVirtualModuleId) {
+				// TODO: In Astro 5.0, we should change the addDevToolbarApp function to separate the logic from the app's metadata.
+				// That way, we can pass the app's data to the dev toolbar without having to load the app's entrypoint, which will allow
+				// for a better UI in the browser where we could still show the app's name and icon even if the app's entrypoint fails to load.
+				// ex: `addDevToolbarApp({ id: 'astro:dev-toolbar:app', name: 'App', icon: '🚀', entrypoint: "./src/something.ts" })`
 				return `
 					export const loadDevToolbarApps = async () => {
-						return [${settings.devToolbarApps
-							.map((plugin) => `(await import(${JSON.stringify(plugin)})).default`)
-							.join(',')}];
+						return (await Promise.all([${settings.devToolbarApps
+							.map((plugin) => `safeLoadPlugin(${JSON.stringify(plugin)})`)
+							.join(',')}])).filter(app => app);
 					};
+
+					async function safeLoadPlugin(entrypoint) {
+						try {
+							const app = (await import(/* @vite-ignore */ entrypoint)).default;
+
+							if (typeof app !== 'object' || !app.id || !app.name) {
+								throw new Error("Apps must default export an object with an id, and a name.");
+							}
+
+							return app;
+						} catch (err) {
+							console.error(\`Failed to load dev toolbar app from \${entrypoint}: \${err.message}\`);
+
+							if (import.meta.hot) {
+  							import.meta.hot.send('astro:devtoolbar:error:load', { entrypoint: entrypoint, error: err.message })
+							}
+
+							return undefined;
+						}
+
+						return undefined;
+					}
 				`;
 			}
 		},
diff --git a/packages/astro/src/vite-plugin-env/index.ts b/packages/astro/src/vite-plugin-env/index.ts
index 7d91b3552491..2e16cc5bf337 100644
--- a/packages/astro/src/vite-plugin-env/index.ts
+++ b/packages/astro/src/vite-plugin-env/index.ts
@@ -14,6 +14,9 @@ const importMetaEnvOnlyRe = /\bimport\.meta\.env\b(?!\.)/;
 // Match valid JS variable names (identifiers), which accepts most alphanumeric characters,
 // except that the first character cannot be a number.
 const isValidIdentifierRe = /^[_$a-zA-Z][_$a-zA-Z0-9]*$/;
+// Match `export const prerender = import.meta.env.*` since `vite=plugin-scanner` requires
+// the `import.meta.env.*` to always be replaced.
+const exportConstPrerenderRe = /\bexport\s+const\s+prerender\s*=\s*import\.meta\.env\.(.+?)\b/;
 
 function getPrivateEnv(
 	viteConfig: vite.ResolvedConfig,
@@ -156,6 +159,7 @@ export default function envVitePlugin({ settings }: EnvPluginOptions): vite.Plug
 			// In dev, we can assign the private env vars to `import.meta.env` directly for performance
 			if (isDev) {
 				const s = new MagicString(source);
+
 				if (!devImportMetaEnvPrepend) {
 					devImportMetaEnvPrepend = `Object.assign(import.meta.env,{`;
 					for (const key in privateEnv) {
@@ -164,6 +168,16 @@ export default function envVitePlugin({ settings }: EnvPluginOptions): vite.Plug
 					devImportMetaEnvPrepend += '});';
 				}
 				s.prepend(devImportMetaEnvPrepend);
+
+				// EDGE CASE: We need to do a static replacement for `export const prerender` for `vite-plugin-scanner`
+				s.replace(exportConstPrerenderRe, (m, key) => {
+					if (privateEnv[key] != null) {
+						return `export const prerender = ${privateEnv[key]}`;
+					} else {
+						return m;
+					}
+				});
+
 				return {
 					code: s.toString(),
 					map: s.generateMap({ hires: 'boundary' }),
diff --git a/packages/astro/src/vite-plugin-html/transform/escape.ts b/packages/astro/src/vite-plugin-html/transform/escape.ts
index 1c250d43dc94..d55233adca34 100644
--- a/packages/astro/src/vite-plugin-html/transform/escape.ts
+++ b/packages/astro/src/vite-plugin-html/transform/escape.ts
@@ -3,19 +3,25 @@ import type MagicString from 'magic-string';
 import type { Plugin } from 'unified';
 import { visit } from 'unist-util-visit';
 
-import { escape, needsEscape, replaceAttribute } from './utils.js';
+import { escapeTemplateLiteralCharacters, needsEscape, replaceAttribute } from './utils.js';
 
 const rehypeEscape: Plugin<[{ s: MagicString }], Root> = ({ s }) => {
 	return (tree) => {
 		visit(tree, (node: Root | RootContent) => {
 			if (node.type === 'text' || node.type === 'comment') {
 				if (needsEscape(node.value)) {
-					s.overwrite(node.position!.start.offset!, node.position!.end.offset!, escape(node.value));
+					s.overwrite(
+						node.position!.start.offset!,
+						node.position!.end.offset!,
+						escapeTemplateLiteralCharacters(node.value)
+					);
 				}
 			} else if (node.type === 'element') {
-				for (const [key, value] of Object.entries(node.properties ?? {})) {
-					const newKey = needsEscape(key) ? escape(key) : key;
-					const newValue = needsEscape(value) ? escape(value) : value;
+				if (!node.properties) return;
+				for (let [key, value] of Object.entries(node.properties)) {
+					key = key.replace(/([A-Z])/g, '-$1').toLowerCase();
+					const newKey = needsEscape(key) ? escapeTemplateLiteralCharacters(key) : key;
+					const newValue = needsEscape(value) ? escapeTemplateLiteralCharacters(value) : value;
 					if (newKey === key && newValue === value) continue;
 					replaceAttribute(s, node, key, value === '' ? newKey : `${newKey}="${newValue}"`);
 				}
diff --git a/packages/astro/src/vite-plugin-html/transform/slots.ts b/packages/astro/src/vite-plugin-html/transform/slots.ts
index a549a48c9121..7969db3831b5 100644
--- a/packages/astro/src/vite-plugin-html/transform/slots.ts
+++ b/packages/astro/src/vite-plugin-html/transform/slots.ts
@@ -3,7 +3,7 @@ import type { Plugin } from 'unified';
 
 import type MagicString from 'magic-string';
 import { visit } from 'unist-util-visit';
-import { escape } from './utils.js';
+import { escapeTemplateLiteralCharacters } from './utils.js';
 
 const rehypeSlots: Plugin<[{ s: MagicString }], Root> = ({ s }) => {
 	return (tree, file) => {
@@ -18,7 +18,11 @@ const rehypeSlots: Plugin<[{ s: MagicString }], Root> = ({ s }) => {
 				const text = file.value
 					.slice(first.position?.start.offset ?? 0, last.position?.end.offset ?? 0)
 					.toString();
-				s.overwrite(start, end, `\${${SLOT_PREFIX}["${name}"] ?? \`${escape(text).trim()}\`}`);
+				s.overwrite(
+					start,
+					end,
+					`\${${SLOT_PREFIX}["${name}"] ?? \`${escapeTemplateLiteralCharacters(text).trim()}\`}`
+				);
 			}
 		});
 	};
diff --git a/packages/astro/src/vite-plugin-html/transform/utils.ts b/packages/astro/src/vite-plugin-html/transform/utils.ts
index 6d61e7532d3e..88cb226e5d88 100644
--- a/packages/astro/src/vite-plugin-html/transform/utils.ts
+++ b/packages/astro/src/vite-plugin-html/transform/utils.ts
@@ -15,15 +15,46 @@ export function replaceAttribute(s: MagicString, node: Element, key: string, new
 	const token = tokens[0].replace(/([^>])(\>[\s\S]*$)/gim, '$1');
 	if (token.trim() === key) {
 		const end = start + key.length;
-		s.overwrite(start, end, newValue);
+		return s.overwrite(start, end, newValue, { contentOnly: true });
 	} else {
-		const end = start + `${key}=${tokens[2]}${tokens[3]}${tokens[2]}`.length;
-		s.overwrite(start, end, newValue);
+		const length = token.length;
+		const end = start + length;
+		return s.overwrite(start, end, newValue, { contentOnly: true });
 	}
 }
+
+// Embedding in our own template literal expression requires escaping
+// any meaningful template literal characters in the user's code!
+const NEEDS_ESCAPE_RE = /[`\\]|\$\{/g;
+
 export function needsEscape(value: any): value is string {
-	return typeof value === 'string' && (value.includes('`') || value.includes('${'));
+	// Reset the RegExp's global state
+	NEEDS_ESCAPE_RE.lastIndex = 0;
+	return typeof value === 'string' && NEEDS_ESCAPE_RE.test(value);
 }
-export function escape(value: string) {
-	return value.replace(/`/g, '\\`').replace(/\$\{/g, '\\${');
+
+export function escapeTemplateLiteralCharacters(value: string) {
+	// Reset the RegExp's global state
+	NEEDS_ESCAPE_RE.lastIndex = 0;
+
+	let char: string | undefined;
+	let startIndex = 0;
+	let segment = '';
+	let text = '';
+
+	// Rather than a naive `String.replace()`, we have to iterate through
+	// the raw contents to properly handle existing backslashes
+	while (([char] = NEEDS_ESCAPE_RE.exec(value) ?? [])) {
+		// Final loop when char === undefined, append trailing content
+		if (!char) {
+			text += value.slice(startIndex);
+			break;
+		}
+		const endIndex = NEEDS_ESCAPE_RE.lastIndex - char.length;
+		const prefix = segment === '\\' ? '' : '\\';
+		segment = prefix + char;
+		text += value.slice(startIndex, endIndex) + segment;
+		startIndex = NEEDS_ESCAPE_RE.lastIndex;
+	}
+	return text;
 }
diff --git a/packages/astro/src/vite-plugin-markdown/images.ts b/packages/astro/src/vite-plugin-markdown/images.ts
index 1123c28784aa..1488ef6fc8c4 100644
--- a/packages/astro/src/vite-plugin-markdown/images.ts
+++ b/packages/astro/src/vite-plugin-markdown/images.ts
@@ -13,7 +13,10 @@ export function getMarkdownCodeForImages(imagePaths: MarkdownImagePath[], html:
 						.map((entry) => {
 							const rawUrl = JSON.stringify(entry.raw);
 							return `{
-											const regex = new RegExp('__ASTRO_IMAGE_="([^"]*' + ${rawUrl} + '[^"]*)"', 'g');
+											const regex = new RegExp('__ASTRO_IMAGE_="([^"]*' + ${rawUrl.replace(
+												/[.*+?^${}()|[\]\\]/g,
+												'\\\\$&'
+											)} + '[^"]*)"', 'g');
 											let match;
 											let occurrenceCounter = 0;
 											while ((match = regex.exec(html)) !== null) {
diff --git a/packages/astro/test/core-image.test.js b/packages/astro/test/core-image.test.js
index 67a76ba8803c..fbaedd9a1e16 100644
--- a/packages/astro/test/core-image.test.js
+++ b/packages/astro/test/core-image.test.js
@@ -427,6 +427,15 @@ describe('astro:image', () => {
 				expect($img.attr('src').startsWith('/_image')).to.equal(true);
 			});
 
+			it('Supports special characters in file name', async () => {
+				let res = await fixture.fetch('/specialChars');
+				let html = await res.text();
+				$ = cheerio.load(html);
+
+				let $img = $('img');
+				expect($img.attr('src').startsWith('/_image')).to.equal(true);
+			});
+
 			it('properly handles remote images', async () => {
 				let res = await fixture.fetch('/httpImage');
 				let html = await res.text();
diff --git a/packages/astro/test/fixtures/core-image/src/assets/c++.png b/packages/astro/test/fixtures/core-image/src/assets/c++.png
new file mode 100644
index 000000000000..25c97b7cb5f9
Binary files /dev/null and b/packages/astro/test/fixtures/core-image/src/assets/c++.png differ
diff --git a/packages/astro/test/fixtures/core-image/src/pages/specialChars.md b/packages/astro/test/fixtures/core-image/src/pages/specialChars.md
new file mode 100644
index 000000000000..f3177cff75ce
--- /dev/null
+++ b/packages/astro/test/fixtures/core-image/src/pages/specialChars.md
@@ -0,0 +1,3 @@
+![C++](../assets/c++.png)
+
+Image with special characters in file name worked.
diff --git a/packages/astro/test/fixtures/html-escape-complex/package.json b/packages/astro/test/fixtures/html-escape-complex/package.json
new file mode 100644
index 000000000000..f37957dd1f0b
--- /dev/null
+++ b/packages/astro/test/fixtures/html-escape-complex/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@test/html-escape-bug",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/html-escape-complex/src/pages/index.html b/packages/astro/test/fixtures/html-escape-complex/src/pages/index.html
new file mode 100644
index 000000000000..7399304836d8
--- /dev/null
+++ b/packages/astro/test/fixtures/html-escape-complex/src/pages/index.html
@@ -0,0 +1,31 @@
+<html lang="en">
+
+	<head>
+		<meta charset="utf-8" />
+		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<meta name="viewport" content="width=device-width" />
+		<meta name="generator" content="{Astro.generator}" />
+		<title>Astro</title>
+	</head>
+
+	<body>
+		<div id="a" data-attr="${a}"></div>
+		<div id="b" data-attr="\\`${b}\\`"></div>
+		<div id="c" data-attr="\\\`${c}\\\`"></div>
+		<div id="d" data-attr="\\\\`${d}\\\\`"></div>
+		<div id="e" data-attr="\\\\\`${e}\\\\\`"></div>
+		<div id="f" data-attr="\\\\\\`${f}\\\\\\`"></div>
+
+		<script>
+			const normal = `There are ${count} things!`;
+			const content = `There are \`${count}\` things!`;
+			const a = "\`${a}\`";
+			const b = "\\`${b}\\`";
+			const c = "\\\`${c}\\\`";
+			const d = "\\\\`${d}\\\\`";
+			const e = "\\\\\`${e}\\\\\`";
+			const f = "\\\\\\`${f}\\\\\\`";
+		</script>
+	</body>
+
+</html>
diff --git a/packages/astro/test/html-escape-complex.test.js b/packages/astro/test/html-escape-complex.test.js
new file mode 100644
index 000000000000..beed15501b96
--- /dev/null
+++ b/packages/astro/test/html-escape-complex.test.js
@@ -0,0 +1,50 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from './test-utils.js';
+
+describe('HTML Escape (Complex)', () => {
+	let fixture;
+	/** @type {string} */
+	let input;
+	/** @type {string} */
+	let output;
+
+	before(async () => {
+		fixture = await loadFixture({
+			root: './fixtures/html-escape-complex/',
+		});
+	});
+
+	describe('build', () => {
+		before(async () => {
+			await fixture.build();
+			// readFile operates relative to `dist`
+			input = await fixture.readFile('../src/pages/index.html');
+			output = await fixture.readFile('./index.html');
+		});
+
+		it('respects complex escape sequences in attributes', async () => {
+			const $in = cheerio.load(input);
+			const $out = cheerio.load(output);
+			for (const char of 'abcdef'.split('')) {
+				const attrIn = $in('#' + char).attr('data-attr');
+				const attrOut = $out('#' + char).attr('data-attr');
+				expect(attrOut).to.equal(attrIn);
+			}
+		});
+
+		it('respects complex escape sequences in <script>', async () => {
+			const $a = cheerio.load(input);
+			const $b = cheerio.load(output);
+			const scriptIn = $a('script');
+			const scriptOut = $b('script');
+
+			expect(scriptOut.text()).to.equal(scriptIn.text());
+		});
+
+		it('matches the entire source file', async () => {
+			// Ignore doctype insertion
+			expect(output.replace('<!DOCTYPE html>', '')).to.equal(input);
+		});
+	});
+});
diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js
index ee26b731be60..6cc445c1ceea 100644
--- a/packages/astro/test/i18n-routing.test.js
+++ b/packages/astro/test/i18n-routing.test.js
@@ -229,6 +229,44 @@ describe('[DEV] i18n routing', () => {
 			const response = await fixture.fetch('/new-site/fr/start');
 			expect(response.status).to.equal(404);
 		});
+
+		describe('when `build.format` is `directory`', () => {
+			before(async () => {
+				fixture = await loadFixture({
+					root: './fixtures/i18n-routing-prefix-other-locales/',
+					i18n: {
+						defaultLocale: 'en',
+						locales: [
+							'en',
+							'pt',
+							'it',
+							{
+								path: 'spanish',
+								codes: ['es', 'es-AR'],
+							},
+						],
+						fallback: {
+							it: 'en',
+							spanish: 'en',
+						},
+					},
+					build: {
+						format: 'directory',
+					},
+				});
+				devServer = await fixture.startDevServer();
+			});
+
+			after(async () => {
+				await devServer.stop();
+			});
+
+			it('should redirect to the english locale with trailing slash', async () => {
+				const response = await fixture.fetch('/new-site/it/start/');
+				expect(response.status).to.equal(200);
+				expect(await response.text()).includes('Start');
+			});
+		});
 	});
 
 	describe('i18n routing with routing strategy [pathname-prefix-always-no-redirect]', () => {
@@ -675,6 +713,7 @@ describe('[SSG] i18n routing', () => {
 		it('should redirect to the index of the default locale', async () => {
 			const html = await fixture.readFile('/index.html');
 			expect(html).to.include('http-equiv="refresh');
+			expect(html).to.include('http-equiv="refresh');
 			expect(html).to.include('url=/new-site/en');
 		});
 
@@ -744,6 +783,25 @@ describe('[SSG] i18n routing', () => {
 				expect(html).to.include('url=/new-site/en');
 			});
 		});
+
+		describe('when `build.format` is `directory`', () => {
+			before(async () => {
+				fixture = await loadFixture({
+					root: './fixtures/i18n-routing-prefix-always/',
+					build: {
+						format: 'directory',
+					},
+				});
+				await fixture.build();
+			});
+
+			it('should redirect to the index of the default locale', async () => {
+				const html = await fixture.readFile('/index.html');
+				expect(html).to.include('http-equiv="refresh');
+				expect(html).to.include('http-equiv="refresh');
+				expect(html).to.include('url=/new-site/en/');
+			});
+		});
 	});
 
 	describe('i18n routing with fallback', () => {
@@ -940,7 +998,7 @@ describe('[SSR] i18n routing', () => {
 			let request = new Request('http://example.com/new-site');
 			let response = await app.render(request);
 			expect(response.status).to.equal(302);
-			expect(response.headers.get('location')).to.equal('/new-site/en');
+			expect(response.headers.get('location')).to.equal('/new-site/en/');
 		});
 
 		it('should render the en locale', async () => {
@@ -1118,7 +1176,7 @@ describe('[SSR] i18n routing', () => {
 			let request = new Request('http://example.com/new-site');
 			let response = await app.render(request);
 			expect(response.status).to.equal(302);
-			expect(response.headers.get('location')).to.equal('/new-site/en');
+			expect(response.headers.get('location')).to.equal('/new-site/en/');
 		});
 
 		it('should render the en locale', async () => {
@@ -1173,6 +1231,28 @@ describe('[SSR] i18n routing', () => {
 				expect(response.headers.get('location')).to.equal('/new-site/en/');
 			});
 		});
+
+		describe('when `build.format` is `directory`', () => {
+			before(async () => {
+				fixture = await loadFixture({
+					root: './fixtures/i18n-routing-prefix-always/',
+					output: 'server',
+					adapter: testAdapter(),
+					build: {
+						format: 'directory',
+					},
+				});
+				await fixture.build();
+				app = await fixture.loadTestAdapterApp();
+			});
+
+			it('should redirect to the index of the default locale', async () => {
+				let request = new Request('http://example.com/new-site/');
+				let response = await app.render(request);
+				expect(response.status).to.equal(302);
+				expect(response.headers.get('location')).to.equal('/new-site/en/');
+			});
+		});
 	});
 
 	describe('with fallback', () => {
diff --git a/packages/astro/test/units/routing/manifest.test.js b/packages/astro/test/units/routing/manifest.test.js
index 7bfdf6839150..fe09f628b24c 100644
--- a/packages/astro/test/units/routing/manifest.test.js
+++ b/packages/astro/test/units/routing/manifest.test.js
@@ -52,8 +52,8 @@ describe('routing - createRouteManifest', () => {
 	it('endpoint routes are sorted before page routes', async () => {
 		const fs = createFs(
 			{
-				'/src/pages/contact-me.astro': `<h1>test</h1>`,
-				'/src/pages/sendContact.ts': `<h1>test</h1>`,
+				'/src/pages/[contact].astro': `<h1>test</h1>`,
+				'/src/pages/[contact].ts': `<h1>test</h1>`,
 			},
 			root
 		);
@@ -85,19 +85,19 @@ describe('routing - createRouteManifest', () => {
 
 		expect(getManifestRoutes(manifest)).to.deep.equal([
 			{
-				route: '/api',
-				type: 'endpoint',
+				route: '/about',
+				type: 'page',
 			},
 			{
-				route: '/sendcontact',
+				route: '/api',
 				type: 'endpoint',
 			},
 			{
-				route: '/about',
-				type: 'page',
+				route: '/[contact]',
+				type: 'endpoint',
 			},
 			{
-				route: '/contact-me',
+				route: '/[contact]',
 				type: 'page',
 			},
 		]);
@@ -148,6 +148,81 @@ describe('routing - createRouteManifest', () => {
 		]);
 	});
 
+	it('route sorting respects the file tree', async () => {
+		const fs = createFs(
+			{
+				'/src/pages/[dynamic_folder]/static.astro': `<h1>test</h1>`,
+				'/src/pages/[dynamic_folder]/index.astro': `<h1>test</h1>`,
+				'/src/pages/[dynamic_folder]/[...rest].astro': `<h1>test</h1>`,
+				'/src/pages/[...rest]/static.astro': `<h1>test</h1>`,
+				'/src/pages/[...rest]/index.astro': `<h1>test</h1>`,
+				'/src/pages/blog/index.astro': `<h1>test</h1>`,
+				'/src/pages/[dynamic_file].astro': `<h1>test</h1>`,
+				'/src/pages/[...other].astro': `<h1>test</h1>`,
+				'/src/pages/static.astro': `<h1>test</h1>`,
+				'/src/pages/index.astro': `<h1>test</h1>`,
+			},
+			root
+		);
+		const settings = await createBasicSettings({
+			root: fileURLToPath(root),
+			base: '/search',
+			trailingSlash: 'never',
+			experimental: {
+				globalRoutePriority: true,
+			},
+		});
+
+		const manifest = createRouteManifest({
+			cwd: fileURLToPath(root),
+			settings,
+			fsMod: fs,
+		});
+
+		expect(getManifestRoutes(manifest)).to.deep.equal([
+			{
+				route: '/',
+				type: 'page',
+			},
+			{
+				route: '/blog',
+				type: 'page',
+			},
+			{
+				route: '/static',
+				type: 'page',
+			},
+			{
+				route: '/[dynamic_folder]',
+				type: 'page',
+			},
+			{
+				route: '/[dynamic_file]',
+				type: 'page',
+			},
+			{
+				route: '/[dynamic_folder]/static',
+				type: 'page',
+			},
+			{
+				route: '/[dynamic_folder]/[...rest]',
+				type: 'page',
+			},
+			{
+				route: '/[...rest]/static',
+				type: 'page',
+			},
+			{
+				route: '/[...rest]',
+				type: 'page',
+			},
+			{
+				route: '/[...other]',
+				type: 'page',
+			},
+		]);
+	});
+
 	it('injected routes are sorted in legacy mode above filesystem routes', async () => {
 		const fs = createFs(
 			{
diff --git a/packages/integrations/alpinejs/package.json b/packages/integrations/alpinejs/package.json
index c6abdd6bd5ab..f612167a81f5 100644
--- a/packages/integrations/alpinejs/package.json
+++ b/packages/integrations/alpinejs/package.json
@@ -30,15 +30,18 @@
   "scripts": {
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\""
+    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "test:e2e": "playwright test"
   },
   "peerDependencies": {
     "@types/alpinejs": "^3.0.0",
     "alpinejs": "^3.0.0"
   },
   "devDependencies": {
+    "@playwright/test": "1.40.0",
     "astro": "workspace:*",
-    "astro-scripts": "workspace:*"
+    "astro-scripts": "workspace:*",
+    "vite": "^5.0.10"
   },
   "publishConfig": {
     "provenance": true
diff --git a/packages/integrations/alpinejs/src/index.ts b/packages/integrations/alpinejs/src/index.ts
index 4a296b8c1f50..77ea68c746f1 100644
--- a/packages/integrations/alpinejs/src/index.ts
+++ b/packages/integrations/alpinejs/src/index.ts
@@ -1,16 +1,110 @@
 import type { AstroIntegration } from 'astro';
+import type { Plugin } from 'vite';
+import { resolve } from 'node:path';
 
-export default function createPlugin(): AstroIntegration {
+interface Options {
+	/**
+	 *	You can extend Alpine by setting this option to a root-relative import specifier (for example, `entrypoint: "/src/entrypoint"`).
+	 *
+	 * The default export of this file should be a function that accepts an Alpine instance prior to starting, allowing the use of custom directives, plugins and other customizations for advanced use cases.
+	 *
+	 * ```js
+	 * // astro.config.mjs
+	 * import { defineConfig } from 'astro/config';
+	 * import alpine from '@astrojs/alpinejs';
+	 *
+	 * export default defineConfig({
+	 *   // ...
+	 *   integrations: [alpine({ entrypoint: '/src/entrypoint' })],
+	 * });
+	 * ```
+	 *
+	 * ```js
+	 * // src/entrypoint.ts
+	 * import type { Alpine } from 'alpinejs'
+	 *
+	 * export default (Alpine: Alpine) => {
+	 *     Alpine.directive('foo', el => {
+	 *         el.textContent = 'bar';
+	 *     })
+	 * }
+	 * ```
+	 */
+	entrypoint?: string;
+}
+
+function virtualEntrypoint(options?: Options): Plugin {
+	const virtualModuleId = 'virtual:@astrojs/alpinejs/entrypoint';
+	const resolvedVirtualModuleId = '\0' + virtualModuleId;
+
+	let isBuild: boolean;
+	let root: string;
+	let entrypoint: string | undefined;
+
+	return {
+		name: '@astrojs/alpinejs/virtual-entrypoint',
+		config(_, { command }) {
+			isBuild = command === 'build';
+		},
+		configResolved(config) {
+			root = config.root;
+			if (options?.entrypoint) {
+				entrypoint = options.entrypoint.startsWith('.')
+					? resolve(root, options.entrypoint)
+					: options.entrypoint;
+			}
+		},
+		resolveId(id) {
+			if (id === virtualModuleId) {
+				return resolvedVirtualModuleId;
+			}
+		},
+		load(id) {
+			if (id === resolvedVirtualModuleId) {
+				if (entrypoint) {
+					return `\
+import * as mod from ${JSON.stringify(entrypoint)};
+						
+export const setup = (Alpine) => {
+	if ('default' in mod) {
+		mod.default(Alpine);
+	} else {
+		${
+			!isBuild
+				? `console.warn("[@astrojs/alpinejs] entrypoint \`" + ${JSON.stringify(
+						entrypoint
+					)} + "\` does not export a default function. Check out https://docs.astro.build/en/guides/integrations-guide/alpinejs/#entrypoint.");`
+				: ''
+		}
+	}
+}`;
+				}
+				return `export const setup = () => {};`;
+			}
+		},
+	};
+}
+
+export default function createPlugin(options?: Options): AstroIntegration {
 	return {
 		name: '@astrojs/alpinejs',
 		hooks: {
-			'astro:config:setup': ({ injectScript }) => {
+			'astro:config:setup': ({ injectScript, updateConfig }) => {
 				// This gets injected into the user's page, so the import will pull
 				// from the project's version of Alpine.js in their package.json.
 				injectScript(
 					'page',
-					`import Alpine from 'alpinejs'; window.Alpine = Alpine; Alpine.start();`
+					`import Alpine from 'alpinejs';
+import { setup } from 'virtual:@astrojs/alpinejs/entrypoint';
+setup(Alpine);
+window.Alpine = Alpine;
+Alpine.start();`
 				);
+				updateConfig({
+					vite: {
+						plugins: [virtualEntrypoint(options)],
+					},
+				});
 			},
 		},
 	};
diff --git a/packages/integrations/alpinejs/test/basics.test.js b/packages/integrations/alpinejs/test/basics.test.js
new file mode 100644
index 000000000000..440e2a6b5bc2
--- /dev/null
+++ b/packages/integrations/alpinejs/test/basics.test.js
@@ -0,0 +1,13 @@
+import { expect } from '@playwright/test';
+import { prepareTestFactory } from './test-utils.js';
+
+const { test } = prepareTestFactory({ root: './fixtures/basics/' });
+
+test.describe('Basics', () => {
+	test('Alpine is working', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/'));
+
+		const el = page.locator('#foo');
+		expect(await el.textContent()).toBe('bar');
+	});
+});
diff --git a/packages/integrations/alpinejs/test/directive.test.js b/packages/integrations/alpinejs/test/directive.test.js
new file mode 100644
index 000000000000..440e2a6b5bc2
--- /dev/null
+++ b/packages/integrations/alpinejs/test/directive.test.js
@@ -0,0 +1,13 @@
+import { expect } from '@playwright/test';
+import { prepareTestFactory } from './test-utils.js';
+
+const { test } = prepareTestFactory({ root: './fixtures/basics/' });
+
+test.describe('Basics', () => {
+	test('Alpine is working', async ({ page, astro }) => {
+		await page.goto(astro.resolveUrl('/'));
+
+		const el = page.locator('#foo');
+		expect(await el.textContent()).toBe('bar');
+	});
+});
diff --git a/packages/integrations/alpinejs/test/fixtures/basics/astro.config.mjs b/packages/integrations/alpinejs/test/fixtures/basics/astro.config.mjs
new file mode 100644
index 000000000000..9fcc100d959e
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/basics/astro.config.mjs
@@ -0,0 +1,6 @@
+import { defineConfig } from 'astro/config';
+import alpine from '@astrojs/alpinejs';
+
+export default defineConfig({
+  integrations: [alpine()],
+})
diff --git a/packages/integrations/alpinejs/test/fixtures/basics/package.json b/packages/integrations/alpinejs/test/fixtures/basics/package.json
new file mode 100644
index 000000000000..1e210ae67341
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/basics/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@test/alpinejs-basics",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/alpinejs": "workspace:*",
+    "@types/alpinejs": "^3.13.5",
+    "alpinejs": "^3.13.3",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/alpinejs/test/fixtures/basics/src/pages/index.astro b/packages/integrations/alpinejs/test/fixtures/basics/src/pages/index.astro
new file mode 100644
index 000000000000..6197e0c64224
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/basics/src/pages/index.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Testing</title>
+	</head>
+	<body>
+		<div id="foo" x-data="{ foo: 'bar' }" x-text="foo"></div>
+	</body>
+</html>
diff --git a/packages/integrations/alpinejs/test/fixtures/directive/astro.config.mjs b/packages/integrations/alpinejs/test/fixtures/directive/astro.config.mjs
new file mode 100644
index 000000000000..6c0266ab059e
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/directive/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import alpine from '@astrojs/alpinejs';
+
+export default defineConfig({
+  integrations: [alpine({
+    entrypoint: "./src/entrypoint.ts"
+  })],
+})
diff --git a/packages/integrations/alpinejs/test/fixtures/directive/package.json b/packages/integrations/alpinejs/test/fixtures/directive/package.json
new file mode 100644
index 000000000000..258e2500e3d4
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/directive/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@test/alpinejs-directive",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/alpinejs": "workspace:*",
+    "@types/alpinejs": "^3.13.5",
+    "alpinejs": "^3.13.3",
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/integrations/alpinejs/test/fixtures/directive/src/entrypoint.ts b/packages/integrations/alpinejs/test/fixtures/directive/src/entrypoint.ts
new file mode 100644
index 000000000000..7a49c044a5b0
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/directive/src/entrypoint.ts
@@ -0,0 +1,7 @@
+import type { Alpine } from 'alpinejs'
+
+export default (Alpine: Alpine) => {
+    Alpine.directive('foo', el => {
+        el.textContent = 'bar';
+    })
+}
\ No newline at end of file
diff --git a/packages/integrations/alpinejs/test/fixtures/directive/src/pages/index.astro b/packages/integrations/alpinejs/test/fixtures/directive/src/pages/index.astro
new file mode 100644
index 000000000000..73753209a0e5
--- /dev/null
+++ b/packages/integrations/alpinejs/test/fixtures/directive/src/pages/index.astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Testing</title>
+	</head>
+	<body>
+		<div id="foo" x-data x-foo></div>
+	</body>
+</html>
diff --git a/packages/integrations/alpinejs/test/test-utils.js b/packages/integrations/alpinejs/test/test-utils.js
new file mode 100644
index 000000000000..ac6b36ea022e
--- /dev/null
+++ b/packages/integrations/alpinejs/test/test-utils.js
@@ -0,0 +1,112 @@
+import { expect, test as testBase } from '@playwright/test';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { loadFixture as baseLoadFixture } from '../../../astro/test/test-utils.js';
+
+export const isWindows = process.platform === 'win32';
+
+// Get all test files in directory, assign unique port for each of them so they don't conflict
+const testFiles = await fs.readdir(new URL('.', import.meta.url));
+const testFileToPort = new Map();
+for (let i = 0; i < testFiles.length; i++) {
+	const file = testFiles[i];
+	if (file.endsWith('.test.js')) {
+		testFileToPort.set(file.slice(0, -8), 4000 + i);
+	}
+}
+
+export function loadFixture(inlineConfig) {
+	if (!inlineConfig?.root) throw new Error("Must provide { root: './fixtures/...' }");
+
+	// resolve the relative root (i.e. "./fixtures/tailwindcss") to a full filepath
+	// without this, the main `loadFixture` helper will resolve relative to `packages/astro/test`
+	return baseLoadFixture({
+		...inlineConfig,
+		root: fileURLToPath(new URL(inlineConfig.root, import.meta.url)),
+		server: {
+			port: testFileToPort.get(path.basename(inlineConfig.root)),
+		},
+	});
+}
+
+export function testFactory(inlineConfig) {
+	let fixture;
+
+	const test = testBase.extend({
+		astro: async ({}, use) => {
+			fixture = fixture || (await loadFixture(inlineConfig));
+			await use(fixture);
+		},
+	});
+
+	test.afterEach(() => {
+		fixture.resetAllFiles();
+	});
+
+	return test;
+}
+
+/**
+ *
+ * @param {string} page
+ * @returns {Promise<{message: string, hint: string, absoluteFileLocation: string, fileLocation: string}>}
+ */
+export async function getErrorOverlayContent(page) {
+	const overlay = await page.waitForSelector('vite-error-overlay', {
+		strict: true,
+		timeout: 10 * 1000,
+	});
+
+	expect(overlay).toBeTruthy();
+
+	const message = await overlay.$$eval('#message-content', (m) => m[0].textContent);
+	const hint = await overlay.$$eval('#hint-content', (m) => m[0].textContent);
+	const [absoluteFileLocation, fileLocation] = await overlay.$$eval('#code header h2', (m) => [
+		m[0].title,
+		m[0].textContent,
+	]);
+	return { message, hint, absoluteFileLocation, fileLocation };
+}
+
+/**
+ * Wait for `astro-island` that contains the `el` to hydrate
+ * @param {import('@playwright/test').Page} page
+ * @param {import('@playwright/test').Locator} el
+ */
+export async function waitForHydrate(page, el) {
+	const astroIsland = page.locator('astro-island', { has: el });
+	const astroIslandId = await astroIsland.last().getAttribute('uid');
+	await page.waitForFunction(
+		(selector) => document.querySelector(selector)?.hasAttribute('ssr') === false,
+		`astro-island[uid="${astroIslandId}"]`
+	);
+}
+
+/**
+ * Scroll to element manually without making sure the `el` is stable
+ * @param {import('@playwright/test').Locator} el
+ */
+export async function scrollToElement(el) {
+	await el.evaluate((node) => {
+		node.scrollIntoView({ behavior: 'auto' });
+	});
+}
+
+export function prepareTestFactory(opts) {
+	const test = testFactory(opts);
+
+	let devServer;
+
+	test.beforeAll(async ({ astro }) => {
+		devServer = await astro.startDevServer();
+	});
+
+	test.afterAll(async () => {
+		await devServer.stop();
+	});
+
+	return {
+		test,
+	};
+}
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index d22aad19c631..7c4fc4713b5d 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -88,7 +88,7 @@
     "devalue": "^4.3.2",
     "linkedom": "^0.16.4",
     "mocha": "^10.2.0",
-    "vite": "^5.0.10"
+    "vite": "^5.0.12"
   },
   "engines": {
     "node": ">=18.14.1"
diff --git a/packages/integrations/mdx/CHANGELOG.md b/packages/integrations/mdx/CHANGELOG.md
index f33c85ea8aba..05f9534e2b34 100644
--- a/packages/integrations/mdx/CHANGELOG.md
+++ b/packages/integrations/mdx/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @astrojs/mdx
 
+## 2.1.0
+
+### Minor Changes
+
+- [#9753](https://github.com/withastro/astro/pull/9753) [`df37366556d46f7abdf82b09e33b08bd94e631b3`](https://github.com/withastro/astro/commit/df37366556d46f7abdf82b09e33b08bd94e631b3) Thanks [@OliverSpeir](https://github.com/OliverSpeir)! - Allows remark plugins to pass options specifying how images in .mdx files will be optimized
+
+## 2.0.6
+
+### Patch Changes
+
+- Updated dependencies [[`53c69dcc82cdf4000aff13a6c11fffe19096cf45`](https://github.com/withastro/astro/commit/53c69dcc82cdf4000aff13a6c11fffe19096cf45), [`2f81cffa9da9db0e2802d303f94feaee8d2f54ec`](https://github.com/withastro/astro/commit/2f81cffa9da9db0e2802d303f94feaee8d2f54ec), [`a505190933365268d48139a5f197a3cfb5570870`](https://github.com/withastro/astro/commit/a505190933365268d48139a5f197a3cfb5570870)]:
+  - @astrojs/markdown-remark@4.2.0
+
 ## 2.0.5
 
 ### Patch Changes
diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json
index e36d05e2d93d..ee2e3394014a 100644
--- a/packages/integrations/mdx/package.json
+++ b/packages/integrations/mdx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/mdx",
   "description": "Add support for MDX pages in your Astro site",
-  "version": "2.0.5",
+  "version": "2.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -75,7 +75,7 @@
     "remark-shiki-twoslash": "^3.1.3",
     "remark-toc": "^9.0.0",
     "unified": "^11.0.4",
-    "vite": "^5.0.10"
+    "vite": "^5.0.12"
   },
   "engines": {
     "node": ">=18.14.1"
diff --git a/packages/integrations/mdx/src/plugins.ts b/packages/integrations/mdx/src/plugins.ts
index e6584aacf13d..d52f303019a3 100644
--- a/packages/integrations/mdx/src/plugins.ts
+++ b/packages/integrations/mdx/src/plugins.ts
@@ -43,7 +43,7 @@ export function createMdxProcessor(mdxOptions: MdxOptions, extraOptions: MdxProc
 }
 
 function getRemarkPlugins(mdxOptions: MdxOptions): PluggableList {
-	let remarkPlugins: PluggableList = [remarkCollectImages, remarkImageToComponent];
+	let remarkPlugins: PluggableList = [];
 
 	if (!isPerformanceBenchmark) {
 		if (mdxOptions.gfm) {
@@ -54,7 +54,12 @@ function getRemarkPlugins(mdxOptions: MdxOptions): PluggableList {
 		}
 	}
 
-	remarkPlugins = [...remarkPlugins, ...mdxOptions.remarkPlugins];
+	remarkPlugins = [
+		...remarkPlugins,
+		...mdxOptions.remarkPlugins,
+		remarkCollectImages,
+		remarkImageToComponent,
+	];
 
 	if (!isPerformanceBenchmark) {
 		// Apply syntax highlighters after user plugins to match `markdown/remark` behavior
diff --git a/packages/integrations/mdx/src/remark-images-to-component.ts b/packages/integrations/mdx/src/remark-images-to-component.ts
index 810056deff0a..86f04aa47d40 100644
--- a/packages/integrations/mdx/src/remark-images-to-component.ts
+++ b/packages/integrations/mdx/src/remark-images-to-component.ts
@@ -1,6 +1,6 @@
 import type { MarkdownVFile } from '@astrojs/markdown-remark';
 import type { Image, Parent } from 'mdast';
-import type { MdxJsxFlowElement, MdxjsEsm } from 'mdast-util-mdx';
+import type { MdxJsxFlowElement, MdxjsEsm, MdxJsxAttribute } from 'mdast-util-mdx';
 import { visit } from 'unist-util-visit';
 import { jsToTreeNode } from './utils.js';
 
@@ -89,6 +89,53 @@ export function remarkImageToComponent() {
 					});
 				}
 
+				if (node.data && node.data.hProperties) {
+					const createArrayAttribute = (name: string, values: string[]): MdxJsxAttribute => {
+						return {
+							type: 'mdxJsxAttribute',
+							name: name,
+							value: {
+								type: 'mdxJsxAttributeValueExpression',
+								value: name,
+								data: {
+									estree: {
+										type: 'Program',
+										body: [
+											{
+												type: 'ExpressionStatement',
+												expression: {
+													type: 'ArrayExpression',
+													elements: values.map((value) => ({
+														type: 'Literal',
+														value: value,
+														raw: String(value),
+													})),
+												},
+											},
+										],
+										sourceType: 'module',
+										comments: [],
+									},
+								},
+							},
+						};
+					};
+					// Go through every hProperty and add it as an attribute of the <Image>
+					Object.entries(node.data.hProperties as Record<string, string | string[]>).forEach(
+						([key, value]) => {
+							if (Array.isArray(value)) {
+								componentElement.attributes.push(createArrayAttribute(key, value));
+							} else {
+								componentElement.attributes.push({
+									name: key,
+									type: 'mdxJsxAttribute',
+									value: String(value),
+								});
+							}
+						}
+					);
+				}
+
 				parent!.children.splice(index!, 1, componentElement);
 			}
 		});
diff --git a/packages/integrations/mdx/test/fixtures/image-remark-imgattr/astro.config.mjs b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/astro.config.mjs
new file mode 100644
index 000000000000..1ba809580cff
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/astro.config.mjs
@@ -0,0 +1,8 @@
+import { defineConfig } from 'astro/config';
+import mdx from '@astrojs/mdx';
+import plugin from "./remarkPlugin"
+
+// https://astro.build/config
+export default defineConfig({
+	integrations: [mdx({remarkPlugins:[plugin]})],
+});
diff --git a/packages/integrations/mdx/test/fixtures/image-remark-imgattr/package.json b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/package.json
new file mode 100644
index 000000000000..89868f9f4cf7
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@test/image-remark-imgattr",
+  "version": "0.0.0",
+  "private": true,
+  "dependencies": {
+    "@astrojs/mdx": "workspace:*",
+    "astro": "workspace:*"
+  },
+  "scripts": {
+    "dev": "astro dev"
+  }
+}
diff --git a/packages/integrations/mdx/test/fixtures/image-remark-imgattr/remarkPlugin.js b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/remarkPlugin.js
new file mode 100644
index 000000000000..f42d9ec524ba
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/remarkPlugin.js
@@ -0,0 +1,22 @@
+export default function plugin() {
+	return transformer;
+
+	function transformer(tree) {
+		function traverse(node) {
+			if (node.type === "image") {
+				node.data = node.data || {};
+				node.data.hProperties = node.data.hProperties || {};
+				node.data.hProperties.id = "test";
+				node.data.hProperties.width = "300";
+				node.data.hProperties.widths = [300,600];
+				node.data.hProperties.sizes = "(min-width: 600px) 600w, 300w";
+			}
+
+			if (node.children) {
+				node.children.forEach(traverse);
+			}
+		}
+
+		traverse(tree);
+	}
+}
diff --git a/packages/integrations/mdx/test/fixtures/image-remark-imgattr/src/assets/penguin2.jpg b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/src/assets/penguin2.jpg
new file mode 100644
index 000000000000..e859ac3c992f
Binary files /dev/null and b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/src/assets/penguin2.jpg differ
diff --git a/packages/integrations/mdx/test/fixtures/image-remark-imgattr/src/pages/index.mdx b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/src/pages/index.mdx
new file mode 100644
index 000000000000..e415e505d69d
--- /dev/null
+++ b/packages/integrations/mdx/test/fixtures/image-remark-imgattr/src/pages/index.mdx
@@ -0,0 +1 @@
+![alt](../assets/penguin2.jpg)
diff --git a/packages/integrations/mdx/test/remark-imgattr.test.js b/packages/integrations/mdx/test/remark-imgattr.test.js
new file mode 100644
index 000000000000..7bedc3e91868
--- /dev/null
+++ b/packages/integrations/mdx/test/remark-imgattr.test.js
@@ -0,0 +1,50 @@
+import { expect } from 'chai';
+import * as cheerio from 'cheerio';
+import { loadFixture } from '../../../astro/test/test-utils.js';
+
+const FIXTURE_ROOT = new URL('./fixtures/image-remark-imgattr/', import.meta.url);
+
+describe('Testing remark plugins for image processing', () => {
+	/** @type {import('./test-utils').Fixture} */
+	let fixture;
+
+	describe('start dev server', () => {
+		/** @type {import('./test-utils').DevServer} */
+		let devServer;
+
+		before(async () => {
+			fixture = await loadFixture({
+				root: FIXTURE_ROOT,
+			});
+
+			devServer = await fixture.startDevServer();
+		});
+
+		after(async () => {
+			await devServer.stop();
+		});
+
+		describe('Test image attributes can be added by remark plugins', () => {
+			let $;
+			before(async () => {
+				let res = await fixture.fetch('/');
+				let html = await res.text();
+				$ = cheerio.load(html);
+			});
+
+			it('<img> has correct attributes', async () => {
+				let $img = $('img');
+				expect($img.attr('id')).to.equal('test');
+				expect($img.attr('sizes')).to.equal('(min-width: 600px) 600w, 300w');
+				expect($img.attr('srcset')).to.not.be.empty;
+			});
+
+			it('<img> was processed properly', async () => {
+				let $img = $('img');
+				expect(new URL($img.attr('src'), 'http://example.com').searchParams.get('w')).to.equal(
+					'300'
+				);
+			});
+		});
+	});
+});
diff --git a/packages/integrations/node/test/prerender.test.js b/packages/integrations/node/test/prerender.test.js
index 0d87e77110f3..84f599bcdac0 100644
--- a/packages/integrations/node/test/prerender.test.js
+++ b/packages/integrations/node/test/prerender.test.js
@@ -140,6 +140,44 @@ describe('Prerendering', () => {
 			expect($('h1').text()).to.equal('Two');
 		});
 	});
+
+	describe('Dev', () => {
+		let devServer;
+
+		before(async () => {
+			process.env.PRERENDER = true;
+
+			fixture = await loadFixture({
+				root: './fixtures/prerender/',
+				output: 'server',
+				adapter: nodejs({ mode: 'standalone' }),
+			});
+			devServer = await fixture.startDevServer();
+		});
+
+		after(async () => {
+			await devServer.stop();
+			delete process.env.PRERENDER;
+		});
+
+		it('Can render SSR route', async () => {
+			const res = await fixture.fetch(`/one`);
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			expect(res.status).to.equal(200);
+			expect($('h1').text()).to.equal('One');
+		});
+
+		it('Can render prerendered route', async () => {
+			const res = await fixture.fetch(`/two`);
+			const html = await res.text();
+			const $ = cheerio.load(html);
+
+			expect(res.status).to.equal(200);
+			expect($('h1').text()).to.equal('Two');
+		});
+	});
 });
 
 describe('Hybrid rendering', () => {
diff --git a/packages/integrations/react/package.json b/packages/integrations/react/package.json
index dbabe0be0355..1390903304a7 100644
--- a/packages/integrations/react/package.json
+++ b/packages/integrations/react/package.json
@@ -56,10 +56,10 @@
     "astro-scripts": "workspace:*",
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
+    "mocha": "^10.2.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "vite": "^5.0.10",
-    "mocha": "^10.2.0"
+    "vite": "^5.0.12"
   },
   "peerDependencies": {
     "@types/react": "^17.0.50 || ^18.0.21",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 112f047f7483..0ceb9f97f930 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -49,7 +49,7 @@
     "astro": "workspace:*",
     "astro-scripts": "workspace:*",
     "svelte": "^4.2.5",
-    "vite": "^5.0.10"
+    "vite": "^5.0.12"
   },
   "peerDependencies": {
     "astro": "^4.0.0",
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index cd797ef33c79..c07f65963be2 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -43,7 +43,7 @@
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "tailwindcss": "^3.3.5",
-    "vite": "^5.0.10"
+    "vite": "^5.0.12"
   },
   "peerDependencies": {
     "astro": "^3.0.0 || ^4.0.0",
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 879b771d1fc0..283a9838e6c7 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/vercel
 
+## 7.0.1
+
+### Patch Changes
+
+- [#9585](https://github.com/withastro/astro/pull/9585) [`05adaaa2d217a3ecb34244d9b40603f35cef4a37`](https://github.com/withastro/astro/commit/05adaaa2d217a3ecb34244d9b40603f35cef4a37) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where edge middleware did not work.
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index e52eb6c394ff..845d26350470 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/vercel",
   "description": "Deploy your site to Vercel",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/integrations/vercel/src/lib/fs.ts b/packages/integrations/vercel/src/lib/fs.ts
index b3dadcfc2ed5..152ee7d7c0d3 100644
--- a/packages/integrations/vercel/src/lib/fs.ts
+++ b/packages/integrations/vercel/src/lib/fs.ts
@@ -31,8 +31,6 @@ export async function getFilesFromFolder(dir: URL) {
 	return files;
 }
 
-export const getVercelOutput = (root: URL) => new URL('./.vercel/output/', root);
-
 /**
  * Copies files into a folder keeping the folder structure intact.
  * The resulting file tree will start at the common ancestor.
diff --git a/packages/integrations/vercel/src/serverless/adapter.ts b/packages/integrations/vercel/src/serverless/adapter.ts
index 5a3c92b02abb..f1c75e4b4d9e 100644
--- a/packages/integrations/vercel/src/serverless/adapter.ts
+++ b/packages/integrations/vercel/src/serverless/adapter.ts
@@ -8,14 +8,14 @@ import type {
 import { AstroError } from 'astro/errors';
 import glob from 'fast-glob';
 import { basename } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL } from 'node:url';
 import {
 	getAstroImageConfig,
 	getDefaultImageConfig,
 	type DevImageService,
 	type VercelImageConfig,
 } from '../image/shared.js';
-import { getVercelOutput, removeDir, writeJson } from '../lib/fs.js';
+import { removeDir, writeJson } from '../lib/fs.js';
 import { copyDependenciesToFunction } from '../lib/nft.js';
 import { getRedirects } from '../lib/redirects.js';
 import {
@@ -29,9 +29,25 @@ import {
 import { generateEdgeMiddleware } from './middleware.js';
 
 const PACKAGE_NAME = '@astrojs/vercel/serverless';
+
+/**
+ * The edge function calls the node server at /_render,
+ * with the original path as the value of this header.
+ */
+export const ASTRO_PATH_HEADER = 'x-astro-path';
+
+/**
+ * The edge function calls the node server at /_render,
+ * with the locals serialized into this header.
+ */
 export const ASTRO_LOCALS_HEADER = 'x-astro-locals';
 export const VERCEL_EDGE_MIDDLEWARE_FILE = 'vercel-edge-middleware';
 
+// Vercel routes the folder names to a path on the deployed website.
+// We attempt to avoid interfering by prefixing with an underscore.
+export const NODE_PATH = '_render';
+const MIDDLEWARE_PATH = '_middleware';
+
 // https://vercel.com/docs/concepts/functions/serverless-functions/runtimes/node-js#node.js-version
 const SUPPORTED_NODE_VERSIONS: Record<
 	string,
@@ -111,8 +127,8 @@ export interface VercelServerlessConfig {
 export default function vercelServerless({
 	webAnalytics,
 	speedInsights,
-	includeFiles,
-	excludeFiles = [],
+	includeFiles: _includeFiles = [],
+	excludeFiles: _excludeFiles = [],
 	imageService,
 	imagesConfig,
 	devImageService = 'sharp',
@@ -130,9 +146,10 @@ export default function vercelServerless({
 	}
 
 	let _config: AstroConfig;
-	let buildTempFolder: URL;
-	let serverEntry: string;
+	let _buildTempFolder: URL;
+	let _serverEntry: string;
 	let _entryPoints: Map<RouteData, URL>;
+	let _middlewareEntryPoint: URL | undefined;
 	// Extra files to be merged with `includeFiles` during build
 	const extraFilesToInclude: URL[] = [];
 
@@ -162,13 +179,12 @@ export default function vercelServerless({
 				if (command === 'build' && speedInsights?.enabled) {
 					injectScript('page', 'import "@astrojs/vercel/speed-insights"');
 				}
-				const outDir = getVercelOutput(config.root);
+
 				updateConfig({
-					outDir,
+					outDir: new URL('./.vercel/output/', config.root),
 					build: {
-						serverEntry: 'entry.mjs',
-						client: new URL('./static/', outDir),
-						server: new URL('./dist/', config.root),
+						client: new URL('./.vercel/output/static/', config.root),
+						server: new URL('./.vercel/output/_functions/', config.root),
 						redirects: false,
 					},
 					vite: {
@@ -195,10 +211,12 @@ export default function vercelServerless({
 							`\tYou can set functionPerRoute: false to prevent surpassing the limit.\n`
 					);
 				}
+
 				setAdapter(getAdapter({ functionPerRoute, edgeMiddleware }));
+
 				_config = config;
-				buildTempFolder = config.build.server;
-				serverEntry = config.build.serverEntry;
+				_buildTempFolder = config.build.server;
+				_serverEntry = config.build.serverEntry;
 
 				if (config.output === 'static') {
 					throw new AstroError(
@@ -208,20 +226,7 @@ export default function vercelServerless({
 			},
 			'astro:build:ssr': async ({ entryPoints, middlewareEntryPoint }) => {
 				_entryPoints = entryPoints;
-				if (middlewareEntryPoint) {
-					const outPath = fileURLToPath(buildTempFolder);
-					const vercelEdgeMiddlewareHandlerPath = new URL(
-						VERCEL_EDGE_MIDDLEWARE_FILE,
-						_config.srcDir
-					);
-					const bundledMiddlewarePath = await generateEdgeMiddleware(
-						middlewareEntryPoint,
-						outPath,
-						vercelEdgeMiddlewareHandlerPath
-					);
-					// let's tell the adapter that we need to save this file
-					extraFilesToInclude.push(bundledMiddlewarePath);
-				}
+				_middlewareEntryPoint = middlewareEntryPoint;
 			},
 			'astro:build:done': async ({ routes, logger }) => {
 				// Merge any includes from `vite.assetsInclude
@@ -240,9 +245,16 @@ export default function vercelServerless({
 					mergeGlobbedIncludes(_config.vite.assetsInclude);
 				}
 
-				const routeDefinitions: { src: string; dest: string }[] = [];
-				const filesToInclude = includeFiles?.map((file) => new URL(file, _config.root)) || [];
-				filesToInclude.push(...extraFilesToInclude);
+				const routeDefinitions: Array<{
+					src: string;
+					dest: string;
+					middlewarePath?: string;
+				}> = [];
+
+				const includeFiles = _includeFiles
+					.map((file) => new URL(file, _config.root))
+					.concat(extraFilesToInclude);
+				const excludeFiles = _excludeFiles.map((file) => new URL(file, _config.root));
 
 				const runtime = getRuntime(process, logger);
 
@@ -267,7 +279,7 @@ export default function vercelServerless({
 							config: _config,
 							logger,
 							NTF_CACHE,
-							includeFiles: filesToInclude,
+							includeFiles,
 							excludeFiles,
 							maxDuration,
 						});
@@ -278,24 +290,28 @@ export default function vercelServerless({
 					}
 				} else {
 					await createFunctionFolder({
-						functionName: 'render',
+						functionName: NODE_PATH,
 						runtime,
-						entry: new URL(serverEntry, buildTempFolder),
+						entry: new URL(_serverEntry, _buildTempFolder),
 						config: _config,
 						logger,
 						NTF_CACHE,
-						includeFiles: filesToInclude,
+						includeFiles,
 						excludeFiles,
 						maxDuration,
 					});
+					const dest = _middlewareEntryPoint ? MIDDLEWARE_PATH : NODE_PATH;
 					for (const route of routes) {
-						if (route.prerender) continue;
-						routeDefinitions.push({
-							src: route.pattern.source,
-							dest: 'render',
-						});
+						if (!route.prerender) routeDefinitions.push({ src: route.pattern.source, dest });
 					}
 				}
+				if (_middlewareEntryPoint) {
+					await createMiddlewareFolder({
+						functionName: MIDDLEWARE_PATH,
+						entry: _middlewareEntryPoint,
+						config: _config,
+					});
+				}
 				const fourOhFourRoute = routes.find((route) => route.pathname === '/404');
 				// Output configuration
 				// https://vercel.com/docs/build-output-api/v3#build-output-configuration
@@ -314,7 +330,11 @@ export default function vercelServerless({
 							? [
 									{
 										src: '/.*',
-										dest: fourOhFourRoute.prerender ? '/404.html' : 'render',
+										dest: fourOhFourRoute.prerender
+											? '/404.html'
+											: _middlewareEntryPoint
+												? MIDDLEWARE_PATH
+												: NODE_PATH,
 										status: 404,
 									},
 								]
@@ -337,7 +357,7 @@ export default function vercelServerless({
 				});
 
 				// Remove temporary folder
-				await removeDir(buildTempFolder);
+				await removeDir(_buildTempFolder);
 			},
 		},
 	};
@@ -345,6 +365,27 @@ export default function vercelServerless({
 
 type Runtime = `nodejs${string}.x`;
 
+interface CreateMiddlewareFolderArgs {
+	config: AstroConfig;
+	entry: URL;
+	functionName: string;
+}
+
+async function createMiddlewareFolder({ functionName, entry, config }: CreateMiddlewareFolderArgs) {
+	const functionFolder = new URL(`./functions/${functionName}.func/`, config.outDir);
+
+	await generateEdgeMiddleware(
+		entry,
+		new URL(VERCEL_EDGE_MIDDLEWARE_FILE, config.srcDir),
+		new URL('./middleware.mjs', functionFolder)
+	);
+
+	await writeJson(new URL(`./.vc-config.json`, functionFolder), {
+		runtime: 'edge',
+		entrypoint: 'middleware.mjs',
+	});
+}
+
 interface CreateFunctionFolderArgs {
 	functionName: string;
 	runtime: Runtime;
@@ -353,7 +394,7 @@ interface CreateFunctionFolderArgs {
 	logger: AstroIntegrationLogger;
 	NTF_CACHE: any;
 	includeFiles: URL[];
-	excludeFiles: string[];
+	excludeFiles: URL[];
 	maxDuration: number | undefined;
 }
 
@@ -379,7 +420,7 @@ async function createFunctionFolder({
 			entry,
 			outDir: functionFolder,
 			includeFiles,
-			excludeFiles: excludeFiles.map((file) => new URL(file, config.root)),
+			excludeFiles,
 			logger,
 		},
 		NTF_CACHE
@@ -393,7 +434,7 @@ async function createFunctionFolder({
 	// https://vercel.com/docs/build-output-api/v3#vercel-primitives/serverless-functions/configuration
 	await writeJson(vcConfig, {
 		runtime,
-		handler,
+		handler: handler.replaceAll('\\', '/'),
 		launcherType: 'Nodejs',
 		maxDuration,
 		supportsResponseStreaming: true,
@@ -411,15 +452,18 @@ function getRuntime(process: NodeJS.Process, logger: AstroIntegrationLogger): Ru
 				`\tYour project will use Node.js 18 as the runtime instead.\n` +
 				`\tConsider switching your local version to 18.\n`
 		);
+		return 'nodejs18.x';
 	}
 	if (support.status === 'current') {
 		return `nodejs${major}.x`;
-	} else if (support?.status === 'beta') {
+	}
+	if (support.status === 'beta') {
 		logger.warn(
 			`Your project is being built for Node.js ${major} as the runtime, which is currently in beta for Vercel Serverless Functions.`
 		);
 		return `nodejs${major}.x`;
-	} else if (support.status === 'deprecated') {
+	}
+	if (support.status === 'deprecated') {
 		const removeDate = new Intl.DateTimeFormat(undefined, { dateStyle: 'long' }).format(
 			support.removal
 		);
@@ -430,14 +474,6 @@ function getRuntime(process: NodeJS.Process, logger: AstroIntegrationLogger): Ru
 				`\tConsider upgrading your local version to 18.\n`
 		);
 		return `nodejs${major}.x`;
-	} else {
-		logger.warn(
-			`\n` +
-				`\tThe local Node.js version (${major}) is not supported by Vercel Serverless Functions.\n` +
-				`\tYour project will use Node.js 18 as the runtime instead.\n` +
-				`\tConsider switching your local version to 18.\n`
-		);
-		return 'nodejs18.x';
 	}
-	return `nodejs${major}.x`;
+	return 'nodejs18.x';
 }
diff --git a/packages/integrations/vercel/src/serverless/entrypoint.ts b/packages/integrations/vercel/src/serverless/entrypoint.ts
index dedc7fcc1a64..a300b8a12f8b 100644
--- a/packages/integrations/vercel/src/serverless/entrypoint.ts
+++ b/packages/integrations/vercel/src/serverless/entrypoint.ts
@@ -1,7 +1,7 @@
 import type { SSRManifest } from 'astro';
 import { applyPolyfills, NodeApp } from 'astro/app/node';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import { ASTRO_LOCALS_HEADER } from './adapter.js';
+import { ASTRO_PATH_HEADER, ASTRO_LOCALS_HEADER } from './adapter.js';
 
 applyPolyfills();
 
@@ -10,6 +10,10 @@ export const createExports = (manifest: SSRManifest) => {
 	const handler = async (req: IncomingMessage, res: ServerResponse) => {
 		const clientAddress = req.headers['x-forwarded-for'] as string | undefined;
 		const localsHeader = req.headers[ASTRO_LOCALS_HEADER];
+		const realPath = req.headers[ASTRO_PATH_HEADER];
+		if (typeof realPath === 'string') {
+			req.url = realPath;
+		}
 		const locals =
 			typeof localsHeader === 'string'
 				? JSON.parse(localsHeader)
diff --git a/packages/integrations/vercel/src/serverless/middleware.ts b/packages/integrations/vercel/src/serverless/middleware.ts
index b3ada80d15bf..648bc0d68f7b 100644
--- a/packages/integrations/vercel/src/serverless/middleware.ts
+++ b/packages/integrations/vercel/src/serverless/middleware.ts
@@ -1,7 +1,7 @@
 import { existsSync } from 'node:fs';
-import { join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { ASTRO_LOCALS_HEADER } from './adapter.js';
+import { builtinModules } from 'node:module';
+import { ASTRO_LOCALS_HEADER, ASTRO_PATH_HEADER, NODE_PATH } from './adapter.js';
 
 /**
  * It generates the Vercel Edge Middleware file.
@@ -16,16 +16,15 @@ import { ASTRO_LOCALS_HEADER } from './adapter.js';
  */
 export async function generateEdgeMiddleware(
 	astroMiddlewareEntryPointPath: URL,
-	outPath: string,
-	vercelEdgeMiddlewareHandlerPath: URL
+	vercelEdgeMiddlewareHandlerPath: URL,
+	outPath: URL
 ): Promise<URL> {
-	const entryPointPathURLAsString = JSON.stringify(
-		fileURLToPath(astroMiddlewareEntryPointPath).replace(/\\/g, '/')
+	const code = edgeMiddlewareTemplate(
+		astroMiddlewareEntryPointPath,
+		vercelEdgeMiddlewareHandlerPath
 	);
-
-	const code = edgeMiddlewareTemplate(entryPointPathURLAsString, vercelEdgeMiddlewareHandlerPath);
 	// https://vercel.com/docs/concepts/functions/edge-middleware#create-edge-middleware
-	const bundledFilePath = join(outPath, 'middleware.mjs');
+	const bundledFilePath = fileURLToPath(outPath);
 	const esbuild = await import('esbuild');
 	await esbuild.build({
 		stdin: {
@@ -36,17 +35,32 @@ export async function generateEdgeMiddleware(
 		platform: 'browser',
 		// https://runtime-keys.proposal.wintercg.org/#edge-light
 		conditions: ['edge-light', 'worker', 'browser'],
-		external: ['astro/middleware'],
 		outfile: bundledFilePath,
 		allowOverwrite: true,
 		format: 'esm',
 		bundle: true,
 		minify: false,
+		// ensure node built-in modules are namespaced with `node:`
+		plugins: [
+			{
+				name: 'esbuild-namespace-node-built-in-modules',
+				setup(build) {
+					const filter = new RegExp(builtinModules.map((mod) => `(^${mod}$)`).join('|'));
+					build.onResolve({ filter }, (args) => ({ path: 'node:' + args.path, external: true }));
+				},
+			},
+		],
 	});
 	return pathToFileURL(bundledFilePath);
 }
 
-function edgeMiddlewareTemplate(middlewarePath: string, vercelEdgeMiddlewareHandlerPath: URL) {
+function edgeMiddlewareTemplate(
+	astroMiddlewareEntryPointPath: URL,
+	vercelEdgeMiddlewareHandlerPath: URL
+) {
+	const middlewarePath = JSON.stringify(
+		fileURLToPath(astroMiddlewareEntryPointPath).replace(/\\/g, '/')
+	);
 	const filePathEdgeMiddleware = fileURLToPath(vercelEdgeMiddlewareHandlerPath);
 	let handlerTemplateImport = '';
 	let handlerTemplateCall = '{}';
@@ -61,20 +75,20 @@ function edgeMiddlewareTemplate(middlewarePath: string, vercelEdgeMiddlewareHand
 import { onRequest } from ${middlewarePath};
 import { createContext, trySerializeLocals } from 'astro/middleware';
 export default async function middleware(request, context) {
-	const url = new URL(request.url);
 	const ctx = createContext({
 		request,
 		params: {}
 	});
 	ctx.locals = ${handlerTemplateCall};
-	const next = async () => {
-		const response = await fetch(url, {
+	const { origin } = new URL(request.url);
+	const next = () =>
+		fetch(new URL('${NODE_PATH}', request.url), {
 			headers: {
-				${JSON.stringify(ASTRO_LOCALS_HEADER)}: trySerializeLocals(ctx.locals)
+				...Object.fromEntries(request.headers.entries()),
+				'${ASTRO_PATH_HEADER}': request.url.replace(origin, ''),
+				'${ASTRO_LOCALS_HEADER}': trySerializeLocals(ctx.locals)
 			}
-		});
-		return response;
-	};
+		})
 
 	return onRequest(ctx, next);
 }`;
diff --git a/packages/integrations/vercel/src/static/adapter.ts b/packages/integrations/vercel/src/static/adapter.ts
index 5924af759a5b..7bc793e40e8f 100644
--- a/packages/integrations/vercel/src/static/adapter.ts
+++ b/packages/integrations/vercel/src/static/adapter.ts
@@ -6,7 +6,7 @@ import {
 	type DevImageService,
 	type VercelImageConfig,
 } from '../image/shared.js';
-import { emptyDir, getVercelOutput, writeJson } from '../lib/fs.js';
+import { emptyDir, writeJson } from '../lib/fs.js';
 import { isServerLikeOutput } from '../lib/prerender.js';
 import { getRedirects } from '../lib/redirects.js';
 import {
@@ -79,7 +79,7 @@ export default function vercelStatic({
 				if (command === 'build' && speedInsights?.enabled) {
 					injectScript('page', 'import "@astrojs/vercel/speed-insights"');
 				}
-				const outDir = new URL('./static/', getVercelOutput(config.root));
+				const outDir = new URL('./.vercel/output/static/', config.root);
 				updateConfig({
 					outDir,
 					build: {
@@ -110,12 +110,12 @@ export default function vercelStatic({
 				// Ensure to have `.vercel/output` empty.
 				// This is because, when building to static, outDir = .vercel/output/static/,
 				// so .vercel/output itself won't get cleaned.
-				await emptyDir(getVercelOutput(_config.root));
+				await emptyDir(new URL('./.vercel/output/', _config.root));
 			},
 			'astro:build:done': async ({ routes }) => {
 				// Output configuration
 				// https://vercel.com/docs/build-output-api/v3#build-output-configuration
-				await writeJson(new URL(`./config.json`, getVercelOutput(_config.root)), {
+				await writeJson(new URL('./.vercel/output/config.json', _config.root), {
 					version: 3,
 					routes: [
 						...getRedirects(routes, _config),
diff --git a/packages/integrations/vercel/test/edge-middleware.test.js b/packages/integrations/vercel/test/edge-middleware.test.js
index deaeb416020c..35b83bb93110 100644
--- a/packages/integrations/vercel/test/edge-middleware.test.js
+++ b/packages/integrations/vercel/test/edge-middleware.test.js
@@ -3,6 +3,31 @@ import chaiJestSnapshot from 'chai-jest-snapshot';
 import { loadFixture } from './test-utils.js';
 
 describe('Vercel edge middleware', () => {
+	/** @type {import('../../../astro/test/test-utils.js').Fixture} */
+	let build;
+	before(async () => {
+		build = await loadFixture({
+			root: './fixtures/middleware-with-edge-file/',
+		});
+		await build.build();
+	});
+
+	it('an edge function is created', async () => {
+		const contents = await build.readFile(
+			'../.vercel/output/functions/_middleware.func/.vc-config.json'
+		);
+		expect(JSON.parse(contents)).to.deep.include({
+			runtime: 'edge',
+			entrypoint: 'middleware.mjs',
+		});
+	});
+
+	it('deployment config points to the middleware edge function', async () => {
+		const contents = await build.readFile('../.vercel/output/config.json');
+		const { routes } = JSON.parse(contents);
+		expect(routes.some((route) => route.dest === '_middleware')).to.be.true;
+	});
+
 	// TODO: The path here seems to be inconsistent?
 	it.skip('with edge handle file, should successfully build the middleware', async () => {
 		const fixture = await loadFixture({
diff --git a/packages/integrations/vercel/test/max-duration.test.js b/packages/integrations/vercel/test/max-duration.test.js
index 8f0af3b89df4..79991290515c 100644
--- a/packages/integrations/vercel/test/max-duration.test.js
+++ b/packages/integrations/vercel/test/max-duration.test.js
@@ -14,7 +14,7 @@ describe('maxDuration', () => {
 
 	it('makes it to vercel function configuration', async () => {
 		const vcConfig = JSON.parse(
-			await fixture.readFile('../.vercel/output/functions/render.func/.vc-config.json')
+			await fixture.readFile('../.vercel/output/functions/_render.func/.vc-config.json')
 		);
 		expect(vcConfig).to.deep.include({ maxDuration: 60 });
 	});
diff --git a/packages/integrations/vercel/test/streaming.test.js b/packages/integrations/vercel/test/streaming.test.js
index 93dc95c39508..205946973a8c 100644
--- a/packages/integrations/vercel/test/streaming.test.js
+++ b/packages/integrations/vercel/test/streaming.test.js
@@ -1,7 +1,7 @@
 import { loadFixture } from './test-utils.js';
 import { expect } from 'chai';
 
-describe('maxDuration', () => {
+describe('streaming', () => {
 	/** @type {import('./test-utils.js').Fixture} */
 	let fixture;
 
@@ -14,7 +14,7 @@ describe('maxDuration', () => {
 
 	it('makes it to vercel function configuration', async () => {
 		const vcConfig = JSON.parse(
-			await fixture.readFile('../.vercel/output/functions/render.func/.vc-config.json')
+			await fixture.readFile('../.vercel/output/functions/_render.func/.vc-config.json')
 		);
 		expect(vcConfig).to.deep.include({ supportsResponseStreaming: true });
 	});
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index b4141a9fd6ac..242cf67c2316 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -53,7 +53,7 @@
     "cheerio": "1.0.0-rc.12",
     "linkedom": "^0.16.4",
     "mocha": "^10.2.0",
-    "vite": "^5.0.10",
+    "vite": "^5.0.12",
     "vue": "^3.3.8"
   },
   "peerDependencies": {
diff --git a/packages/markdown/remark/CHANGELOG.md b/packages/markdown/remark/CHANGELOG.md
index 72023ae3c3d4..c71de000f32b 100644
--- a/packages/markdown/remark/CHANGELOG.md
+++ b/packages/markdown/remark/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @astrojs/markdown-remark
 
+## 4.2.0
+
+### Minor Changes
+
+- [#9738](https://github.com/withastro/astro/pull/9738) [`a505190933365268d48139a5f197a3cfb5570870`](https://github.com/withastro/astro/commit/a505190933365268d48139a5f197a3cfb5570870) Thanks [@bluwy](https://github.com/bluwy)! - Fixes usage in browser environments by using subpath imports
+
+### Patch Changes
+
+- [#9736](https://github.com/withastro/astro/pull/9736) [`53c69dcc82cdf4000aff13a6c11fffe19096cf45`](https://github.com/withastro/astro/commit/53c69dcc82cdf4000aff13a6c11fffe19096cf45) Thanks [@bluwy](https://github.com/bluwy)! - Initializes internal `cwdUrlStr` variable lazily for performance, and workaround Rollup side-effect detection bug when building for non-Node runtimes
+
+- [#9723](https://github.com/withastro/astro/pull/9723) [`2f81cffa9da9db0e2802d303f94feaee8d2f54ec`](https://github.com/withastro/astro/commit/2f81cffa9da9db0e2802d303f94feaee8d2f54ec) Thanks [@blackmann](https://github.com/blackmann)! - Fixes a case where transformers wouldn't work on the `class` property
+
 ## 4.1.0
 
 ### Minor Changes
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index 60c75b954bb5..e38b8e792440 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/markdown/remark/src/shiki.ts b/packages/markdown/remark/src/shiki.ts
index 04b1bbcf6a72..492d5a821eb3 100644
--- a/packages/markdown/remark/src/shiki.ts
+++ b/packages/markdown/remark/src/shiki.ts
@@ -1,5 +1,6 @@
 import { bundledLanguages, createCssVariablesTheme, getHighlighter } from 'shikiji';
 import { visit } from 'unist-util-visit';
+import type { Properties } from 'hast';
 import type { ShikiConfig } from './types.js';
 
 export interface ShikiHighlighter {
@@ -61,9 +62,8 @@ export async function createShikiHighlighter({
 								node.tagName = 'code';
 							}
 
-							// Cast to string as shikiji will always pass them as strings instead of any other types
-							const classValue = (node.properties.class as string) ?? '';
-							const styleValue = (node.properties.style as string) ?? '';
+							const classValue = normalizePropAsString(node.properties.class) ?? '';
+							const styleValue = normalizePropAsString(node.properties.style) ?? '';
 
 							// Replace "shiki" class naming with "astro-code"
 							node.properties.class = classValue.replace(/shiki/g, 'astro-code');
@@ -129,6 +129,10 @@ export async function createShikiHighlighter({
 	};
 }
 
+function normalizePropAsString(value: Properties[string]): string | null {
+	return Array.isArray(value) ? value.join(' ') : (value as string | null);
+}
+
 /**
  * shiki -> shikiji compat as we need to manually replace it
  * @internal Exported for error overlay use only
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1b261998408a..f8ace279e5ed 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -51,6 +51,9 @@ importers:
       eslint-plugin-prettier:
         specifier: ^5.0.0
         version: 5.1.2(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.1.1)
+      globby:
+        specifier: ^14.0.0
+        version: 14.0.0
       only-allow:
         specifier: ^1.1.1
         version: 1.2.1
@@ -125,28 +128,28 @@ importers:
   examples/basics:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/blog:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^2.0.5
+        specifier: ^2.1.0
         version: link:../../packages/integrations/mdx
       '@astrojs/rss':
-        specifier: ^4.0.2
+        specifier: ^4.0.3
         version: link:../../packages/astro-rss
       '@astrojs/sitemap':
         specifier: ^3.0.5
         version: link:../../packages/integrations/sitemap
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/component:
     devDependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/framework-alpine:
@@ -161,7 +164,7 @@ importers:
         specifier: ^3.13.3
         version: 3.13.3
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/framework-lit:
@@ -173,7 +176,7 @@ importers:
         specifier: ^0.2.1
         version: 0.2.1
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       lit:
         specifier: ^2.8.0
@@ -197,7 +200,7 @@ importers:
         specifier: ^4.0.8
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -227,7 +230,7 @@ importers:
         specifier: ^1.2.1
         version: 1.2.1(preact@10.19.3)
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -245,7 +248,7 @@ importers:
         specifier: ^18.2.15
         version: 18.2.18
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       react:
         specifier: ^18.2.0
@@ -260,7 +263,7 @@ importers:
         specifier: ^4.0.1
         version: link:../../packages/integrations/solid
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       solid-js:
         specifier: ^1.8.5
@@ -272,7 +275,7 @@ importers:
         specifier: ^5.0.3
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -284,7 +287,7 @@ importers:
         specifier: ^4.0.8
         version: link:../../packages/integrations/vue
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       vue:
         specifier: ^3.3.8
@@ -296,13 +299,13 @@ importers:
         specifier: ^8.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/integration:
     devDependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/middleware:
@@ -311,7 +314,7 @@ importers:
         specifier: ^8.0.0
         version: link:../../packages/integrations/node
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       html-minifier:
         specifier: ^4.0.0
@@ -324,19 +327,19 @@ importers:
   examples/minimal:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/non-html-pages:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/portfolio:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/ssr:
@@ -348,7 +351,7 @@ importers:
         specifier: ^5.0.3
         version: link:../../packages/integrations/svelte
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       svelte:
         specifier: ^4.2.5
@@ -357,7 +360,7 @@ importers:
   examples/starlog:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       sass:
         specifier: ^1.69.5
@@ -375,7 +378,7 @@ importers:
         specifier: ^5.1.0
         version: link:../../packages/integrations/tailwind
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/with-markdoc:
@@ -384,16 +387,16 @@ importers:
         specifier: ^0.8.3
         version: link:../../packages/integrations/markdoc
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/with-markdown-plugins:
     dependencies:
       '@astrojs/markdown-remark':
-        specifier: ^4.1.0
+        specifier: ^4.2.0
         version: link:../../packages/markdown/remark
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       hast-util-select:
         specifier: ^6.0.2
@@ -414,19 +417,19 @@ importers:
   examples/with-markdown-shiki:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
 
   examples/with-mdx:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^2.0.5
+        specifier: ^2.1.0
         version: link:../../packages/integrations/mdx
       '@astrojs/preact':
         specifier: ^3.1.0
         version: link:../../packages/integrations/preact
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       preact:
         specifier: ^10.19.2
@@ -441,7 +444,7 @@ importers:
         specifier: ^0.5.0
         version: 0.5.0(nanostores@0.9.5)(preact@10.19.3)
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       nanostores:
         specifier: ^0.9.5
@@ -453,7 +456,7 @@ importers:
   examples/with-tailwindcss:
     dependencies:
       '@astrojs/mdx':
-        specifier: ^2.0.5
+        specifier: ^2.1.0
         version: link:../../packages/integrations/mdx
       '@astrojs/tailwind':
         specifier: ^5.1.0
@@ -462,7 +465,7 @@ importers:
         specifier: ^1.6.3
         version: 1.6.4
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       autoprefixer:
         specifier: ^10.4.15
@@ -480,11 +483,11 @@ importers:
   examples/with-vitest:
     dependencies:
       astro:
-        specifier: ^4.2.1
+        specifier: ^4.2.4
         version: link:../../packages/astro
       vitest:
-        specifier: ^0.34.2
-        version: 0.34.6
+        specifier: ^1.2.1
+        version: 1.2.1(@types/node@18.19.4)
 
   packages/astro:
     dependencies:
@@ -663,11 +666,11 @@ importers:
         specifier: ^6.0.1
         version: 6.0.1
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
       vitefu:
         specifier: ^0.2.5
-        version: 0.2.5(vite@5.0.10)
+        version: 0.2.5(vite@5.0.12)
       which-pm:
         specifier: ^2.1.1
         version: 2.1.1
@@ -2825,6 +2828,12 @@ importers:
         specifier: workspace:*
         version: link:../../..
 
+  packages/astro/test/fixtures/html-escape-complex:
+    dependencies:
+      astro:
+        specifier: workspace:*
+        version: link:../../..
+
   packages/astro/test/fixtures/html-page:
     dependencies:
       astro:
@@ -3781,12 +3790,48 @@ importers:
 
   packages/integrations/alpinejs:
     devDependencies:
+      '@playwright/test':
+        specifier: 1.40.0
+        version: 1.40.0
       astro:
         specifier: workspace:*
         version: link:../../astro
       astro-scripts:
         specifier: workspace:*
         version: link:../../../scripts
+      vite:
+        specifier: ^5.0.10
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
+
+  packages/integrations/alpinejs/test/fixtures/basics:
+    dependencies:
+      '@astrojs/alpinejs':
+        specifier: workspace:*
+        version: link:../../..
+      '@types/alpinejs':
+        specifier: ^3.13.5
+        version: 3.13.5
+      alpinejs:
+        specifier: ^3.13.3
+        version: 3.13.3
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
+  packages/integrations/alpinejs/test/fixtures/directive:
+    dependencies:
+      '@astrojs/alpinejs':
+        specifier: workspace:*
+        version: link:../../..
+      '@types/alpinejs':
+        specifier: ^3.13.5
+        version: 3.13.5
+      alpinejs:
+        specifier: ^3.13.3
+        version: 3.13.3
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
 
   packages/integrations/cloudflare: {}
 
@@ -3891,8 +3936,8 @@ importers:
         specifier: ^10.2.0
         version: 10.2.0
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
 
   packages/integrations/markdoc/test/fixtures/content-collections:
     dependencies:
@@ -4123,8 +4168,8 @@ importers:
         specifier: ^11.0.4
         version: 11.0.4
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
 
   packages/integrations/mdx/test/fixtures/css-head-mdx:
     dependencies:
@@ -4138,6 +4183,15 @@ importers:
         specifier: 0.2.4
         version: 0.2.4
 
+  packages/integrations/mdx/test/fixtures/image-remark-imgattr:
+    dependencies:
+      '@astrojs/mdx':
+        specifier: workspace:*
+        version: link:../../..
+      astro:
+        specifier: workspace:*
+        version: link:../../../../../astro
+
   packages/integrations/mdx/test/fixtures/mdx-frontmatter-injection:
     dependencies:
       '@astrojs/mdx':
@@ -4459,7 +4513,7 @@ importers:
     dependencies:
       '@vitejs/plugin-react':
         specifier: ^4.2.0
-        version: 4.2.1(vite@5.0.10)
+        version: 4.2.1(vite@5.0.12)
       ultrahtml:
         specifier: ^1.3.0
         version: 1.5.2
@@ -4492,8 +4546,8 @@ importers:
         specifier: ^18.1.0
         version: 18.2.0(react@18.2.0)
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
 
   packages/integrations/react/test/fixtures/react-component:
     dependencies:
@@ -4591,7 +4645,7 @@ importers:
     dependencies:
       '@sveltejs/vite-plugin-svelte':
         specifier: ^3.0.0
-        version: 3.0.1(svelte@4.2.8)(vite@5.0.10)
+        version: 3.0.1(svelte@4.2.8)(vite@5.0.12)
       svelte2tsx:
         specifier: ^0.6.25
         version: 0.6.27(svelte@4.2.8)(typescript@5.2.2)
@@ -4606,8 +4660,8 @@ importers:
         specifier: ^4.2.5
         version: 4.2.8
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
 
   packages/integrations/tailwind:
     dependencies:
@@ -4637,8 +4691,8 @@ importers:
         specifier: ^3.3.5
         version: 3.4.0
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
 
   packages/integrations/tailwind/test/fixtures/basic:
     dependencies:
@@ -4873,10 +4927,10 @@ importers:
     dependencies:
       '@vitejs/plugin-vue':
         specifier: ^4.5.0
-        version: 4.6.2(vite@5.0.10)(vue@3.4.3)
+        version: 4.6.2(vite@5.0.12)(vue@3.4.3)
       '@vitejs/plugin-vue-jsx':
         specifier: ^3.1.0
-        version: 3.1.0(vite@5.0.10)(vue@3.4.3)
+        version: 3.1.0(vite@5.0.12)(vue@3.4.3)
       '@vue/babel-plugin-jsx':
         specifier: ^1.1.5
         version: 1.1.5(@babel/core@7.23.7)
@@ -4906,8 +4960,8 @@ importers:
         specifier: ^10.2.0
         version: 10.2.0
       vite:
-        specifier: ^5.0.10
-        version: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
       vue:
         specifier: ^3.3.8
         version: 3.4.3(typescript@5.2.2)
@@ -7127,7 +7181,6 @@ packages:
   /@sindresorhus/merge-streams@1.0.0:
     resolution: {integrity: sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==}
     engines: {node: '>=18'}
-    dev: false
 
   /@solidjs/router@0.9.1(solid-js@1.8.7):
     resolution: {integrity: sha512-kRY75piOQsyoH75E/RP6lr7uVGFCjeeCCCJx7Z2D1Vc6+I1yFQjLCvE+6agXGwqDoWi6vbETP1g7gmp/L1mNLg==}
@@ -7137,7 +7190,7 @@ packages:
       solid-js: 1.8.7
     dev: false
 
-  /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.10):
+  /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.12):
     resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==}
     engines: {node: ^18.0.0 || >=20}
     peerDependencies:
@@ -7148,15 +7201,15 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.10)
+      '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.12)
       debug: 4.3.4(supports-color@8.1.1)
       svelte: 4.2.8
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.8)(vite@5.0.10):
+  /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.8)(vite@5.0.12):
     resolution: {integrity: sha512-CGURX6Ps+TkOovK6xV+Y2rn8JKa8ZPUHPZ/NKgCxAmgBrXReavzFl8aOSCj3kQ1xqT7yGJj53hjcV/gqwDAaWA==}
     engines: {node: ^18.0.0 || >=20}
     peerDependencies:
@@ -7166,15 +7219,15 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.10)
+      '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.12)
       debug: 4.3.4(supports-color@8.1.1)
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.5
       svelte: 4.2.8
       svelte-hmr: 0.15.3(svelte@4.2.8)
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
-      vitefu: 0.2.5(vite@5.0.10)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
+      vitefu: 0.2.5(vite@5.0.12)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -7249,14 +7302,9 @@ packages:
       '@types/chai': 4.3.11
     dev: true
 
-  /@types/chai-subset@1.3.5:
-    resolution: {integrity: sha512-c2mPnw+xHtXDoHmdtcCXGwyLMiauiAyxWMzhGpqHC4nqI/Y5G2XhTampslK2rb59kpcuHon03UH8W6iYUzw88A==}
-    dependencies:
-      '@types/chai': 4.3.11
-    dev: false
-
   /@types/chai@4.3.11:
     resolution: {integrity: sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==}
+    dev: true
 
   /@types/clean-css@4.2.11:
     resolution: {integrity: sha512-Y8n81lQVTAfP2TOdtJJEsCoYl1AnOkqDqMvXb9/7pfgZZ7r8YrEyurrAvAoAjHOGXKRybay+5CsExqIH6liccw==}
@@ -7734,7 +7782,7 @@ packages:
       - supports-color
     dev: false
 
-  /@vitejs/plugin-react@4.2.1(vite@5.0.10):
+  /@vitejs/plugin-react@4.2.1(vite@5.0.12):
     resolution: {integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -7748,12 +7796,12 @@ packages:
       '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.7)
       '@types/babel__core': 7.20.5
       react-refresh: 0.14.0
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@vitejs/plugin-vue-jsx@3.1.0(vite@5.0.10)(vue@3.4.3):
+  /@vitejs/plugin-vue-jsx@3.1.0(vite@5.0.12)(vue@3.4.3):
     resolution: {integrity: sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -7766,13 +7814,13 @@ packages:
       '@babel/core': 7.23.7
       '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.7)
       '@vue/babel-plugin-jsx': 1.1.5(@babel/core@7.23.7)
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
       vue: 3.4.3(typescript@5.2.2)
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@vitejs/plugin-vue@4.6.2(vite@5.0.10)(vue@3.4.3):
+  /@vitejs/plugin-vue@4.6.2(vite@5.0.12)(vue@3.4.3):
     resolution: {integrity: sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -7782,44 +7830,45 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
       vue: 3.4.3(typescript@5.2.2)
     dev: false
 
-  /@vitest/expect@0.34.6:
-    resolution: {integrity: sha512-QUzKpUQRc1qC7qdGo7rMK3AkETI7w18gTCUrsNnyjjJKYiuUB9+TQK3QnR1unhCnWRC0AbKv2omLGQDF/mIjOw==}
+  /@vitest/expect@1.2.1:
+    resolution: {integrity: sha512-/bqGXcHfyKgFWYwIgFr1QYDaR9e64pRKxgBNWNXPefPFRhgm+K3+a/dS0cUGEreWngets3dlr8w8SBRw2fCfFQ==}
     dependencies:
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
+      '@vitest/spy': 1.2.1
+      '@vitest/utils': 1.2.1
       chai: 4.3.10
     dev: false
 
-  /@vitest/runner@0.34.6:
-    resolution: {integrity: sha512-1CUQgtJSLF47NnhN+F9X2ycxUP0kLHQ/JWvNHbeBfwW8CzEGgeskzNnHDyv1ieKTltuR6sdIHV+nmR6kPxQqzQ==}
+  /@vitest/runner@1.2.1:
+    resolution: {integrity: sha512-zc2dP5LQpzNzbpaBt7OeYAvmIsRS1KpZQw4G3WM/yqSV1cQKNKwLGmnm79GyZZjMhQGlRcSFMImLjZaUQvNVZQ==}
     dependencies:
-      '@vitest/utils': 0.34.6
-      p-limit: 4.0.0
+      '@vitest/utils': 1.2.1
+      p-limit: 5.0.0
       pathe: 1.1.1
     dev: false
 
-  /@vitest/snapshot@0.34.6:
-    resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
+  /@vitest/snapshot@1.2.1:
+    resolution: {integrity: sha512-Tmp/IcYEemKaqAYCS08sh0vORLJkMr0NRV76Gl8sHGxXT5151cITJCET20063wk0Yr/1koQ6dnmP6eEqezmd/Q==}
     dependencies:
       magic-string: 0.30.5
       pathe: 1.1.1
       pretty-format: 29.7.0
     dev: false
 
-  /@vitest/spy@0.34.6:
-    resolution: {integrity: sha512-xaCvneSaeBw/cz8ySmF7ZwGvL0lBjfvqc1LpQ/vcdHEvpLn3Ff1vAvjw+CoGn0802l++5L/pxb7whwcWAw+DUQ==}
+  /@vitest/spy@1.2.1:
+    resolution: {integrity: sha512-vG3a/b7INKH7L49Lbp0IWrG6sw9j4waWAucwnksPB1r1FTJgV7nkBByd9ufzu6VWya/QTvQW4V9FShZbZIB2UQ==}
     dependencies:
       tinyspy: 2.2.0
     dev: false
 
-  /@vitest/utils@0.34.6:
-    resolution: {integrity: sha512-IG5aDD8S6zlvloDsnzHw0Ut5xczlF+kv2BOTo+iXfPr54Yhi5qbVOgGB1hZaVq4iJ4C/MZ2J0y15IlsV/ZcI0A==}
+  /@vitest/utils@1.2.1:
+    resolution: {integrity: sha512-bsH6WVZYe/J2v3+81M5LDU8kW76xWObKIURpPrOXm2pjBniBu2MERI/XP60GpS4PHU3jyK50LUutOwrx4CyHUg==}
     dependencies:
       diff-sequences: 29.6.3
+      estree-walker: 3.0.3
       loupe: 2.3.7
       pretty-format: 29.7.0
     dev: false
@@ -8022,8 +8071,8 @@ packages:
     dependencies:
       acorn: 8.11.3
 
-  /acorn-walk@8.3.1:
-    resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==}
+  /acorn-walk@8.3.2:
+    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
     engines: {node: '>=0.4.0'}
     dev: false
 
@@ -10282,7 +10331,6 @@ packages:
       path-type: 5.0.0
       slash: 5.1.0
       unicorn-magic: 0.1.0
-    dev: false
 
   /globrex@0.1.2:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
@@ -11390,9 +11438,12 @@ packages:
       pify: 4.0.1
       strip-bom: 3.0.0
 
-  /local-pkg@0.4.3:
-    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
+  /local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
+    dependencies:
+      mlly: 1.4.2
+      pkg-types: 1.0.3
     dev: false
 
   /locate-character@3.0.0:
@@ -12725,13 +12776,6 @@ packages:
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      yocto-queue: 1.0.0
-    dev: false
-
   /p-limit@5.0.0:
     resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
     engines: {node: '>=18'}
@@ -12929,7 +12973,6 @@ packages:
   /path-type@5.0.0:
     resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
     engines: {node: '>=12'}
-    dev: false
 
   /pathe@1.1.1:
     resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
@@ -13400,6 +13443,14 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
+  /postcss@8.4.33:
+    resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+
   /preact-render-to-string@6.3.1(preact@10.19.3):
     resolution: {integrity: sha512-NQ28WrjLtWY6lKDlTxnFpKHZdpjfF+oE6V4tZ0rTrunHrtZp6Dm0oFrcJalt/5PNeqJz4j1DuZDS0Y6rCBoqDA==}
     peerDependencies:
@@ -14378,7 +14429,6 @@ packages:
   /slash@5.1.0:
     resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
     engines: {node: '>=14.16'}
-    dev: false
 
   /slice-ansi@5.0.0:
     resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
@@ -14949,8 +14999,8 @@ packages:
     resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==}
     dev: false
 
-  /tinypool@0.7.0:
-    resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==}
+  /tinypool@0.8.2:
+    resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==}
     engines: {node: '>=14.0.0'}
     dev: false
 
@@ -15305,7 +15355,6 @@ packages:
   /unicorn-magic@0.1.0:
     resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
     engines: {node: '>=18'}
-    dev: false
 
   /unified@10.1.2:
     resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==}
@@ -15578,17 +15627,16 @@ packages:
       unist-util-stringify-position: 4.0.0
       vfile-message: 4.0.2
 
-  /vite-node@0.34.6(@types/node@18.19.4):
-    resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
-    engines: {node: '>=v14.18.0'}
+  /vite-node@1.2.1(@types/node@18.19.4):
+    resolution: {integrity: sha512-fNzHmQUSOY+y30naohBvSW7pPn/xn3Ib/uqm+5wAJQJiqQsU0NBR78XdRJb04l4bOFKjpTWld0XAfkKlrDbySg==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4(supports-color@8.1.1)
-      mlly: 1.4.2
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -15616,7 +15664,7 @@ packages:
       merge-anything: 5.1.7
       solid-js: 1.8.7
       solid-refresh: 0.5.3(solid-js@1.8.7)
-      vitefu: 0.2.5(vite@5.0.10)
+      vitefu: 0.2.5(vite@5.0.12)
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -15644,8 +15692,8 @@ packages:
       svgo: 3.2.0
     dev: false
 
-  /vite@5.0.10(@types/node@18.19.4)(sass@1.69.6):
-    resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==}
+  /vite@5.0.12(@types/node@18.19.4)(sass@1.69.6):
+    resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -15674,13 +15722,13 @@ packages:
     dependencies:
       '@types/node': 18.19.4
       esbuild: 0.19.11
-      postcss: 8.4.32
+      postcss: 8.4.33
       rollup: 4.9.2
       sass: 1.69.6
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vitefu@0.2.5(vite@5.0.10):
+  /vitefu@0.2.5(vite@5.0.12):
     resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0
@@ -15688,25 +15736,25 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
     dev: false
 
-  /vitest@0.34.6:
-    resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
-    engines: {node: '>=v14.18.0'}
+  /vitest@1.2.1(@types/node@18.19.4):
+    resolution: {integrity: sha512-TRph8N8rnSDa5M2wKWJCMnztCZS9cDcgVTQ6tsTFTG/odHJ4l5yNVqvbeDJYJRZ6is3uxaEpFs8LL6QM+YFSdA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@vitest/browser': '*'
-      '@vitest/ui': '*'
+      '@types/node': ^18.0.0 || >=20.0.0
+      '@vitest/browser': ^1.0.0
+      '@vitest/ui': ^1.0.0
       happy-dom: '*'
       jsdom: '*'
-      playwright: '*'
-      safaridriver: '*'
-      webdriverio: '*'
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
+      '@types/node':
+        optional: true
       '@vitest/browser':
         optional: true
       '@vitest/ui':
@@ -15715,36 +15763,28 @@ packages:
         optional: true
       jsdom:
         optional: true
-      playwright:
-        optional: true
-      safaridriver:
-        optional: true
-      webdriverio:
-        optional: true
     dependencies:
-      '@types/chai': 4.3.11
-      '@types/chai-subset': 1.3.5
       '@types/node': 18.19.4
-      '@vitest/expect': 0.34.6
-      '@vitest/runner': 0.34.6
-      '@vitest/snapshot': 0.34.6
-      '@vitest/spy': 0.34.6
-      '@vitest/utils': 0.34.6
-      acorn: 8.11.3
-      acorn-walk: 8.3.1
+      '@vitest/expect': 1.2.1
+      '@vitest/runner': 1.2.1
+      '@vitest/snapshot': 1.2.1
+      '@vitest/spy': 1.2.1
+      '@vitest/utils': 1.2.1
+      acorn-walk: 8.3.2
       cac: 6.7.14
       chai: 4.3.10
       debug: 4.3.4(supports-color@8.1.1)
-      local-pkg: 0.4.3
+      execa: 8.0.1
+      local-pkg: 0.5.0
       magic-string: 0.30.5
       pathe: 1.1.1
       picocolors: 1.0.0
       std-env: 3.7.0
       strip-literal: 1.3.0
       tinybench: 2.5.1
-      tinypool: 0.7.0
-      vite: 5.0.10(@types/node@18.19.4)(sass@1.69.6)
-      vite-node: 0.34.6(@types/node@18.19.4)
+      tinypool: 0.8.2
+      vite: 5.0.12(@types/node@18.19.4)(sass@1.69.6)
+      vite-node: 1.2.1(@types/node@18.19.4)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less