diff --git a/.changeset/orange-swans-smoke.md b/.changeset/orange-swans-smoke.md
new file mode 100644
index 000000000..1a36b4ecd
--- /dev/null
+++ b/.changeset/orange-swans-smoke.md
@@ -0,0 +1,8 @@
+---
+'astro': patch
+'@astrojs/prism': patch
+'create-astro': patch
+'@astrojs/markdown-remark': patch
+---
+
+Update dependency bundling to include more deps
diff --git a/packages/astro-prism/package.json b/packages/astro-prism/package.json
index cc84024e6..d37fcbb34 100644
--- a/packages/astro-prism/package.json
+++ b/packages/astro-prism/package.json
@@ -18,6 +18,8 @@
   "keywords": [],
   "author": "Skypack",
   "license": "MIT",
+  "//": "Default to 'devDependencies' (bundled with src/) rather than 'dependencies' (unbundled).",
+  "//": "See CONTRIBUTING.md for more info!",
   "devDependencies": {
     "prismjs": "^1.23.0"
   },
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 42acba25b..a8cd3cf6a 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -39,6 +39,8 @@
     "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
     "test": "mocha --parallel --timeout 15000"
   },
+  "//": "Default to 'devDependencies' (bundled with src/) rather than 'dependencies' (unbundled).",
+  "//": "See CONTRIBUTING.md for more info!",
   "dependencies": {
     "@astrojs/compiler": "^0.1.0-canary.47",
     "@astrojs/markdown-remark": "^0.3.1",
@@ -48,7 +50,19 @@
     "@astrojs/renderer-vue": "^0.1.8",
     "@babel/core": "^7.15.5",
     "@web/rollup-plugin-html": "^1.10.1",
+    "vite": "^2.5.10"
+  },
+  "devDependencies": {
+    "@types/babel__core": "^7.1.15",
+    "@types/chai": "^4.2.22",
+    "@types/connect": "^3.4.35",
+    "@types/mime": "^2.0.3",
+    "@types/mocha": "^9.0.0",
+    "@types/node-fetch": "^2.5.12",
+    "@types/send": "^0.17.1",
+    "@types/yargs-parser": "^20.2.1",
     "astring": "^1.7.5",
+    "chai": "^4.3.4",
     "cheerio": "^1.0.0-rc.10",
     "ci-info": "^3.2.0",
     "connect": "^3.7.0",
@@ -60,6 +74,7 @@
     "html-entities": "^2.3.2",
     "kleur": "^4.1.4",
     "mime": "^2.5.2",
+    "mocha": "^9.1.1",
     "morphdom": "^2.6.1",
     "node-fetch": "^2.6.1",
     "path-to-regexp": "^6.2.0",
@@ -69,30 +84,16 @@
     "shiki": "^0.9.10",
     "shorthash": "^0.0.2",
     "slash": "^4.0.0",
-    "srcset-parse": "^1.1.0",
     "source-map": "^0.7.3",
     "sourcemap-codec": "^1.4.8",
+    "srcset-parse": "^1.1.0",
     "string-width": "^5.0.0",
     "strip-ansi": "^7.0.1",
     "supports-esm": "^1.0.0",
     "tiny-glob": "^0.2.8",
-    "vite": "^2.5.10",
     "yargs-parser": "^20.2.9",
     "zod": "^3.8.1"
   },
-  "devDependencies": {
-    "@types/babel__core": "^7.1.15",
-    "@types/chai": "^4.2.22",
-    "@types/connect": "^3.4.35",
-    "@types/mime": "^2.0.3",
-    "@types/mocha": "^9.0.0",
-    "@types/node-fetch": "^2.5.12",
-    "@types/send": "^0.17.1",
-    "@types/yargs-parser": "^20.2.1",
-    "chai": "^4.3.4",
-    "cheerio": "^1.0.0-rc.10",
-    "mocha": "^9.1.1"
-  },
   "engines": {
     "node": "^12.20.0 || ^14.13.1 || >=16.0.0",
     "npm": ">=6.14.0"
diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json
index 6b3672922..dd06ccef3 100644
--- a/packages/create-astro/package.json
+++ b/packages/create-astro/package.json
@@ -23,18 +23,19 @@
     "dist",
     "create-astro.js"
   ],
+  "//": "Default to 'devDependencies' (bundled with src/) rather than 'dependencies' (unbundled).",
+  "//": "See CONTRIBUTING.md for more info!",
   "dependencies": {
-    "@types/degit": "^2.8.2",
-    "@types/node-fetch": "^2.5.12",
-    "@types/prompts": "^2.0.12",
-    "degit": "^2.8.4",
+    "degit": "^2.8.4"
+  },
+  "devDependencies": {
     "kleur": "^4.1.1",
     "node-fetch": "^2.6.1",
     "prompts": "^2.4.1",
-    "yargs-parser": "^20.2.7"
-  },
-  "devDependencies": {
+    "yargs-parser": "^20.2.7",
+    "@types/degit": "^2.8.2",
     "@types/node-fetch": "^2.5.12",
+    "@types/prompts": "^2.0.12",
     "uvu": "^0.5.1"
   },
   "engines": {
diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json
index ce7c9d3ac..d8a34ae9e 100644
--- a/packages/markdown/remark/package.json
+++ b/packages/markdown/remark/package.json
@@ -17,6 +17,8 @@
     "postbuild": "astro-scripts copy \"src/**/*.js\"",
     "dev": "astro-scripts dev \"src/**/*.ts\""
   },
+  "//": "Default to 'devDependencies' (bundled with src/) rather than 'dependencies' (unbundled).",
+  "//": "See CONTRIBUTING.md for more info!",
   "dependencies": {
     "@silvenon/remark-smartypants": "^1.0.0",
     "assert": "^2.0.0",
@@ -37,7 +39,6 @@
     "unist-util-map": "^3.0.0",
     "unist-util-visit": "^4.0.0"
   },
-  "//": "Important that gray-matter is in devDependencies so it gets bundled by esbuild!",
   "devDependencies": {
     "@types/github-slugger": "^1.3.0",
     "gray-matter": "^4.0.3"