diff --git a/.changeset/giant-shirts-sing.md b/.changeset/giant-shirts-sing.md
index b584984ab..17c0c507e 100644
--- a/.changeset/giant-shirts-sing.md
+++ b/.changeset/giant-shirts-sing.md
@@ -2,4 +2,8 @@
 'astro': patch
 ---
 
-Add support for `.cjs`, `.js`, and `.ts` Astro config files
+Improve support for Astro config files.
+
+In addition to properly loading `.cjs` and `.js` files in all cases, Astro now supports `astro.config.ts` files. 
+
+For convenience, you may now also move your `astro.config.js` file to a top-level `config/` directory.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 3d48dca1d..82dd36c0f 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -40,7 +40,9 @@
   "changesets": [
     "curvy-years-kiss",
     "dull-bikes-doubt",
+    "giant-shirts-sing",
     "pink-trainers-learn",
+    "shaggy-guests-type",
     "silly-apples-build",
     "tiny-bulldogs-lie"
   ]
diff --git a/.changeset/shaggy-guests-type.md b/.changeset/shaggy-guests-type.md
index 062ba96be..fb17723d8 100644
--- a/.changeset/shaggy-guests-type.md
+++ b/.changeset/shaggy-guests-type.md
@@ -2,4 +2,10 @@
 'astro': patch
 ---
 
-fix: Improve Tailwind HMR
+Improve Tailwind HMR in `dev` mode
+
+Fix bug when using `<Markdown></Markdown>` with no content
+
+Support `PUBLIC_` prefixed `.env` variables
+
+Respect `tsconfig.json` and `jsconfig.json` paths as aliases
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
index 3b18f7226..0c492fb67 100644
--- a/examples/blog-multiple-authors/package.json
+++ b/examples/blog-multiple-authors/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
index 8cccb3345..6d8489faf 100644
--- a/examples/blog/package.json
+++ b/examples/blog/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
index b08dadcca..92167416e 100644
--- a/examples/docs/package.json
+++ b/examples/docs/package.json
@@ -12,7 +12,7 @@
     "@docsearch/react": "^1.0.0-alpha.27"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1",
+    "astro": "^0.21.0-next.2",
     "@snowpack/plugin-dotenv": "^2.1.0"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
index 290cb5245..4fd8b7969 100644
--- a/examples/framework-lit/package.json
+++ b/examples/framework-lit/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-lit": "^0.2.0-next.0",
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
index b9a7b1ddf..f27d03dc6 100644
--- a/examples/framework-multiple/package.json
+++ b/examples/framework-multiple/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.2.0-next.0",
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
index 16ba558ef..67169e205 100644
--- a/examples/framework-preact/package.json
+++ b/examples/framework-preact/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
index 055e88180..5cf569c03 100644
--- a/examples/framework-react/package.json
+++ b/examples/framework-react/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
index 78e5d4091..74e6d748a 100644
--- a/examples/framework-solid/package.json
+++ b/examples/framework-solid/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.2.0-next.0",
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
index 58f268986..256785cc1 100644
--- a/examples/framework-svelte/package.json
+++ b/examples/framework-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
index 3fe526072..6fe3b763b 100644
--- a/examples/framework-vue/package.json
+++ b/examples/framework-vue/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
index e48028d83..e9726b64e 100644
--- a/examples/minimal/package.json
+++ b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/portfolio-svelte/package.json b/examples/portfolio-svelte/package.json
index 72b8629b0..2fe80fb8a 100644
--- a/examples/portfolio-svelte/package.json
+++ b/examples/portfolio-svelte/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
index bf3b72449..407e0b0a6 100644
--- a/examples/portfolio/package.json
+++ b/examples/portfolio/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/starter/package.json b/examples/starter/package.json
index 85f5c8599..b2521233c 100644
--- a/examples/starter/package.json
+++ b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
index e8cf3c270..4b4974cd7 100644
--- a/examples/with-markdown-plugins/package.json
+++ b/examples/with-markdown-plugins/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1",
+    "astro": "^0.21.0-next.2",
     "rehype-add-classes": "^1.0.0",
     "rehype-autolink-headings": "^6.1.0",
     "rehype-toc": "^3.0.2",
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
index 2b6ecb32f..d5ed36030 100644
--- a/examples/with-markdown/package.json
+++ b/examples/with-markdown/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
index 3e7eee165..f5a854a7a 100644
--- a/examples/with-nanostores/package.json
+++ b/examples/with-nanostores/package.json
@@ -13,6 +13,6 @@
   },
   "devDependencies": {
     "@astrojs/renderer-solid": "^0.2.0-next.0",
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
index a7ee6a2bf..6fc133e09 100644
--- a/examples/with-tailwindcss/package.json
+++ b/examples/with-tailwindcss/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1",
+    "astro": "^0.21.0-next.2",
     "autoprefixer": "^10.4.0",
     "tailwindcss": "^2.2.19"
   }
diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
index 9425b7504..41da94a7a 100644
--- a/packages/astro/CHANGELOG.md
+++ b/packages/astro/CHANGELOG.md
@@ -1,5 +1,20 @@
 # astro
 
+## 0.21.0-next.2
+
+### Patch Changes
+
+- fbae2bc5: **Improve support for Astro config files.**
+
+In addition to properly loading `.cjs` and `.js` files in all cases, Astro now supports `astro.config.ts` files. 
+
+For convenience, you may now also move your `astro.config.js` file to a top-level `config/` directory.
+
+- 2e1bded7: Improve Tailwind HMR in `dev` mode
+- Fix bug when using `<Markdown></Markdown>` with no content
+- Support `PUBLIC_` prefixed `.env` variables
+- Respect `tsconfig.json` and `jsconfig.json` paths as aliases
+
 ## 0.21.0-next.1
 
 ### Patch Changes
diff --git a/packages/astro/package.json b/packages/astro/package.json
index a84b295e3..19f473c9d 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "0.21.0-next.1",
+  "version": "0.21.0-next.2",
   "author": "Skypack",
   "license": "MIT",
   "type": "module",
diff --git a/www/package.json b/www/package.json
index 3774235bd..00552a93f 100644
--- a/www/package.json
+++ b/www/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.21.0-next.1"
+    "astro": "^0.21.0-next.2"
   }
 }