diff --git a/.changeset/bright-apricots-kiss.md b/.changeset/bright-apricots-kiss.md
deleted file mode 100644
index 483a70e5067f1..0000000000000
--- a/.changeset/bright-apricots-kiss.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'create-astro': patch
----
-
-Fix: Log an error when passing a `--template` that does not exist
diff --git a/.changeset/chilly-dingos-eat.md b/.changeset/chilly-dingos-eat.md
deleted file mode 100644
index fbbd4a522d31e..0000000000000
--- a/.changeset/chilly-dingos-eat.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@astrojs/partytown': minor
----
-
-Expose more partytown config properties
diff --git a/.changeset/flat-baboons-nail.md b/.changeset/flat-baboons-nail.md
deleted file mode 100644
index 128d4234baef5..0000000000000
--- a/.changeset/flat-baboons-nail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Prevent frontmatter errors from crashing the dev server
diff --git a/.changeset/hip-avocados-grow.md b/.changeset/hip-avocados-grow.md
deleted file mode 100644
index ba92ed186fe6d..0000000000000
--- a/.changeset/hip-avocados-grow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': minor
----
-
-add new flag with open for dev and preview
diff --git a/.changeset/metal-cameras-bow.md b/.changeset/metal-cameras-bow.md
deleted file mode 100644
index 2275c4804ddb0..0000000000000
--- a/.changeset/metal-cameras-bow.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-'@astrojs/markdoc': minor
-'astro': patch
----
-
-Simplify Markdoc configuration with a new `markdoc.config.mjs` file. This lets you import Astro components directly to render as Markdoc tags and nodes, without the need for the previous `components` property. This new configuration also unlocks passing variables to your Markdoc from the `Content` component ([see the new docs](https://docs.astro.build/en/guides/integrations-guide/markdoc/#pass-markdoc-variables)).
-
-## Migration
-
-Move any existing Markdoc config from your `astro.config` to a new `markdoc.config.mjs` file at the root of your project. This should be applied as a default export, with the optional `defineMarkdocConfig()` helper for autocomplete in your editor.
-
-This example configures an `aside` Markdoc tag. Note that components should be imported and applied to the `render` attribute _directly,_ instead of passing the name as a string:
-
-```js
-// markdoc.config.mjs
-import { defineMarkdocConfig } from '@astrojs/markdoc/config';
-import Aside from './src/components/Aside.astro';
-
-export default defineMarkdocConfig({
-  tags: {
-    aside: {
-      render: Aside,
-    }
-  }
-});
-```
-
-You should also remove the `components` prop from your `Content` components. Since components are imported into your config directly, this is no longer needed.
-
-```diff
----
-- import Aside from '../components/Aside.astro';
-import { getEntryBySlug } from 'astro:content';
-
-const entry = await getEntryBySlug('docs', 'why-markdoc');
-const { Content } = await entry.render();
----
-
-<Content
-- components={{ Aside }}
-/>
-```
diff --git a/.changeset/perfect-rabbits-repair.md b/.changeset/perfect-rabbits-repair.md
deleted file mode 100644
index e7bf45e02cdb3..0000000000000
--- a/.changeset/perfect-rabbits-repair.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fixes an attribute naming mismatch in the definition for <link> elements in astro.JSX
diff --git a/.changeset/thick-penguins-turn.md b/.changeset/thick-penguins-turn.md
deleted file mode 100644
index 7ee77abfaedcd..0000000000000
--- a/.changeset/thick-penguins-turn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'astro': patch
----
-
-Fix images not having the proper path when using `base`
diff --git a/examples/basics/package.json b/examples/basics/package.json
index fdee84fbea3d4..59aa142969f67 100644
--- a/examples/basics/package.json
+++ b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 4ae33211769ea..5234ac2a0e609 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "@astrojs/mdx": "^0.18.2",
     "@astrojs/rss": "^2.3.1",
     "@astrojs/sitemap": "^1.2.1"
diff --git a/examples/component/package.json b/examples/component/package.json
index 51d48cd5a64fc..0f6ffd2c70b01 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"
diff --git a/examples/deno/package.json b/examples/deno/package.json
index 1bb1ef552963b..1ef75718eb991 100644
--- a/examples/deno/package.json
+++ b/examples/deno/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   },
   "devDependencies": {
     "@astrojs/deno": "^4.1.0"
diff --git a/examples/docs/package.json b/examples/docs/package.json
index 3d8030267fe0a..bc9dd0383e3e3 100644
--- a/examples/docs/package.json
+++ b/examples/docs/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "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 2c51e7c568a5d..4c8a350f54ca2 100644
--- a/examples/framework-alpine/package.json
+++ b/examples/framework-alpine/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "alpinejs": "^3.10.2",
     "@astrojs/alpinejs": "^0.2.1",
     "@types/alpinejs": "^3.7.0"
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index a0392efba51c4..d53ae810c7de4 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "lit": "^2.2.5",
     "@astrojs/lit": "^1.3.0",
     "@webcomponents/template-shadowroot": "^0.1.0"
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index 39d0b31ae1f3c..3e821d7f52e98 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "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 8f6d54a78e7d7..f8d322803867c 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "preact": "^10.7.3",
     "@astrojs/preact": "^2.1.0",
     "@preact/signals": "^1.1.0"
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 0ba04b740fedf..cc97eef4dffb2 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "@astrojs/react": "^2.1.0",
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index af3e32197b135..c6520e5f6fc79 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "solid-js": "^1.4.3",
     "@astrojs/solid-js": "^2.1.0"
   }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index ca6761c8ff766..43a7946709540 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.1.0",
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 5916f2807bdb4..a8f654116689d 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "vue": "^3.2.37",
     "@astrojs/vue": "^2.1.0"
   }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
index e1dfbfa6472de..64f29cf1241d3 100644
--- a/examples/hackernews/package.json
+++ b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^5.1.0",
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
index 3706479338566..9b8c332dee631 100644
--- a/examples/integration/package.json
+++ b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index 216d0777f51e3..018e5376a7ca8 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
index 46d15c8c718bf..15d2a8de623b9 100644
--- a/examples/non-html-pages/package.json
+++ b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index e8824e38b4c94..40fd291236245 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
index 1050654aea621..91333aee253b6 100644
--- a/examples/ssr/package.json
+++ b/examples/ssr/package.json
@@ -12,7 +12,7 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "svelte": "^3.48.0",
     "@astrojs/svelte": "^2.1.0",
     "@astrojs/node": "^5.1.0",
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
index f3139284042a0..a4a878e83094e 100644
--- a/examples/with-markdoc/package.json
+++ b/examples/with-markdoc/package.json
@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdoc": "^0.0.5",
-    "astro": "^2.1.7",
+    "@astrojs/markdoc": "^1.0.0",
+    "astro": "^2.2.0",
     "kleur": "^4.1.5"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index 9d956717a6ffd..5b06b7ffb7dcf 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "@astrojs/markdown-remark": "^2.1.2",
     "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 78ac2f1d9de29..be6a5e1dbec5b 100644
--- a/examples/with-markdown-shiki/package.json
+++ b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7"
+    "astro": "^2.2.0"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
index f740d624cc304..e5252ef3d7e23 100644
--- a/examples/with-mdx/package.json
+++ b/examples/with-mdx/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "preact": "^10.6.5",
     "@astrojs/preact": "^2.1.0",
     "@astrojs/mdx": "^0.18.2"
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 145236caaf5e8..9602933071d6b 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "preact": "^10.7.3",
     "@astrojs/preact": "^2.1.0",
     "nanostores": "^0.5.12",
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index e35300d0e6518..e4ab6a23baa8b 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^0.18.2",
     "@astrojs/tailwind": "^3.1.1",
     "@types/canvas-confetti": "^1.4.3",
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "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 9ad0e4eb32736..2fa80dffa5267 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.1.7",
+    "astro": "^2.2.0",
     "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 72379b5314420..01afdebaf0dfe 100644
--- a/examples/with-vitest/package.json
+++ b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^2.1.7",
+    "astro": "^2.2.0",
     "vitest": "^0.20.3"
   }
 }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 8dd5e4fde5540..b3050f7b3b96e 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,57 @@
 # astro
 
+## 2.2.0
+
+### Minor Changes
+
+- [#6578](https://github.com/withastro/astro/pull/6578) [`adecda7d6`](https://github.com/withastro/astro/commit/adecda7d6009793c5d20519a997e3b7afb08ad57) Thanks [@wulinsheng123](https://github.com/wulinsheng123)! - add new flag with open for dev and preview
+
+### Patch Changes
+
+- [#6675](https://github.com/withastro/astro/pull/6675) [`1f783e320`](https://github.com/withastro/astro/commit/1f783e32075c20b13063599696644f5d47b75d8d) Thanks [@matthewp](https://github.com/matthewp)! - Prevent frontmatter errors from crashing the dev server
+
+- [#6653](https://github.com/withastro/astro/pull/6653) [`7c439868a`](https://github.com/withastro/astro/commit/7c439868a3bc7d466418da9af669966014f3d9fe) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Simplify Markdoc configuration with a new `markdoc.config.mjs` file. This lets you import Astro components directly to render as Markdoc tags and nodes, without the need for the previous `components` property. This new configuration also unlocks passing variables to your Markdoc from the `Content` component ([see the new docs](https://docs.astro.build/en/guides/integrations-guide/markdoc/#pass-markdoc-variables)).
+
+  ## Migration
+
+  Move any existing Markdoc config from your `astro.config` to a new `markdoc.config.mjs` file at the root of your project. This should be applied as a default export, with the optional `defineMarkdocConfig()` helper for autocomplete in your editor.
+
+  This example configures an `aside` Markdoc tag. Note that components should be imported and applied to the `render` attribute _directly,_ instead of passing the name as a string:
+
+  ```js
+  // markdoc.config.mjs
+  import { defineMarkdocConfig } from '@astrojs/markdoc/config';
+  import Aside from './src/components/Aside.astro';
+
+  export default defineMarkdocConfig({
+    tags: {
+      aside: {
+        render: Aside,
+      },
+    },
+  });
+  ```
+
+  You should also remove the `components` prop from your `Content` components. Since components are imported into your config directly, this is no longer needed.
+
+  ```diff
+  ---
+  - import Aside from '../components/Aside.astro';
+  import { getEntryBySlug } from 'astro:content';
+
+  const entry = await getEntryBySlug('docs', 'why-markdoc');
+  const { Content } = await entry.render();
+  ---
+
+  <Content
+  - components={{ Aside }}
+  />
+  ```
+
+- [#6639](https://github.com/withastro/astro/pull/6639) [`25cd3e574`](https://github.com/withastro/astro/commit/25cd3e574999c1c7294a089ad8c39df27ccdbf17) Thanks [@tony-sull](https://github.com/tony-sull)! - Fixes an attribute naming mismatch in the definition for <link> elements in astro.JSX
+
+- [#6643](https://github.com/withastro/astro/pull/6643) [`fc0ed9c53`](https://github.com/withastro/astro/commit/fc0ed9c53cd374860bbdb2503318a55ca09a2662) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix images not having the proper path when using `base`
+
 ## 2.1.7
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 73cc79c1833c3..23c26e766e60e 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.1.7",
+  "version": "2.2.0",
   "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 8ae781c5f9f43..2e8ca430853ce 100644
--- a/packages/create-astro/CHANGELOG.md
+++ b/packages/create-astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # create-astro
 
+## 3.1.2
+
+### Patch Changes
+
+- [#6677](https://github.com/withastro/astro/pull/6677) [`4a3262060`](https://github.com/withastro/astro/commit/4a32620600966ea89ddb5e1669d89a53e85ccf9a) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Fix: Log an error when passing a `--template` that does not exist
+
 ## 3.1.1
 
 ### Patch Changes
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index 1801a680d321d..3f1f4b736dcee 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
diff --git a/packages/integrations/cloudflare/package.json b/packages/integrations/cloudflare/package.json
index e97ba7140262d..d6a7e8c57ede9 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.1.7"
+    "astro": "workspace:^2.2.0"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/deno/package.json b/packages/integrations/deno/package.json
index 6f72bc614fceb..486763f41282a 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.1.7"
+    "astro": "workspace:^2.2.0"
   },
   "devDependencies": {
     "astro": "workspace:*",
diff --git a/packages/integrations/image/package.json b/packages/integrations/image/package.json
index b4d80a83f14b0..54482c06ff85f 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.1.7",
+    "astro": "workspace:^2.2.0",
     "sharp": ">=0.31.0"
   },
   "peerDependenciesMeta": {
diff --git a/packages/integrations/markdoc/CHANGELOG.md b/packages/integrations/markdoc/CHANGELOG.md
index f73a9ecc4437a..453f263f07bea 100644
--- a/packages/integrations/markdoc/CHANGELOG.md
+++ b/packages/integrations/markdoc/CHANGELOG.md
@@ -1,5 +1,52 @@
 # @astrojs/markdoc
 
+## 1.0.0
+
+### Minor Changes
+
+- [#6653](https://github.com/withastro/astro/pull/6653) [`7c439868a`](https://github.com/withastro/astro/commit/7c439868a3bc7d466418da9af669966014f3d9fe) Thanks [@bholmesdev](https://github.com/bholmesdev)! - Simplify Markdoc configuration with a new `markdoc.config.mjs` file. This lets you import Astro components directly to render as Markdoc tags and nodes, without the need for the previous `components` property. This new configuration also unlocks passing variables to your Markdoc from the `Content` component ([see the new docs](https://docs.astro.build/en/guides/integrations-guide/markdoc/#pass-markdoc-variables)).
+
+  ## Migration
+
+  Move any existing Markdoc config from your `astro.config` to a new `markdoc.config.mjs` file at the root of your project. This should be applied as a default export, with the optional `defineMarkdocConfig()` helper for autocomplete in your editor.
+
+  This example configures an `aside` Markdoc tag. Note that components should be imported and applied to the `render` attribute _directly,_ instead of passing the name as a string:
+
+  ```js
+  // markdoc.config.mjs
+  import { defineMarkdocConfig } from '@astrojs/markdoc/config';
+  import Aside from './src/components/Aside.astro';
+
+  export default defineMarkdocConfig({
+    tags: {
+      aside: {
+        render: Aside,
+      },
+    },
+  });
+  ```
+
+  You should also remove the `components` prop from your `Content` components. Since components are imported into your config directly, this is no longer needed.
+
+  ```diff
+  ---
+  - import Aside from '../components/Aside.astro';
+  import { getEntryBySlug } from 'astro:content';
+
+  const entry = await getEntryBySlug('docs', 'why-markdoc');
+  const { Content } = await entry.render();
+  ---
+
+  <Content
+  - components={{ Aside }}
+  />
+  ```
+
+### Patch Changes
+
+- Updated dependencies [[`1f783e320`](https://github.com/withastro/astro/commit/1f783e32075c20b13063599696644f5d47b75d8d), [`adecda7d6`](https://github.com/withastro/astro/commit/adecda7d6009793c5d20519a997e3b7afb08ad57), [`7c439868a`](https://github.com/withastro/astro/commit/7c439868a3bc7d466418da9af669966014f3d9fe), [`25cd3e574`](https://github.com/withastro/astro/commit/25cd3e574999c1c7294a089ad8c39df27ccdbf17), [`fc0ed9c53`](https://github.com/withastro/astro/commit/fc0ed9c53cd374860bbdb2503318a55ca09a2662)]:
+  - astro@2.2.0
+
 ## 0.0.5
 
 ### Patch Changes
diff --git a/packages/integrations/markdoc/package.json b/packages/integrations/markdoc/package.json
index 5fb778b27d584..1ed889c30aec9 100644
--- a/packages/integrations/markdoc/package.json
+++ b/packages/integrations/markdoc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/markdoc",
   "description": "Add support for Markdoc pages in your Astro site",
-  "version": "0.0.5",
+  "version": "1.0.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/netlify/package.json b/packages/integrations/netlify/package.json
index 35538fa2613a4..56cf8a3dc1377 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.1.7"
+    "astro": "workspace:^2.2.0"
   },
   "devDependencies": {
     "@netlify/edge-handler-types": "^0.34.1",
diff --git a/packages/integrations/node/package.json b/packages/integrations/node/package.json
index 2f6893e39d393..a6da64be8992e 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.1.7"
+    "astro": "workspace:^2.2.0"
   },
   "devDependencies": {
     "@types/send": "^0.17.1",
diff --git a/packages/integrations/partytown/CHANGELOG.md b/packages/integrations/partytown/CHANGELOG.md
index a4408fe601ad6..53ecb8ac79fe7 100644
--- a/packages/integrations/partytown/CHANGELOG.md
+++ b/packages/integrations/partytown/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/partytown
 
+## 1.2.0
+
+### Minor Changes
+
+- [#6667](https://github.com/withastro/astro/pull/6667) [`aff53c109`](https://github.com/withastro/astro/commit/aff53c109c4f7b08b6b80e58e9ca5cb481131eb5) Thanks [@thebinarymutant](https://github.com/thebinarymutant)! - Expose more partytown config properties
+
 ## 1.1.1
 
 ### Patch Changes
diff --git a/packages/integrations/partytown/package.json b/packages/integrations/partytown/package.json
index 9b944757ea376..f44234380637a 100644
--- a/packages/integrations/partytown/package.json
+++ b/packages/integrations/partytown/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/partytown",
   "description": "Use Partytown to move scripts into a web worker in your Astro project",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json
index 8ddece2049abe..2914e55453605 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.1.7",
+    "astro": "workspace:^2.2.0",
     "svelte": "^3.54.0"
   },
   "engines": {
diff --git a/packages/integrations/tailwind/package.json b/packages/integrations/tailwind/package.json
index cfb94ac16665f..5b6a42c33d273 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.1.7",
+    "astro": "workspace:^2.2.0",
     "tailwindcss": "^3.0.24"
   },
   "pnpm": {
diff --git a/packages/integrations/vercel/package.json b/packages/integrations/vercel/package.json
index 4ead67050eb98..736c403cace43 100644
--- a/packages/integrations/vercel/package.json
+++ b/packages/integrations/vercel/package.json
@@ -53,7 +53,7 @@
     "web-vitals": "^3.1.1"
   },
   "peerDependencies": {
-    "astro": "workspace:^2.1.7"
+    "astro": "workspace:^2.2.0"
   },
   "devDependencies": {
     "@types/set-cookie-parser": "^2.4.2",
diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json
index b507126197a1a..113170aad5733 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.1.7",
+    "astro": "workspace:^2.2.0",
     "vue": "^3.2.30"
   },
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b8547b9a0a11b..9871679cbccc3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -104,7 +104,7 @@ importers:
 
   examples/basics:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       astro: link:../../packages/astro
 
@@ -113,7 +113,7 @@ importers:
       '@astrojs/mdx': ^0.18.2
       '@astrojs/rss': ^2.3.1
       '@astrojs/sitemap': ^1.2.1
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       '@astrojs/mdx': link:../../packages/integrations/mdx
       '@astrojs/rss': link:../../packages/astro-rss
@@ -122,14 +122,14 @@ importers:
 
   examples/component:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     devDependencies:
       astro: link:../../packages/astro
 
   examples/deno:
     specifiers:
       '@astrojs/deno': ^4.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       astro: link:../../packages/astro
     devDependencies:
@@ -145,7 +145,7 @@ importers:
       '@types/node': ^18.0.0
       '@types/react': ^17.0.45
       '@types/react-dom': ^18.0.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       html-escaper: ^3.0.3
       preact: ^10.7.3
       react: ^18.1.0
@@ -171,7 +171,7 @@ importers:
       '@astrojs/alpinejs': ^0.2.1
       '@types/alpinejs': ^3.7.0
       alpinejs: ^3.10.2
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       '@astrojs/alpinejs': link:../../packages/integrations/alpinejs
       '@types/alpinejs': 3.7.1
@@ -182,7 +182,7 @@ importers:
     specifiers:
       '@astrojs/lit': ^1.3.0
       '@webcomponents/template-shadowroot': ^0.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       lit: ^2.2.5
     dependencies:
       '@astrojs/lit': link:../../packages/integrations/lit
@@ -197,7 +197,7 @@ importers:
       '@astrojs/solid-js': ^2.1.0
       '@astrojs/svelte': ^2.1.0
       '@astrojs/vue': ^2.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       preact: ^10.7.3
       react: ^18.1.0
       react-dom: ^18.1.0
@@ -222,7 +222,7 @@ importers:
     specifiers:
       '@astrojs/preact': ^2.1.0
       '@preact/signals': ^1.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       preact: ^10.7.3
     dependencies:
       '@astrojs/preact': link:../../packages/integrations/preact
@@ -235,7 +235,7 @@ importers:
       '@astrojs/react': ^2.1.0
       '@types/react': ^18.0.10
       '@types/react-dom': ^18.0.5
-      astro: ^2.1.7
+      astro: ^2.2.0
       react: ^18.1.0
       react-dom: ^18.1.0
     dependencies:
@@ -249,7 +249,7 @@ importers:
   examples/framework-solid:
     specifiers:
       '@astrojs/solid-js': ^2.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       solid-js: ^1.4.3
     dependencies:
       '@astrojs/solid-js': link:../../packages/integrations/solid
@@ -259,7 +259,7 @@ importers:
   examples/framework-svelte:
     specifiers:
       '@astrojs/svelte': ^2.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       svelte: ^3.48.0
     dependencies:
       '@astrojs/svelte': link:../../packages/integrations/svelte
@@ -269,7 +269,7 @@ importers:
   examples/framework-vue:
     specifiers:
       '@astrojs/vue': ^2.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       vue: ^3.2.37
     dependencies:
       '@astrojs/vue': link:../../packages/integrations/vue
@@ -279,32 +279,32 @@ importers:
   examples/hackernews:
     specifiers:
       '@astrojs/node': ^5.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       '@astrojs/node': link:../../packages/integrations/node
       astro: link:../../packages/astro
 
   examples/integration:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     devDependencies:
       astro: link:../../packages/astro
 
   examples/minimal:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       astro: link:../../packages/astro
 
   examples/non-html-pages:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       astro: link:../../packages/astro
 
   examples/portfolio:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       astro: link:../../packages/astro
 
@@ -312,7 +312,7 @@ importers:
     specifiers:
       '@astrojs/node': ^5.1.0
       '@astrojs/svelte': ^2.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       concurrently: ^7.2.1
       svelte: ^3.48.0
       unocss: ^0.15.6
@@ -328,8 +328,8 @@ importers:
 
   examples/with-markdoc:
     specifiers:
-      '@astrojs/markdoc': ^0.0.5
-      astro: ^2.1.7
+      '@astrojs/markdoc': ^1.0.0
+      astro: ^2.2.0
       kleur: ^4.1.5
     dependencies:
       '@astrojs/markdoc': link:../../packages/integrations/markdoc
@@ -339,7 +339,7 @@ importers:
   examples/with-markdown-plugins:
     specifiers:
       '@astrojs/markdown-remark': ^2.1.2
-      astro: ^2.1.7
+      astro: ^2.2.0
       hast-util-select: 5.0.1
       rehype-autolink-headings: ^6.1.1
       rehype-slug: ^5.0.1
@@ -356,7 +356,7 @@ importers:
 
   examples/with-markdown-shiki:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
     dependencies:
       astro: link:../../packages/astro
 
@@ -364,7 +364,7 @@ importers:
     specifiers:
       '@astrojs/mdx': ^0.18.2
       '@astrojs/preact': ^2.1.0
-      astro: ^2.1.7
+      astro: ^2.2.0
       preact: ^10.6.5
     dependencies:
       '@astrojs/mdx': link:../../packages/integrations/mdx
@@ -376,7 +376,7 @@ importers:
     specifiers:
       '@astrojs/preact': ^2.1.0
       '@nanostores/preact': ^0.1.3
-      astro: ^2.1.7
+      astro: ^2.2.0
       nanostores: ^0.5.12
       preact: ^10.7.3
     dependencies:
@@ -391,7 +391,7 @@ importers:
       '@astrojs/mdx': ^0.18.2
       '@astrojs/tailwind': ^3.1.1
       '@types/canvas-confetti': ^1.4.3
-      astro: ^2.1.7
+      astro: ^2.2.0
       autoprefixer: ^10.4.7
       canvas-confetti: ^1.5.1
       postcss: ^8.4.14
@@ -408,7 +408,7 @@ importers:
 
   examples/with-vite-plugin-pwa:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
       vite-plugin-pwa: 0.11.11
       workbox-window: ^6.5.3
     dependencies:
@@ -418,7 +418,7 @@ importers:
 
   examples/with-vitest:
     specifiers:
-      astro: ^2.1.7
+      astro: ^2.2.0
       vitest: ^0.20.3
     dependencies:
       astro: link:../../packages/astro