diff --git a/.changeset/bright-forks-add.md b/.changeset/bright-forks-add.md
deleted file mode 100644
index d43484f046b3d..0000000000000
--- a/.changeset/bright-forks-add.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Teardown compiler after Vite build to free up memory when rendering pages
diff --git a/.changeset/cold-mirrors-joke.md b/.changeset/cold-mirrors-joke.md
deleted file mode 100644
index efdee39399e58..0000000000000
--- a/.changeset/cold-mirrors-joke.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Run astro sync in build mode
diff --git a/.changeset/cuddly-snakes-switch.md b/.changeset/cuddly-snakes-switch.md
deleted file mode 100644
index 38aecf055f2d7..0000000000000
--- a/.changeset/cuddly-snakes-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/vercel': patch
----
-
-Fixed undici-related bug
diff --git a/.changeset/green-wombats-pay.md b/.changeset/green-wombats-pay.md
deleted file mode 100644
index 031a85e959f25..0000000000000
--- a/.changeset/green-wombats-pay.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix regression that caused some stateful Vite plugins to assume they were running in `dev` mode during the `build` and vice versa.
diff --git a/.changeset/real-balloons-cough.md b/.changeset/real-balloons-cough.md
deleted file mode 100644
index d8ba66c63ffca..0000000000000
--- a/.changeset/real-balloons-cough.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-astro': patch
----
-
-Respect original `package.json` indentation
diff --git a/.changeset/wise-bikes-fix.md b/.changeset/wise-bikes-fix.md
deleted file mode 100644
index 96628546e8a34..0000000000000
--- a/.changeset/wise-bikes-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Add warning when using headers and encoding in endpoints in SSR
diff --git a/examples/basics/package.json b/examples/basics/package.json
index 5936b4611ea51..47a25530af063 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 83aee66848f71..400e4a4ad7961 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "@astrojs/mdx": "^0.17.2",
     "@astrojs/rss": "^2.1.1",
     "@astrojs/sitemap": "^1.1.0"
diff --git a/examples/component/package.json b/examples/component/package.json
index 10ca0688555ac..1faab0d4a8638 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"
diff --git a/examples/deno/package.json b/examples/deno/package.json
index 9616ddbdbc536..b898797c9301b 100644
--- a/examples/deno/package.json
+++ b/examples/deno/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   },
   "devDependencies": {
     "@astrojs/deno": "^4.0.2"
diff --git a/examples/docs/package.json b/examples/docs/package.json
index 7cdb8bf669cc6..3462a5e3dda9a 100644
--- a/examples/docs/package.json
+++ b/examples/docs/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
index 00435fd2512d7..81243e9dd9ded 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "alpinejs": "^3.10.2",
     "@astrojs/alpinejs": "^0.1.3",
     "@types/alpinejs": "^3.7.0"
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 4c44f40dd7984..ef9ad4365e4d8 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "lit": "^2.2.5",
     "@astrojs/lit": "^1.2.1",
     "@webcomponents/template-shadowroot": "^0.1.0"
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 957471ad13309..4b1123b33415b 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 1d04d6376562b..c45b8c563fc41 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "preact": "^10.7.3",
     "@astrojs/preact": "^2.0.3",
     "@preact/signals": "^1.1.0"
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index f9781a8491c6b..1eca5a379fd68 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "@astrojs/react": "^2.0.2",
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 27915cc755d73..3312be4c3de8d 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "solid-js": "^1.4.3",
     "@astrojs/solid-js": "^2.0.2"
   }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 61dab7591dc38..9d819cde038ce 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -13,6 +13,6 @@
   "dependencies": {
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^2.0.2",
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 7861c97690327..bd095d069f9b9 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "vue": "^3.2.37",
     "@astrojs/vue": "^2.0.1"
   }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index 6b63e0ff3db85..5678535c02d74 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^5.0.4",
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 75dc24695a0c1..724af05c2faad 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index dd18117a6a22e..fa17a30b713d2 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 0d6cfd8f132bd..3f9ad0368991b 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index d2dcbc3118c19..521e08dd93199 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index f0348ee4e9428..24e1de3bd925a 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -12,7 +12,7 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^2.0.2",
     "@astrojs/node": "^5.0.4",
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 91aad04e72f9e..ab469f48156e9 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "@astrojs/markdown-remark": "^2.0.1",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",
diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
index 958decf3bd6a5..88c39f07acb33 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16"
+    "astro": "^2.0.17"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index 811c2104b7845..09a24ecfd87f4 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "preact": "^10.6.5",
     "@astrojs/preact": "^2.0.3",
     "@astrojs/mdx": "^0.17.2"
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 94870fbdd70e0..96b44ae4e0181 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "preact": "^10.7.3",
     "@astrojs/preact": "^2.0.3",
     "nanostores": "^0.5.12",
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index 25d1731a4d5a1..e6c070edd85ec 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^0.17.2",
     "@astrojs/tailwind": "^3.0.1",
     "@types/canvas-confetti": "^1.4.3",
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.14",
diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
index abb1edf1529b4..d94da6fb86092 100644
--- a/examples/with-vite-plugin-pwa/package.json
+++ b/examples/with-vite-plugin-pwa/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.3"
   }
diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
index da7b956986191..d0c68f161d9dd 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^2.0.16",
+    "astro": "^2.0.17",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 5aba4f0755b86..a7196971939fb 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,17 @@
 # astro
 
+## 2.0.17
+
+### Patch Changes
+
+- [#6391](https://github.com/withastro/astro/pull/6391) [`45501c531`](https://github.com/withastro/astro/commit/45501c531bf75f60063e1f8b7ac50f5d8d93eb6f) Thanks [@bluwy](https://github.com/bluwy)! - Teardown compiler after Vite build to free up memory when rendering pages
+
+- [#6392](https://github.com/withastro/astro/pull/6392) [`ee8b2a067`](https://github.com/withastro/astro/commit/ee8b2a067201f94c6b06fbfc094288e068116c60) Thanks [@bluwy](https://github.com/bluwy)! - Run astro sync in build mode
+
+- [#6368](https://github.com/withastro/astro/pull/6368) [`02a7266e3`](https://github.com/withastro/astro/commit/02a7266e3c32c196fe733a5d3480f9e308cb62ee) Thanks [@userquin](https://github.com/userquin)! - Fix regression that caused some stateful Vite plugins to assume they were running in `dev` mode during the `build` and vice versa.
+
+- [#6358](https://github.com/withastro/astro/pull/6358) [`95164bfdd`](https://github.com/withastro/astro/commit/95164bfdd2c1cbe5f1fafeab9e998ee4c85df3e3) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add warning when using headers and encoding in endpoints in SSR
+
 ## 2.0.16
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 48edc2435e659..f901ddf785b76 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
diff --git a/packages/create-astro/CHANGELOG.md b/packages/create-astro/CHANGELOG.md
index fa279d09d4749..f5d96580f7b72 100644
--- a/packages/create-astro/CHANGELOG.md
+++ b/packages/create-astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-astro
 
+## 3.0.5
+
+### Patch Changes
+
+- [#6375](https://github.com/withastro/astro/pull/6375) [`754c5ca9a`](https://github.com/withastro/astro/commit/754c5ca9aa93d4e8674059ce79f6b694c147db83) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Respect original `package.json` indentation
+
 ## 3.0.4
 
 ### Patch Changes
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index 7a86b454bf12b..6eab50b11dc9f 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index a01f3019254ae..3843ab82a39a0 100644
--- a/packages/integrations/cloudflare/package.json
+++ b/packages/integrations/cloudflare/package.json
@@ -38,7 +38,7 @@
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16"
+    "astro": "workspace:^2.0.17"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index 12c16920e75e5..43433bccb494c 100644
--- a/packages/integrations/deno/package.json
+++ b/packages/integrations/deno/package.json
@@ -33,7 +33,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16"
+    "astro": "workspace:^2.0.17"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index 60baeb4378b33..bc1f33a08b183 100644
--- a/packages/integrations/image/package.json
+++ b/packages/integrations/image/package.json
@@ -63,7 +63,7 @@
     "vite": "^4.1.2"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16",
+    "astro": "workspace:^2.0.17",
     "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index 22a0619825a09..4d06ab0157c93 100644
--- a/packages/integrations/netlify/package.json
+++ b/packages/integrations/netlify/package.json
@@ -39,7 +39,7 @@
     "esbuild": "^0.15.18"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16"
+    "astro": "workspace:^2.0.17"
   },
   "devDependencies": {
     "@netlify/edge-handler-types": "^0.34.1",
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 888c41cb7a6e1..0f239b01d81d0 100644
--- a/packages/integrations/node/package.json
+++ b/packages/integrations/node/package.json
@@ -35,7 +35,7 @@
     "server-destroy": "^1.0.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16"
+    "astro": "workspace:^2.0.17"
   },
   "devDependencies": {
     "@types/send": "^0.17.1",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index f0272282503a2..760f8b68b7f26 100644
--- a/packages/integrations/svelte/package.json
+++ b/packages/integrations/svelte/package.json
@@ -43,7 +43,7 @@
     "vite": "^4.1.2"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16",
+    "astro": "workspace:^2.0.17",
     "svelte": "^3.54.0"
   },
   "engines": {
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index c11caa13a9d94..4067805d75674 100644
--- a/packages/integrations/tailwind/package.json
+++ b/packages/integrations/tailwind/package.json
@@ -40,7 +40,7 @@
     "vite": "^4.1.2"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16",
+    "astro": "workspace:^2.0.17",
     "tailwindcss": "^3.0.24"
   },
   "pnpm": {
diff --git a/packages/integrations/vercel/CHANGELOG.md b/packages/integrations/vercel/CHANGELOG.md
index 34c4e3d874c6c..2370ef736929b 100644
--- a/packages/integrations/vercel/CHANGELOG.md
+++ b/packages/integrations/vercel/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @astrojs/vercel
 
+## 3.1.4
+
+### Patch Changes
+
+- [#6380](https://github.com/withastro/astro/pull/6380) [`0e378c3b8`](https://github.com/withastro/astro/commit/0e378c3b87627ca2764872a426dfba0a1606f991) Thanks [@JuanM04](https://github.com/JuanM04)! - Fixed undici-related bug
+
+- Updated dependencies [[`45501c531`](https://github.com/withastro/astro/commit/45501c531bf75f60063e1f8b7ac50f5d8d93eb6f), [`ee8b2a067`](https://github.com/withastro/astro/commit/ee8b2a067201f94c6b06fbfc094288e068116c60), [`02a7266e3`](https://github.com/withastro/astro/commit/02a7266e3c32c196fe733a5d3480f9e308cb62ee), [`95164bfdd`](https://github.com/withastro/astro/commit/95164bfdd2c1cbe5f1fafeab9e998ee4c85df3e3)]:
+  - astro@2.0.17
+
 ## 3.1.3
 
 ### Patch Changes
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index d0a202cf98024..ca5a395eef4f2 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/vercel",
   "description": "Deploy your site to Vercel",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -53,7 +53,7 @@
     "web-vitals": "^3.1.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16"
+    "astro": "workspace:^2.0.17"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.2",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index 8081c2b8aaee2..065ab515653a9 100644
--- a/packages/integrations/vue/package.json
+++ b/packages/integrations/vue/package.json
@@ -50,7 +50,7 @@
     "vue": "^3.2.37"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.0.16",
+    "astro": "workspace:^2.0.17",
     "vue": "^3.2.30"
   },
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6c89632942dca..1fc7b08aa3f20 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -83,7 +83,7 @@ importers:
 
   examples/basics:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       astro: link:../../packages/astro
 
@@ -92,7 +92,7 @@ importers:
       '@astrojs/mdx': ^0.17.2
       '@astrojs/rss': ^2.1.1
       '@astrojs/sitemap': ^1.1.0
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       '@astrojs/mdx': link:../../packages/integrations/mdx
       '@astrojs/rss': link:../../packages/astro-rss
@@ -101,14 +101,14 @@ importers:
 
   examples/component:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     devDependencies:
       astro: link:../../packages/astro
 
   examples/deno:
     specifiers:
       '@astrojs/deno': ^4.0.2
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       astro: link:../../packages/astro
     devDependencies:
@@ -124,7 +124,7 @@ importers:
       '@types/node': ^18.0.0
       '@types/react': ^17.0.45
       '@types/react-dom': ^18.0.0
-      astro: ^2.0.16
+      astro: ^2.0.17
       html-escaper: ^3.0.3
       preact: ^10.7.3
       react: ^18.1.0
@@ -150,7 +150,7 @@ importers:
       '@astrojs/alpinejs': ^0.1.3
       '@types/alpinejs': ^3.7.0
       alpinejs: ^3.10.2
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       '@astrojs/alpinejs': link:../../packages/integrations/alpinejs
       '@types/alpinejs': 3.7.1
@@ -161,7 +161,7 @@ importers:
     specifiers:
       '@astrojs/lit': ^1.2.1
       '@webcomponents/template-shadowroot': ^0.1.0
-      astro: ^2.0.16
+      astro: ^2.0.17
       lit: ^2.2.5
     dependencies:
       '@astrojs/lit': link:../../packages/integrations/lit
@@ -176,7 +176,7 @@ importers:
       '@astrojs/solid-js': ^2.0.2
       '@astrojs/svelte': ^2.0.2
       '@astrojs/vue': ^2.0.1
-      astro: ^2.0.16
+      astro: ^2.0.17
       preact: ^10.7.3
       react: ^18.1.0
       react-dom: ^18.1.0
@@ -201,7 +201,7 @@ importers:
     specifiers:
       '@astrojs/preact': ^2.0.3
       '@preact/signals': ^1.1.0
-      astro: ^2.0.16
+      astro: ^2.0.17
       preact: ^10.7.3
     dependencies:
       '@astrojs/preact': link:../../packages/integrations/preact
@@ -214,7 +214,7 @@ importers:
       '@astrojs/react': ^2.0.2
       '@types/react': ^18.0.10
       '@types/react-dom': ^18.0.5
-      astro: ^2.0.16
+      astro: ^2.0.17
       react: ^18.1.0
       react-dom: ^18.1.0
     dependencies:
@@ -228,7 +228,7 @@ importers:
   examples/framework-solid:
     specifiers:
       '@astrojs/solid-js': ^2.0.2
-      astro: ^2.0.16
+      astro: ^2.0.17
       solid-js: ^1.4.3
     dependencies:
       '@astrojs/solid-js': link:../../packages/integrations/solid
@@ -238,7 +238,7 @@ importers:
   examples/framework-svelte:
     specifiers:
       '@astrojs/svelte': ^2.0.2
-      astro: ^2.0.16
+      astro: ^2.0.17
       svelte: ^3.48.0
     dependencies:
       '@astrojs/svelte': link:../../packages/integrations/svelte
@@ -248,7 +248,7 @@ importers:
   examples/framework-vue:
     specifiers:
       '@astrojs/vue': ^2.0.1
-      astro: ^2.0.16
+      astro: ^2.0.17
       vue: ^3.2.37
     dependencies:
       '@astrojs/vue': link:../../packages/integrations/vue
@@ -258,32 +258,32 @@ importers:
   examples/hackernews:
     specifiers:
       '@astrojs/node': ^5.0.4
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       '@astrojs/node': link:../../packages/integrations/node
       astro: link:../../packages/astro
 
   examples/integration:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     devDependencies:
       astro: link:../../packages/astro
 
   examples/minimal:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       astro: link:../../packages/astro
 
   examples/non-html-pages:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       astro: link:../../packages/astro
 
   examples/portfolio:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       astro: link:../../packages/astro
 
@@ -291,7 +291,7 @@ importers:
     specifiers:
       '@astrojs/node': ^5.0.4
       '@astrojs/svelte': ^2.0.2
-      astro: ^2.0.16
+      astro: ^2.0.17
       concurrently: ^7.2.1
       svelte: ^3.48.0
       unocss: ^0.15.6
@@ -308,7 +308,7 @@ importers:
   examples/with-markdown-plugins:
     specifiers:
       '@astrojs/markdown-remark': ^2.0.1
-      astro: ^2.0.16
+      astro: ^2.0.17
       hast-util-select: 5.0.1
       rehype-autolink-headings: ^6.1.1
       rehype-slug: ^5.0.1
@@ -325,7 +325,7 @@ importers:
 
   examples/with-markdown-shiki:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
     dependencies:
       astro: link:../../packages/astro
 
@@ -333,7 +333,7 @@ importers:
     specifiers:
       '@astrojs/mdx': ^0.17.2
       '@astrojs/preact': ^2.0.3
-      astro: ^2.0.16
+      astro: ^2.0.17
       preact: ^10.6.5
     dependencies:
       '@astrojs/mdx': link:../../packages/integrations/mdx
@@ -345,7 +345,7 @@ importers:
     specifiers:
       '@astrojs/preact': ^2.0.3
       '@nanostores/preact': ^0.1.3
-      astro: ^2.0.16
+      astro: ^2.0.17
       nanostores: ^0.5.12
       preact: ^10.7.3
     dependencies:
@@ -360,7 +360,7 @@ importers:
       '@astrojs/mdx': ^0.17.2
       '@astrojs/tailwind': ^3.0.1
       '@types/canvas-confetti': ^1.4.3
-      astro: ^2.0.16
+      astro: ^2.0.17
       autoprefixer: ^10.4.7
       canvas-confetti: ^1.5.1
       postcss: ^8.4.14
@@ -377,7 +377,7 @@ importers:
 
   examples/with-vite-plugin-pwa:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
       vite-plugin-pwa: 0.11.11
       workbox-window: ^6.5.3
     dependencies:
@@ -387,7 +387,7 @@ importers:
 
   examples/with-vitest:
     specifiers:
-      astro: ^2.0.16
+      astro: ^2.0.17
       vitest: ^0.20.3
     dependencies:
       astro: link:../../packages/astro