Merge branch 'main' into email-signup

astro.config.mjs

@@ -3,8 +3,9 @@ import sitemap from "@astrojs/sitemap"
 import solidJs from "@astrojs/solid-js"
 import tailwind from "@astrojs/tailwind"
 import vercel from "@astrojs/vercel/serverless"
+import astroExpressiveCode from "astro-expressive-code"
 import { defineConfig } from "astro/config"
-import fs from "node:fs"
+import houston from "./houston.theme.json"
 
 /* https://vercel.com/docs/projects/environment-variables/system-environment-variables#system-environment-variables */
 const VERCEL_PREVIEW_SITE =
@@ -20,14 +21,13 @@ export default defineConfig({
 			applyBaseStyles: false,
 		}),
 		solidJs(),
+		astroExpressiveCode({
+			themes: [houston],
+			frames: false,
+		}),
 		mdx(),
 		sitemap(),
 	],
-	markdown: {
-		shikiConfig: {
-			theme: JSON.parse(fs.readFileSync("./houston.theme.json", { encoding: "utf-8" })),
-		},
-	},
 	image: {
 		domains: ["v1.screenshot.11ty.dev"],
 	},

package.json

@@ -28,6 +28,7 @@
     "@astrojs/tailwind": "^5.0.3",
     "@fontsource-variable/inter": "^5.0.16",
     "astro": "^4.0.4",
+    "astro-expressive-code": "^0.32.0",
     "chart.js": "4.4.1",
     "clsx": "^2.0.0",
     "gray-matter": "^4.0.3",

src/content/blog/astro-025.mdx

@@ -31,7 +31,7 @@ We can't do anything about the first two, but we can make Astro even easier for
 
 We'll share a lot more on this over the next two weeks, but you can start exploring the new API today [on our docs site.](https://docs.astro.build/en/guides/integrations-guide/). To migrate an existing Astro project to this new API, [read through our migration guide](https://docs.astro.build/en/migrate/#astro-integrations).
 
-```diff
+```diff lang="js"
 // astro.config.js
 + import lit from '@astrojs/lit';
 + import react from '@astrojs/react';

src/content/blog/astro-150.mdx

@@ -29,7 +29,7 @@ npm run preview
 
 We will be updating the other first party Astro adapters to support preview over time. Adapters can opt-in to this feature by providing the `previewEntrypoint` via the `setAdapter` function in `astro:config:done` hook. The Node.js adapter's code looks like this:
 
-```diff
+```diff lang="js"
 export default function() {
   return {
     name: '@astrojs/node',

src/content/blog/astro-250.mdx

@@ -29,7 +29,7 @@ First, we've introduced a new `type: 'data'` property to store data formats like
 
 Create data collections alongside your existing content collections:
 
-```diff
+```diff lang="js"
 src/content/
     blog/
         week-1.md